Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: o3d/gpu_plugin/np_utils/np_utils.h

Issue 196032: Replaced BaseNPObject with DefaultNPObject because...... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
« no previous file with comments | « o3d/gpu_plugin/np_utils/np_object_pointer_unittest.cc ('k') | o3d/gpu_plugin/np_utils/np_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: o3d/gpu_plugin/np_utils/np_utils.h
===================================================================
--- o3d/gpu_plugin/np_utils/np_utils.h (revision 25244)
+++ o3d/gpu_plugin/np_utils/np_utils.h (working copy)
@@ -8,6 +8,7 @@
#include <string>
#include "o3d/gpu_plugin/np_utils/np_browser.h"
+#include "o3d/gpu_plugin/np_utils/np_class.h"
#include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
#include "third_party/npapi/bindings/npapi.h"
#include "third_party/npapi/bindings/npruntime.h"
@@ -30,7 +31,7 @@
return true;
} else if (NPVARIANT_IS_OBJECT(variant)) {
NPObject* object = NPVARIANT_TO_OBJECT(variant);
- if (object->_class == BaseNPObject::GetNPClass<T>()) {
+ if (object->_class == NPGetClass<T>()) {
*value = NPObjectPointer<T>(static_cast<T*>(
NPVARIANT_TO_OBJECT(variant)));
return true;
@@ -78,7 +79,7 @@
public:
SmartNPVariant();
SmartNPVariant(const SmartNPVariant& rhs);
- SmartNPVariant(const NPVariant& rhs);
+ explicit SmartNPVariant(const NPVariant& rhs);
template <typename T>
explicit SmartNPVariant(const T& v) {
@@ -261,7 +262,7 @@
template <typename NPObjectType>
NPObjectPointer<NPObjectType> NPCreateObject(NPP npp) {
- const NPClass* np_class = BaseNPObject::GetNPClass<NPObjectType>();
+ const NPClass* np_class = NPGetClass<NPObjectType>();
NPObjectType* object = static_cast<NPObjectType*>(
NPBrowser::get()->CreateObject(npp, np_class));
return NPObjectPointer<NPObjectType>::FromReturned(object);
« no previous file with comments | « o3d/gpu_plugin/np_utils/np_object_pointer_unittest.cc ('k') | o3d/gpu_plugin/np_utils/np_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698