Changeset 141731 in webkit

Timestamp:

Feb 3, 2013 8:04:12 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Do not call m_widgetClient->show() for WebHelperPlugin.
​https://bugs.webkit.org/show_bug.cgi?id=108740

Patch by David Dorwin <​ddorwin@chromium.org> on 2013-02-03
Reviewed by Kent Tamura.

The calls to m_widgetClient->show() and setFocus() do not appear to be
necessary, and the former causes problems on at least on platform.

• src/WebHelperPluginImpl.cpp:

(WebKit::WebHelperPluginImpl::initialize): Removed calls to m_widgetClient->show() and setFocus().
(WebKit::WebHelperPluginImpl::setFocus): Should never be called.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebHelperPluginImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-03  David Dorwin  <ddorwin@chromium.org>
+
+        [chromium] Do not call m_widgetClient->show() for WebHelperPlugin.
+        https://bugs.webkit.org/show_bug.cgi?id=108740
+
+        Reviewed by Kent Tamura.
+
+        The calls to m_widgetClient->show() and setFocus() do not appear to be
+        necessary, and the former causes problems on at least on platform.
+
+        * src/WebHelperPluginImpl.cpp:
+        (WebKit::WebHelperPluginImpl::initialize): Removed calls to m_widgetClient->show() and setFocus().
+        (WebKit::WebHelperPluginImpl::setFocus): Should never be called.
+
 2013-02-02  Michael Nordman  <michaeln@google.com>
 

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

@@ -121 +121 @@
     m_webView = webView;
 
-    if (!initializePage(webView, pluginType))
-        return false;
-    m_widgetClient->show(WebNavigationPolicy());
-    setFocus(true);
-
-    return true;
+    return initializePage(webView, pluginType);
 }
 
@@ -234 +229 @@
 }
 
-void WebHelperPluginImpl::setFocus(bool enable)
-{
-    if (!m_page)
-        return;
-    m_page->focusController()->setFocused(enable);
-    if (enable)
-        m_page->focusController()->setActive(true);
+void WebHelperPluginImpl::setFocus(bool)
+{
+    ASSERT_NOT_REACHED();
 }