Changeset 141623 in webkit

Timestamp:

Feb 1, 2013 12:11:15 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] InputHandler status is not restored when page history goes back
​https://bugs.webkit.org/show_bug.cgi?id=108448

Patch by Sean Wang <​Xuewen.Wang@torchmobile.com.cn> on 2013-02-01
Reviewed by Yong Li.

PR288406 Internally reviewed by Mike Fenton

When webpage goes back, it restores the old frame's selection and focused node,
but we don't save the InputHandler's status, it becomes non-input mode when page
goes back. When it restores the focus, since the new focus node is same as the old
document focused node, webcore will not notify client to update the input handler.

This patch updates the input handler's status by notifying it focus node changed.

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::restoreViewState):

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::restoreViewState):
(WebKit):

• WebKitSupport/InputHandler.h:

(InputHandler):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (1 diff)
• WebKitSupport/InputHandler.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-02-01  Sean Wang  <Xuewen.Wang@torchmobile.com.cn>
+
+        [BlackBerry] InputHandler status is not restored when page history goes back
+        https://bugs.webkit.org/show_bug.cgi?id=108448
+
+        Reviewed by Yong Li.
+
+        PR288406 Internally reviewed by Mike Fenton
+
+        When webpage goes back, it restores the old frame's selection and focused node,
+        but we don't save the InputHandler's status, it becomes non-input mode when page
+        goes back. When it restores the focus, since the new focus node is same as the old
+        document focused node, webcore will not notify client to update the input handler.
+
+        This patch updates the input handler's status by notifying it focus node changed.
+
+
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::restoreViewState):
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::restoreViewState):
+        (WebKit):
+        * WebKitSupport/InputHandler.h:
+        (InputHandler):
+
 2013-01-31  Jacky Jiang  <zhajiang@rim.com>
 

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

@@ -1139 +1139 @@
     bool orientationChanged = viewState.orientation % 180 != m_webPagePrivate->mainFrame()->orientation() % 180;
 
+    m_webPagePrivate->m_inputHandler->restoreViewState();
+
     if (!scrollChanged && !scaleChanged && !reflowChanged && !orientationChanged)
         return;

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

@@ -2400 +2400 @@
 }
 
-}
-}
+void InputHandler::restoreViewState()
+{
+    setInputModeEnabled();
+    focusedNodeChanged();
+}
+
+}
+}

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

@@ -155 +155 @@
     void setSystemSpellCheckStatus(bool enabled) { m_spellCheckStatusConfirmed = true; m_globalSpellCheckStatus = enabled; }
 
+    void restoreViewState();
+
 private:
     enum PendingKeyboardStateChange { NoChange, Visible, NotVisible };