Title: [89650] trunk/Source/WebCore
- Revision
- 89650
- Author
- z...@google.com
- Date
- 2011-06-23 18:53:29 -0700 (Thu, 23 Jun 2011)
Log Message
2011-06-23 Zhenyao Mo <z...@google.com>
Reviewed by Kenneth Russell.
Limit WebGL internal drawingBuffer size to 4k x 4k
https://bugs.webkit.org/show_bug.cgi?id=63304
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::reshape): Limit drawing buffer size to 4k x 4k.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89649 => 89650)
--- trunk/Source/WebCore/ChangeLog 2011-06-24 01:35:30 UTC (rev 89649)
+++ trunk/Source/WebCore/ChangeLog 2011-06-24 01:53:29 UTC (rev 89650)
@@ -1,3 +1,13 @@
+2011-06-23 Zhenyao Mo <z...@google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Limit WebGL internal drawingBuffer size to 4k x 4k
+ https://bugs.webkit.org/show_bug.cgi?id=63304
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::reshape): Limit drawing buffer size to 4k x 4k.
+
2011-06-20 MORITA Hajime <morr...@google.com>
Reviewed by Dimitri Glazkov.
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (89649 => 89650)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2011-06-24 01:35:30 UTC (rev 89649)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2011-06-24 01:53:29 UTC (rev 89650)
@@ -609,6 +609,9 @@
// This is an approximation because at WebGLRenderingContext level we don't
// 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]);
width = clamp(width, 1, maxWidth);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
