Title: [141731] trunk/Source/WebKit/chromium
Revision
141731
Author
commit-qu...@webkit.org
Date
2013-02-03 20:04:12 -0800 (Sun, 03 Feb 2013)

Log Message

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

Patch by David Dorwin <ddor...@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.

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (141730 => 141731)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-02-04 03:22:44 UTC (rev 141730)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-02-04 04:04:12 UTC (rev 141731)
@@ -1,3 +1,17 @@
+2013-02-03  David Dorwin  <ddor...@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  <micha...@google.com>
 
         [chromium] FileSystem mods: Changes to snapshot file creation to reduce dependencies on blobs.

Modified: trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp (141730 => 141731)


--- trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp	2013-02-04 03:22:44 UTC (rev 141730)
+++ trunk/Source/WebKit/chromium/src/WebHelperPluginImpl.cpp	2013-02-04 04:04:12 UTC (rev 141731)
@@ -120,12 +120,7 @@
     ASSERT(webView);
     m_webView = webView;
 
-    if (!initializePage(webView, pluginType))
-        return false;
-    m_widgetClient->show(WebNavigationPolicy());
-    setFocus(true);
-
-    return true;
+    return initializePage(webView, pluginType);
 }
 
 void WebHelperPluginImpl::closeHelperPlugin()
@@ -233,13 +228,9 @@
     PageWidgetDelegate::layout(m_page.get());
 }
 
-void WebHelperPluginImpl::setFocus(bool enable)
+void WebHelperPluginImpl::setFocus(bool)
 {
-    if (!m_page)
-        return;
-    m_page->focusController()->setFocused(enable);
-    if (enable)
-        m_page->focusController()->setActive(true);
+    ASSERT_NOT_REACHED();
 }
 
 void WebHelperPluginImpl::close()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to