Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1295)

Unified Diff: content/plugin/webplugin_proxy.cc

Issue 7171021: Reverting this to see if the Flash crashes on Mac canary are due to this CL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/plugins/npapi/webplugin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/webplugin_proxy.cc
===================================================================
--- content/plugin/webplugin_proxy.cc (revision 89220)
+++ content/plugin/webplugin_proxy.cc (working copy)
@@ -94,11 +94,6 @@
if (accelerated_surface_.get())
accelerated_surface_.reset();
#endif
-
- if (plugin_element_)
- WebBindings::releaseObject(plugin_element_);
- if (window_npobject_)
- WebBindings::releaseObject(window_npobject_);
}
bool WebPluginProxy::Send(IPC::Message* msg) {
@@ -201,7 +196,7 @@
NPObject* WebPluginProxy::GetWindowScriptNPObject() {
if (window_npobject_)
- return window_npobject_;
+ return WebBindings::retainObject(window_npobject_);
int npobject_route_id = channel_->GenerateRouteID();
bool success = false;
@@ -218,7 +213,7 @@
NPObject* WebPluginProxy::GetPluginElement() {
if (plugin_element_)
- return plugin_element_;
+ return WebBindings::retainObject(plugin_element_);
int npobject_route_id = channel_->GenerateRouteID();
bool success = false;
« no previous file with comments | « no previous file | webkit/plugins/npapi/webplugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698