Changeset 87987 in webkit

Timestamp:

Jun 2, 2011 7:10:44 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-02 John Bates <​jbates@google.com>

Reviewed by James Robinson.

DrawingBufferChromium cleanup:

• Correct FIXME comment about synchronization.
• Remove unnecessary DrawingBufferInternal indirection struct and its unused offscreenColorTexture member. ​https://bugs.webkit.org/show_bug.cgi?id=61953

• platform/graphics/chromium/DrawingBufferChromium.cpp: (WebCore::DrawingBuffer::DrawingBuffer): (WebCore::DrawingBuffer::~DrawingBuffer): (WebCore::DrawingBuffer::publishToPlatformLayer): (WebCore::DrawingBuffer::didReset): (WebCore::DrawingBuffer::platformLayer):
• platform/graphics/gpu/DrawingBuffer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/DrawingBufferChromium.cpp (modified) (6 diffs)
• platform/graphics/gpu/DrawingBuffer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-02  John Bates  <jbates@google.com>
+
+        Reviewed by James Robinson.
+
+        DrawingBufferChromium cleanup:
+        - Correct FIXME comment about synchronization.
+        - Remove unnecessary DrawingBufferInternal indirection struct
+          and its unused offscreenColorTexture member.
+        https://bugs.webkit.org/show_bug.cgi?id=61953
+
+        * platform/graphics/chromium/DrawingBufferChromium.cpp:
+        (WebCore::DrawingBuffer::DrawingBuffer):
+        (WebCore::DrawingBuffer::~DrawingBuffer):
+        (WebCore::DrawingBuffer::publishToPlatformLayer):
+        (WebCore::DrawingBuffer::didReset):
+        (WebCore::DrawingBuffer::platformLayer):
+        * platform/graphics/gpu/DrawingBuffer.h:
+
 2011-06-02  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -47 +47 @@
 namespace WebCore {
 
-struct DrawingBufferInternal {
-    unsigned offscreenColorTexture;
-#if USE(ACCELERATED_COMPOSITING)
-    RefPtr<Canvas2DLayerChromium> platformLayer;
-#endif
-};
-
 static unsigned generateColorTexture(GraphicsContext3D* context, const IntSize& size)
 {
@@ -87 +80 @@
     , m_multisampleFBO(0)
     , m_multisampleColorBuffer(0)
-    , m_internal(adoptPtr(new DrawingBufferInternal))
 #if USE(SKIA)
     , m_grContext(0)
@@ -109 +101 @@
 {
 #if USE(ACCELERATED_COMPOSITING)
-    if (m_internal->platformLayer)
-        m_internal->platformLayer->setDrawingBuffer(0);
+    if (m_platformLayer)
+        m_platformLayer->setDrawingBuffer(0);
 #endif
 
@@ -129 +121 @@
     if (multisample())
         commit();
-    unsigned parentTexture = m_internal->platformLayer->textureId();
-    // FIXME: We do the copy in the canvas' (child) context so that it executes in the correct order relative to
-    // other commands in the child context.  This ensures that the parent texture always contains a complete
-    // frame and not some intermediate result.  However, there is no synchronization to ensure that this copy
-    // happens before the compositor draws.  This means we might draw stale frames sometimes.  Ideally this
-    // would insert a fence into the child command stream that the compositor could wait for.
+    unsigned parentTexture = m_platformLayer->textureId();
+    // We do the copy in the canvas' (child) context so that it executes in the correct order relative to
+    // other commands in the child context. This ensures that the parent texture always contains a complete
+    // frame and not some intermediate result. LayerRendererChromium uses glSetLatch to make sure the child
+    // context completes before the parent context consumes the texture.
     m_context->makeContextCurrent();
 #if USE(SKIA)
@@ -148 +139 @@
 {
 #if USE(ACCELERATED_COMPOSITING)
-    if (m_internal->platformLayer)
-        m_internal->platformLayer->setTextureChanged();
+    if (m_platformLayer)
+        m_platformLayer->setTextureChanged();
 #endif
 }
@@ -156 +147 @@
 PlatformLayer* DrawingBuffer::platformLayer()
 {
-    if (!m_internal->platformLayer)
-        m_internal->platformLayer = Canvas2DLayerChromium::create(this, 0);
-    return m_internal->platformLayer.get();
+    if (!m_platformLayer)
+        m_platformLayer = Canvas2DLayerChromium::create(this, 0);
+    return m_platformLayer.get();
 }
 #endif

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

@@ -50 +50 @@
 namespace WebCore {
 
-#if PLATFORM(CHROMIUM)
-struct DrawingBufferInternal;
+#if PLATFORM(CHROMIUM) && USE(ACCELERATED_COMPOSITING)
+class Canvas2DLayerChromium;
 #endif
 
@@ -139 +139 @@
 #if PLATFORM(CHROMIUM)
     OwnPtr<WillPublishCallback> m_callback;
-    OwnPtr<DrawingBufferInternal> m_internal;
+#if USE(ACCELERATED_COMPOSITING)
+    RefPtr<Canvas2DLayerChromium> m_platformLayer;
+#endif
 #endif