content/renderer/webplugin_delegate_proxy.h - 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: content/renderer/webplugin_delegate_proxy.h

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: Add missing includes. 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

« content/renderer/browser_plugin/browser_plugin.cc ('K') | « content/renderer/browser_plugin/browser_plugin_bindings.cc ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | webkit/plugins/npapi/webplugin_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/webplugin_delegate_proxy.h

diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h

index 1a05791dfbb1a48343d65806194988a8059d179b..2482119f5970ae9829b36c6bc39c64e8d9e2a1b2 100644

--- a/content/renderer/webplugin_delegate_proxy.h

+++ b/content/renderer/webplugin_delegate_proxy.h

@@ -68,6 +68,7 @@ class WebPluginDelegateProxy

const gfx::Rect& clip_rect) OVERRIDE;

virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect) OVERRIDE;

virtual NPObject* GetPluginScriptableObject() OVERRIDE;

+ virtual NPP GetPluginNPP() OVERRIDE;

virtual bool GetFormValue(string16* value) OVERRIDE;

virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,

int notify_id) OVERRIDE;

@@ -266,6 +267,9 @@ class WebPluginDelegateProxy

NPObject* npobject_;

base::WeakPtr<NPObjectStub> window_script_object_;

+ // Dummy NPP used to uniquely identify this plugin.

+ scoped_ptr<NPP_t> npp_;

// Event passed in by the plugin process and is used to decide if messages

// need to be pumped in the NPP_HandleEvent sync call.

scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_;