| 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 "webkit/plugins/ppapi/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/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "third_party/npapi/bindings/npapi.h" | 12 #include "third_party/npapi/bindings/npapi.h" |
| 13 #include "third_party/npapi/bindings/npruntime.h" | 13 #include "third_party/npapi/bindings/npruntime.h" |
| 14 #include "ppapi/c/dev/ppb_var_deprecated.h" | 14 #include "ppapi/c/dev/ppb_var_deprecated.h" |
| 15 #include "ppapi/c/dev/ppp_class_deprecated.h" | 15 #include "ppapi/c/dev/ppp_class_deprecated.h" |
| 16 #include "ppapi/c/pp_resource.h" | 16 #include "ppapi/c/pp_resource.h" |
| 17 #include "ppapi/c/pp_var.h" | 17 #include "ppapi/c/pp_var.h" |
| 18 #include "ppapi/shared_impl/var.h" | 18 #include "ppapi/shared_impl/var.h" |
| 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" |
| 20 #include "webkit/plugins/ppapi/npapi_glue.h" | 20 #include "webkit/plugins/ppapi/npapi_glue.h" |
| 21 #include "webkit/plugins/ppapi/plugin_module.h" | 21 #include "webkit/plugins/ppapi/plugin_module.h" |
| 22 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" | 22 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
| 23 #include "webkit/plugins/ppapi/resource.h" | |
| 24 #include "webkit/plugins/ppapi/resource_tracker.h" | 23 #include "webkit/plugins/ppapi/resource_tracker.h" |
| 25 #include "webkit/plugins/ppapi/string.h" | 24 #include "webkit/plugins/ppapi/string.h" |
| 26 | 25 |
| 27 using ppapi::StringVar; | 26 using ppapi::StringVar; |
| 28 using ppapi::Var; | 27 using ppapi::Var; |
| 29 using WebKit::WebBindings; | 28 using WebKit::WebBindings; |
| 30 | 29 |
| 31 namespace webkit { | 30 namespace webkit { |
| 32 namespace ppapi { | 31 namespace ppapi { |
| 33 | 32 |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 // static | 334 // static |
| 336 NPObject* PluginObject::AllocateObjectWrapper() { | 335 NPObject* PluginObject::AllocateObjectWrapper() { |
| 337 NPObjectWrapper* wrapper = new NPObjectWrapper; | 336 NPObjectWrapper* wrapper = new NPObjectWrapper; |
| 338 memset(wrapper, 0, sizeof(NPObjectWrapper)); | 337 memset(wrapper, 0, sizeof(NPObjectWrapper)); |
| 339 return wrapper; | 338 return wrapper; |
| 340 } | 339 } |
| 341 | 340 |
| 342 } // namespace ppapi | 341 } // namespace ppapi |
| 343 } // namespace webkit | 342 } // namespace webkit |
| 344 | 343 |
| OLD | NEW |