Changeset 223563 in webkit

Timestamp:

Oct 17, 2017 11:49:11 AM (7 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r223459.

This change introduced LayoutTest failures.

Reverted changeset:

"WebGL clamps drawingBufferWidth to 4096 pixels on a 5120
monitor/canvas"
​https://bugs.webkit.org/show_bug.cgi?id=178223
​https://trac.webkit.org/changeset/223459

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/large-drawing-buffer-resize-expected.txt (deleted)
• LayoutTests/fast/canvas/webgl/large-drawing-buffer-resize.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-17  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r223459.
+
+        This change introduced LayoutTest failures.
+
+        Reverted changeset:
+
+        "WebGL clamps drawingBufferWidth to 4096 pixels on a 5120
+        monitor/canvas"
+        https://bugs.webkit.org/show_bug.cgi?id=178223
+        https://trac.webkit.org/changeset/223459
+
 2017-10-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-17  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r223459.
+
+        This change introduced LayoutTest failures.
+
+        Reverted changeset:
+
+        "WebGL clamps drawingBufferWidth to 4096 pixels on a 5120
+        monitor/canvas"
+        https://bugs.webkit.org/show_bug.cgi?id=178223
+        https://trac.webkit.org/changeset/223459
+
 2017-10-17  Youenn Fablet  <youenn@apple.com>
 

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

@@ -847 +847 @@
     // know if the underlying FBO uses textures or renderbuffers.
     GC3Dint maxSize = std::min(m_maxTextureSize, m_maxRenderbufferSize);
+    // Limit drawing buffer size to 4k to avoid memory exhaustion.
+    const int sizeUpperLimit = 4096;
+    maxSize = std::min(maxSize, sizeUpperLimit);
     GC3Dint maxWidth = std::min(maxSize, m_maxViewportDims[0]);
     GC3Dint maxHeight = std::min(maxSize, m_maxViewportDims[1]);