Title: [187305] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187305
- Author
- [email protected]
- Date
- 2015-07-24 00:03:46 -0700 (Fri, 24 Jul 2015)
Log Message
Merged r187136. rdar://problem/18477459
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187304 => 187305)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:02:10 UTC (rev 187304)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 07:03:46 UTC (rev 187305)
@@ -1,3 +1,16 @@
+2015-07-24 Lucas Forschler <[email protected]>
+
+ Merge r187136
+
+ 2015-07-21 Daniel Bates <[email protected]>
+
+ Fix the build following <https://trac.webkit.org/changeset/187129>
+ (https://bugs.webkit.org/show_bug.cgi?id=147112)
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState): Guard implementation with PLATFORM(IOS)
+ since this logic is specific to the iOS port.
+
2015-07-23 Lucas Forschler <[email protected]>
Merge r187129
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (187304 => 187305)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-07-24 07:02:10 UTC (rev 187304)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-07-24 07:03:46 UTC (rev 187305)
@@ -928,6 +928,7 @@
#if ENABLE(NETWORK_PROCESS)
void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
{
+#if PLATFORM(IOS)
ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
// The network process crashed; take new tokens for the new network process.
@@ -935,6 +936,9 @@
m_backgroundTokenForNetworkProcess = newNetworkProcessProxy.throttler().backgroundActivityToken();
else if (m_foregroundTokenForNetworkProcess)
m_foregroundTokenForNetworkProcess = newNetworkProcessProxy.throttler().foregroundActivityToken();
+#else
+ UNUSED_PARAM(newNetworkProcessProxy);
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
