diff options
| author | Ben Murdoch <benm@google.com> | 2011-02-07 14:24:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-07 14:24:20 -0800 |
| commit | a046a139c49a1c3e9e85101aeca4b68b89c396ca (patch) | |
| tree | e135cb8d3fe248e45fabc33e36af79c1ea35d6de /WebCore/rendering | |
| parent | 4a181ab990b9a9d3e84ef21bea182c21b0c32414 (diff) | |
| parent | 18f918c26433769b819eb5445da18bae7b3ba83e (diff) | |
| download | external_webkit-a046a139c49a1c3e9e85101aeca4b68b89c396ca.zip external_webkit-a046a139c49a1c3e9e85101aeca4b68b89c396ca.tar.gz external_webkit-a046a139c49a1c3e9e85101aeca4b68b89c396ca.tar.bz2 | |
Merge "Fix crash in RenderLayer due to null pointer" into honeycomb
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderLayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index 00cc020..b850ba3 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -2188,7 +2188,8 @@ RenderLayer::updateScrollInfoAfterLayout() m_hasOverflowScroll = hasOverflowScroll; dirtyZOrderLists(); dirtyStackingContextZOrderLists(); - renderer()->node()->setNeedsStyleRecalc(SyntheticStyleChange); + if (renderer()->node()) + renderer()->node()->setNeedsStyleRecalc(SyntheticStyleChange); } #endif } |