summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-09-07 14:44:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-07 14:44:47 -0700
commit321b119b4942dca02c7557790c7951695473ae7d (patch)
treefc5a5e5e130cb4a0e2ccd803bfe0f56c522f435c
parent96a891dfb6478f30d5ead90c5741eb578f6cf1e5 (diff)
parent1eeb96174172e2d7b58477e81332c7e56413239c (diff)
downloadexternal_webkit-321b119b4942dca02c7557790c7951695473ae7d.zip
external_webkit-321b119b4942dca02c7557790c7951695473ae7d.tar.gz
external_webkit-321b119b4942dca02c7557790c7951695473ae7d.tar.bz2
Merge "Revert to allocate textures for layers which had overflow children."
-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