Changeset 101311 in webkit

Timestamp:

Nov 28, 2011, 5:38:32 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Synchronization problem in Canvas/WebGLRenderingContext when listener asks for image
​https://bugs.webkit.org/show_bug.cgi?id=73228

Patch by Dana Jansens <​danakj@chromium.org> on 2011-11-28
Reviewed by Kenneth Russell.

• html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::markContextChanged):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-28  Dana Jansens  <danakj@chromium.org>
+
+        Synchronization problem in Canvas/WebGLRenderingContext when listener asks for image
+        https://bugs.webkit.org/show_bug.cgi?id=73228
+
+        Reviewed by Kenneth Russell.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::markContextChanged):
+
 2011-11-28  Rafael Weinstein  <rafaelw@chromium.org>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -542 +542 @@
 #if USE(ACCELERATED_COMPOSITING)
     RenderBox* renderBox = canvas()->renderBox();
-    if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing())
+    if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing()) {
+        m_markedCanvasDirty = true;
         renderBox->layer()->contentChanged(RenderLayer::CanvasChanged);
-    else {
+    } else {
 #endif
-        if (!m_markedCanvasDirty)
+        if (!m_markedCanvasDirty) {
+            m_markedCanvasDirty = true;
             canvas()->didDraw(FloatRect(0, 0, canvas()->width(), canvas()->height()));
+        }
 #if USE(ACCELERATED_COMPOSITING)
     }
 #endif
-    m_markedCanvasDirty = true;
 }