<!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>[175103] branches/safari-600.3-branch/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/175103">175103</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 02:20:27 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172637">r172637</a>. rdar://problem/18428706</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxycpp">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxyh">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxymessagesin">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2PluginProcessmacPluginControllerProxyMacmm">branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsPluginh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsPluginProxycpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsPluginProxyh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsPluginViewcpp">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessPluginsPluginViewh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2014-10-23 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172637.
+
+ 2014-08-15 Gavin Barraclough <barraclough@apple.com>
+
+ de-PLATFORM(COCOA) a couple of methods in plugin code
+ https://bugs.webkit.org/show_bug.cgi?id=135987
+
+ Reviewed by Sam Weinig.
+
+ Pass through the visibility & focus on all platforms, to simplify & avoid
+ any weird inconsistencies between platforms.
+
+ * PluginProcess/PluginControllerProxy.cpp:
+ (WebKit::PluginControllerProxy::windowFocusChanged):
+ (WebKit::PluginControllerProxy::windowVisibilityChanged):
+ * PluginProcess/PluginControllerProxy.h:
+ * PluginProcess/PluginControllerProxy.messages.in:
+ * PluginProcess/mac/PluginControllerProxyMac.mm:
+ (WebKit::PluginControllerProxy::windowFocusChanged): Deleted.
+ (WebKit::PluginControllerProxy::windowVisibilityChanged): Deleted.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::windowFocusChanged):
+ (WebKit::NetscapePlugin::windowVisibilityChanged):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Plugin.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::windowAndViewFramesChanged):
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::viewStateDidChange):
+ (WebKit::PluginView::platformViewStateDidChange): Deleted.
+ * WebProcess/Plugins/PluginView.h:
+
+2014-10-23 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172634.
</span><span class="cx">
</span><span class="cx"> 2014-08-15 Gavin Barraclough <barraclough@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -434,6 +434,23 @@
</span><span class="cx"> m_plugin->visibilityDidChange(isVisible);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginControllerProxy::windowFocusChanged(bool hasFocus)
+{
+ ASSERT(m_plugin);
+ m_plugin->windowFocusChanged(hasFocus);
+}
+
+void PluginControllerProxy::windowVisibilityChanged(bool isVisible)
+{
+ ASSERT(m_plugin);
+ m_plugin->windowVisibilityChanged(isVisible);
+
+ if (isVisible)
+ m_visiblityActivity.start();
+ else
+ m_visiblityActivity.stop();
+}
+
</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></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -149,10 +149,11 @@
</span><span class="cx"> void didUpdate();
</span><span class="cx"> void getPluginScriptableNPObject(uint64_t& pluginScriptableNPObjectID);
</span><span class="cx">
</span><ins>+ void windowFocusChanged(bool);
+ void windowVisibilityChanged(bool);
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- void windowFocusChanged(bool);
</del><span class="cx"> void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
</span><del>- void windowVisibilityChanged(bool);
</del><span class="cx"> void sendComplexTextInput(const String& textInput);
</span><span class="cx"> void setLayerHostingMode(uint32_t);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessPluginControllerProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -98,19 +98,19 @@
</span><span class="cx"> # Get a reference to the plug-in's scriptable NPObject.
</span><span class="cx"> GetPluginScriptableNPObject() -> (uint64_t pluginScriptableNPObjectID)
</span><span class="cx">
</span><ins>+ # Sent when the containing NSWindow's focus changes
+ WindowFocusChanged(bool hasFocus)
+
+ # Sent when the containing NSWindow's visibility changes
+ WindowVisibilityChanged(bool isVisible)
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> # Send the complex text input to the plug-in.
</span><span class="cx"> SendComplexTextInput(String textInput)
</span><span class="cx">
</span><del>- # Sent when the containing NSWindow's focus changes
- WindowFocusChanged(bool hasFocus)
-
</del><span class="cx"> # Sent when the containing NSWindow or NSView frame changes
</span><span class="cx"> WindowAndViewFramesChanged(WebCore::IntRect windowFrameInScreenCoordinates, WebCore::IntRect viewFrameInWindowCoordinates)
</span><span class="cx">
</span><del>- # Sent when the containing NSWindow's visibility changes
- WindowVisibilityChanged(bool isVisible)
-
</del><span class="cx"> # Sent when the containing window's layer hosting mode changes
</span><span class="cx"> SetLayerHostingMode(uint32_t layerHostingMode)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2PluginProcessmacPluginControllerProxyMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -94,25 +94,11 @@
</span><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginControllerProxy::windowFocusChanged(bool hasFocus)
-{
- m_plugin->windowFocusChanged(hasFocus);
-}
-
</del><span class="cx"> void PluginControllerProxy::windowAndViewFramesChanged(const IntRect& windowFrameInScreenCoordinates, const IntRect& viewFrameInWindowCoordinates)
</span><span class="cx"> {
</span><span class="cx"> m_plugin->windowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginControllerProxy::windowVisibilityChanged(bool isVisible)
-{
- m_plugin->windowVisibilityChanged(isVisible);
- if (isVisible)
- m_visiblityActivity.start();
- else
- m_visiblityActivity.stop();
-}
-
</del><span class="cx"> void PluginControllerProxy::sendComplexTextInput(const String& textInput)
</span><span class="cx"> {
</span><span class="cx"> m_plugin->sendComplexTextInput(textInput);
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -1071,6 +1071,18 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+
+void NetscapePlugin::windowFocusChanged(bool)
+{
+}
+
+void NetscapePlugin::windowVisibilityChanged(bool)
+{
+}
+
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -219,11 +219,12 @@
</span><span class="cx"> virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
</span><span class="cx"> virtual bool findString(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> virtual void windowFocusChanged(bool);
</span><del>- virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
</del><span class="cx"> virtual void windowVisibilityChanged(bool);
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
+
</ins><span class="cx"> virtual uint64_t pluginComplexTextInputIdentifier() const;
</span><span class="cx"> virtual void sendComplexTextInput(const String& textInput);
</span><span class="cx"> virtual void setLayerHostingMode(LayerHostingMode) override;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsPluginh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -219,16 +219,16 @@
</span><span class="cx"> // Get the NPObject that corresponds to the plug-in's scriptable object. Returns a retained object.
</span><span class="cx"> virtual NPObject* pluginScriptableNPObject() = 0;
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> // Tells the plug-in about window focus changes.
</span><span class="cx"> virtual void windowFocusChanged(bool) = 0;
</span><del>-
</del><ins>+
+ // Tells the plug-in about window visibility changes.
+ virtual void windowVisibilityChanged(bool) = 0;
+
+#if PLATFORM(COCOA)
</ins><span class="cx"> // Tells the plug-in about window and plug-in frame changes.
</span><span class="cx"> virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) = 0;
</span><span class="cx">
</span><del>- // Tells the plug-in about window visibility changes.
- virtual void windowVisibilityChanged(bool) = 0;
-
</del><span class="cx"> // Get the per complex text input identifier.
</span><span class="cx"> virtual uint64_t pluginComplexTextInputIdentifier() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -485,22 +485,21 @@
</span><span class="cx"> return m_connection->npRemoteObjectMap()->createNPObjectProxy(pluginScriptableNPObjectID, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> void PluginProxy::windowFocusChanged(bool hasFocus)
</span><span class="cx"> {
</span><span class="cx"> m_connection->connection()->send(Messages::PluginControllerProxy::WindowFocusChanged(hasFocus), m_pluginInstanceID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginProxy::windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates)
-{
- m_connection->connection()->send(Messages::PluginControllerProxy::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates), m_pluginInstanceID);
-}
-
</del><span class="cx"> void PluginProxy::windowVisibilityChanged(bool isVisible)
</span><span class="cx"> {
</span><span class="cx"> m_connection->connection()->send(Messages::PluginControllerProxy::WindowVisibilityChanged(isVisible), m_pluginInstanceID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+void PluginProxy::windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates)
+{
+ m_connection->connection()->send(Messages::PluginControllerProxy::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates), m_pluginInstanceID);
+}
</ins><span class="cx"> uint64_t PluginProxy::pluginComplexTextInputIdentifier() const
</span><span class="cx"> {
</span><span class="cx"> return m_pluginInstanceID;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsPluginProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -113,10 +113,12 @@
</span><span class="cx"> virtual bool handlesPageScaleFactor();
</span><span class="cx">
</span><span class="cx"> virtual NPObject* pluginScriptableNPObject();
</span><ins>+
+ virtual void windowFocusChanged(bool);
+ virtual void windowVisibilityChanged(bool);
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><del>- virtual void windowFocusChanged(bool);
</del><span class="cx"> virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
</span><del>- virtual void windowVisibilityChanged(bool);
</del><span class="cx"> virtual uint64_t pluginComplexTextInputIdentifier() const;
</span><span class="cx"> virtual void sendComplexTextInput(const String& textInput);
</span><span class="cx"> virtual void setLayerHostingMode(LayerHostingMode) override;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -505,16 +505,6 @@
</span><span class="cx">
</span><span class="cx"> void PluginView::viewStateDidChange(ViewState::Flags changed)
</span><span class="cx"> {
</span><del>-#if PLATFORM(COCOA)
- platformViewStateDidChange(changed);
-#else
- UNUSED_PARAM(changed);
-#endif
-}
-
-#if PLATFORM(COCOA)
-void PluginView::platformViewStateDidChange(ViewState::Flags changed)
-{
</del><span class="cx"> if (!m_plugin || !m_isInitialized)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -524,6 +514,7 @@
</span><span class="cx"> m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> void PluginView::setDeviceScaleFactor(float scaleFactor)
</span><span class="cx"> {
</span><span class="cx"> if (!m_isInitialized || !m_plugin)
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h (175102 => 175103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-10-23 09:18:48 UTC (rev 175102)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-10-23 09:20:27 UTC (rev 175103)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> void setLayerHostingMode(LayerHostingMode);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- void platformViewStateDidChange(WebCore::ViewState::Flags changed);
</del><span class="cx"> void setDeviceScaleFactor(float);
</span><span class="cx"> void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates);
</span><span class="cx"> bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
</span></span></pre>
</div>
</div>
</body>
</html>