Title: [139787] trunk/Source/WebKit/blackberry
Revision
139787
Author
[email protected]
Date
2013-01-15 14:04:29 -0800 (Tue, 15 Jan 2013)

Log Message

[BlackBerry] Don't overwrite field dir with current locale.
https://bugs.webkit.org/show_bug.cgi?id=106932

Reviewed by Yong Li.

PR 212267.

Remove uncalled onInputLocaleChanged and stop re-writing the dir
on input focus which prevented RTL fields from rendering properly.

Reviewed Internally by Eli Fidler.

* Api/WebPage.cpp:
* Api/WebPage.h:
* Api/WebPage_p.h:
(WebPagePrivate):
* WebKitSupport/InputHandler.cpp:
* WebKitSupport/InputHandler.h:
(InputHandler):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (139786 => 139787)


--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp	2013-01-15 22:04:29 UTC (rev 139787)
@@ -3517,19 +3517,6 @@
         zoomToInitialScaleOnLoad();
 }
 
-void WebPagePrivate::onInputLocaleChanged(bool isRTL)
-{
-    if (isRTL != m_webSettings->isWritingDirectionRTL()) {
-        m_webSettings->setWritingDirectionRTL(isRTL);
-        m_inputHandler->handleInputLocaleChanged(isRTL);
-    }
-}
-
-void WebPage::onInputLocaleChanged(bool isRTL)
-{
-    d->onInputLocaleChanged(isRTL);
-}
-
 void WebPagePrivate::suspendBackingStore()
 {
 #if USE(ACCELERATED_COMPOSITING)

Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (139786 => 139787)


--- trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h	2013-01-15 22:04:29 UTC (rev 139787)
@@ -264,7 +264,6 @@
     void setDateTimeInput(const BlackBerry::Platform::String& value);
     void setColorInput(const BlackBerry::Platform::String& value);
 
-    void onInputLocaleChanged(bool isRTL);
     static void onNetworkAvailabilityChanged(bool available);
     static void onCertificateStoreLocationSet(const BlackBerry::Platform::String& caPath);
 

Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (139786 => 139787)


--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h	2013-01-15 22:04:29 UTC (rev 139787)
@@ -326,8 +326,6 @@
 
     void updateCursor();
 
-    void onInputLocaleChanged(bool isRTL);
-
     ViewMode viewMode() const { return m_viewMode; }
     bool setViewMode(ViewMode); // Returns true if the change requires re-layout.
 

Modified: trunk/Source/WebKit/blackberry/ChangeLog (139786 => 139787)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-01-15 22:04:29 UTC (rev 139787)
@@ -1,3 +1,25 @@
+2013-01-15  Mike Fenton  <[email protected]>
+
+        [BlackBerry] Don't overwrite field dir with current locale.
+        https://bugs.webkit.org/show_bug.cgi?id=106932
+
+        Reviewed by Yong Li.
+
+        PR 212267.
+
+        Remove uncalled onInputLocaleChanged and stop re-writing the dir
+        on input focus which prevented RTL fields from rendering properly.
+
+        Reviewed Internally by Eli Fidler.
+
+        * Api/WebPage.cpp:
+        * Api/WebPage.h:
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * WebKitSupport/InputHandler.cpp:
+        * WebKitSupport/InputHandler.h:
+        (InputHandler):
+
 2013-01-15  Jacky Jiang  <[email protected]>
 
         [BlackBerry] Manual zoom propagates to next page load

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (139786 => 139787)


--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp	2013-01-15 22:04:29 UTC (rev 139787)
@@ -1738,22 +1738,6 @@
     m_composingTextEnd = 0;
 }
 
-void InputHandler::handleInputLocaleChanged(bool isRTL)
-{
-    if (!isActiveTextEdit())
-        return;
-
-    ASSERT(m_currentFocusElement->document() && m_currentFocusElement->document()->frame());
-    RenderObject* renderer = m_currentFocusElement->renderer();
-    if (!renderer)
-        return;
-
-    Editor* editor = m_currentFocusElement->document()->frame()->editor();
-    ASSERT(editor);
-    if ((renderer->style()->direction() == RTL) != isRTL)
-        editor->setBaseWritingDirection(isRTL ? RightToLeftWritingDirection : LeftToRightWritingDirection);
-}
-
 void InputHandler::clearCurrentFocusElement()
 {
     if (m_currentFocusElement)

Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h (139786 => 139787)


--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2013-01-15 22:03:13 UTC (rev 139786)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.h	2013-01-15 22:04:29 UTC (rev 139787)
@@ -104,7 +104,6 @@
     PassRefPtr<WebCore::Element> currentFocusElement() const { return m_currentFocusElement; }
 
     void ensureFocusElementVisible(bool centerFieldInDisplay = true);
-    void handleInputLocaleChanged(bool isRTL);
 
     // PopupMenu methods.
     bool willOpenPopupForNode(WebCore::Node*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to