diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-05-15 09:57:23 -0700 |
|---|---|---|
| committer | Nicolas Roard <nicolasroard@google.com> | 2012-05-15 10:02:38 -0700 |
| commit | ca602195c97340b621ffe0c5a7fdf3732d439219 (patch) | |
| tree | 729afeab943aabdc543043f016f73a6708808626 /Source/WebKit/android/jni/WebViewCore.cpp | |
| parent | 0d38139a55b1f371edb1a2a65f4b7ee51daa8e37 (diff) | |
| download | external_webkit-ca602195c97340b621ffe0c5a7fdf3732d439219.zip external_webkit-ca602195c97340b621ffe0c5a7fdf3732d439219.tar.gz external_webkit-ca602195c97340b621ffe0c5a7fdf3732d439219.tar.bz2 | |
Fix crash on arstechnica
Not checking for cachedImage for the background images...
bug:6482165
Change-Id: I9de5ee9cef446cd07688b40f6b04bdd493e40edd
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 e621644..1a67efa 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); |