diff options
| author | Steve Block <steveblock@google.com> | 2012-04-27 18:49:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-27 19:10:54 +0100 |
| commit | 1711ae858c31e6ade43a99517f3cb5b358a2cb5f (patch) | |
| tree | 5a6a672855f2ec9644e5d148096b41ac3f05d4f7 /Source/WebCore/rendering | |
| parent | 1cc46c0cf78d80f6cd0c8cd5093906c782be5691 (diff) | |
| download | external_webkit-1711ae858c31e6ade43a99517f3cb5b358a2cb5f.zip external_webkit-1711ae858c31e6ade43a99517f3cb5b358a2cb5f.tar.gz external_webkit-1711ae858c31e6ade43a99517f3cb5b358a2cb5f.tar.bz2 | |
Cherry-pick WebKit change r92025 to fix a rendering crash
See http://trac.webkit.org/changeset/92025
Bug: 6328932
Change-Id: I2ed97a9f3d7d953f5a9bfe24b252124f896d31b4
Diffstat (limited to 'Source/WebCore/rendering')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index 66aab18..1ffa0de 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -1449,7 +1449,8 @@ void RenderLayer::scrollTo(int x, int y) #endif // Schedule the scroll DOM event. - renderer()->node()->document()->eventQueue()->enqueueOrDispatchScrollEvent(renderer()->node(), EventQueue::ScrollEventElementTarget); + if (renderer()->node()) + renderer()->node()->document()->eventQueue()->enqueueOrDispatchScrollEvent(renderer()->node(), EventQueue::ScrollEventElementTarget); } void RenderLayer::scrollRectToVisible(const IntRect& rect, bool scrollToAnchor, const ScrollAlignment& alignX, const ScrollAlignment& alignY) |