Changeset 187136 in webkit

Timestamp:

Jul 21, 2015, 4:33:37 PM (11 years ago)

Author:

dbates@webkit.org

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-21  Daniel Bates  <dabates@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.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -929 +929 @@
 void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
 {
+#if PLATFORM(IOS)
     ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
 
@@ -936 +937 @@
     else if (m_foregroundTokenForNetworkProcess)
         m_foregroundTokenForNetworkProcess = newNetworkProcessProxy.throttler().foregroundActivityToken();
+#else
+    UNUSED_PARAM(newNetworkProcessProxy);
+#endif
 }
 #endif