Title: [149206] trunk/Source/WebKit/blackberry
- Revision
- 149206
- Author
- commit-qu...@webkit.org
- Date
- 2013-04-26 13:34:12 -0700 (Fri, 26 Apr 2013)
Log Message
[BlackBerry] Check for valid element in elementTouched
https://bugs.webkit.org/show_bug.cgi?id=115205
Patch by Nima Ghanavatian <nghanavat...@blackberry.com> on 2013-04-26
Reviewed by Rob Buis.
Internally reviewed by Genevieve Mak.
PR 331546
We might receive a null ptr from nodeAsElementIfApplicable which
is passed in here. Check to make sure it's valid before using.
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::elementTouched):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149205 => 149206)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-26 20:12:04 UTC (rev 149205)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-26 20:34:12 UTC (rev 149206)
@@ -1,3 +1,19 @@
+2013-04-26 Nima Ghanavatian <nghanavat...@blackberry.com>
+
+ [BlackBerry] Check for valid element in elementTouched
+ https://bugs.webkit.org/show_bug.cgi?id=115205
+
+ Reviewed by Rob Buis.
+
+ Internally reviewed by Genevieve Mak.
+
+ PR 331546
+ We might receive a null ptr from nodeAsElementIfApplicable which
+ is passed in here. Check to make sure it's valid before using.
+
+ * WebKitSupport/InputHandler.cpp:
+ (BlackBerry::WebKit::InputHandler::elementTouched):
+
2013-04-26 Martin Robinson <mrobin...@igalia.com>
Remove the remaining Skia #ifdefs
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (149205 => 149206)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2013-04-26 20:12:04 UTC (rev 149205)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2013-04-26 20:34:12 UTC (rev 149206)
@@ -2644,7 +2644,9 @@
if (isActiveTextEdit() && nonShadowElementUnderFatFinger == m_currentFocusElement)
showTextInputTypeSuggestionBox(true /* allowEmptyPrefix */);
- m_elementTouchedIsCrossFrame = nonShadowElementUnderFatFinger->document()->frame() != m_webPage->focusedOrMainFrame();
+ m_elementTouchedIsCrossFrame = nonShadowElementUnderFatFinger
+ && nonShadowElementUnderFatFinger->document()
+ && nonShadowElementUnderFatFinger->document()->frame() != m_webPage->focusedOrMainFrame();
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
