Title: [135554] trunk/Source/WebKit/blackberry
Revision
135554
Author
[email protected]
Date
2012-11-22 19:31:38 -0800 (Thu, 22 Nov 2012)

Log Message

[BlackBerry] Guard against a lost focusedNode that input handler isn't yet informed of.
https://bugs.webkit.org/show_bug.cgi?id=103071

Reviewed by Rob Buis.

Fix potential for a crash if input mode is active but
we can't get a focusedNode.

Reviewed Internally by Gen Mak.

* WebKitSupport/SelectionHandler.cpp:
(BlackBerry::WebKit::SelectionHandler::setCaretPosition):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/ChangeLog (135553 => 135554)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-11-23 02:54:10 UTC (rev 135553)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-11-23 03:31:38 UTC (rev 135554)
@@ -1,3 +1,18 @@
+2012-11-22  Mike Fenton  <[email protected]>
+
+        [BlackBerry] Guard against a lost focusedNode that input handler isn't yet informed of.
+        https://bugs.webkit.org/show_bug.cgi?id=103071
+
+        Reviewed by Rob Buis.
+
+        Fix potential for a crash if input mode is active but
+        we can't get a focusedNode.
+
+        Reviewed Internally by Gen Mak.
+
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::setCaretPosition):
+
 2012-11-21  Genevieve Mak  <[email protected]>
 
         [BlackBerry] Drop Synchronous Mouse Events

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (135553 => 135554)


--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-11-23 02:54:10 UTC (rev 135553)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp	2012-11-23 03:31:38 UTC (rev 135554)
@@ -234,7 +234,7 @@
 
 void SelectionHandler::setCaretPosition(const WebCore::IntPoint &position)
 {
-    if (!m_webPage->m_inputHandler->isInputMode())
+    if (!m_webPage->m_inputHandler->isInputMode() || !m_webPage->focusedOrMainFrame()->document()->focusedNode())
         return;
 
     m_caretActive = true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to