Changeset 117485 in webkit

Timestamp:

May 17, 2012 1:04:08 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Limiting render surface texture manager memory to 0 when contentsMemoryUseBytes is large.
​https://bugs.webkit.org/show_bug.cgi?id=86764

Patch by Michal Mocny <​mmocny@google.com> on 2012-05-17
Reviewed by Adrienne Walker.

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::beginDrawingFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/LayerRendererChromium.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-17  Michal Mocny  <mmocny@google.com>
+
+        [chromium] Limiting render surface texture manager memory to 0 when contentsMemoryUseBytes is large.
+        https://bugs.webkit.org/show_bug.cgi?id=86764
+
+        Reviewed by Adrienne Walker.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::beginDrawingFrame):
+
 2012-05-17  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -417 +417 @@
     size_t contentsMemoryUseBytes = m_contentsTextureAllocator->currentMemoryUseBytes();
     size_t maxLimit = TextureManager::highLimitBytes(viewportSize());
-    m_renderSurfaceTextureManager->setMaxMemoryLimitBytes(maxLimit - contentsMemoryUseBytes);
+    size_t newLimit = (maxLimit > contentsMemoryUseBytes) ? maxLimit - contentsMemoryUseBytes : 0;
+    m_renderSurfaceTextureManager->setMaxMemoryLimitBytes(newLimit);
 
     if (viewportSize().isEmpty())