diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-05-15 10:16:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-15 10:16:54 -0700 |
| commit | eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0 (patch) | |
| tree | d7df9df8e9bd076dea8c1cf39bcd6b8dab15943f /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 8001929cfbff025063aab7bd129277b24cf3a9ff (diff) | |
| parent | ca602195c97340b621ffe0c5a7fdf3732d439219 (diff) | |
| download | external_webkit-eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0.zip external_webkit-eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0.tar.gz external_webkit-eb4dd05cf87c2fcd52fa31fbfe0b110dea7e0cf0.tar.bz2 | |
Merge "Fix crash on arstechnica" into jb-dev
Diffstat (limited to 'Source/WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index ede8b69..af76daa 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -835,7 +835,8 @@ BaseLayerAndroid* WebViewCore::createBaseLayer() Color viewBackground = view->baseBackgroundColor(); background = bodyHasCSSBackground ? viewBackground.blend(background) : viewBackground; } - bodyHasFixedBackgroundImage = style->hasFixedBackgroundImage(); + bodyHasFixedBackgroundImage = style->hasFixedBackgroundImage() + && FixedBackgroundImageLayerAndroid::GetCachedImage(style); } PicturePileLayerContent* content = new PicturePileLayerContent(m_content); |