[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 417569c2b048a429cc34519f8683b8b2edcd5e59
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 19:48:14 2010 +0000

    Fix build.
    
    WebKit/efl:
    
    * ewk/ewk_view.cpp:
    (ewk_view_input_method_state_set): Updated for change
    in name of isUrlField to isURLField.
    
    WebKit/qt:
    
    * WebCoreSupport/EditorClientQt.cpp:
    (WebCore::EditorClientQt::setInputMethodState): Updated for change
    in name of isUrlField to isURLField.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67655 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 6715c3e..0572c7a 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-16  Darin Adler  <darin at apple.com>
+
+        Fix build.
+
+        * ewk/ewk_view.cpp:
+        (ewk_view_input_method_state_set): Updated for change
+        in name of isUrlField to isURLField.
+
 2010-09-14  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 82102c8..76e4bf5 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -3250,7 +3250,7 @@ void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active)
                 priv->imh |= inputElement->isTelephoneField() * EWK_IMH_TELEPHONE;
                 priv->imh |= inputElement->isNumberField() * EWK_IMH_NUMBER;
                 priv->imh |= inputElement->isEmailField() * EWK_IMH_EMAIL;
-                priv->imh |= inputElement->isUrlField() * EWK_IMH_URL;
+                priv->imh |= inputElement->isURLField() * EWK_IMH_URL;
             }
         }
     }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index a970404..59cb3e0 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-16  Darin Adler  <darin at apple.com>
 
+        Fix build.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState): Updated for change
+        in name of isUrlField to isURLField.
+
+2010-09-16  Darin Adler  <darin at apple.com>
+
         Reviewed by Andreas Kling.
 
         Reduce use of HTMLInputElement::inputType so we can remove it later
diff --git a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
index 0a9a0ea..080c459 100644
--- a/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
@@ -612,7 +612,7 @@ void EditorClientQt::setInputMethodState(bool active)
                 hints |= Qt::ImhDigitsOnly;
             if (inputElement->isEmailField())
                 hints |= Qt::ImhEmailCharactersOnly;
-            if (inputElement->isUrlField())
+            if (inputElement->isURLField())
                 hints |= Qt::ImhUrlCharactersOnly;
             // Setting the Qt::WA_InputMethodEnabled attribute true and Qt::ImhHiddenText flag
             // for password fields. The Qt platform is responsible for determining which widget

-- 
WebKit Debian packaging