summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-24 15:30:29 +0100
committerSteve Block <steveblock@google.com>2011-05-24 15:38:23 +0100
commitb3725cedeb43722b3b175aaeff70552e562d2c94 (patch)
tree05d9ae1e76745c71cff73524a05f0d0825754d7b
parent10b539940b83c9b7ea6a6ebcf8707d9841b4284f (diff)
downloadexternal_webkit-b3725cedeb43722b3b175aaeff70552e562d2c94.zip
external_webkit-b3725cedeb43722b3b175aaeff70552e562d2c94.tar.gz
external_webkit-b3725cedeb43722b3b175aaeff70552e562d2c94.tar.bz2
Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()
Bug: 4461705 Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index d7b792b..992585a 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -226,8 +226,11 @@ void GraphicsLayerAndroid::updateFixedPosition()
RenderLayer* renderLayer = renderLayerFromClient(m_client);
RenderView* view = static_cast<RenderView*>(renderLayer->renderer());
+ if (!view)
+ return;
+
// We will need the Iframe flag in the LayerAndroid tree for fixed position
- if (view && view->isRenderIFrame())
+ if (view->isRenderIFrame())
m_contentLayer->setIsIframe(true);
// If we are a fixed position layer, just set it
if (view->isPositioned() && view->style()->position() == FixedPosition) {