summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-09-07 14:17:07 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2011-09-07 14:17:07 -0700
commit1eeb96174172e2d7b58477e81332c7e56413239c (patch)
treefb9a01bef2d57f77b654f0df3b40130894896ab4
parent13d9e99a89d771d44695e9ddbc28ef0811588076 (diff)
downloadexternal_webkit-1eeb96174172e2d7b58477e81332c7e56413239c.zip
external_webkit-1eeb96174172e2d7b58477e81332c7e56413239c.tar.gz
external_webkit-1eeb96174172e2d7b58477e81332c7e56413239c.tar.bz2
Revert to allocate textures for layers which had overflow children.
The original change on minimizing the texture for the overflow layer is too aggressive. Revert this until we have a better solution. bug:5254818 Change-Id: I77b43f151e801dd896baf197b9e523d20f42b469
-rw-r--r--Source/WebCore/platform/graphics/android/LayerAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
index 4b24961..1d52c42 100644
--- a/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -651,7 +651,7 @@ void LayerAndroid::setContentsImage(SkBitmapRef* img)
bool LayerAndroid::needsTexture()
{
return m_contentsImage || (prepareContext()
- && m_recordingPicture->width() && m_recordingPicture->height() && !m_hasOverflowChildren);
+ && m_recordingPicture->width() && m_recordingPicture->height());
}
IntRect LayerAndroid::clippedRect() const