Fix crash on arstechnica

Not checking for cachedImage for the background images...

bug:6482165
Change-Id: I9de5ee9cef446cd07688b40f6b04bdd493e40edd

1 files changed, 31 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
index 8abff96..62a5824 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
@@ -202,4 +202,35 @@ bool FixedBackgroundImageLayerAndroid::drawGL(bool layerTilesDisabled)
     return false;
 }
 
+Image* FixedBackgroundImageLayerAndroid::GetCachedImage(PassRefPtr<RenderStyle> aStyle)
+{
+    RefPtr<RenderStyle> style = aStyle;
+    if (!style)
+        return 0;
+
+    if (!style->hasFixedBackgroundImage())
+        return 0;
+
+    FillLayer* layers = style->accessBackgroundLayers();
+    StyleImage* styleImage = layers->image();
+
+    if (!styleImage)
+        return 0;
+
+    if (!styleImage->isLoaded())
+        return 0;
+
+    if (!styleImage->isCachedImage())
+        return 0;
+
+    CachedImage* cachedImage = static_cast<StyleCachedImage*>(styleImage)->cachedImage();
+
+    Image* image = cachedImage->image();
+
+    if (image == Image::nullImage())
+        return 0;
+
+    return image;
+}
+
 } // namespace WebCore