Changeset 117998 in webkit

Timestamp:

May 22, 2012, 10:38:31 AM (13 years ago)

Author:

zmo@google.com

Message:

Merge 117814 - Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer()
​https://bugs.webkit.org/show_bug.cgi?id=87032

Reviewed by James Robinson.

• platform/graphics/chromium/DrawingBufferChromium.cpp:

(WebCore::DrawingBuffer::prepareBackBuffer): restore the user's framebuffer binding if there is one.

TBR=​zmo@google.com

File:

• branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (modified) (1 diff)

branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp

@@ -133 +133 @@
     }
 
-    if (multisample())
+    if (multisample() && !m_framebufferBinding)
         bind();
+    else
+        restoreFramebufferBinding();
 }