Changeset 246592 in webkit

Timestamp:

Jun 19, 2019 10:13:25 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Page blinks after navigation swipe if it triggered PSON
​https://bugs.webkit.org/show_bug.cgi?id=198996

Patch by Alexander Mikhaylenko <​exalm7659@gmail.com> on 2019-06-19
Reviewed by Michael Catanzaro.

Disconnect and then reconnect ViewGestureController during process swap
instead of destroying and re-creating it.

• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::PageClientImpl::processWillSwap): Added.
(WebKit::PageClientImpl::PageClientImpl::processDidExit): Implemented.

• UIProcess/API/gtk/PageClientImpl.h:
• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseWillSwapWebProcess): Added.
Disconnect ViewGestureController if it exists.
(webkitWebViewBaseDidExitWebProcess): Added.
Destroy ViewGestureController.
(webkitWebViewBaseDidRelaunchWebProcess):
Reconnect the ViewGestureController if it exists.

• UIProcess/API/gtk/WebKitWebViewBasePrivate.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (2 diffs)
• UIProcess/API/gtk/WebKitWebViewBasePrivate.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-19  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        [GTK] Page blinks after navigation swipe if it triggered PSON
+        https://bugs.webkit.org/show_bug.cgi?id=198996
+
+        Reviewed by Michael Catanzaro.
+
+        Disconnect and then reconnect ViewGestureController during process swap
+        instead of destroying and re-creating it.
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::PageClientImpl::processWillSwap): Added.
+        (WebKit::PageClientImpl::PageClientImpl::processDidExit): Implemented.
+        * UIProcess/API/gtk/PageClientImpl.h:
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseWillSwapWebProcess): Added.
+        Disconnect ViewGestureController if it exists.
+        (webkitWebViewBaseDidExitWebProcess): Added.
+        Destroy ViewGestureController.
+        (webkitWebViewBaseDidRelaunchWebProcess):
+        Reconnect the ViewGestureController if it exists.
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+
 2019-06-19  Takashi Komori  <Takashi.Komori@sony.com>
 

trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp

@@ -119 +119 @@
 }
 
+void PageClientImpl::PageClientImpl::processWillSwap()
+{
+    webkitWebViewBaseWillSwapWebProcess(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+}
+
 void PageClientImpl::PageClientImpl::processDidExit()
 {
-    notImplemented();
+    webkitWebViewBaseDidExitWebProcess(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
 }
 

trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h

@@ -70 +70 @@
     bool isViewVisible() override;
     bool isViewInWindow() override;
+    void processWillSwap() override;
     void processDidExit() override;
     void didRelaunchProcess() override;

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -1701 +1701 @@
 }
 
+void webkitWebViewBaseWillSwapWebProcess(WebKitWebViewBase* webkitWebViewBase)
+{
+    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+
+    if (priv->viewGestureController)
+        priv->viewGestureController->disconnectFromProcess();
+}
+
+void webkitWebViewBaseDidExitWebProcess(WebKitWebViewBase* webkitWebViewBase)
+{
+    webkitWebViewBase->priv->viewGestureController = nullptr;
+}
+
 void webkitWebViewBaseDidRelaunchWebProcess(WebKitWebViewBase* webkitWebViewBase)
 {
@@ -1707 +1720 @@
 
     WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
-    priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
-    priv->viewGestureController->setSwipeGestureEnabled(priv->isBackForwardNavigationGestureEnabled);
+
+    if (priv->viewGestureController)
+        priv->viewGestureController->connectToProcess();
+    else {
+        priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
+        priv->viewGestureController->setSwipeGestureEnabled(priv->isBackForwardNavigationGestureEnabled);
+    }
 }
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

@@ -72 +72 @@
 void webkitWebViewBaseExitAcceleratedCompositingMode(WebKitWebViewBase*);
 bool webkitWebViewBaseMakeGLContextCurrent(WebKitWebViewBase*);
+void webkitWebViewBaseWillSwapWebProcess(WebKitWebViewBase*);
+void webkitWebViewBaseDidExitWebProcess(WebKitWebViewBase*);
 void webkitWebViewBaseDidRelaunchWebProcess(WebKitWebViewBase*);
 void webkitWebViewBasePageClosed(WebKitWebViewBase*);