diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-05-23 19:06:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-23 19:06:00 -0700 |
| commit | 415b03411f96b199071dc0aedc30f9517659929f (patch) | |
| tree | 1c33e96ec2db539a33cbc5fcfcf5214c68d16f02 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 668d6f8ffd1fc17b5c6f5abf072b97430993d118 (diff) | |
| parent | cd6a3bff0abccf9f1c3c3351c6984be2c3124239 (diff) | |
| download | external_webkit-415b03411f96b199071dc0aedc30f9517659929f.zip external_webkit-415b03411f96b199071dc0aedc30f9517659929f.tar.gz external_webkit-415b03411f96b199071dc0aedc30f9517659929f.tar.bz2 | |
am cd6a3bff: am 6f4fd96b: Merge "Don\'t set up background images if 1x1" into jb-dev
* commit 'cd6a3bff0abccf9f1c3c3351c6984be2c3124239':
Don't set up background images if 1x1
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index fd1b7d0..00cec40 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -843,8 +843,11 @@ BaseLayerAndroid* WebViewCore::createBaseLayer(GraphicsLayerAndroid* root) Color viewBackground = view->baseBackgroundColor(); background = bodyHasCSSBackground ? viewBackground.blend(background) : viewBackground; } - bodyHasFixedBackgroundImage = style->hasFixedBackgroundImage() - && FixedBackgroundImageLayerAndroid::GetCachedImage(style); + if (style->hasFixedBackgroundImage()) { + Image* backgroundImage = FixedBackgroundImageLayerAndroid::GetCachedImage(style); + if (backgroundImage && backgroundImage->width() > 1 && backgroundImage->height() > 1) + bodyHasFixedBackgroundImage = true; + } } PicturePileLayerContent* content = new PicturePileLayerContent(m_content); |