Changeset 196058 in webkit

Timestamp:

Feb 3, 2016 1:54:20 AM (8 years ago)

Author:

zandobersek@gmail.com

Message:

[TexMap] CompositingCoordinator should store the overlay layer, flush it as appropriate
​https://bugs.webkit.org/show_bug.cgi?id=152058

Reviewed by Michael Catanzaro.

Previously, the CompositingCoordinator only added the overlay layer to the
layer tree, but flushing its compositing state is also required. For that to
happen, CompositingCoordinator has to store a pointer to the overlay layer
object and flush it in ::flushPendingLayerChanges().

Overlay layers are most prominently used by the Web Inspector to highlight
the DOM elements on the Web page that are being hovered in the inspector.

• platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:

(WebCore::CompositingCoordinator::CompositingCoordinator):
(WebCore::CompositingCoordinator::setRootCompositingLayer):
(WebCore::CompositingCoordinator::flushPendingLayerChanges):

• platform/graphics/texmap/coordinated/CompositingCoordinator.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (modified) (3 diffs)
• platform/graphics/texmap/coordinated/CompositingCoordinator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-03  Zan Dobersek  <zdobersek@igalia.com>
+
+        [TexMap] CompositingCoordinator should store the overlay layer, flush it as appropriate
+        https://bugs.webkit.org/show_bug.cgi?id=152058
+
+        Reviewed by Michael Catanzaro.
+
+        Previously, the CompositingCoordinator only added the overlay layer to the
+        layer tree, but flushing its compositing state is also required. For that to
+        happen, CompositingCoordinator has to store a pointer to the overlay layer
+        object and flush it in ::flushPendingLayerChanges().
+
+        Overlay layers are most prominently used by the Web Inspector to highlight
+        the DOM elements on the Web page that are being hovered in the inspector.
+
+        * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+        (WebCore::CompositingCoordinator::CompositingCoordinator):
+        (WebCore::CompositingCoordinator::setRootCompositingLayer):
+        (WebCore::CompositingCoordinator::flushPendingLayerChanges):
+        * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
+
 2016-02-03  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp

@@ -48 +48 @@
     , m_client(client)
     , m_rootCompositingLayer(nullptr)
+    , m_overlayCompositingLayer(nullptr)
     , m_isDestructing(false)
     , m_isPurging(false)
@@ -79 +80 @@
         m_rootLayer->addChildAtIndex(m_rootCompositingLayer, 0);
 
-    if (overlayLayer)
-        m_rootLayer->addChild(overlayLayer);
+    m_overlayCompositingLayer = overlayLayer;
+    if (m_overlayCompositingLayer)
+        m_rootLayer->addChild(m_overlayCompositingLayer);
 }
 
@@ -95 +97 @@
     initializeRootCompositingLayerIfNeeded();
 
-    m_rootLayer->flushCompositingStateForThisLayerOnly(m_page->mainFrame().view()->viewportIsStable());
+    bool viewportIsStable = m_page->mainFrame().view()->viewportIsStable();
+    m_rootLayer->flushCompositingStateForThisLayerOnly(viewportIsStable);
     m_client->didFlushRootLayer(m_visibleContentsRect);
+
+    if (m_overlayCompositingLayer)
+        m_overlayCompositingLayer->flushCompositingState(FloatRect(FloatPoint(), m_rootLayer->size()), viewportIsStable);
 
     bool didSync = m_page->mainFrame().view()->flushCompositingStateIncludingSubframes();

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h

@@ -130 +130 @@
     std::unique_ptr<GraphicsLayer> m_rootLayer;
     GraphicsLayer* m_rootCompositingLayer;
+    GraphicsLayer* m_overlayCompositingLayer;
 
     CoordinatedGraphicsState m_state;