summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebViewCore.cpp
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-09-22 16:54:49 -0700
committerRussell Brenner <russellbrenner@google.com>2011-09-26 16:49:28 -0700
commitb4bf6cc925ee7af6187a0f0124cbc5ef85828c8d (patch)
tree86bbc0b27718a40378d9987808a9f48eac648378 /Source/WebKit/android/jni/WebViewCore.cpp
parent573d2754446fc611151ef424b4b87a525bcd006d (diff)
downloadexternal_webkit-b4bf6cc925ee7af6187a0f0124cbc5ef85828c8d.zip
external_webkit-b4bf6cc925ee7af6187a0f0124cbc5ef85828c8d.tar.gz
external_webkit-b4bf6cc925ee7af6187a0f0124cbc5ef85828c8d.tar.bz2
Limit the number of buckets in a PictureSet
Added MAX_BUCKET_COUNT_X and _Y so that absurdly large pages, such as those in LayoutTests, don't run out of memory due to millions of buckets. Renamed checkDimensions() to setDimensions() and made inval an optional parameter so that it can be used more generally within PictureSet to adjust settings. Bug: 5300146 Change-Id: Ic6c2dc97085ef38d5782aa005b71a6797d165e24
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 24266f6..26c73b2 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -686,7 +686,7 @@ void WebViewCore::recordPictureSet(PictureSet* content)
if (cacheBuilder().pictureSetDisabled())
content->clear();
- content->checkDimensions(width, height, &m_addInval);
+ content->setDimensions(width, height, &m_addInval);
// Add the current inval rects to the PictureSet, and rebuild it.
content->add(m_addInval, 0, 0, false);