Changeset 258829 in webkit

Timestamp:

Mar 23, 2020 3:16:21 AM (4 years ago)

Author:

youenn@apple.com

Message:

Explicitly activate the new DrawingAreaProxy on PSON navigation
​https://bugs.webkit.org/show_bug.cgi?id=209232

Reviewed by Antti Koivisto.

Delay tree unfreezing for provisional pages until the main frame load is committed.
At that point, UIProcess is made aware and is doing the process swap.
We can thus unfreeze the tree so that UIProcess starts getting DrawAreaProxy messages.

This allows UIProcess to start listening to DrawAreaProxy messages at the time of doing process swapping in WebPageProxy.

• UIProcess/DrawingAreaProxy.cpp:

(WebKit::DrawingAreaProxy::DrawingAreaProxy):
(WebKit::DrawingAreaProxy::startReceivingMessages):

• UIProcess/DrawingAreaProxy.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setDrawingArea):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didCompletePageTransition):
(WebKit::WebPage::didCommitLoad):

Location:

trunk/Source

Files:

• WebCore/loader/FrameLoaderStateMachine.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/DrawingAreaProxy.cpp (modified) (1 diff)
• WebKit/UIProcess/DrawingAreaProxy.h (modified) (2 diffs)
• WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebKit/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebCore/loader/FrameLoaderStateMachine.h

@@ -52 +52 @@
 
     WEBCORE_EXPORT bool committingFirstRealLoad() const;
-    WEBCORE_EXPORT bool committedFirstRealDocumentLoad() const;
-    bool creatingInitialEmptyDocument() const;
+    bool committedFirstRealDocumentLoad() const;
+    WEBCORE_EXPORT bool creatingInitialEmptyDocument() const;
     WEBCORE_EXPORT bool isDisplayingInitialEmptyDocument() const;
     WEBCORE_EXPORT bool firstLayoutDone() const;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-03-23  youenn fablet  <youenn@apple.com>
+
+        Explicitly activate the new DrawingAreaProxy on PSON navigation
+        https://bugs.webkit.org/show_bug.cgi?id=209232
+
+        Reviewed by Antti Koivisto.
+
+        Delay tree unfreezing for provisional pages until the main frame load is committed.
+        At that point, UIProcess is made aware and is doing the process swap.
+        We can thus unfreeze the tree so that UIProcess starts getting DrawAreaProxy messages.
+
+        This allows UIProcess to start listening to DrawAreaProxy messages at the time of doing process swapping in WebPageProxy.
+
+        * UIProcess/DrawingAreaProxy.cpp:
+        (WebKit::DrawingAreaProxy::DrawingAreaProxy):
+        (WebKit::DrawingAreaProxy::startReceivingMessages):
+        * UIProcess/DrawingAreaProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setDrawingArea):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didCompletePageTransition):
+        (WebKit::WebPage::didCommitLoad):
+
 2020-03-22  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/DrawingAreaProxy.cpp

@@ -49 +49 @@
 #endif
 {
-    process.addMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_identifier, *this);
 }
 
 DrawingAreaProxy::~DrawingAreaProxy()
 {
-    process().removeMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_identifier);
+    if (m_startedReceivingMessages)
+        process().removeMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_identifier);
+}
+
+void DrawingAreaProxy::startReceivingMessages()
+{
+    m_startedReceivingMessages = true;
+    process().addMessageReceiver(Messages::DrawingAreaProxy::messageReceiverName(), m_identifier, *this);
 }
 

trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h

@@ -61 +61 @@
     DrawingAreaType type() const { return m_type; }
     DrawingAreaIdentifier identifier() const { return m_identifier; }
+
+    void startReceivingMessages();
 
     virtual void deviceScaleFactorDidChange() = 0;
@@ -156 +158 @@
     virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
 #endif
+    bool m_startedReceivingMessages { false };
 };
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -1036 +1036 @@
         return;
 
+    m_drawingArea->startReceivingMessages();
+
 #if ENABLE(ASYNC_SCROLLING) && PLATFORM(COCOA)
     if (m_drawingArea->type() == DrawingAreaTypeRemoteLayerTree) {

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

@@ -3335 +3335 @@
 {
     unfreezeLayerTree(LayerTreeFreezeReason::PageTransition);
-
-    auto& stateMachine = m_mainFrame->coreFrame()->loader().stateMachine();
-    RELEASE_LOG_IF_ALLOWED(Layers, "didCompletePageTransition: Did complete page transition, loader state is %d", stateMachine.stateForDebugging());
-
-    if (stateMachine.committedFirstRealDocumentLoad())
-        unfreezeLayerTree(LayerTreeFreezeReason::ProcessSwap);
 }
 
@@ -5866 +5860 @@
         return;
 
+    ASSERT(!frame->coreFrame()->loader().stateMachine().creatingInitialEmptyDocument());
+    unfreezeLayerTree(LayerTreeFreezeReason::ProcessSwap);
+
 #if ENABLE(RESOURCE_LOAD_STATISTICS)
     clearLoadedThirdPartyDomains();