Changeset 83828 in webkit

Timestamp:

Apr 14, 2011 2:27:58 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-14 John Bates <​jbates@google.com>

Reviewed by Kenneth Russell.

Fix bug with adding wrong context to LayerRendererChromium and get rid of RefPtr loop.
​https://bugs.webkit.org/show_bug.cgi?id=58383

• platform/graphics/chromium/LayerRendererChromium.cpp: (WebCore::LayerRendererChromium::addChildContext): (WebCore::LayerRendererChromium::removeChildContext):
• platform/graphics/chromium/LayerRendererChromium.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  John Bates  <jbates@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Fix bug with adding wrong context to LayerRendererChromium and get rid of RefPtr loop.
+        https://bugs.webkit.org/show_bug.cgi?id=58383
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::addChildContext):
+        (WebCore::LayerRendererChromium::removeChildContext):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+
 2011-04-14  Renata Hodovan  <reni@webkit.org>
 

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

@@ -57 +57 @@
         layerRendererContext()->deleteTexture(m_textureId);
     if (m_drawingBuffer && layerRenderer())
-        layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D());
+        layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
 }
 
@@ -108 +108 @@
     if (drawingBuffer != m_drawingBuffer) {
         if (m_drawingBuffer && layerRenderer())
-            layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D());
+            layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
 
         m_drawingBuffer = drawingBuffer;
@@ -114 +114 @@
 
         if (drawingBuffer && layerRenderer())
-            layerRenderer()->addChildContext(m_drawingBuffer->graphicsContext3D());
+            layerRenderer()->addChildContext(m_drawingBuffer->graphicsContext3D().get());
     }
 }
@@ -123 +123 @@
         if (m_drawingBuffer->graphicsContext3D()) {
             if (layerRenderer())
-                layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D());
+                layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
             if (newLayerRenderer)
-                newLayerRenderer->addChildContext(m_drawingBuffer->graphicsContext3D());
+                newLayerRenderer->addChildContext(m_drawingBuffer->graphicsContext3D().get());
         }
 

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

@@ -1035 +1035 @@
 }
 
-void LayerRendererChromium::addChildContext(PassRefPtr<GraphicsContext3D> pctx)
-{
-    RefPtr<GraphicsContext3D> ctx = pctx;
+void LayerRendererChromium::addChildContext(GraphicsContext3D* ctx)
+{
     if (!ctx->getExtensions()->supports("GL_CHROMIUM_latch"))
         return;
@@ -1061 +1060 @@
 }
 
-void LayerRendererChromium::removeChildContext(PassRefPtr<GraphicsContext3D> pctx)
-{
-    RefPtr<GraphicsContext3D> ctx = pctx;
+void LayerRendererChromium::removeChildContext(GraphicsContext3D* ctx)
+{
     if (!ctx->getExtensions()->supports("GL_CHROMIUM_latch"))
         return;

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

@@ -132 +132 @@
     String layerTreeAsText() const;
 
-    void addChildContext(PassRefPtr<GraphicsContext3D>);
-    void removeChildContext(PassRefPtr<GraphicsContext3D>);
+    void addChildContext(GraphicsContext3D*);
+    void removeChildContext(GraphicsContext3D*);
 
 private:
     typedef Vector<RefPtr<CCLayerImpl> > LayerList;
-    typedef HashMap<RefPtr<GraphicsContext3D>, int> ChildContextMap;
+    typedef HashMap<GraphicsContext3D*, int> ChildContextMap;
 
     explicit LayerRendererChromium(PassRefPtr<GraphicsContext3D>, PassOwnPtr<TilePaintInterface> contentPaint);

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

@@ -98 +98 @@
             layerRenderer()->removeChildContext(m_context);
         if (context)
-            layerRenderer()->addChildContext(m_context);
+            layerRenderer()->addChildContext(const_cast<GraphicsContext3D*>(context));
     }