summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webplugin_impl.h
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 19:50:29 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 19:50:29 +0000
commitad8a85dd4f052b7d1cb8557bdfb15bf6de773316 (patch)
treea9e188844a0c31d4c6ff46539c956008e3833442 /webkit/glue/webplugin_impl.h
parent6108213466a0ffd60ea35d6cc8bf940277daf945 (diff)
downloadchromium_src-ad8a85dd4f052b7d1cb8557bdfb15bf6de773316.zip
chromium_src-ad8a85dd4f052b7d1cb8557bdfb15bf6de773316.tar.gz
chromium_src-ad8a85dd4f052b7d1cb8557bdfb15bf6de773316.tar.bz2
Remove WebPluginImpl::element_
This member was of type HTMLPlugInElement. This is a step toward removing all WebCore includes from webplugin_impl.cc. R=jam BUG=10036 TEST=none Review URL: http://codereview.chromium.org/173126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webplugin_impl.h')
-rw-r--r--webkit/glue/webplugin_impl.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index b64fa48..de31e57 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -23,7 +23,6 @@
class WebFrameImpl;
class WebPluginDelegate;
-class WebPluginImpl;
namespace WebCore {
class Event;
@@ -77,10 +76,10 @@ class WebPluginImpl : public WebPlugin,
uint32 length);
private:
- WebPluginImpl(WebCore::HTMLPlugInElement* element, WebFrameImpl* frame,
- WebPluginDelegate* delegate, const GURL& plugin_url,
- bool load_manually, const std::string& mime_type,
- int arg_count, char** arg_names, char** arg_values);
+ WebPluginImpl(
+ WebFrameImpl* frame, WebPluginDelegate* delegate, const GURL& plugin_url,
+ bool load_manually, const std::string& mime_type, int arg_count,
+ char** arg_names, char** arg_values);
// WebKit::WebPlugin methods:
virtual void destroy();
@@ -235,6 +234,9 @@ class WebPluginImpl : public WebPlugin,
// Delayed task for downloading the plugin source URL.
void OnDownloadPluginSrcUrl();
+ // Returns the WebViewDelegate associated with webframe_;
+ WebViewDelegate* GetWebViewDelegate();
+
struct ClientInfo {
int id;
WebPluginResourceClient* client;
@@ -250,15 +252,12 @@ class WebPluginImpl : public WebPlugin,
bool windowless_;
gfx::PluginWindowHandle window_;
- WebCore::HTMLPlugInElement* element_;
WebFrameImpl* webframe_;
WebPluginDelegate* delegate_;
- // Don't use RefPtr here since doing so extends the lifetime of a plugin
- // beyond the frame which causes crashes and videos playing after navigating
- // away etc.
- WebKit::WebPluginContainer* widget_;
+ // This is just a weak reference.
+ WebKit::WebPluginContainer* container_;
typedef std::map<WebPluginResourceClient*,
webkit_glue::MultipartResponseDelegate*>