Title: [239131] trunk/Source/WebKit
Revision
239131
Author
[email protected]
Date
2018-12-12 15:42:24 -0800 (Wed, 12 Dec 2018)

Log Message

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.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (239130 => 239131)


--- trunk/Source/WebKit/ChangeLog	2018-12-12 22:04:02 UTC (rev 239130)
+++ trunk/Source/WebKit/ChangeLog	2018-12-12 23:42:24 UTC (rev 239131)
@@ -1,3 +1,13 @@
+2018-12-12  Ross Kirsling  <[email protected]>
+
+        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  <[email protected]>
 
         Add a preference to enable / disable devicemotion and deviceorientation events

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (239130 => 239131)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-12-12 22:04:02 UTC (rev 239130)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2018-12-12 23:42:24 UTC (rev 239131)
@@ -2759,12 +2759,6 @@
     };
 }
 
-void WebPageProxy::didFailToSuspendAfterProcessSwap()
-{
-    // Only the SuspendedPageProxy should be getting this call.
-    ASSERT_NOT_REACHED();
-}
-
 void WebPageProxy::setUserAgent(String&& userAgent)
 {
     if (m_userAgent == userAgent)

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (239130 => 239131)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.h	2018-12-12 22:04:02 UTC (rev 239130)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h	2018-12-12 23:42:24 UTC (rev 239131)
@@ -1566,8 +1566,10 @@
 
     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);
 
     RefPtr<API::Navigation> reattachToWebProcessForReload();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to