Unreviewed fix for Cocoa Debug test instability following r239129.
authorross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2018 23:42:24 +0000 (23:42 +0000)
committerross.kirsling@sony.com <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2018 23:42:24 +0000 (23:42 +0000)
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap): Deleted.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
Move the whole assertion to the declaration site.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239131 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebPageProxy.cpp
Source/WebKit/UIProcess/WebPageProxy.h

index 573ae31..d02c211 100644 (file)
@@ -1,3 +1,13 @@
+2018-12-12  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed fix for Cocoa Debug test instability following r239129.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap): Deleted.
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::didFailToSuspendAfterProcessSwap):
+        Move the whole assertion to the declaration site.
+
 2018-12-12  Chris Dumez  <cdumez@apple.com>
 
         Add a preference to enable / disable devicemotion and deviceorientation events
index 82eb374..788e36d 100644 (file)
@@ -2759,12 +2759,6 @@ void WebPageProxy::continueNavigationInNewProcess(API::Navigation& navigation, s
     };
 }
 
-void WebPageProxy::didFailToSuspendAfterProcessSwap()
-{
-    // Only the SuspendedPageProxy should be getting this call.
-    ASSERT_NOT_REACHED();
-}
-
 void WebPageProxy::setUserAgent(String&& userAgent)
 {
     if (m_userAgent == userAgent)
index 0bcda19..165054c 100644 (file)
@@ -1566,7 +1566,9 @@ private:
 
     void reattachToWebProcess();
     void swapToWebProcess(Ref<WebProcessProxy>&&, std::unique_ptr<SuspendedPageProxy>&&, ShouldDelayAttachingDrawingArea);
-    NO_RETURN_DUE_TO_ASSERT void didFailToSuspendAfterProcessSwap();
+
+    // Only the SuspendedPageProxy should be getting this call.
+    NO_RETURN_DUE_TO_ASSERT void didFailToSuspendAfterProcessSwap() { ASSERT_NOT_REACHED(); }
 
     void finishAttachingToWebProcess(ShouldDelayAttachingDrawingArea = ShouldDelayAttachingDrawingArea::No);