summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/plugins/plugin_stream_url.cc3
-rw-r--r--webkit/glue/plugins/webplugin_delegate_impl.cc2
-rw-r--r--webkit/glue/webplugin.h4
3 files changed, 7 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_stream_url.cc b/webkit/glue/plugins/plugin_stream_url.cc
index 440d825..7228329 100644
--- a/webkit/glue/plugins/plugin_stream_url.cc
+++ b/webkit/glue/plugins/plugin_stream_url.cc
@@ -26,6 +26,9 @@ PluginStreamUrl::PluginStreamUrl(
}
PluginStreamUrl::~PluginStreamUrl() {
+ if (instance() && instance()->webplugin()) {
+ instance()->webplugin()->ResourceClientDeleted(AsResourceClient());
+ }
}
bool PluginStreamUrl::Close(NPReason reason) {
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc
index 23c11aa..1d10270 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl.cc
@@ -1205,8 +1205,6 @@ WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient(
NPAPI::PluginStream* plugin_stream =
reinterpret_cast<NPAPI::PluginStream*>(existing_stream);
- plugin_stream->CancelRequest();
-
return plugin_stream->AsResourceClient();
}
diff --git a/webkit/glue/webplugin.h b/webkit/glue/webplugin.h
index 682e138..354dd73 100644
--- a/webkit/glue/webplugin.h
+++ b/webkit/glue/webplugin.h
@@ -118,6 +118,10 @@ class WebPlugin {
// Returns true iff in off the record (Incognito) mode.
virtual bool IsOffTheRecord() = 0;
+ // Called when the WebPluginResourceClient instance is deleted.
+ virtual void ResourceClientDeleted(
+ WebPluginResourceClient* resource_client) {}
+
private:
DISALLOW_EVIL_CONSTRUCTORS(WebPlugin);
};