Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175102 => 175103)
--- 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)
@@ -1,5 +1,40 @@
2014-10-23 Babak Shafiei <[email protected]>
+ Merge r172637.
+
+ 2014-08-15 Gavin Barraclough <[email protected]>
+
+ 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 <[email protected]>
+
Merge r172634.
2014-08-15 Gavin Barraclough <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp (175102 => 175103)
--- 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)
@@ -434,6 +434,23 @@
m_plugin->visibilityDidChange(isVisible);
}
+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();
+}
+
void PluginControllerProxy::didEvaluateJavaScript(uint64_t requestID, const String& result)
{
m_plugin->didEvaluateJavaScript(requestID, result);
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.h (175102 => 175103)
--- 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)
@@ -149,10 +149,11 @@
void didUpdate();
void getPluginScriptableNPObject(uint64_t& pluginScriptableNPObjectID);
+ void windowFocusChanged(bool);
+ void windowVisibilityChanged(bool);
+
#if PLATFORM(COCOA)
- void windowFocusChanged(bool);
void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
- void windowVisibilityChanged(bool);
void sendComplexTextInput(const String& textInput);
void setLayerHostingMode(uint32_t);
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in (175102 => 175103)
--- 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)
@@ -98,19 +98,19 @@
# Get a reference to the plug-in's scriptable NPObject.
GetPluginScriptableNPObject() -> (uint64_t pluginScriptableNPObjectID)
+ # Sent when the containing NSWindow's focus changes
+ WindowFocusChanged(bool hasFocus)
+
+ # Sent when the containing NSWindow's visibility changes
+ WindowVisibilityChanged(bool isVisible)
+
#if PLATFORM(COCOA)
# Send the complex text input to the plug-in.
SendComplexTextInput(String textInput)
- # Sent when the containing NSWindow's focus changes
- WindowFocusChanged(bool hasFocus)
-
# Sent when the containing NSWindow or NSView frame changes
WindowAndViewFramesChanged(WebCore::IntRect windowFrameInScreenCoordinates, WebCore::IntRect viewFrameInWindowCoordinates)
- # Sent when the containing NSWindow's visibility changes
- WindowVisibilityChanged(bool isVisible)
-
# Sent when the containing window's layer hosting mode changes
SetLayerHostingMode(uint32_t layerHostingMode)
#endif
Modified: branches/safari-600.3-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm (175102 => 175103)
--- 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)
@@ -94,25 +94,11 @@
[CATransaction commit];
}
-void PluginControllerProxy::windowFocusChanged(bool hasFocus)
-{
- m_plugin->windowFocusChanged(hasFocus);
-}
-
void PluginControllerProxy::windowAndViewFramesChanged(const IntRect& windowFrameInScreenCoordinates, const IntRect& viewFrameInWindowCoordinates)
{
m_plugin->windowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);
}
-void PluginControllerProxy::windowVisibilityChanged(bool isVisible)
-{
- m_plugin->windowVisibilityChanged(isVisible);
- if (isVisible)
- m_visiblityActivity.start();
- else
- m_visiblityActivity.stop();
-}
-
void PluginControllerProxy::sendComplexTextInput(const String& textInput)
{
m_plugin->sendComplexTextInput(textInput);
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (175102 => 175103)
--- 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)
@@ -1071,6 +1071,18 @@
return true;
}
+#if !PLATFORM(COCOA)
+
+void NetscapePlugin::windowFocusChanged(bool)
+{
+}
+
+void NetscapePlugin::windowVisibilityChanged(bool)
+{
+}
+
+#endif
+
} // namespace WebKit
#endif // ENABLE(NETSCAPE_PLUGIN_API)
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (175102 => 175103)
--- 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)
@@ -219,11 +219,12 @@
virtual unsigned countFindMatches(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
virtual bool findString(const String&, WebCore::FindOptions, unsigned maxMatchCount) override;
-#if PLATFORM(COCOA)
virtual void windowFocusChanged(bool);
- virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
virtual void windowVisibilityChanged(bool);
+#if PLATFORM(COCOA)
+ virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
+
virtual uint64_t pluginComplexTextInputIdentifier() const;
virtual void sendComplexTextInput(const String& textInput);
virtual void setLayerHostingMode(LayerHostingMode) override;
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/Plugin.h (175102 => 175103)
--- 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)
@@ -219,16 +219,16 @@
// Get the NPObject that corresponds to the plug-in's scriptable object. Returns a retained object.
virtual NPObject* pluginScriptableNPObject() = 0;
-#if PLATFORM(COCOA)
// Tells the plug-in about window focus changes.
virtual void windowFocusChanged(bool) = 0;
-
+
+ // Tells the plug-in about window visibility changes.
+ virtual void windowVisibilityChanged(bool) = 0;
+
+#if PLATFORM(COCOA)
// Tells the plug-in about window and plug-in frame changes.
virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates) = 0;
- // Tells the plug-in about window visibility changes.
- virtual void windowVisibilityChanged(bool) = 0;
-
// Get the per complex text input identifier.
virtual uint64_t pluginComplexTextInputIdentifier() const = 0;
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (175102 => 175103)
--- 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)
@@ -485,22 +485,21 @@
return m_connection->npRemoteObjectMap()->createNPObjectProxy(pluginScriptableNPObjectID, this);
}
-#if PLATFORM(COCOA)
void PluginProxy::windowFocusChanged(bool hasFocus)
{
m_connection->connection()->send(Messages::PluginControllerProxy::WindowFocusChanged(hasFocus), m_pluginInstanceID);
}
-void PluginProxy::windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates)
-{
- m_connection->connection()->send(Messages::PluginControllerProxy::WindowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates), m_pluginInstanceID);
-}
-
void PluginProxy::windowVisibilityChanged(bool isVisible)
{
m_connection->connection()->send(Messages::PluginControllerProxy::WindowVisibilityChanged(isVisible), m_pluginInstanceID);
}
+#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);
+}
uint64_t PluginProxy::pluginComplexTextInputIdentifier() const
{
return m_pluginInstanceID;
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (175102 => 175103)
--- 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)
@@ -113,10 +113,12 @@
virtual bool handlesPageScaleFactor();
virtual NPObject* pluginScriptableNPObject();
+
+ virtual void windowFocusChanged(bool);
+ virtual void windowVisibilityChanged(bool);
+
#if PLATFORM(COCOA)
- virtual void windowFocusChanged(bool);
virtual void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
- virtual void windowVisibilityChanged(bool);
virtual uint64_t pluginComplexTextInputIdentifier() const;
virtual void sendComplexTextInput(const String& textInput);
virtual void setLayerHostingMode(LayerHostingMode) override;
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (175102 => 175103)
--- 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)
@@ -505,16 +505,6 @@
void PluginView::viewStateDidChange(ViewState::Flags changed)
{
-#if PLATFORM(COCOA)
- platformViewStateDidChange(changed);
-#else
- UNUSED_PARAM(changed);
-#endif
-}
-
-#if PLATFORM(COCOA)
-void PluginView::platformViewStateDidChange(ViewState::Flags changed)
-{
if (!m_plugin || !m_isInitialized)
return;
@@ -524,6 +514,7 @@
m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
}
+#if PLATFORM(COCOA)
void PluginView::setDeviceScaleFactor(float scaleFactor)
{
if (!m_isInitialized || !m_plugin)
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/Plugins/PluginView.h (175102 => 175103)
--- 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)
@@ -75,7 +75,6 @@
void setLayerHostingMode(LayerHostingMode);
#if PLATFORM(COCOA)
- void platformViewStateDidChange(WebCore::ViewState::Flags changed);
void setDeviceScaleFactor(float);
void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates);
bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
