<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170423] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170423">170423</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-25 03:38:28 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Windowed plugins visibility doesn't work
https://bugs.webkit.org/show_bug.cgi?id=131487
Reviewed by Anders Carlsson.
Implement plugins visibility changes and add a new message to
notify the UI process when a windowed plugin is shown/hidden to
show/hide the plugin widget.
* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::visibilityDidChange): Add
implementation to notify the plugin about visibility change.
(WebKit::PluginControllerProxy::windowedPluginVisibilityDidChange):
Send WindowedPluginVisibilityDidChange to the plugin proxy.
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/PluginControllerProxy.messages.in: Add VisibilityDidChange message.
* UIProcess/WebPageProxy.h: Add windowedPluginVisibilityDidChange
to handle WindowedPluginVisibilityDidChange message.
* UIProcess/WebPageProxy.messages.in: Add WindowedPluginVisibilityDidChange message.
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::windowedPluginVisibilityDidChange):
* UIProcess/gtk/WebPageProxyGtk.cpp:
(WebKit::WebPageProxy::createPluginContainer): Do not show the
plugins by default.
(WebKit::WebPageProxy::windowedPluginVisibilityDidChange): Show or hide the plugin widget.
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::NetscapePlugin): Initialize m_isVisible.
(WebKit::NetscapePlugin::visibilityDidChange): Add visible parameter and save it in m_isVisible
member, calling platformVisibilityDidChange() only when it has actually changed.
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
(WebKit::NetscapePlugin::platformVisibilityDidChange): Notify the controller about visibility change.
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/Plugin.h:
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::visibilityDidChange): Send VisibilityDidChange message to the plugin controller proxy.
(WebKit::PluginProxy::windowedPluginVisibilityDidChange): Notify the controller about visibility change.
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/Plugins/PluginProxy.messages.in: Add WindowedPluginVisibilityDidChange message.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::didInitializePlugin): Also call viewVisibilityDidChange() when the plugin is initialized.
(WebKit::PluginView::setParentVisible): Override this Widget method to update the plugin visibility when parent
widget is shown/hidden.
(WebKit::PluginView::viewVisibilityDidChange): Pass visible parameter to visibilityDidChange().
(WebKit::PluginView::windowedPluginVisibilityDidChange): Send WindowedPluginVisibilityDidChange message to the UI process.
* WebProcess/Plugins/PluginView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxycpp">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxyh">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessPluginControllerProxymessagesin">trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflWebPageProxyEflcpp">trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapex11NetscapePluginX11cpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginh">trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginControllerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxycpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxyh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxymessagesin">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2014-06-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Windowed plugins visibility doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=131487
+
+ Reviewed by Anders Carlsson.
+
+ Implement plugins visibility changes and add a new message to
+ notify the UI process when a windowed plugin is shown/hidden to
+ show/hide the plugin widget.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::visibilityDidChange): Add
+ implementation to notify the plugin about visibility change.
+ (WebKit::PluginControllerProxy::windowedPluginVisibilityDidChange):
+ Send WindowedPluginVisibilityDidChange to the plugin proxy.
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginControllerProxy.messages.in: Add VisibilityDidChange message.
+ * UIProcess/WebPageProxy.h: Add windowedPluginVisibilityDidChange
+ to handle WindowedPluginVisibilityDidChange message.
+ * UIProcess/WebPageProxy.messages.in: Add WindowedPluginVisibilityDidChange message.
+ * UIProcess/efl/WebPageProxyEfl.cpp:
+ (WebKit::WebPageProxy::windowedPluginVisibilityDidChange):
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ (WebKit::WebPageProxy::createPluginContainer): Do not show the
+ plugins by default.
+ (WebKit::WebPageProxy::windowedPluginVisibilityDidChange): Show or hide the plugin widget.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::NetscapePlugin): Initialize m_isVisible.
+ (WebKit::NetscapePlugin::visibilityDidChange): Add visible parameter and save it in m_isVisible
+ member, calling platformVisibilityDidChange() only when it has actually changed.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+ (WebKit::NetscapePlugin::platformVisibilityDidChange): Notify the controller about visibility change.
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/Plugin.h:
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::visibilityDidChange): Send VisibilityDidChange message to the plugin controller proxy.
+ (WebKit::PluginProxy::windowedPluginVisibilityDidChange): Notify the controller about visibility change.
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginProxy.messages.in: Add WindowedPluginVisibilityDidChange message.
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::didInitializePlugin): Also call viewVisibilityDidChange() when the plugin is initialized.
+ (WebKit::PluginView::setParentVisible): Override this Widget method to update the plugin visibility when parent
+ widget is shown/hidden.
+ (WebKit::PluginView::viewVisibilityDidChange): Pass visible parameter to visibilityDidChange().
+ (WebKit::PluginView::windowedPluginVisibilityDidChange): Send WindowedPluginVisibilityDidChange message to the UI process.
+ * WebProcess/Plugins/PluginView.h:
+
</ins><span class="cx"> 2014-06-24 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] We should not start potential tap activation unless the tap gesture recognizer succeed
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -427,6 +427,12 @@
</span><span class="cx"> m_plugin->geometryDidChange(pluginSize, clipRect, pluginToRootViewTransform);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginControllerProxy::visibilityDidChange(bool isVisible)
+{
+ ASSERT(m_plugin);
+ m_plugin->visibilityDidChange(isVisible);
+}
+
</ins><span class="cx"> void PluginControllerProxy::didEvaluateJavaScript(uint64_t requestID, const String& result)
</span><span class="cx"> {
</span><span class="cx"> m_plugin->didEvaluateJavaScript(requestID, result);
</span><span class="lines">@@ -611,6 +617,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_connection->connection()->send(Messages::PluginProxy::WindowedPluginGeometryDidChange(frameRect, clipRect, windowID), m_pluginInstanceID);
</span><span class="cx"> }
</span><ins>+
+void PluginControllerProxy::windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
+{
+ m_connection->connection()->send(Messages::PluginProxy::WindowedPluginVisibilityDidChange(isVisible, windowID), m_pluginInstanceID);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -116,12 +116,14 @@
</span><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> virtual uint64_t createPluginContainer() override;
</span><span class="cx"> virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID) override;
</span><ins>+ virtual void windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void frameDidFinishLoading(uint64_t requestID);
</span><span class="cx"> void frameDidFail(uint64_t requestID, bool wasCancelled);
</span><span class="cx"> void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform, float contentsScaleFactor, const ShareableBitmap::Handle& backingStoreHandle);
</span><ins>+ void visibilityDidChange(bool isVisible);
</ins><span class="cx"> void didEvaluateJavaScript(uint64_t requestID, const String& result);
</span><span class="cx"> void streamDidReceiveResponse(uint64_t streamID, const String& responseURLString, uint32_t streamLength, uint32_t lastModifiedTime, const String& mimeType, const String& headers);
</span><span class="cx"> void streamDidReceiveData(uint64_t streamID, const IPC::DataReference& data);
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessPluginControllerProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -26,6 +26,9 @@
</span><span class="cx"> # Sent when the plug-in geometry changes.
</span><span class="cx"> GeometryDidChange(WebCore::IntSize pluginSize, WebCore::IntRect clipRect, WebCore::AffineTransform pluginToRootViewTransform, float scaleFactor, WebKit::ShareableBitmap::Handle backingStoreHandle)
</span><span class="cx">
</span><ins>+ # Sent when the plug-in visibility changes.
+ VisibilityDidChange(bool isVisible)
+
</ins><span class="cx"> # Sent when a frame has finished loading.
</span><span class="cx"> FrameDidFinishLoading(uint64_t requestID)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -1232,6 +1232,7 @@
</span><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> void createPluginContainer(uint64_t& windowID);
</span><span class="cx"> void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID);
</span><ins>+ void windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void processNextQueuedWheelEvent();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -328,6 +328,7 @@
</span><span class="cx"> # X11 windowed plugin messages
</span><span class="cx"> CreatePluginContainer() -> (uint64_t windowID)
</span><span class="cx"> WindowedPluginGeometryDidChange(WebCore::IntRect frameRect, WebCore::IntRect clipRect, uint64_t windowID)
</span><ins>+ WindowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflWebPageProxyEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -97,6 +97,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::windowedPluginVisibilityDidChange(bool, uint64_t)
+{
+ notImplemented();
+}
+
</ins><span class="cx"> void WebPageProxy::handleInputMethodKeydown(bool& handled)
</span><span class="cx"> {
</span><span class="cx"> handled = m_keyEventQueue.first().isFiltered();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPageProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> GtkWidget* socket = gtk_socket_new();
</span><span class="cx"> g_signal_connect(socket, "plug-removed", G_CALLBACK(pluginContainerPlugRemoved), 0);
</span><span class="cx"> gtk_container_add(GTK_CONTAINER(viewWidget()), socket);
</span><del>- gtk_widget_show(socket);
</del><span class="cx">
</span><span class="cx"> windowID = static_cast<uint64_t>(gtk_socket_get_id(GTK_SOCKET(socket)));
</span><span class="cx"> pluginWindowMap().set(windowID, socket);
</span><span class="lines">@@ -117,6 +116,18 @@
</span><span class="cx">
</span><span class="cx"> webkitWebViewBaseChildMoveResize(WEBKIT_WEB_VIEW_BASE(viewWidget()), plugin, frameRect);
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
+{
+ GtkWidget* plugin = pluginWindowMap().get(windowID);
+ if (!plugin)
+ return;
+
+ if (isVisible)
+ gtk_widget_show(plugin);
+ else
+ gtk_widget_hide(plugin);
+}
</ins><span class="cx"> #endif // PLUGIN_ARCHITECTURE(X11)
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setInputMethodState(bool enabled)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> , m_inNPPNew(false)
</span><span class="cx"> , m_shouldUseManualLoader(false)
</span><span class="cx"> , m_hasCalledSetWindow(false)
</span><ins>+ , m_isVisible(false)
</ins><span class="cx"> , m_nextTimerID(0)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> , m_drawingModel(static_cast<NPDrawingModel>(-1))
</span><span class="lines">@@ -760,10 +761,14 @@
</span><span class="cx"> callSetWindow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetscapePlugin::visibilityDidChange()
</del><ins>+void NetscapePlugin::visibilityDidChange(bool isVisible)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_isStarted);
</span><span class="cx">
</span><ins>+ if (m_isVisible == isVisible)
+ return;
+
+ m_isVisible = isVisible;
</ins><span class="cx"> platformVisibilityDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> virtual bool isTransparent();
</span><span class="cx"> virtual bool wantsWheelEvents() override;
</span><span class="cx"> virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
</span><del>- virtual void visibilityDidChange();
</del><ins>+ virtual void visibilityDidChange(bool isVisible);
</ins><span class="cx"> virtual void frameDidFinishLoading(uint64_t requestID);
</span><span class="cx"> virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
</span><span class="cx"> virtual void didEvaluateJavaScript(uint64_t requestID, const String& result);
</span><span class="lines">@@ -300,6 +300,7 @@
</span><span class="cx"> bool m_inNPPNew;
</span><span class="cx"> bool m_shouldUseManualLoader;
</span><span class="cx"> bool m_hasCalledSetWindow;
</span><ins>+ bool m_isVisible;
</ins><span class="cx">
</span><span class="cx"> RefPtr<NetscapePluginStream> m_manualStream;
</span><span class="cx"> Vector<bool, 8> m_popupEnabledStates;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapex11NetscapePluginX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -297,7 +297,15 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePlugin::platformVisibilityDidChange()
</span><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ if (!m_isWindowed)
+ return;
+
+ uint64_t windowID = 0;
+#if PLATFORM(GTK)
+ windowID = static_cast<uint64_t>(GDK_WINDOW_XID(gtk_plug_get_socket_window(GTK_PLUG(m_platformPluginWidget))));
+#endif
+ controller()->windowedPluginVisibilityDidChange(m_isVisible, windowID);
+ controller()->windowedPluginGeometryDidChange(m_frameRectInWindowCoordinates, m_clipRect, windowID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetscapePlugin::platformPaint(GraphicsContext* context, const IntRect& dirtyRect, bool /*isSnapshot*/)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> virtual bool wantsWheelEvents() override { return true; }
</span><span class="cx"> virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) override;
</span><span class="cx"> virtual void contentsScaleFactorChanged(float) override;
</span><del>- virtual void visibilityDidChange() override { }
</del><ins>+ virtual void visibilityDidChange(bool) override { }
</ins><span class="cx"> virtual void frameDidFinishLoading(uint64_t requestID) override;
</span><span class="cx"> virtual void frameDidFail(uint64_t requestID, bool wasCancelled) override;
</span><span class="cx"> virtual void didEvaluateJavaScript(uint64_t requestID, const String& result) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Plugin.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform) = 0;
</span><span class="cx">
</span><span class="cx"> // Tells the plug-in that it has been explicitly hidden or shown. (Note that this is not called when the plug-in becomes obscured from view on screen.)
</span><del>- virtual void visibilityDidChange() = 0;
</del><ins>+ virtual void visibilityDidChange(bool isVisible) = 0;
</ins><span class="cx">
</span><span class="cx"> // Tells the plug-in that a frame load request that the plug-in made by calling PluginController::loadURL has finished.
</span><span class="cx"> virtual void frameDidFinishLoading(uint64_t requestID) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginController.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx"> // Create a plugin container for windowed plugins
</span><span class="cx"> virtual uint64_t createPluginContainer() = 0;
</span><span class="cx"> virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID) = 0;
</span><ins>+ virtual void windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID) = 0;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Called when the a plug-in instance is successfully initialized, either synchronously or asynchronously.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -300,10 +300,10 @@
</span><span class="cx"> geometryDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginProxy::visibilityDidChange()
</del><ins>+void PluginProxy::visibilityDidChange(bool isVisible)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_isStarted);
</span><del>- notImplemented();
</del><ins>+ m_connection->connection()->send(Messages::PluginControllerProxy::VisibilityDidChange(isVisible), m_pluginInstanceID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginProxy::frameDidFinishLoading(uint64_t requestID)
</span><span class="lines">@@ -680,6 +680,11 @@
</span><span class="cx"> {
</span><span class="cx"> controller()->windowedPluginGeometryDidChange(frameRect, clipRect, windowID);
</span><span class="cx"> }
</span><ins>+
+void PluginProxy::windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
+{
+ controller()->windowedPluginVisibilityDidChange(isVisible, windowID);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void PluginProxy::update(const IntRect& paintedRect)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> virtual bool isTransparent();
</span><span class="cx"> virtual bool wantsWheelEvents() override;
</span><span class="cx"> virtual void geometryDidChange(const WebCore::IntSize& pluginSize, const WebCore::IntRect& clipRect, const WebCore::AffineTransform& pluginToRootViewTransform);
</span><del>- virtual void visibilityDidChange();
</del><ins>+ virtual void visibilityDidChange(bool isVisible);
</ins><span class="cx"> virtual void frameDidFinishLoading(uint64_t requestID);
</span><span class="cx"> virtual void frameDidFail(uint64_t requestID, bool wasCancelled);
</span><span class="cx"> virtual void didEvaluateJavaScript(uint64_t requestID, const String& result);
</span><span class="lines">@@ -172,6 +172,7 @@
</span><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> void createPluginContainer(uint64_t& windowID);
</span><span class="cx"> void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID);
</span><ins>+ void windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool canInitializeAsynchronously() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.messages.in 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -73,6 +73,9 @@
</span><span class="cx">
</span><span class="cx"> # Update geometry of windowed plugin widget
</span><span class="cx"> WindowedPluginGeometryDidChange(WebCore::IntRect frameRect, WebCore::IntRect clipRect, uint64_t windowID)
</span><ins>+
+ # Update visibility of windowed plugin widget
+ WindowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Tells the WebProcess that the plug-in was successfully initialized asynchronously
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -615,6 +615,7 @@
</span><span class="cx"> windowAndViewFramesChanged(m_webPage->windowFrameInScreenCoordinates(), m_webPage->viewFrameInWindowCoordinates());
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ viewVisibilityDidChange();
</ins><span class="cx"> viewGeometryDidChange();
</span><span class="cx">
</span><span class="cx"> if (m_pluginElement->document().focusedElement() == m_pluginElement)
</span><span class="lines">@@ -1021,6 +1022,15 @@
</span><span class="cx"> Widget::hide();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginView::setParentVisible(bool isVisible)
+{
+ if (isParentVisible() == isVisible)
+ return;
+
+ Widget::setParentVisible(isVisible);
+ viewVisibilityDidChange();
+}
+
</ins><span class="cx"> bool PluginView::transformsAffectFrameRect()
</span><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="lines">@@ -1063,7 +1073,7 @@
</span><span class="cx"> if (!m_isInitialized || !m_plugin || !parent())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_plugin->visibilityDidChange();
</del><ins>+ m_plugin->visibilityDidChange(isVisible());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect PluginView::clipRectInWindowCoordinates() const
</span><span class="lines">@@ -1625,6 +1635,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_webPage->send(Messages::WebPageProxy::WindowedPluginGeometryDidChange(frameRect, clipRect, windowID));
</span><span class="cx"> }
</span><ins>+
+void PluginView::windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
+{
+ m_webPage->send(Messages::WebPageProxy::WindowedPluginVisibilityDidChange(isVisible, windowID));
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (170422 => 170423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-06-25 06:54:48 UTC (rev 170422)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-06-25 10:38:28 UTC (rev 170423)
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> virtual void notifyWidget(WebCore::WidgetNotification) override;
</span><span class="cx"> virtual void show() override;
</span><span class="cx"> virtual void hide() override;
</span><ins>+ virtual void setParentVisible(bool) override;
</ins><span class="cx"> virtual bool transformsAffectFrameRect() override;
</span><span class="cx"> virtual void clipRectChanged() override;
</span><span class="cx">
</span><span class="lines">@@ -215,6 +216,7 @@
</span><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> virtual uint64_t createPluginContainer() override;
</span><span class="cx"> virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID) override;
</span><ins>+ virtual void windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void didInitializePlugin() override;
</span></span></pre>
</div>
</div>
</body>
</html>