Attachment 357192 Details for Bug 192646 – ROLLOUT of r239129

[patch] ROLLOUT of r239129

bug-192646-20181212162722.patch (text/plain), 2.37 KB, created by WebKit Commit Bot on 2018-12-12 16:27:23 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-12-12 16:27:23 PST

Size: 2.37 KB

patch

obsolete

>Subversion Revision: 239132
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index aff2ca0e0cdb61648afc97524d0adad42c63ca8e..05cf3a99f7b3543521633d19a5ceb232fcc326d6 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-12-12  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r239129 and r239131.
>+        https://bugs.webkit.org/show_bug.cgi?id=192646
>+
>+        Casued macOS and iOS Debug testing to fail early (Requested by
>+        Truitt on #webkit).
>+
>+        Reverted changesets:
>+
>+        "Unreviewed build fix for WinCairo Debug after r239080(?)."
>+        https://trac.webkit.org/changeset/239129
>+
>+        "Unreviewed fix for Cocoa Debug test instability following
>+        r239129."
>+        https://trac.webkit.org/changeset/239131
>+
> 2018-12-12  Vivek Seth  <v_seth@apple.com>
> 
>         HTTPS Upgrade: Figure out if/how to tell clients that the HTTPS upgrade happened
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 788e36d7caaf30ac103872e164369dd0434eaee2..fbbc875e36918a6a200dafa5a8a6a0a08fbc1027 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -2759,6 +2759,12 @@ void WebPageProxy::continueNavigationInNewProcess(API::Navigation& navigation, s
>     };
> }
> 
>+NO_RETURN_DUE_TO_ASSERT void WebPageProxy::didFailToSuspendAfterProcessSwap()
>+{
>+    // Only the SuspendedPageProxy should be getting this call.
>+    ASSERT_NOT_REACHED();
>+}
>+
> void WebPageProxy::setUserAgent(String&& userAgent)
> {
>     if (m_userAgent == userAgent)
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 165054ca4a38f2bf15885dba4882a90b91402004..a32e831f59b6ecc1b998024ba357bfe4f6d659d7 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -1566,9 +1566,7 @@ private:
> 
>     void reattachToWebProcess();
>     void swapToWebProcess(Ref<WebProcessProxy>&&, std::unique_ptr<SuspendedPageProxy>&&, ShouldDelayAttachingDrawingArea);
>-
>-    // Only the SuspendedPageProxy should be getting this call.
>-    NO_RETURN_DUE_TO_ASSERT void didFailToSuspendAfterProcessSwap() { ASSERT_NOT_REACHED(); }
>+    void didFailToSuspendAfterProcessSwap();
> 
>     void finishAttachingToWebProcess(ShouldDelayAttachingDrawingArea = ShouldDelayAttachingDrawingArea::No);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192646: 357192