diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-09-16 09:42:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-16 09:42:02 -0700 |
| commit | c3f1b21425d59f244073057e2af3bd2fe48873d5 (patch) | |
| tree | c471aeda7b66c5322922a4f280f4e235018d4ae4 /Source | |
| parent | e58b3f68036f1c961ed4c2c65a547481d8fde3e3 (diff) | |
| parent | 36533130543c7c6adaaaeaba3ccfdd4335741794 (diff) | |
| download | external_webkit-c3f1b21425d59f244073057e2af3bd2fe48873d5.zip external_webkit-c3f1b21425d59f244073057e2af3bd2fe48873d5.tar.gz external_webkit-c3f1b21425d59f244073057e2af3bd2fe48873d5.tar.bz2 | |
Merge "Add null checks in getTouchHighlightRects()"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index 9b5a6fa..e2193d8 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -1729,7 +1729,7 @@ Vector<IntRect> WebViewCore::getTouchHighlightRects(int x, int y, int slop) Node* eventNode = it->get(); while (eventNode) { RenderObject* render = eventNode->renderer(); - if (render->isBody() || render->isRenderView()) + if (render && (render->isBody() || render->isRenderView())) break; if (eventNode->supportsFocus() || eventNode->hasEventListeners(eventNames().clickEvent) @@ -1755,7 +1755,7 @@ Vector<IntRect> WebViewCore::getTouchHighlightRects(int x, int y, int slop) // If the fat point touches everyone, the order in the list should be "b", "d", "c" // and "a". When we search for the event node for "b", we really don't want "a" as // in the z-order it is behind everything else. - if (!render->style()->hasAutoZIndex()) + if (render && !render->style()->hasAutoZIndex()) break; eventNode = eventNode->parentNode(); } |