Changeset 76359 in webkit

Timestamp:

Jan 21, 2011 10:31:45 AM (13 years ago)

Author:

Adam Roben

Message:

Replace some "sync compositing state" terminology with "flush pending GraphicsLayer changes"

This seems to be the direction in which our code is moving. I chose "GraphicsLayer" as
opposed to just "layer" because there are cases where we flush changes to CACFLayers that
don't have a corresponding GraphicsLayer.

Fixes <​http://webkit.org/b/52894> "Sync compositing state" terminology in
WKCACFLayerRenderer and friends is confusing

Reviewed by Simon Fraser.

Source/WebCore:

• platform/graphics/win/WKCACFLayerRenderer.cpp:

(WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer):
(WebCore::WKCACFLayerRenderer::render):
Updated for renames.

(WebCore::WKCACFLayerRenderer::flushPendingGraphicsLayerChangesSoon): Renamed from
syncCompositingStateSoon, and updated for other renames.

• platform/graphics/win/WKCACFLayerRenderer.h: Renamed m_syncLayerChanges to
• m_shouldFlushPendingGraphicsLayerChanges.

(WebCore::WKCACFLayerRendererClient::flushPendingGraphicsLayerChanges): Renamed from
syncCompositingState.

Source/WebKit/win:

• WebCoreSupport/WebChromeClient.cpp:

(WebChromeClient::scheduleCompositingLayerSync): Updated for WebView changes.

• WebView.cpp:

(WebView::paint): Updated for rename.
(WebView::flushPendingGraphicsLayerChangesSoon): Renamed from scheduleCompositingLayerSync.
(WebView::notifySyncRequired): Updated for rename.
(WebView::flushPendingGraphicsLayerChanges): Renamed from syncCompositingState.

• WebView.h: Did the renames.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp (modified) (3 diffs)
• WebCore/platform/graphics/win/WKCACFLayerRenderer.h (modified) (3 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (4 diffs)
• WebKit/win/WebView.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-21  Adam Roben  <aroben@apple.com>
+
+        Replace some "sync compositing state" terminology with "flush pending GraphicsLayer changes"
+
+        This seems to be the direction in which our code is moving. I chose "GraphicsLayer" as
+        opposed to just "layer" because there are cases where we flush changes to CACFLayers that
+        don't have a corresponding GraphicsLayer.
+
+        Fixes <http://webkit.org/b/52894> "Sync compositing state" terminology in
+        WKCACFLayerRenderer and friends is confusing
+
+        Reviewed by Simon Fraser.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        (WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer):
+        (WebCore::WKCACFLayerRenderer::render):
+        Updated for renames.
+
+        (WebCore::WKCACFLayerRenderer::flushPendingGraphicsLayerChangesSoon): Renamed from
+        syncCompositingStateSoon, and updated for other renames.
+
+        * platform/graphics/win/WKCACFLayerRenderer.h: Renamed m_syncLayerChanges to
+        * m_shouldFlushPendingGraphicsLayerChanges.
+        (WebCore::WKCACFLayerRendererClient::flushPendingGraphicsLayerChanges): Renamed from
+        syncCompositingState.
+
 2011-01-21  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp

@@ -188 +188 @@
     , m_renderTimer(this, &WKCACFLayerRenderer::renderTimerFired)
     , m_mustResetLostDeviceBeforeRendering(false)
-    , m_syncLayerChanges(false)
+    , m_shouldFlushPendingGraphicsLayerChanges(false)
 {
     // Point the CACFContext to this
@@ -431 +431 @@
     }
 
-    // Sync the layer if needed
-    if (m_syncLayerChanges) {
-        m_client->syncCompositingState();
-        m_syncLayerChanges = false;
+    if (m_shouldFlushPendingGraphicsLayerChanges) {
+        m_client->flushPendingGraphicsLayerChanges();
+        m_shouldFlushPendingGraphicsLayerChanges = false;
     }
 
@@ -525 +524 @@
 }
 
-void WKCACFLayerRenderer::syncCompositingStateSoon()
-{
-    m_syncLayerChanges = true;
+void WKCACFLayerRenderer::flushPendingGraphicsLayerChangesSoon()
+{
+    m_shouldFlushPendingGraphicsLayerChanges = true;
     renderSoon();
 }

trunk/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.h

@@ -54 +54 @@
     virtual ~WKCACFLayerRendererClient() { }
     virtual bool shouldRender() const = 0;
-    virtual void syncCompositingState() { }
+    virtual void flushPendingGraphicsLayerChanges() { }
 };
 
@@ -76 +76 @@
     void paint();
     void resize();
-    void syncCompositingStateSoon();
+    void flushPendingGraphicsLayerChangesSoon();
 
 protected:
@@ -111 +111 @@
     Timer<WKCACFLayerRenderer> m_renderTimer;
     bool m_mustResetLostDeviceBeforeRendering;
-    bool m_syncLayerChanges;
+    bool m_shouldFlushPendingGraphicsLayerChanges;
     HashSet<RefPtr<PlatformCALayer> > m_pendingAnimatedLayers;
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-01-21  Adam Roben  <aroben@apple.com>
+
+        Replace some "sync compositing state" terminology with "flush pending GraphicsLayer changes"
+
+        This seems to be the direction in which our code is moving. I chose "GraphicsLayer" as
+        opposed to just "layer" because there are cases where we flush changes to CACFLayers that
+        don't have a corresponding GraphicsLayer.
+
+        Fixes <http://webkit.org/b/52894> "Sync compositing state" terminology in
+        WKCACFLayerRenderer and friends is confusing
+
+        Reviewed by Simon Fraser.
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::scheduleCompositingLayerSync): Updated for WebView changes.
+
+        * WebView.cpp:
+        (WebView::paint): Updated for rename.
+        (WebView::flushPendingGraphicsLayerChangesSoon): Renamed from scheduleCompositingLayerSync.
+        (WebView::notifySyncRequired): Updated for rename.
+        (WebView::flushPendingGraphicsLayerChanges): Renamed from syncCompositingState.
+
+        * WebView.h: Did the renames.
+
 2011-01-20  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp

@@ -827 +827 @@
 void WebChromeClient::scheduleCompositingLayerSync()
 {
-    m_webView->scheduleCompositingLayerSync();
+    m_webView->flushPendingGraphicsLayerChangesSoon();
 }
 

trunk/Source/WebKit/win/WebView.cpp

@@ -991 +991 @@
 #if USE(ACCELERATED_COMPOSITING)
     if (isAcceleratedCompositing()) {
-        syncCompositingState();
-        // Syncing might have taken us out of compositing mode.
+        flushPendingGraphicsLayerChanges();
+        // Flushing might have taken us out of compositing mode.
         if (isAcceleratedCompositing()) {
             // FIXME: We need to paint into dc (if provided). <http://webkit.org/b/52578>
@@ -6273 +6273 @@
 }
 
-void WebView::scheduleCompositingLayerSync()
+void WebView::flushPendingGraphicsLayerChangesSoon()
 {
     if (!m_layerRenderer)
         return;
-    m_layerRenderer->syncCompositingStateSoon();
+    m_layerRenderer->flushPendingGraphicsLayerChangesSoon();
 }
 
@@ -6481 +6481 @@
 void WebView::notifySyncRequired(const GraphicsLayer*)
 {
-    scheduleCompositingLayerSync();
+    flushPendingGraphicsLayerChangesSoon();
 }
 
@@ -6518 +6518 @@
 }
 
-void WebView::syncCompositingState()
+void WebView::flushPendingGraphicsLayerChanges()
 {
     Frame* coreFrame = core(m_mainFrame);

trunk/Source/WebKit/win/WebView.h

@@ -906 +906 @@
 
 #if USE(ACCELERATED_COMPOSITING)
-    void scheduleCompositingLayerSync();
+    void flushPendingGraphicsLayerChangesSoon();
     void setRootChildLayer(WebCore::GraphicsLayer*);
 #endif
@@ -950 +950 @@
     // WKCACFLayerRendererClient
     virtual bool shouldRender() const;
-    virtual void syncCompositingState();
+    virtual void flushPendingGraphicsLayerChanges();
 #endif