From 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 7 May 2012 11:21:11 +0200 Subject: Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286) --- Source/WebKit2/WebProcess/Plugins/PluginController.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/WebProcess/Plugins/PluginController.h') diff --git a/Source/WebKit2/WebProcess/Plugins/PluginController.h b/Source/WebKit2/WebProcess/Plugins/PluginController.h index da48eb6e1..25032cca0 100644 --- a/Source/WebKit2/WebProcess/Plugins/PluginController.h +++ b/Source/WebKit2/WebProcess/Plugins/PluginController.h @@ -85,9 +85,6 @@ public: // Evaluates the given script string in the context of the given NPObject. virtual bool evaluate(NPObject*, const String& scriptString, NPVariant* result, bool allowPopups) = 0; - // Tries to short circuit the NPN_Invoke call with the given parameters. Returns true on success. - virtual bool tryToShortCircuitInvoke(NPObject*, NPIdentifier methodName, const NPVariant* arguments, uint32_t argumentCount, bool& returnValue, NPVariant& result) = 0; - // Set the statusbar text. virtual void setStatusbarText(const String&) = 0; @@ -146,6 +143,12 @@ public: // Decrements a counter that, when it reaches 0, stops preventing the plug-in from being destroyed. virtual void unprotectPluginFromDestruction() = 0; +#if PLUGIN_ARCHITECTURE(X11) + // Create a plugin container for windowed plugins + virtual uint64_t createPluginContainer() = 0; + virtual void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect, const WebCore::IntRect& clipRect, uint64_t windowID) = 0; +#endif + // Helper class for delaying destruction of a plug-in. class PluginDestructionProtector { public: -- cgit v1.2.1