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

Unified Diff: content/plugin/npobject_stub.cc

Issue 7696016: Remove the window script object tear-down special-case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 3 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 | « content/plugin/npobject_stub.h ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/npobject_stub.cc
diff --git a/content/plugin/npobject_stub.cc b/content/plugin/npobject_stub.cc
index 79aae7040ea88115253ae02685eac1fee85024ab..b3e1441243e106c8f38a4c9c7e72e4c914d4fe9d 100644
--- a/content/plugin/npobject_stub.cc
+++ b/content/plugin/npobject_stub.cc
@@ -39,7 +39,7 @@ NPObjectStub::~NPObjectStub() {
CHECK(!npobject_);
}
-void NPObjectStub::DeleteSoon(bool release_npobject) {
+void NPObjectStub::DeleteSoon() {
if (npobject_) {
channel_->RemoveMappingForNPObjectStub(route_id_, npobject_);
@@ -49,8 +49,7 @@ void NPObjectStub::DeleteSoon(bool release_npobject) {
NPObject* npobject = npobject_;
npobject_ = NULL;
- if (release_npobject)
- WebBindings::releaseObject(npobject);
+ WebBindings::releaseObject(npobject);
MessageLoop::current()->DeleteSoon(FROM_HERE, this);
}
@@ -102,12 +101,12 @@ bool NPObjectStub::OnMessageReceived(const IPC::Message& msg) {
}
void NPObjectStub::OnChannelError() {
- DeleteSoon(true);
+ DeleteSoon();
}
void NPObjectStub::OnRelease(IPC::Message* reply_msg) {
Send(reply_msg);
- DeleteSoon(true);
+ DeleteSoon();
}
void NPObjectStub::OnHasMethod(const NPIdentifier_Param& name,
« no previous file with comments | « content/plugin/npobject_stub.h ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698