Title: [259971] releases/WebKitGTK/webkit-2.28/Source/WebKit
Revision
259971
Author
[email protected]
Date
2020-04-12 06:17:01 -0700 (Sun, 12 Apr 2020)

Log Message

Merge r259943 - [GTK] Page is not drawn with PSON, hardware acceleration and address typed in URL bar
https://bugs.webkit.org/show_bug.cgi?id=208091

Reviewed by Michael Catanzaro.

This happens only when accelerated compositing mode policy is set to always. In this case, the
bindSurfaceToWebPage wayland message is received before the WebPageProxy has updated the web page identifier. We
should always check if there's a provisional page and get its web page identifier.

* UIProcess/gtk/WaylandCompositor.cpp:
(WebKit::WaylandCompositor::bindSurfaceToWebPage):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (259970 => 259971)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-04-12 13:16:58 UTC (rev 259970)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog	2020-04-12 13:17:01 UTC (rev 259971)
@@ -1,5 +1,19 @@
 2020-04-12  Carlos Garcia Campos  <[email protected]>
 
+        [GTK] Page is not drawn with PSON, hardware acceleration and address typed in URL bar
+        https://bugs.webkit.org/show_bug.cgi?id=208091
+
+        Reviewed by Michael Catanzaro.
+
+        This happens only when accelerated compositing mode policy is set to always. In this case, the
+        bindSurfaceToWebPage wayland message is received before the WebPageProxy has updated the web page identifier. We
+        should always check if there's a provisional page and get its web page identifier.
+
+        * UIProcess/gtk/WaylandCompositor.cpp:
+        (WebKit::WaylandCompositor::bindSurfaceToWebPage):
+
+2020-04-12  Carlos Garcia Campos  <[email protected]>
+
         [GTK][PSON] Crash in WaylandCompositor::Surface destructor with USE_WPE_RENDERER disabled
         https://bugs.webkit.org/show_bug.cgi?id=209345
 

Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp (259970 => 259971)


--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2020-04-12 13:16:58 UTC (rev 259970)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp	2020-04-12 13:17:01 UTC (rev 259971)
@@ -28,6 +28,7 @@
 
 #if PLATFORM(WAYLAND) && USE(EGL) && !USE(WPE_RENDERER)
 
+#include "ProvisionalPageProxy.h"
 #include "WebKitWaylandServerProtocol.h"
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -558,7 +559,9 @@
 {
     WebPageProxy* webPage = nullptr;
     for (auto* page : m_pageMap.keys()) {
-        if (page->webPageID() == pageID) {
+        auto* provisionalPage = page->provisionalPageProxy();
+        auto webPageID = provisionalPage ? provisionalPage->webPageID() : page->webPageID();
+        if (webPageID == pageID) {
             webPage = page;
             break;
         }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to