ppapi/proxy/enter_proxy.h - Issue 8342016: Revert 106142 - Add a new globals object for PPAPI tracking information.

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: ppapi/proxy/enter_proxy.h

Issue 8342016: Revert 106142 - Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 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: ppapi/proxy/enter_proxy.h

===================================================================

--- ppapi/proxy/enter_proxy.h (revision 106146)

+++ ppapi/proxy/enter_proxy.h (working copy)

@@ -9,7 +9,6 @@

#include "ppapi/cpp/completion_callback.h"

#include "ppapi/proxy/host_dispatcher.h"

#include "ppapi/proxy/plugin_dispatcher.h"

-#include "ppapi/proxy/plugin_globals.h"

#include "ppapi/proxy/plugin_resource_tracker.h"

#include "ppapi/thunk/enter.h"

@@ -33,8 +32,8 @@

public:

EnterPluginFromHostResource(const HostResource& host_resource)

: thunk::EnterResourceNoLock<ResourceT>(

- PluginGlobals::Get()->plugin_resource_tracker()->

- PluginResourceForHostResource(host_resource),

+ PluginResourceTracker::GetInstance()->PluginResourceForHostResource(

+ host_resource),

false) {

// Validate that we're in the plugin rather than the host. Otherwise this

// object will do the wrong thing. In the plugin, the instance should have

« no previous file with comments | « ppapi/ppapi_tests.gypi ('k') | ppapi/proxy/plugin_globals.h » ('j') | no next file with comments »