Title: [135758] trunk/Source/WebKit/blackberry
- Revision
- 135758
- Author
- [email protected]
- Date
- 2012-11-26 13:38:45 -0800 (Mon, 26 Nov 2012)
Log Message
[BlackBerry] Null check calls associated with retrieving the caret rect.
https://bugs.webkit.org/show_bug.cgi?id=103281
Patch by Nima Ghanavatian <[email protected]> on 2012-11-26
Reviewed by Rob Buis.
Some of these calls can return null, which could lead to a crash.
Internally reviewed by Gen Mak.
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (135757 => 135758)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-11-26 21:20:37 UTC (rev 135757)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-11-26 21:38:45 UTC (rev 135758)
@@ -1,3 +1,17 @@
+2012-11-26 Nima Ghanavatian <[email protected]>
+
+ [BlackBerry] Null check calls associated with retrieving the caret rect.
+ https://bugs.webkit.org/show_bug.cgi?id=103281
+
+ Reviewed by Rob Buis.
+
+ Some of these calls can return null, which could lead to a crash.
+
+ Internally reviewed by Gen Mak.
+
+ * WebKitSupport/InputHandler.cpp:
+ (BlackBerry::WebKit::InputHandler::requestSpellingCheckingOptions):
+
2012-11-26 Jonathan Dong <[email protected]>
[BlackBerry] Should not autofill username and password when there're more than one password inputs on the same page
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (135757 => 135758)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-11-26 21:20:37 UTC (rev 135757)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-11-26 21:38:45 UTC (rev 135758)
@@ -743,6 +743,9 @@
if (m_webPage->focusedOrMainFrame()->selection()->selectionType() != VisibleSelection::CaretSelection)
return;
+ if (!m_currentFocusElement || !m_currentFocusElement->document() || !m_currentFocusElement->document()->frame())
+ return;
+
// imf_sp_text_t should be generated in pixel viewport coordinates.
WebCore::IntRect caretRect = m_webPage->focusedOrMainFrame()->selection()->selection().visibleStart().absoluteCaretBounds();
caretRect = m_webPage->focusedOrMainFrame()->view()->contentsToRootView(caretRect);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
