[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 8ef448c298331f161155773e29b95269f3d69265
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 2 03:22:06 2010 +0000

    2010-10-01  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Adam Barth.
    
            [GTK] r68923 broke some plugin tests
            https://bugs.webkit.org/show_bug.cgi?id=47040
    
            No longer pass focus and blur events to plugins when the "old" DOM Level
            2 DOMFocusIn/DOMFocusOut events occur. r68923 made a change which means
            that the DOM Level 3 version is always fired for this event.
    
            No new tests, as this should cause the failing tests to pass.
    
            * plugins/PluginView.cpp:
            (WebCore::PluginView::handleEvent): No longer pass focus and blur events to
            plugins when DOMFocusIn / DOMFocusOut events occur.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68970 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8f32336..66c011c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-01  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Adam Barth.
+
+        [GTK] r68923 broke some plugin tests
+        https://bugs.webkit.org/show_bug.cgi?id=47040
+
+        No longer pass focus and blur events to plugins when the "old" DOM Level
+        2 DOMFocusIn/DOMFocusOut events occur. r68923 made a change which means
+        that the DOM Level 3 version is always fired for this event. 
+
+        No new tests, as this should cause the failing tests to pass.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::handleEvent): No longer pass focus and blur events to
+        plugins when DOMFocusIn / DOMFocusOut events occur.
+
 2010-10-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index d0c3570..f7db010 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -170,9 +170,9 @@ void PluginView::handleEvent(Event* event)
     else if (event->isKeyboardEvent())
         handleKeyboardEvent(static_cast<KeyboardEvent*>(event));
 #if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
-    else if (event->type() == eventNames().DOMFocusOutEvent || event->type() == eventNames().focusoutEvent)
+    else if (event->type() == eventNames().focusoutEvent)
         handleFocusOutEvent();
-    else if (event->type() == eventNames().DOMFocusInEvent || event->type() == eventNames().focusinEvent)
+    else if (event->type() == eventNames().focusinEvent)
         handleFocusInEvent();
 #endif
 }

-- 
WebKit Debian packaging