Changeset 246030 in webkit

Timestamp:

Jun 3, 2019, 1:07:06 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r244182): [CoordinatedGraphics] Related view doesn't receive graphic updates
​https://bugs.webkit.org/show_bug.cgi?id=198418

Reviewed by Žan Doberšek.

This is because we need a DisplayRefreshMonitor per drawing area, but the one from the first ThreradedCompositor
is always reused because they use the same display ID.

• WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:

(WebKit::DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode): Use a unique display ID derived from
WebPage's ID.
(WebKit::DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode): Use the primary display ID.

• WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:

(WebKit::LayerTreeHost::LayerTreeHost): Get the current web page display ID instead of inventing one.
(WebKit::LayerTreeHost::setIsDiscardable): Do not change display ID.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp (modified) (2 diffs)
• WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r244182): [CoordinatedGraphics] Related view doesn't receive graphic updates
+        https://bugs.webkit.org/show_bug.cgi?id=198418
+
+        Reviewed by Žan Doberšek.
+
+        This is because we need a DisplayRefreshMonitor per drawing area, but the one from the first ThreradedCompositor
+        is always reused because they use the same display ID.
+
+        * WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
+        (WebKit::DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode): Use a unique display ID derived from
+        WebPage's ID.
+        (WebKit::DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode): Use the primary display ID.
+        * WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:
+        (WebKit::LayerTreeHost::LayerTreeHost): Get the current web page display ID instead of inventing one.
+        (WebKit::LayerTreeHost::setIsDiscardable): Do not change display ID.
+
 2019-06-01  Dean Jackson  <dino@apple.com>
 

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

@@ -545 +545 @@
     m_wantsToExitAcceleratedCompositingMode = false;
 
+    // In order to ensure that we get a unique DisplayRefreshMonitor per-DrawingArea (necessary because ThreadedDisplayRefreshMonitor
+    // is driven by the ThreadedCompositor of the drawing area), give each page a unique DisplayID derived from WebPage's unique ID.
+    m_webPage.windowScreenDidChange(std::numeric_limits<uint32_t>::max() - m_webPage.pageID().toUInt64());
+
     ASSERT(!m_layerTreeHost);
     if (m_previousLayerTreeHost) {
@@ -598 +602 @@
     m_discardPreviousLayerTreeHostTimer.startOneShot(5_s);
 
+    // Always use the primary display ID (0) when not in accelerated compositing mode.
+    m_webPage.windowScreenDidChange(0);
+
     m_dirtyRegion = m_webPage.bounds();
 

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

@@ -35 +35 @@
 #include "WebPage.h"
 #include "WebPageProxyMessages.h"
+#include <WebCore/Chrome.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
@@ -45 +46 @@
 namespace WebKit {
 using namespace WebCore;
-
-static const PlatformDisplayID primaryDisplayID = 0;
-#if PLATFORM(GTK)
-static const PlatformDisplayID compositingDisplayID = 1;
-#else
-static const PlatformDisplayID compositingDisplayID = primaryDisplayID;
-#endif
 
 LayerTreeHost::LayerTreeHost(WebPage& webPage)
@@ -84 +78 @@
             paintFlags |= TextureMapper::PaintingMirrored;
 
-        m_compositor = ThreadedCompositor::create(m_compositorClient, m_compositorClient, compositingDisplayID, scaledSize, scaleFactor, ThreadedCompositor::ShouldDoFrameSync::Yes, paintFlags);
+        m_compositor = ThreadedCompositor::create(m_compositorClient, m_compositorClient, m_webPage.corePage()->chrome().displayID(), scaledSize, scaleFactor, ThreadedCompositor::ShouldDoFrameSync::Yes, paintFlags);
         m_layerTreeContext.contextID = m_surface->surfaceID();
     } else
-        m_compositor = ThreadedCompositor::create(m_compositorClient, m_compositorClient, compositingDisplayID, scaledSize, scaleFactor);
-
-    m_webPage.windowScreenDidChange(compositingDisplayID);
+        m_compositor = ThreadedCompositor::create(m_compositorClient, m_compositorClient, m_webPage.corePage()->chrome().displayID(), scaledSize, scaleFactor);
 
     didChangeViewport();
@@ -325 +317 @@
     if (m_isDiscardable) {
         m_discardableSyncActions = OptionSet<DiscardableSyncActions>();
-        m_webPage.windowScreenDidChange(primaryDisplayID);
-        return;
-    }
-    m_webPage.windowScreenDidChange(compositingDisplayID);
+        return;
+    }
 
     if (m_discardableSyncActions.isEmpty())