Changeset 128183 in webkit

Timestamp:

Sep 11, 2012 7:30:18 AM (12 years ago)

Author:

anilsson@rim.com

Message:

[BlackBerry] SelectionHandler drops caret change notifications
​https://bugs.webkit.org/show_bug.cgi?id=96378

Reviewed by Antonio Gomes.

The selection handler deliberately drops caret change notifications
while the input handler is processing changes, to avoid displaying
intermediate state during a complex change.

However, this meant that the client was never informed of the final
caret position.

Fixed by notifying client about caret change after processing ends, if
one or more caret change notifications were dropped during processing.

PR #205073

Reviewed internally by Mike Fenton.

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::setProcessingChange):
(WebKit):

• WebKitSupport/InputHandler.h:

(InputHandler):

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::SelectionHandler):
(BlackBerry::WebKit::SelectionHandler::inputHandlerDidFinishProcessingChange):
(WebKit):
(BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
(BlackBerry::WebKit::SelectionHandler::notifyCaretPositionChangedIfNeeded):

• WebKitSupport/SelectionHandler.h:

(SelectionHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (1 diff)
• WebKitSupport/InputHandler.h (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (4 diffs)
• WebKitSupport/SelectionHandler.h (modified) (2 diffs)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-09-11  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] SelectionHandler drops caret change notifications
+        https://bugs.webkit.org/show_bug.cgi?id=96378
+
+        Reviewed by Antonio Gomes.
+
+        The selection handler deliberately drops caret change notifications
+        while the input handler is processing changes, to avoid displaying
+        intermediate state during a complex change.
+
+        However, this meant that the client was never informed of the final
+        caret position.
+
+        Fixed by notifying client about caret change after processing ends, if
+        one or more caret change notifications were dropped during processing.
+
+        PR #205073
+
+        Reviewed internally by Mike Fenton.
+
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::setProcessingChange):
+        (WebKit):
+        * WebKitSupport/InputHandler.h:
+        (InputHandler):
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::SelectionHandler):
+        (BlackBerry::WebKit::SelectionHandler::inputHandlerDidFinishProcessingChange):
+        (WebKit):
+        (BlackBerry::WebKit::SelectionHandler::selectionPositionChanged):
+        (BlackBerry::WebKit::SelectionHandler::notifyCaretPositionChangedIfNeeded):
+        * WebKitSupport/SelectionHandler.h:
+        (SelectionHandler):
+
 2012-09-10  Antonio Gomes  <agomes@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

@@ -339 +339 @@
 }
 
+void InputHandler::setProcessingChange(bool processingChange)
+{
+    if (processingChange == m_processingChange)
+        return;
+
+    m_processingChange = processingChange;
+
+    if (!m_processingChange)
+        m_webPage->m_selectionHandler->inputHandlerDidFinishProcessingChange();
+}
+
 WTF::String InputHandler::elementText()
 {

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h

@@ -111 +111 @@
 
     bool processingChange() const { return m_processingChange; }
-    void setProcessingChange(bool processingChange) { m_processingChange = processingChange; }
+    void setProcessingChange(bool);
 
     WTF::String elementText();

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp

@@ -71 +71 @@
     , m_caretActive(false)
     , m_lastUpdatedEndPointIsValid(false)
+    , m_didSuppressCaretPositionChangedNotification(false)
 {
 }
@@ -269 +270 @@
 
     SelectionLog(LogLevelInfo, "SelectionHandler::setCaretPosition point valid, cursor updated");
+}
+
+void SelectionHandler::inputHandlerDidFinishProcessingChange()
+{
+    if (m_didSuppressCaretPositionChangedNotification)
+        notifyCaretPositionChangedIfNeeded();
 }
 
@@ -854 +861 @@
     if (m_webPage->m_inputHandler->isInputMode() && m_webPage->m_inputHandler->processingChange()) {
         m_webPage->m_client->cancelSelectionVisuals();
-        return;
-    }
-
-    if (m_caretActive || (m_webPage->m_inputHandler->isInputMode() && m_webPage->focusedOrMainFrame()->selection()->isCaret())) {
-        // This may update the caret to no longer be active.
-        caretPositionChanged();
-    }
+
+        // Since we're not calling notifyCaretPositionChangedIfNeeded now, we have to do so at the end of processing
+        // to avoid dropping a notification.
+        m_didSuppressCaretPositionChangedNotification = true;
+        return;
+    }
+
+    notifyCaretPositionChangedIfNeeded();
 
     // Enter selection mode if selection type is RangeSelection, and disable selection if
@@ -949 +957 @@
 }
 
+
+void SelectionHandler::notifyCaretPositionChangedIfNeeded()
+{
+    m_didSuppressCaretPositionChangedNotification = false;
+
+    if (m_caretActive || (m_webPage->m_inputHandler->isInputMode() && m_webPage->focusedOrMainFrame()->selection()->isCaret())) {
+        // This may update the caret to no longer be active.
+        caretPositionChanged();
+    }
+}
+
 // NOTE: This function is not in WebKit coordinates.
 void SelectionHandler::caretPositionChanged()

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.h

@@ -72 +72 @@
     bool lastUpdatedEndPointIsValid() const { return m_lastUpdatedEndPointIsValid; }
 
+    void inputHandlerDidFinishProcessingChange();
+
 private:
+    void notifyCaretPositionChangedIfNeeded();
     void caretPositionChanged();
     void regionForTextQuads(WTF::Vector<WebCore::FloatQuad>&, BlackBerry::Platform::IntRectRegion&, bool shouldClipToVisibleContent = true) const;
@@ -90 +93 @@
     bool m_caretActive;
     bool m_lastUpdatedEndPointIsValid;
+    bool m_didSuppressCaretPositionChangedNotification;
     BlackBerry::Platform::IntRectRegion m_lastSelectionRegion;