webkit/plugins/ppapi/plugin_object.cc - Issue 15007012: Track NPObject ownership by the originating plugins' NPP identifier. [2/3] (Chrome)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/plugins/ppapi/plugin_object.cc

Issue 15007012: Track NPObject ownership by the originating plugins' NPP identifier. [2/3] (Chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix teardown of BrowserPlugins that were never initialize()d. Created 7 years, 7 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

Index: webkit/plugins/ppapi/plugin_object.cc

diff --git a/webkit/plugins/ppapi/plugin_object.cc b/webkit/plugins/ppapi/plugin_object.cc

index a5ef5febf5938f65e408f6d989d3256b380abf8b..9b6a1303d31bdc8f740674542675451e8b239274 100644

--- a/webkit/plugins/ppapi/plugin_object.cc

+++ b/webkit/plugins/ppapi/plugin_object.cc

@@ -298,7 +298,8 @@ PP_Var PluginObject::Create(PluginInstance* instance,

// WrapperClass_Allocated function which will have created an object wrapper

// appropriate for this class (derived from NPObject).

NPObjectWrapper* wrapper = static_cast<NPObjectWrapper*>(

- WebBindings::createObject(NULL, const_cast<NPClass*>(&wrapper_class)));

+ WebBindings::createObject(instance->instanceNPP(),

+ const_cast<NPClass*>(&wrapper_class)));

// This object will register itself both with the NPObject and with the

// PluginModule. The NPObject will normally handle its lifetime, and it

« no previous file with comments | « webkit/plugins/ppapi/message_channel.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »