Changeset 110630 in webkit

Timestamp:

Mar 13, 2012, 3:57:43 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Input focus state should unfocus the frame selection instead of the field.
​https://bugs.webkit.org/show_bug.cgi?id=81023

Patch by Mike Fenton <​mifenton@rim.com> on 2012-03-13
Reviewed by Antonio Gomes.

PR 137400.

Prevent cursor drawing by unfocusing the frame selection
when input mode is not ready.

Greatly simplify the decision to focus input fields by removing
all ties to the page load state and base it on input. Input mode
is disabled when a page load begins and enabled on any user input.

The field is focused and ready for input immediately, only the
frame selection (or cursor) is unfocused.

Reviewed Internally by Gen Mak, Antonio Gomes and Nima Ghanavatian.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setLoadState):
(BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):

• Api/WebPageClient.h:
• WebCoreSupport/EditorClientBlackBerry.cpp:

(WebCore::EditorClientBlackBerry::shouldBeginEditing):

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::InputHandler):
(BlackBerry::WebKit::InputHandler::setElementUnfocused):
(BlackBerry::WebKit::InputHandler::enableInputMode):
(BlackBerry::WebKit::InputHandler::setElementFocused):
(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
(BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
(BlackBerry::WebKit::InputHandler::handleKeyboardInput):
(BlackBerry::WebKit::InputHandler::setComposingText):

• WebKitSupport/InputHandler.h:

(InputHandler):

• WebKitSupport/TouchEventHandler.cpp:

(BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (2 diffs)
• Api/WebPageClient.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/EditorClientBlackBerry.cpp (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (9 diffs)
• WebKitSupport/InputHandler.h (modified) (3 diffs)
• WebKitSupport/TouchEventHandler.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -842 +842 @@
             toggleTextReflowIfEnabledForBlockZoomOnly();
 #endif
+
+            // Notify InputHandler of state change.
+            m_inputHandler->enableInputMode(false);
 
             // Set the scroll to origin here and notify the client since we'll be
@@ -3529 +3532 @@
 
     if (mouseEvent.eventType() == MouseEventPressed) {
+        m_inputHandler->enableInputMode();
         if (m_inputHandler->willOpenPopupForNode(node)) {
             // Do not allow any human generated mouse or keyboard events to select <option>s in the list box

trunk/Source/WebKit/blackberry/Api/WebPageClient.h

@@ -130 +130 @@
     virtual void hideTapHighlight() = 0;
 
-    virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle, bool waitForExplicitKeyboardShowCall) = 0;
+    virtual void inputFocusGained(Platform::BlackBerryInputType, int inputStyle) = 0;
     virtual void inputFocusLost() = 0;
     virtual void inputTextChanged() = 0;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-13  Mike Fenton  <mifenton@rim.com>
+
+        [BlackBerry] Input focus state should unfocus the frame selection instead of the field.
+        https://bugs.webkit.org/show_bug.cgi?id=81023
+
+        Reviewed by Antonio Gomes.
+
+        PR 137400.
+
+        Prevent cursor drawing by unfocusing the frame selection
+        when input mode is not ready.
+
+        Greatly simplify the decision to focus input fields by removing
+        all ties to the page load state and base it on input.  Input mode
+        is disabled when a page load begins and enabled on any user input.
+
+        The field is focused and ready for input immediately, only the
+        frame selection (or cursor) is unfocused.
+
+        Reviewed Internally by Gen Mak, Antonio Gomes and Nima Ghanavatian.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setLoadState):
+        (BlackBerry::WebKit::WebPagePrivate::handleMouseEvent):
+        * Api/WebPageClient.h:
+        * WebCoreSupport/EditorClientBlackBerry.cpp:
+        (WebCore::EditorClientBlackBerry::shouldBeginEditing):
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::InputHandler):
+        (BlackBerry::WebKit::InputHandler::setElementUnfocused):
+        (BlackBerry::WebKit::InputHandler::enableInputMode):
+        (BlackBerry::WebKit::InputHandler::setElementFocused):
+        (BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+        (BlackBerry::WebKit::InputHandler::notifyClientOfKeyboardVisibilityChange):
+        (BlackBerry::WebKit::InputHandler::handleKeyboardInput):
+        (BlackBerry::WebKit::InputHandler::setComposingText):
+        * WebKitSupport/InputHandler.h:
+        (InputHandler):
+        * WebKitSupport/TouchEventHandler.cpp:
+        (BlackBerry::WebKit::TouchEventHandler::handleTouchPoint):
+
 2012-03-13  Adam Barth  <abarth@webkit.org> && Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp

@@ -160 +160 @@
         return m_webPagePrivate->m_dumpRenderTree->shouldBeginEditingInDOMRange(range);
 
-    return m_webPagePrivate->m_inputHandler->shouldAcceptInputFocus();
+    return true;
 }
 

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

@@ -110 +110 @@
     : m_webPage(page)
     , m_currentFocusElement(0)
+    , m_inputModeEnabled(false)
     , m_processingChange(false)
     , m_changingFocus(false)
@@ -407 +408 @@
         m_webPage->m_client->inputFocusLost();
         m_webPage->m_selectionHandler->selectionPositionChanged();
+
+        // If the frame selection isn't focused, focus it.
+        if (!m_currentFocusElement->document()->frame()->selection()->isFocused())
+            m_currentFocusElement->document()->frame()->selection()->setFocused(true);
     }
 
@@ -414 +419 @@
 }
 
-bool InputHandler::shouldAcceptInputFocus()
-{
-    // If the DRT is running, always accept focus.
-    if (m_webPage->m_dumpRenderTree)
-        return true;
-
-    if (Platform::Settings::get()->alwaysShowKeyboardOnFocus()) {
-        FocusLog(LogLevelInfo, "InputHandler::shouldAcceptInputFocus alwaysShowKeyboardOnFocus is active.");
-        return true;
-    }
-
-    Frame* focusedFrame = m_webPage->focusedOrMainFrame();
-    if (!focusedFrame) {
-        FocusLog(LogLevelInfo, "InputHandler::shouldAcceptInputFocus Frame not valid.");
-        return false;
-    }
-
-    // Any user action should be respected. Mouse will be down when touch is
-    // used to focus.
-    if (focusedFrame->eventHandler()->mousePressed()) {
-        FocusLog(LogLevelInfo, "InputHandler::shouldAcceptInputFocus Mouse is pressed focusing.");
-        return true;
-    }
-
-    if (!m_webPage->m_client->hasKeyboardFocus()) {
-        FocusLog(LogLevelInfo, "InputHandler::shouldAcceptInputFocus Client does not have input focus.");
-        return false;
-    }
-
-    if (m_webPage->isLoading()) {
-        FocusLog(LogLevelInfo, "InputHandler::shouldAcceptInputFocus Webpage is loading.");
-        return false;
-    }
-
-    // Make sure the focused frame is not processing load events.
-    FocusLog(LogLevelInfo, "InputHandler::shouldAcceptInputFocus returning state of processingLoadEvent (%s).", !focusedFrame->document()->processingLoadEvent() ? "true" : "false");
-    return !focusedFrame->document()->processingLoadEvent();
+void InputHandler::enableInputMode(bool inputModeAllowed)
+{
+    FocusLog(LogLevelInfo, "InputHandler::enableInputMode %s, override is %s"
+             , inputModeAllowed ? "true" : "false"
+            , m_webPage->m_dumpRenderTree || Platform::Settings::get()->alwaysShowKeyboardOnFocus() ? "true" : "false");
+
+    m_inputModeEnabled = inputModeAllowed;
+
+    // If DRT is running or always show keyboard setting is active, do not delay
+    // showing the keyboard.
+    if (m_webPage->m_dumpRenderTree || Platform::Settings::get()->alwaysShowKeyboardOnFocus())
+        m_inputModeEnabled = true;
+
+    // If the frame selection isn't focused, focus it.
+    if (m_inputModeEnabled && isActiveTextEdit() && !m_currentFocusElement->document()->frame()->selection()->isFocused())
+        m_currentFocusElement->document()->frame()->selection()->setFocused(true);
 }
 
@@ -458 +442 @@
     ASSERT(element->document() && element->document()->frame());
 
-    if (!m_changingFocus && !shouldAcceptInputFocus()) {
-        // Remove the focus from this element, but guard against recursion by
-        // allowing a refocus during the blur to continue.
-        // THIS IS A HACK that needs to be fixed. Instead of blur the field,
-        // the frame or frame selection should be blurred. Google bypasses these
-        // though so it can't be done right now.
-        m_changingFocus = true;
-        element->blur();
-        m_changingFocus = false;
-        return;
-    }
+    if (element->document()->frame()->selection()->isFocused() != m_inputModeEnabled)
+        element->document()->frame()->selection()->setFocused(m_inputModeEnabled);
 
     // Clear the existing focus node details.
@@ -482 +457 @@
 
     FocusLog(LogLevelInfo, "InputHandler::setElementFocused, Type=%d, Style=%d", type, m_currentFocusElementTextEditMask);
-
-    m_webPage->m_client->inputFocusGained(type,
-                                          m_currentFocusElementTextEditMask,
-                                          m_delayKeyboardVisibilityChange /* wait for explicit keyboard show call */);
+    m_webPage->m_client->inputFocusGained(type, m_currentFocusElementTextEditMask);
 
     handleInputLocaleChanged(m_webPage->m_webSettings->isWritingDirectionRTL());
+
+    if (!m_delayKeyboardVisibilityChange)
+        notifyClientOfKeyboardVisibilityChange(true);
 }
 
@@ -553 +528 @@
 void InputHandler::ensureFocusTextElementVisible(CaretScrollType scrollType)
 {
-    if (!m_currentFocusElement || !m_currentFocusElement->document())
+    if (!m_inputModeEnabled || !m_currentFocusElement || !m_currentFocusElement->document())
         return;
 
@@ -755 +730 @@
 void InputHandler::notifyClientOfKeyboardVisibilityChange(bool visible)
 {
+    // If we aren't ready for input, keyboard changes should be ignored.
+    if (!m_inputModeEnabled && visible)
+        return;
+
     if (!m_delayKeyboardVisibilityChange) {
         m_webPage->showVirtualKeyboard(visible);
@@ -909 +888 @@
 {
     InputLog(LogLevelInfo, "InputHandler::handleKeyboardInput received character=%lc, type=%d", keyboardEvent.character(), keyboardEvent.type());
+
+    // Enable input mode if we are processing a key event.
+    enableInputMode();
 
     // If we aren't specifically part of a composition, fail, IMF should never send key input
@@ -1690 +1672 @@
     InputLog(LogLevelInfo, "InputHandler::setComposingText at relativeCursorPosition: %d", relativeCursorPosition);
 
+    // Enable input mode if we are processing a key event.
+    enableInputMode();
+
     return setSpannableTextAndRelativeCursor(spannableString, relativeCursorPosition, true /* markTextAsComposing */) ? 0 : -1;
 }

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

@@ -57 +57 @@
     enum FocusElementType { TextEdit, TextPopup /* Date/Time & Color */, SelectPopup, Plugin };
     enum CaretScrollType { CenterAlways, CenterIfNeeded, EdgeIfNeeded };
+
+    void enableInputMode(bool inputModeAllowed = true);
 
     void focusedNodeChanged();
@@ -117 +119 @@
     int32_t commitText(spannable_string_t*, int32_t relativeCursorPosition);
 
-    bool shouldAcceptInputFocus();
-
 private:
     enum PendingKeyboardStateChange { NoChange, Visible, NotVisible };
@@ -178 +178 @@
 
     RefPtr<WebCore::Element> m_currentFocusElement;
+    bool m_inputModeEnabled;
 
     bool m_processingChange;

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

@@ -175 +175 @@
 bool TouchEventHandler::handleTouchPoint(Platform::TouchPoint& point)
 {
+    // Enable input mode on any touch event.
+    m_webPage->m_inputHandler->enableInputMode();
+
     switch (point.m_state) {
     case Platform::TouchPoint::TouchPressed: