Changeset 92430 in webkit

Timestamp:

Aug 4, 2011, 4:46:59 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Implement a global resource limit for DrawingBuffer to limit the amount of GPU memory used by 2d canvas backing stores
​https://bugs.webkit.org/show_bug.cgi?id=65655

Patch by James Robinson <​jamesr@chromium.org> on 2011-08-04
Reviewed by Kenneth Russell.

• platform/graphics/gpu/DrawingBuffer.cpp:

(WebCore::DrawingBuffer::setResourceLimit):
(WebCore::DrawingBuffer::clear):
(WebCore::DrawingBuffer::reset):

• platform/graphics/gpu/DrawingBuffer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gpu/DrawingBuffer.cpp (modified) (3 diffs)
• platform/graphics/gpu/DrawingBuffer.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-04  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Implement a global resource limit for DrawingBuffer to limit the amount of GPU memory used by 2d canvas backing stores
+        https://bugs.webkit.org/show_bug.cgi?id=65655
+
+        Reviewed by Kenneth Russell.
+
+        * platform/graphics/gpu/DrawingBuffer.cpp:
+        (WebCore::DrawingBuffer::setResourceLimit):
+        (WebCore::DrawingBuffer::clear):
+        (WebCore::DrawingBuffer::reset):
+        * platform/graphics/gpu/DrawingBuffer.h:
+
 2011-08-04  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp

@@ -39 +39 @@
 namespace WebCore {
 
+// Global resource ceiling (expressed in terms of pixels) for DrawingBuffer creation and resize.
+// When this limit is set, DrawingBuffer::create() and DrawingBuffer::reset() calls that would
+// exceed the global cap will instead clear the buffer.
+#if PLATFORM(CHROMIUM) // Currently, this cap only exists for chromium.
+static int s_maximumResourceUsePixels = 16 * 1024 * 1024;
+#else
+static int s_maximumResourceUsePixels = 0;
+#endif
+static int s_currentResourceUsePixels = 0;
+
 PassRefPtr<DrawingBuffer> DrawingBuffer::create(GraphicsContext3D* context, const IntSize& size)
 {
@@ -61 +71 @@
 
     m_context->makeContextCurrent();
+    if (!m_size.isEmpty())
+        s_currentResourceUsePixels -= m_size.width() * m_size.height();
 
     if (m_colorBuffer) {
@@ -203 +215 @@
     m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &maxTextureSize);
     if (newSize.height() > maxTextureSize || newSize.width() > maxTextureSize) {
-      clear();
-      return false;
-    }
+        clear();
+        return false;
+    }
+
+    int pixelDelta = newSize.width() * newSize.height();
+    if (!m_size.isEmpty())
+        pixelDelta -= m_size.width() * m_size.height();
+
+    if (s_maximumResourceUsePixels && (s_currentResourceUsePixels + pixelDelta) > s_maximumResourceUsePixels) {
+        clear();
+        return false;
+    }
+    s_currentResourceUsePixels += pixelDelta;
 
     const GraphicsContext3D::Attributes& attributes = m_context->getContextAttributes();

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.h

@@ -59 +59 @@
 public:
     friend class GraphicsContext3D;
-    
+
     ~DrawingBuffer();
 
@@ -115 +115 @@
     
     DrawingBuffer(GraphicsContext3D*, const IntSize&, bool multisampleExtensionSupported, bool packedDepthStencilExtensionSupported);
-    
+
     // Platform specific function called after reset() so each platform can do extra work if needed
     void didReset();