Changeset 93647 in webkit

Timestamp:

Aug 23, 2011 4:01:08 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Remove obsolete child context list from LayerRendererChromium
​https://bugs.webkit.org/show_bug.cgi?id=66743

Patch by James Robinson <​jamesr@chromium.org> on 2011-08-23
Reviewed by Kenneth Russell.

Before we had proper semantics for flush() in the command buffer, we
used a scheme of latches across contexts to ensure consistent frames
were presented for WebGL and canvas. We no longer have latches and
flush is a proper synchronization primative, so the child context list
no longer does anything. Canvas2DLayerChromium and
WebGLLayerChromium's implementations of updateCompositorResources() do
flushes on the appropriate context already - canvas layers via
DrawingBuffer::publishToPlatformLayer(), and WebGL layers via the call
to prepareTexture().

No new tests since the code being removed doesn't do anything.

• platform/graphics/chromium/Canvas2DLayerChromium.cpp:

(WebCore::Canvas2DLayerChromium::~Canvas2DLayerChromium):
(WebCore::Canvas2DLayerChromium::setDrawingBuffer):

• platform/graphics/chromium/Canvas2DLayerChromium.h:
• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::drawLayers):

• platform/graphics/chromium/LayerRendererChromium.h:
• platform/graphics/chromium/WebGLLayerChromium.cpp:

(WebCore::WebGLLayerChromium::~WebGLLayerChromium):
(WebCore::WebGLLayerChromium::setContext):

• platform/graphics/chromium/WebGLLayerChromium.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/Canvas2DLayerChromium.cpp (modified) (2 diffs)
• platform/graphics/chromium/Canvas2DLayerChromium.h (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (2 diffs)
• platform/graphics/chromium/LayerRendererChromium.h (modified) (3 diffs)
• platform/graphics/chromium/WebGLLayerChromium.cpp (modified) (3 diffs)
• platform/graphics/chromium/WebGLLayerChromium.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-23  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove obsolete child context list from LayerRendererChromium
+        https://bugs.webkit.org/show_bug.cgi?id=66743
+
+        Reviewed by Kenneth Russell.
+
+        Before we had proper semantics for flush() in the command buffer, we
+        used a scheme of latches across contexts to ensure consistent frames
+        were presented for WebGL and canvas. We no longer have latches and
+        flush is a proper synchronization primative, so the child context list
+        no longer does anything. Canvas2DLayerChromium and
+        WebGLLayerChromium's implementations of updateCompositorResources() do
+        flushes on the appropriate context already - canvas layers via
+        DrawingBuffer::publishToPlatformLayer(), and WebGL layers via the call
+        to prepareTexture().
+
+        No new tests since the code being removed doesn't do anything.
+
+        * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
+        (WebCore::Canvas2DLayerChromium::~Canvas2DLayerChromium):
+        (WebCore::Canvas2DLayerChromium::setDrawingBuffer):
+        * platform/graphics/chromium/Canvas2DLayerChromium.h:
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::drawLayers):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+        * platform/graphics/chromium/WebGLLayerChromium.cpp:
+        (WebCore::WebGLLayerChromium::~WebGLLayerChromium):
+        (WebCore::WebGLLayerChromium::setContext):
+        * platform/graphics/chromium/WebGLLayerChromium.h:
+
 2011-08-23  Alexei Svitkine  <asvitkine@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp

@@ -55 +55 @@
 Canvas2DLayerChromium::~Canvas2DLayerChromium()
 {
-    if (m_drawingBuffer && layerRenderer())
-        layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
 }
 
@@ -85 +83 @@
 void Canvas2DLayerChromium::setDrawingBuffer(DrawingBuffer* drawingBuffer)
 {
-    if (drawingBuffer != m_drawingBuffer) {
-        if (m_drawingBuffer && layerRenderer())
-            layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
-
-        m_drawingBuffer = drawingBuffer;
-
-        if (drawingBuffer && layerRenderer())
-            layerRenderer()->addChildContext(m_drawingBuffer->graphicsContext3D().get());
-    }
-}
-
-void Canvas2DLayerChromium::setLayerRenderer(LayerRendererChromium* newLayerRenderer)
-{
-    if (layerRenderer() != newLayerRenderer && m_drawingBuffer) {
-        if (m_drawingBuffer->graphicsContext3D()) {
-            if (layerRenderer())
-                layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
-            if (newLayerRenderer)
-                newLayerRenderer->addChildContext(m_drawingBuffer->graphicsContext3D().get());
-        }
-
-        LayerChromium::setLayerRenderer(newLayerRenderer);
-    }
+    m_drawingBuffer = drawingBuffer;
 }
 

trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.h

@@ -53 +53 @@
     void setDrawingBuffer(DrawingBuffer*);
 
-    virtual void setLayerRenderer(LayerRendererChromium*);
-
 private:
     explicit Canvas2DLayerChromium(DrawingBuffer*, GraphicsLayerChromium* owner);

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -569 +569 @@
         return;
 
-    // Before drawLayers:
-    ChildContextMap::iterator i = m_childContexts.begin();
-    for (; i != m_childContexts.end(); ++i) {
-        i->first->flush();
-    }
-
     {
         TRACE_EVENT("LayerRendererChromium::synchronizeTrees", this, 0);
@@ -1298 +1292 @@
 }
 
-
-void LayerRendererChromium::addChildContext(GraphicsContext3D* ctx)
-{
-    // This is a ref-counting map, because some contexts are shared by multiple
-    // layers (specifically, Canvas2DLayerChromium).
-
-    // Insert the ctx with a count of 1, or return the existing iterator.
-    std::pair<ChildContextMap::iterator, bool> insert_result = m_childContexts.add(ctx, 1);
-    if (!insert_result.second) {
-        // Already present in map, so increment.
-        ++insert_result.first->second;
-    } else {
-// FIXME(jbates): when compositor is multithreaded and copyTexImage2D bug is fixed,
-// uncomment this block:
-//      // This is a new child context - set the parentToChild latch so that it
-//      // can continue past its first wait latch.
-//      Extensions3DChromium* ext = static_cast<Extensions3DChromium*>(ctx->getExtensions());
-//      GC3Duint latchId;
-//      ext->getParentToChildLatchCHROMIUM(&latchId);
-//      ext->setLatchCHROMIUM(0, latchId);
-    }
-}
-
-void LayerRendererChromium::removeChildContext(GraphicsContext3D* ctx)
-{
-    ChildContextMap::iterator i = m_childContexts.find(ctx);
-    if (i != m_childContexts.end()) {
-        if (--i->second <= 0) {
-            // Count reached zero, so remove from map.
-            m_childContexts.remove(i);
-        }
-    } else {
-        // error
-        ASSERT(0 && "m_childContexts map has mismatched add/remove calls");
-    }
-}
-
 bool LayerRendererChromium::isCompositorContextLost()
 {

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -144 +144 @@
     String layerTreeAsText() const;
 
-    void addChildContext(GraphicsContext3D*);
-    void removeChildContext(GraphicsContext3D*);
-
     // Return true if the compositor context has an error.
     bool isCompositorContextLost();
@@ -160 +157 @@
 
 private:
-    typedef HashMap<GraphicsContext3D*, int> ChildContextMap;
-
     // FIXME: This needs to be moved to the CCLayerTreeHostImpl when that class exists.
     RefPtr<CCLayerImpl> m_rootCCLayerImpl;
@@ -238 +233 @@
 #endif
 
-    ChildContextMap m_childContexts;
-
     bool m_contextSupportsMapSub;
 

trunk/Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp

@@ -60 +60 @@
 WebGLLayerChromium::~WebGLLayerChromium()
 {
-    if (m_context && layerRenderer())
-        layerRenderer()->removeChildContext(m_context);
 }
 
@@ -130 +128 @@
 {
     bool contextChanged = (m_context != context);
-    if (contextChanged && layerRenderer()) {
-        if (m_context)
-            layerRenderer()->removeChildContext(m_context);
-        if (context)
-            layerRenderer()->addChildContext(const_cast<GraphicsContext3D*>(context));
-    }
 
     m_context = const_cast<GraphicsContext3D*>(context);
@@ -154 +146 @@
 }
 
-void WebGLLayerChromium::setLayerRenderer(LayerRendererChromium* newLayerRenderer)
-{
-    if (layerRenderer() != newLayerRenderer) {
-        if (m_context) {
-            if (layerRenderer())
-                layerRenderer()->removeChildContext(m_context);
-            if (newLayerRenderer)
-                newLayerRenderer->addChildContext(m_context);
-        }
-
-        LayerChromium::setLayerRenderer(newLayerRenderer);
-    }
-}
-
 void WebGLLayerChromium::rateLimitContext(Timer<WebGLLayerChromium>*)
 {

trunk/Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.h

@@ -58 +58 @@
     GraphicsContext3D* context() { return m_context; }
 
-    virtual void setLayerRenderer(LayerRendererChromium*);
-
 protected:
     virtual const char* layerTypeAsString() const { return "WebGLLayer"; }