Title: [187136] trunk/Source/WebKit2
- Revision
- 187136
- Author
- dba...@webkit.org
- Date
- 2015-07-21 16:33:37 -0700 (Tue, 21 Jul 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (187135 => 187136)
--- trunk/Source/WebKit2/ChangeLog 2015-07-21 23:31:48 UTC (rev 187135)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-21 23:33:37 UTC (rev 187136)
@@ -1,3 +1,12 @@
+2015-07-21 Daniel Bates <daba...@apple.com>
+
+ 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-21 Simon Fraser <simon.fra...@apple.com>
Rename the 'View' log channel to 'Printing'
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (187135 => 187136)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-07-21 23:31:48 UTC (rev 187135)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-07-21 23:33:37 UTC (rev 187136)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
