Changeset 128858 in webkit

Timestamp:

Sep 18, 2012 1:17:21 AM (12 years ago)

Author:

anilsson@rim.com

Message:

[BlackBerry] Prevent scroll adjustment of input fields when region of interest mechanism active
​https://bugs.webkit.org/show_bug.cgi?id=96750

Reviewed by Antonio Gomes.

The region of interest mechanism replaces the scrolling/zooming
functionality in InputHandler::ensureFocusTextElementVisible().

We introduce a new fine-grained setting for the various adjustment
modes. The WebKit embedder can disable all scroll types in favor of the
region of interest mechanism by using the new setting.

PR #208387

Reviewed internally by Mike Fenton.

• WebKitSupport/AboutData.cpp:

(BlackBerry::WebKit::configPage):

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):

• WebKitSupport/InputHandler.h:

Location:

trunk/Source/WebKit/blackberry

Files:

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

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-09-18  Arvid Nilsson  <anilsson@rim.com>
+
+        [BlackBerry] Prevent scroll adjustment of input fields when region of interest mechanism active
+        https://bugs.webkit.org/show_bug.cgi?id=96750
+
+        Reviewed by Antonio Gomes.
+
+        The region of interest mechanism replaces the scrolling/zooming
+        functionality in InputHandler::ensureFocusTextElementVisible().
+
+        We introduce a new fine-grained setting for the various adjustment
+        modes. The WebKit embedder can disable all scroll types in favor of the
+        region of interest mechanism by using the new setting.
+
+        PR #208387
+
+        Reviewed internally by Mike Fenton.
+
+        * WebKitSupport/AboutData.cpp:
+        (BlackBerry::WebKit::configPage):
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::ensureFocusTextElementVisible):
+        * WebKitSupport/InputHandler.h:
+
 2012-09-17  Jakob Petsovits  <jpetsovits@rim.com>
 

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

@@ -140 +140 @@
     page += numberToHTMLTr("fineCursorControlEnabled", settings->fineCursorControlEnabled());
     page += numberToHTMLTr("alwaysShowKeyboardOnFocus", settings->alwaysShowKeyboardOnFocus());
-    page += numberToHTMLTr("allowCenterScrollAdjustmentForInputFields", settings->allowCenterScrollAdjustmentForInputFields());
+    page += numberToHTMLTr("allowedScrollAdjustmentForInputFields", settings->allowedScrollAdjustmentForInputFields());
     page += numberToHTMLTr("unrestrictedResizeEvents", settings->unrestrictedResizeEvents());
     page += numberToHTMLTr("isBridgeBrowser", settings->isBridgeBrowser());

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

@@ -1052 +1052 @@
         return;
 
-    if (!Platform::Settings::instance()->allowCenterScrollAdjustmentForInputFields() && scrollType != EdgeIfNeeded)
+    if (!(Platform::Settings::instance()->allowedScrollAdjustmentForInputFields() & scrollType))
         return;
 

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

@@ -23 +23 @@
 
 #include <BlackBerryPlatformInputEvents.h>
+#include <BlackBerryPlatformSettings.h>
 
 #include <imf/events.h>
@@ -66 +67 @@
 
     enum FocusElementType { TextEdit, TextPopup /* Date/Time & Color */, SelectPopup, Plugin };
-    enum CaretScrollType { CenterAlways, CenterIfNeeded, EdgeIfNeeded };
+    enum CaretScrollType { CenterAlways = BlackBerry::Platform::Settings::ScrollAdjustmentCenterAlways,
+                           CenterIfNeeded = BlackBerry::Platform::Settings::ScrollAdjustmentCenterIfNeeded,
+                           EdgeIfNeeded = BlackBerry::Platform::Settings::ScrollAdjustmentEdgeIfNeeded };
 
     bool isInputModeEnabled() const;