From 6876dff90c40f6abf9013705f723fedf871d3fdb Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Fri, 15 Jan 2010 19:38:09 +0000 Subject: linux: reinstate Pepper plugins Someone mistakenly disabled it. This also factorizes the various platforms. In particular, PluginInstance::set_window_handle, cause of complexity isn't needed. That window_handle is only used for regular plugins in 2 places: - on Win32 windowed plugins to invalidate the plugin window. There's no plugin window on Pepper so this isn't needed. - on Win32 and Linux for windowless plugins to get a reference to the browser's window. That isn't cross-platform so shouldn't be in Pepper. Review URL: http://codereview.chromium.org/551042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36389 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/webplugin_delegate_pepper.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'chrome/renderer/webplugin_delegate_pepper.h') diff --git a/chrome/renderer/webplugin_delegate_pepper.h b/chrome/renderer/webplugin_delegate_pepper.h index d2da979..608748c 100644 --- a/chrome/renderer/webplugin_delegate_pepper.h +++ b/chrome/renderer/webplugin_delegate_pepper.h @@ -40,8 +40,7 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate { static WebPluginDelegatePepper* Create( const FilePath& filename, const std::string& mime_type, - const base::WeakPtr& render_view, - gfx::PluginWindowHandle containing_view); + const base::WeakPtr& render_view); // WebPluginDelegate implementation virtual bool Initialize(const GURL& url, @@ -189,7 +188,6 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate { private: WebPluginDelegatePepper( const base::WeakPtr& render_view, - gfx::PluginWindowHandle containing_view, NPAPI::PluginInstance *instance); ~WebPluginDelegatePepper(); @@ -210,7 +208,6 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate { webkit_glue::WebPlugin* plugin_; scoped_refptr instance_; - gfx::PluginWindowHandle parent_; NPWindow window_; gfx::Rect window_rect_; gfx::Rect clip_rect_; -- cgit v1.1