content/renderer/pepper/plugin_object.cc - Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper.

Side by Side Diff: content/renderer/pepper/plugin_object.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "webkit/plugins/ppapi/plugin_object.h"	5 #include "content/renderer/pepper/plugin_object.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/strings/string_number_conversions.h"	10 #include "base/strings/string_number_conversions.h"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

	12 #include "content/renderer/pepper/npapi_glue.h"

	13 #include "content/renderer/pepper/plugin_module.h"

	14 #include "content/renderer/pepper/ppapi_plugin_instance_impl.h"

12 #include "ppapi/c/dev/ppb_var_deprecated.h"	15 #include "ppapi/c/dev/ppb_var_deprecated.h"

13 #include "ppapi/c/dev/ppp_class_deprecated.h"	16 #include "ppapi/c/dev/ppp_class_deprecated.h"

14 #include "ppapi/c/pp_resource.h"	17 #include "ppapi/c/pp_resource.h"

15 #include "ppapi/c/pp_var.h"	18 #include "ppapi/c/pp_var.h"

16 #include "ppapi/shared_impl/ppapi_globals.h"	19 #include "ppapi/shared_impl/ppapi_globals.h"

17 #include "ppapi/shared_impl/resource_tracker.h"	20 #include "ppapi/shared_impl/resource_tracker.h"

18 #include "ppapi/shared_impl/var.h"	21 #include "ppapi/shared_impl/var.h"

19 #include "ppapi/shared_impl/var_tracker.h"	22 #include "ppapi/shared_impl/var_tracker.h"

20 #include "third_party/WebKit/public/web/WebBindings.h"	23 #include "third_party/WebKit/public/web/WebBindings.h"

21 #include "third_party/npapi/bindings/npapi.h"	24 #include "third_party/npapi/bindings/npapi.h"

22 #include "third_party/npapi/bindings/npruntime.h"	25 #include "third_party/npapi/bindings/npruntime.h"

23 #include "webkit/plugins/ppapi/npapi_glue.h"

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

25 #include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"

26	26

27 using ppapi::PpapiGlobals;	27 using ppapi::PpapiGlobals;

28 using ppapi::StringVar;	28 using ppapi::StringVar;

29 using ppapi::Var;	29 using ppapi::Var;

30 using WebKit::WebBindings;	30 using WebKit::WebBindings;

31	31

32 namespace webkit {	32 namespace webkit {

33 namespace ppapi {	33 namespace ppapi {

34	34

35 namespace {	35 namespace {

(...skipping 315 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
351 // static	351 // static

352 NPObject* PluginObject::AllocateObjectWrapper() {	352 NPObject* PluginObject::AllocateObjectWrapper() {

353 NPObjectWrapper* wrapper = new NPObjectWrapper;	353 NPObjectWrapper* wrapper = new NPObjectWrapper;

354 memset(wrapper, 0, sizeof(NPObjectWrapper));	354 memset(wrapper, 0, sizeof(NPObjectWrapper));

355 return wrapper;	355 return wrapper;

356 }	356 }

357	357

358 } // namespace ppapi	358 } // namespace ppapi

359 } // namespace webkit	359 } // namespace webkit

360	360

OLD	NEW