diff options
| author | Patrick Scott <phanna@android.com> | 2010-08-18 08:32:59 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-08-18 08:36:23 -0400 |
| commit | c5e6b092f1406104813248e52a2be6bc1c005943 (patch) | |
| tree | d1e61125a61aa28e3132272791aa2b9a90140f97 | |
| parent | af55f2069e35150538b12690c2c881579443cf43 (diff) | |
| download | external_webkit-c5e6b092f1406104813248e52a2be6bc1c005943.zip external_webkit-c5e6b092f1406104813248e52a2be6bc1c005943.tar.gz external_webkit-c5e6b092f1406104813248e52a2be6bc1c005943.tar.bz2 | |
Fix acid3 crash.
Bug: 2928878, 2928899
Change-Id: I90ca6f93a61c921b520731e6a143e5b4457fa44c
| -rw-r--r-- | WebCore/rendering/RenderLayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index ee1f1d4..7c63af9 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -1884,7 +1884,7 @@ bool RenderLayer::hasOverflowControls() const #if ENABLE(ANDROID_OVERFLOW_SCROLL) bool RenderLayer::hasOverflowScroll() const { - if (!enclosingElement()->hasTagName(HTMLNames::divTag)) + if (!enclosingElement() || !enclosingElement()->hasTagName(HTMLNames::divTag)) return false; if (m_scrollDimensionsDirty) return false; |