Changeset 84270 in webkit

Timestamp:

Apr 19, 2011 11:17:30 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-19 Stuart Morgan <​stuartmorgan@chromium.org>

Reviewed by Tony Chang.

[chromium] Clicking on plugin for first time blocks focus shift
​https://bugs.webkit.org/show_bug.cgi?id=58419

Added new test for cross-iframe focus changes on plugin clicks.

• plugins/mouse-click-iframe-to-plugin-expected.txt: Added.
• plugins/mouse-click-iframe-to-plugin.html: Added.

2011-04-19 Stuart Morgan <​stuartmorgan@chromium.org>

Reviewed by Tony Chang.

[chromium] Clicking on plugin for first time blocks focus shift
​https://bugs.webkit.org/show_bug.cgi?id=58419

Switched to using FocusController when moving focus to a plugin
so that cross-frame focus changes are handled correctly.

• src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::handleMouseEvent):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/mouse-click-iframe-to-plugin-expected.txt (added)
• LayoutTests/plugins/mouse-click-iframe-to-plugin.html (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-19  Stuart Morgan  <stuartmorgan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Clicking on plugin for first time blocks focus shift
+        https://bugs.webkit.org/show_bug.cgi?id=58419
+
+        Added new test for cross-iframe focus changes on plugin clicks.
+
+        * plugins/mouse-click-iframe-to-plugin-expected.txt: Added.
+        * plugins/mouse-click-iframe-to-plugin.html: Added.
+
 2011-04-19  Jungshik Shin  <jshin@chromium.org>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-19  Stuart Morgan  <stuartmorgan@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Clicking on plugin for first time blocks focus shift
+        https://bugs.webkit.org/show_bug.cgi?id=58419
+
+        Switched to using FocusController when moving focus to a plugin
+        so that cross-frame focus changes are handled correctly.
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::handleMouseEvent):
+
 2011-04-19  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -481 +481 @@
 
     if (event->type() == eventNames().mousedownEvent) {
-        // Ensure that the frame containing the plugin has focus.
         Frame* containingFrame = parentView->frame();
         if (Page* currentPage = containingFrame->page())
-            currentPage->focusController()->setFocusedFrame(containingFrame);
-        // Give focus to our containing HTMLPluginElement.
-        containingFrame->document()->setFocusedNode(m_element);
+            currentPage->focusController()->setFocusedNode(m_element, containingFrame);
+        else
+            containingFrame->document()->setFocusedNode(m_element);
     }