Changeset 90338 in webkit

Timestamp:

Jul 3, 2011 8:04:28 AM (13 years ago)

Author:

robert@webkit.org

Message:

2011-06-23 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
​https://bugs.webkit.org/show_bug.cgi?id=30355

Unfortunately this has to be a rendertree test, as there is no rendertext way of
determining if a selection is still highlighted.

• platform/chromium/plugins/mouse-click-plugin-clears-selection-expected.txt: Added.
• platform/qt/plugins/mouse-click-plugin-clears-selection-expected.txt: Added.
• plugins/mouse-click-plugin-clears-selection.html: Added.

2011-06-23 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
​https://bugs.webkit.org/show_bug.cgi?id=30355

Test: plugins/mouse-click-plugin-clears-selection.html

PluginView needs to use page->focusController()->setFocusedNode() when focusing a plugin
in order to clear the FrameSelection in the currently focused node. In its platform-specific
code Chromium already does this (WebPluginContainerImpl.cpp).

• WebCore.exp.in: Add symbol for FocusController::setFocusedNode
• plugins/PluginView.cpp: (WebCore::PluginView::focusPluginElement): Using FocusController::setFocusedNode() makes

the call to FocusController:setFocusedFrame() and Document::setFocusedNode()
redundant, since it calls both.

2011-06-23 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
​https://bugs.webkit.org/show_bug.cgi?id=30355

PluginView needs to use page->focusController()->setFocusedNode() when focusing a plugin
in order to clear the FrameSelection in the currently focused node. In its platform-specific
code Chromium already does this (WebPluginContainerImpl.cpp).

• WebProcess/Plugins/PluginView.cpp: (WebCore::PluginView::focusPluginElement): Using FocusController::setFocusedNode() makes

the call to FocusController:setFocusedFrame() redundant, since the
former calls it.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/plugins/mouse-click-plugin-clears-selection-expected.txt (added)
• LayoutTests/platform/qt/plugins/mouse-click-plugin-clears-selection-expected.txt (added)
• LayoutTests/plugins/mouse-click-plugin-clears-selection.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (1 diff)
• Source/WebCore/plugins/PluginView.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-23  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
+        https://bugs.webkit.org/show_bug.cgi?id=30355
+
+        Unfortunately this has to be a rendertree test, as there is no rendertext way of
+        determining if a selection is still highlighted.
+
+        * platform/chromium/plugins/mouse-click-plugin-clears-selection-expected.txt: Added.
+        * platform/qt/plugins/mouse-click-plugin-clears-selection-expected.txt: Added.
+        * plugins/mouse-click-plugin-clears-selection.html: Added.
+
 2011-07-02  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-23  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
+        https://bugs.webkit.org/show_bug.cgi?id=30355
+
+        Test: plugins/mouse-click-plugin-clears-selection.html
+
+        PluginView needs to use page->focusController()->setFocusedNode() when focusing a plugin
+        in order to clear the FrameSelection in the currently focused node. In its platform-specific
+        code Chromium already does this (WebPluginContainerImpl.cpp).
+
+        * WebCore.exp.in: Add symbol for FocusController::setFocusedNode
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::focusPluginElement): Using FocusController::setFocusedNode() makes
+                                                   the call to FocusController:setFocusedFrame() and Document::setFocusedNode()
+                                                   redundant, since it calls both.
+
 2011-07-01  Michael Nordman  <michaeln@google.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -400 +400 @@
 __ZN7WebCore15FocusController10setFocusedEb
 __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
+__ZN7WebCore15FocusController14setFocusedNodeEPNS_4NodeEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE
 __ZN7WebCore15FocusController9setActiveEb

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -910 +910 @@
     // Focus the plugin
     if (Page* page = m_parentFrame->page())
-        page->focusController()->setFocusedFrame(m_parentFrame);
-    m_parentFrame->document()->setFocusedNode(m_element);
+        page->focusController()->setFocusedNode(m_element, m_parentFrame);
+    else
+        m_parentFrame->document()->setFocusedNode(m_element);
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-23  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
+        https://bugs.webkit.org/show_bug.cgi?id=30355
+
+        PluginView needs to use page->focusController()->setFocusedNode() when focusing a plugin
+        in order to clear the FrameSelection in the currently focused node. In its platform-specific
+        code Chromium already does this (WebPluginContainerImpl.cpp).
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebCore::PluginView::focusPluginElement): Using FocusController::setFocusedNode() makes
+                                                   the call to FocusController:setFocusedFrame() redundant, since the
+                                                   former calls it.
+
 2011-07-02  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -682 +682 @@
     
     if (Page* page = frame()->page())
-        page->focusController()->setFocusedFrame(frame());
-    frame()->document()->setFocusedNode(m_pluginElement);
+       page->focusController()->setFocusedNode(m_pluginElement.get(), frame());
+    else
+       frame()->document()->setFocusedNode(m_pluginElement);
 }