summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-11-10 11:52:39 +0000
committerBen Murdoch <benm@google.com>2011-11-10 14:28:20 +0000
commitd178dc379b292b67e36ddfd60a93114587d7eb56 (patch)
tree5f92303f376b0a36f688fb761685fc1ebce7d44b /Source/WebKit
parent5d8f08b924be7ee27891cda15c51ed2b5e20753c (diff)
downloadexternal_webkit-d178dc379b292b67e36ddfd60a93114587d7eb56.zip
external_webkit-d178dc379b292b67e36ddfd60a93114587d7eb56.tar.gz
external_webkit-d178dc379b292b67e36ddfd60a93114587d7eb56.tar.bz2
Fix CTS regressions from merge to r74534.
WebKit change http://trac.webkit.org/changeset/73385 removed overflow dimensions from the calculation of layer dimensions. This means that the optimisation inside the nav cache to skip building a frame cache when one of the layer dimensions is 0 is no longer valid (as the layer may contain only overflow content). Bug: 5572431 Change-Id: I3c973ad1ed57b07217d19f5d4fba7bfe522a2165
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/nav/CacheBuilder.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp
index 623d2cb..0c9e85c 100644
--- a/Source/WebKit/android/nav/CacheBuilder.cpp
+++ b/Source/WebKit/android/nav/CacheBuilder.cpp
@@ -2882,8 +2882,6 @@ bool CacheBuilder::setData(CachedFrame* cachedFrame)
RenderLayer* layer = renderer->enclosingLayer();
if (layer == NULL)
return false;
- if (layer->width() == 0 || layer->height() == 0)
- return false;
if (!frame->view())
return false;
int x, y;