webkit/plugins/ppapi/resource_helper.cc - 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: webkit/plugins/ppapi/resource_helper.cc

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: webkit/plugins/ppapi/resource_helper.cc

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

--- webkit/plugins/ppapi/resource_helper.cc (revision 106147)

+++ webkit/plugins/ppapi/resource_helper.cc (working copy)

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

#include "base/logging.h"

#include "ppapi/shared_impl/resource.h"

-#include "webkit/plugins/ppapi/host_globals.h"

#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"

#include "webkit/plugins/ppapi/plugin_module.h"

#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"

@@ -18,7 +17,7 @@

// static

PluginInstance* ResourceHelper::GetPluginInstance(

const ::ppapi::Resource* resource) {

- ResourceTracker* tracker = HostGlobals::Get()->host_resource_tracker();

+ ResourceTracker* tracker = ResourceTracker::Get();

return tracker->GetInstance(resource->pp_instance());

}

Property changes on: webkit/plugins/ppapi/resource_helper.cc

___________________________________________________________________

Added: svn:mergeinfo

Merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/resource_helper.cc:r3734-4217,4606-5108,5177-5263

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