diff options
| author | Steve Block <steveblock@google.com> | 2011-05-24 10:14:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-24 10:14:43 -0700 |
| commit | 99231f8e5c2dfae0faab1efc56462f750832f3c8 (patch) | |
| tree | 7e626ec34a7cbd210e35f8030c007b9bc1dc0aa0 | |
| parent | 1cbc42144e272dc48c17e23d1275405e19619b35 (diff) | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-99231f8e5c2dfae0faab1efc56462f750832f3c8.zip external_webkit-99231f8e5c2dfae0faab1efc56462f750832f3c8.tar.gz external_webkit-99231f8e5c2dfae0faab1efc56462f750832f3c8.tar.bz2 | |
Merge "Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 5 |
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) { |