Changeset 240365 in webkit

Timestamp:

Jan 23, 2019 4:23:52 PM (5 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r240343.

Caused 4 PSON API test failures.

Reverted changeset:

"[PSON] Flash on back navigation on Mac"
​https://bugs.webkit.org/show_bug.cgi?id=193716
​https://trac.webkit.org/changeset/240343

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/SuspendedPageProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• UIProcess/WebProcessPool.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-23  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r240343.
+
+        Caused 4 PSON API test failures.
+
+        Reverted changeset:
+
+        "[PSON] Flash on back navigation on Mac"
+        https://bugs.webkit.org/show_bug.cgi?id=193716
+        https://trac.webkit.org/changeset/240343
+
 2019-01-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/SuspendedPageProxy.cpp

@@ -27 +27 @@
 #include "SuspendedPageProxy.h"
 
-#include "DrawingAreaProxy.h"
 #include "Logging.h"
 #include "WebPageMessages.h"
@@ -156 +155 @@
     m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_page.pageID());
 
-    bool shouldKeepOnFailure = false;
-#if PLATFORM(MAC)
-    // With web process side tiles, we need to keep the suspended page around on failure to avoid flashing.
-    // It is removed by WebPageProxy::enterAcceleratedCompositingMode when the target page is ready.
-    shouldKeepOnFailure = m_page.drawingArea() && m_page.drawingArea()->type() == DrawingAreaTypeTiledCoreAnimation;
-#endif
-    if (newSuspensionState == SuspensionState::FailedToSuspend && !shouldKeepOnFailure) {
-        RunLoop::main().dispatch([weakProcessPool = makeWeakPtr(m_process->processPool()), weakThis = makeWeakPtr(*this)] {
-            if (weakProcessPool && weakThis)
-                weakProcessPool->removeSuspendedPage(*weakThis);
-        });
-    }
-
     if (m_readyToUnsuspendHandler)
         m_readyToUnsuspendHandler(this);

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6848 +6848 @@
 void WebPageProxy::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
 {
-#if PLATFORM(MAC)
-    ASSERT(m_drawingArea->type() == DrawingAreaTypeTiledCoreAnimation);
-#endif
     pageClient().enterAcceleratedCompositingMode(layerTreeContext);
-    // We needed the failed suspended page to stay alive to avoid flashing. Now we can get rid of it.
-    m_process->processPool().removeFailedSuspendedPagesForPage(*this);
 }
 

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -2263 +2263 @@
 }
 
-void WebProcessPool::removeFailedSuspendedPagesForPage(WebPageProxy& page)
-{
-    m_suspendedPages.removeAllMatching([&page](auto& suspendedPage) {
-        return &suspendedPage->page() == &page && suspendedPage->failedToSuspend();
-    });
-}
-
 std::unique_ptr<SuspendedPageProxy> WebProcessPool::takeSuspendedPage(SuspendedPageProxy& suspendedPage)
 {

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -448 +448 @@
     void addSuspendedPage(std::unique_ptr<SuspendedPageProxy>&&);
     void removeAllSuspendedPagesForPage(WebPageProxy&);
-    void removeFailedSuspendedPagesForPage(WebPageProxy&);
     std::unique_ptr<SuspendedPageProxy> takeSuspendedPage(SuspendedPageProxy&);
     void removeSuspendedPage(SuspendedPageProxy&);

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -1341 +1341 @@
 {
     auto failedToSuspend = [this, protectedThis = makeRef(*this)] {
+        close();
         send(Messages::WebPageProxy::DidFailToSuspendAfterProcessSwap());
     };