Changeset 199536 in webkit

Timestamp:

Apr 14, 2016 4:09:37 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

WebGL based canvases composite incorrectly after changing size
​https://bugs.webkit.org/show_bug.cgi?id=152556
<rdar://problem/24012678>

Patch by Antoine Quint <Antoine Quint> on 2016-04-14
Reviewed by Dean Jackson.

Source/WebCore:

On iOS, we use the CAEAGLLayer's bounds to set the size of the backing store.
However, that layer's bounds is also used to size the layer during layout. If
the canvas backing store is resized after layout has been performed, the call
to setBounds loses the layout value and the <canvas> element is incorrectly
sized on screen.

To address this, when updating the backing store, we keep track of the previous
layer bounds so we can reset it after we sized the backing store.

Test: webgl/webgl-backing-store-size-update.html

• platform/graphics/GraphicsContext3D.h:
• platform/graphics/mac/GraphicsContext3DMac.mm:

(WebCore::GraphicsContext3D::setRenderbufferStorageFromDrawable):

LayoutTests:

Adding a new test that sets the size of the backing store to a different
size than the layout size after the layout size of the <canvas> element
has been applied to ensure that the implementation correctly retains the
layout size as the canvas backing store is resized.

• webgl/webgl-backing-store-size-update-expected.html: Added.
• webgl/webgl-backing-store-size-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgl/webgl-backing-store-size-update-expected.html (added)
• LayoutTests/webgl/webgl-backing-store-size-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-14  Antoine Quint  <graouts@apple.com>
+
+        WebGL based canvases composite incorrectly after changing size
+        https://bugs.webkit.org/show_bug.cgi?id=152556
+        <rdar://problem/24012678>
+
+        Reviewed by Dean Jackson.
+
+        Adding a new test that sets the size of the backing store to a different
+        size than the layout size after the layout size of the <canvas> element
+        has been applied to ensure that the implementation correctly retains the
+        layout size as the canvas backing store is resized.
+
+        * webgl/webgl-backing-store-size-update-expected.html: Added.
+        * webgl/webgl-backing-store-size-update.html: Added.
+
 2016-04-13  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-14  Antoine Quint  <graouts@apple.com>
+
+        WebGL based canvases composite incorrectly after changing size
+        https://bugs.webkit.org/show_bug.cgi?id=152556
+        <rdar://problem/24012678>
+
+        Reviewed by Dean Jackson.
+
+        On iOS, we use the CAEAGLLayer's bounds to set the size of the backing store.
+        However, that layer's bounds is also used to size the layer during layout. If
+        the canvas backing store is resized after layout has been performed, the call
+        to setBounds loses the layout value and the <canvas> element is incorrectly
+        sized on screen.
+
+        To address this, when updating the backing store, we keep track of the previous
+        layer bounds so we can reset it after we sized the backing store.
+
+        Test: webgl/webgl-backing-store-size-update.html
+
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::setRenderbufferStorageFromDrawable):
+
 2016-04-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -1292 +1292 @@
 
 #if PLATFORM(IOS)
-    bool setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height);
+    void setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height);
 #endif
 

trunk/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm

@@ -341 +341 @@
 
 #if PLATFORM(IOS)
-bool GraphicsContext3D::setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height)
-{
+void GraphicsContext3D::setRenderbufferStorageFromDrawable(GC3Dsizei width, GC3Dsizei height)
+{
+    // We need to make a call to setBounds below to update the backing store size but we also
+    // do not want to clobber the bounds set during layout.
+    CGRect previousBounds = [m_webGLLayer.get() bounds];
+
     [m_webGLLayer setBounds:CGRectMake(0, 0, width, height)];
     [m_webGLLayer setOpaque:(m_internalColorFormat != GL_RGBA8)];
 
-    return [m_contextObj renderbufferStorage:GL_RENDERBUFFER fromDrawable:static_cast<id<EAGLDrawable>>(m_webGLLayer.get())];
+    [m_contextObj renderbufferStorage:GL_RENDERBUFFER fromDrawable:static_cast<id<EAGLDrawable>>(m_webGLLayer.get())];
+
+    [m_webGLLayer setBounds:previousBounds];
 }
 #endif