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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4c81294c2e8f9c4568d0e047d482fafb021b8f73
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 15:50:16 2010 +0000

    2010-08-09  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [gtk] gtk_im_context_focus_in() should only be called when an input-able element has focus
            https://bugs.webkit.org/show_bug.cgi?id=43602
    
            Only call gtk_im_context_focus_in() when we focus a frame which is currently in
            an editable node.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_focus_in_event): Conditionalize call to gtk_im_context_focus_in().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e429a69..64d5f0e 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-09  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [gtk] gtk_im_context_focus_in() should only be called when an input-able element has focus
+        https://bugs.webkit.org/show_bug.cgi?id=43602
+
+        Only call gtk_im_context_focus_in() when we focus a frame which is currently in
+        an editable node. 
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_focus_in_event): Conditionalize call to gtk_im_context_focus_in().
+
 2010-08-06  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 1d2af0e..58d91ea 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -797,7 +797,8 @@ static gboolean webkit_web_view_focus_in_event(GtkWidget* widget, GdkEventFocus*
         else
             focusController->setFocusedFrame(core(webView)->mainFrame());
 
-        gtk_im_context_focus_in(webView->priv->imContext);
+        if (focusController->focusedFrame()->editor()->canEdit())
+            gtk_im_context_focus_in(webView->priv->imContext);
     }
     return GTK_WIDGET_CLASS(webkit_web_view_parent_class)->focus_in_event(widget, event);
 }

-- 
WebKit Debian packaging