Title: [117485] trunk/Source/WebCore
- Revision
- 117485
- Author
- commit-qu...@webkit.org
- Date
- 2012-05-17 13:04:08 -0700 (Thu, 17 May 2012)
Log 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 <mmo...@google.com> on 2012-05-17
Reviewed by Adrienne Walker.
* platform/graphics/chromium/LayerRendererChromium.cpp:
(WebCore::LayerRendererChromium::beginDrawingFrame):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117484 => 117485)
--- trunk/Source/WebCore/ChangeLog 2012-05-17 20:01:50 UTC (rev 117484)
+++ trunk/Source/WebCore/ChangeLog 2012-05-17 20:04:08 UTC (rev 117485)
@@ -1,3 +1,13 @@
+2012-05-17 Michal Mocny <mmo...@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 <m...@apple.com>
In vertical writing modes, pagination may split a line after a block shifts
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (117484 => 117485)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-05-17 20:01:50 UTC (rev 117484)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp 2012-05-17 20:04:08 UTC (rev 117485)
@@ -416,7 +416,8 @@
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())
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
