Changeset 110526 in webkit

Timestamp:

Mar 12, 2012, 6:52:59 PM (13 years ago)

Author:

zmo@google.com

Message:

After webgl canvas resize, bindings might be lost
​https://bugs.webkit.org/show_bug.cgi?id=80895

Reviewed by Stephen White.

Source/WebCore:

Test: fast/canvas/webgl/texture-bindings-uneffected-on-resize.html

• html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::reshape): recover bindings after reshape.

LayoutTests:

• fast/canvas/webgl/texture-bindings-uneffected-on-resize-expected.txt: Added.
• fast/canvas/webgl/texture-bindings-uneffected-on-resize.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize-expected.txt (added)
• LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-12  Zhenyao Mo  <zmo@google.com>
+
+        After webgl canvas resize, bindings might be lost
+        https://bugs.webkit.org/show_bug.cgi?id=80895
+
+        Reviewed by Stephen White.
+
+        * fast/canvas/webgl/texture-bindings-uneffected-on-resize-expected.txt: Added.
+        * fast/canvas/webgl/texture-bindings-uneffected-on-resize.html: Added.
+
 2012-03-12  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-12  Zhenyao Mo  <zmo@google.com>
+
+        After webgl canvas resize, bindings might be lost
+        https://bugs.webkit.org/show_bug.cgi?id=80895
+
+        Reviewed by Stephen White.
+
+        Test: fast/canvas/webgl/texture-bindings-uneffected-on-resize.html
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::reshape): recover bindings after reshape.
+
 2012-03-12  Kentaro Hara  <haraken@chromium.org>
 

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

@@ -753 +753 @@
     else
         m_context->reshape(width, height);
+
+    m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, objectOrZero(m_textureUnits[m_activeTextureUnit].m_texture2DBinding.get()));
+    m_context->bindRenderbuffer(GraphicsContext3D::RENDERBUFFER, objectOrZero(m_renderbufferBinding.get()));
+    if (m_framebufferBinding)
+      m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, objectOrZero(m_framebufferBinding.get()));
 }