diff options
Diffstat (limited to 'o3d/gpu/np_utils')
26 files changed, 68 insertions, 66 deletions
diff --git a/o3d/gpu/np_utils/default_np_object.h b/o3d/gpu/np_utils/default_np_object.h index 575dabc..b3b5fc0 100644 --- a/o3d/gpu/np_utils/default_np_object.h +++ b/o3d/gpu/np_utils/default_np_object.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "gpu/np_utils/np_headers.h" -namespace gpu_plugin { +namespace np_utils { class BaseNPDispatcher; @@ -79,6 +79,6 @@ class DefaultNPObject : public RootClass { private: DISALLOW_COPY_AND_ASSIGN(DefaultNPObject); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_DEFAULT_NP_OBJECT_H_ diff --git a/o3d/gpu/np_utils/dispatched_np_object_unittest.cc b/o3d/gpu/np_utils/dispatched_np_object_unittest.cc index d4b2f96..19d5a2b 100644 --- a/o3d/gpu/np_utils/dispatched_np_object_unittest.cc +++ b/o3d/gpu/np_utils/dispatched_np_object_unittest.cc @@ -14,7 +14,7 @@ using testing::Return; using testing::StrictMock; -namespace gpu_plugin { +namespace np_utils { // This mock class has a dispatcher chain with an entry for each mocked // function. The tests that follow that invoking an NPAPI method calls the @@ -400,4 +400,4 @@ TEST_F(DispatchedNPObjectTest, EnumeratesAllAvailableMethods) { NPBrowser::get()->MemFree(names); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/dynamic_np_object.cc b/o3d/gpu/np_utils/dynamic_np_object.cc index 153c189..e037fdc 100644 --- a/o3d/gpu/np_utils/dynamic_np_object.cc +++ b/o3d/gpu/np_utils/dynamic_np_object.cc @@ -4,7 +4,7 @@ #include "gpu/np_utils/dynamic_np_object.h" -namespace gpu_plugin { +namespace np_utils { DynamicNPObject::DynamicNPObject(NPP npp) { } @@ -56,4 +56,4 @@ bool DynamicNPObject::Enumerate(NPIdentifier** names, uint32_t* count) { return true; } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/dynamic_np_object.h b/o3d/gpu/np_utils/dynamic_np_object.h index 8dd4892..2b63e78 100644 --- a/o3d/gpu/np_utils/dynamic_np_object.h +++ b/o3d/gpu/np_utils/dynamic_np_object.h @@ -10,7 +10,7 @@ #include "gpu/np_utils/default_np_object.h" #include "gpu/np_utils/np_utils.h" -namespace gpu_plugin { +namespace np_utils { // NPObjects of this type have a dictionary of property name / variant pairs // that can be changed at runtime through NPAPI. @@ -30,6 +30,6 @@ class DynamicNPObject : public DefaultNPObject<NPObject> { PropertyMap properties_; DISALLOW_COPY_AND_ASSIGN(DynamicNPObject); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_DYNAMIC_NP_OBJECT_H_ diff --git a/o3d/gpu/np_utils/dynamic_np_object_unittest.cc b/o3d/gpu/np_utils/dynamic_np_object_unittest.cc index 56fcff7..d58e963 100644 --- a/o3d/gpu/np_utils/dynamic_np_object_unittest.cc +++ b/o3d/gpu/np_utils/dynamic_np_object_unittest.cc @@ -13,7 +13,7 @@ using testing::Return; using testing::StrictMock; -namespace gpu_plugin { +namespace np_utils { class NPDynamicNPObjectTest : public testing::Test { protected: @@ -80,4 +80,4 @@ TEST_F(NPDynamicNPObjectTest, InvalidateNullsObjectProperties) { EXPECT_EQ(2, object_->referenceCount); NPBrowser::get()->ReleaseObject(object_.Get()); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_browser.cc b/o3d/gpu/np_utils/np_browser.cc index 3754d3b..5eb93a3 100644 --- a/o3d/gpu/np_utils/np_browser.cc +++ b/o3d/gpu/np_utils/np_browser.cc @@ -11,7 +11,7 @@ #include "o3d/third_party/npapi/include/npfunctions.h" #endif -namespace gpu_plugin { +namespace np_utils { NPBrowser* NPBrowser::browser_; @@ -125,4 +125,4 @@ void NPBrowser::UnscheduleTimer(NPP npp, uint32 timer_id) { netscape_funcs_->unscheduletimer(npp, timer_id); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_browser.h b/o3d/gpu/np_utils/np_browser.h index d792316..e46bf38 100644 --- a/o3d/gpu/np_utils/np_browser.h +++ b/o3d/gpu/np_utils/np_browser.h @@ -10,7 +10,7 @@ typedef struct _NPNetscapeFuncs NPNetscapeFuncs; -namespace gpu_plugin { +namespace np_utils { // This class exposes the functions provided by the browser to a plugin (the // ones prefixed NPN_). @@ -90,6 +90,6 @@ class NPBrowser { DISALLOW_COPY_AND_ASSIGN(NPBrowser); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_BROWSER_H_ diff --git a/o3d/gpu/np_utils/np_browser_mock.h b/o3d/gpu/np_utils/np_browser_mock.h index 1ef574e..c5361c7 100644 --- a/o3d/gpu/np_utils/np_browser_mock.h +++ b/o3d/gpu/np_utils/np_browser_mock.h @@ -8,7 +8,7 @@ #include "gpu/np_utils/np_browser_stub.h" #include "testing/gmock/include/gmock/gmock.h" -namespace gpu_plugin { +namespace np_utils { // This mocks certain member functions of the stub browser. Those relating // to identifiers, memory management, reference counting and forwarding to @@ -45,6 +45,6 @@ class MockNPBrowser : public StubNPBrowser { MOCK_METHOD2(UnscheduleTimer, void(NPP npp, uint32 timer_id)); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_BROWSER_MOCK_H_ diff --git a/o3d/gpu/np_utils/np_browser_stub.cc b/o3d/gpu/np_utils/np_browser_stub.cc index 2bc1c6a..2e1c757 100644 --- a/o3d/gpu/np_utils/np_browser_stub.cc +++ b/o3d/gpu/np_utils/np_browser_stub.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" -namespace gpu_plugin { +namespace np_utils { StubNPBrowser::StubNPBrowser() : NPBrowser(NULL) { } @@ -122,4 +122,4 @@ uint32 StubNPBrowser::ScheduleTimer(NPP npp, void StubNPBrowser::UnscheduleTimer(NPP npp, uint32 timer_id) { } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_browser_stub.h b/o3d/gpu/np_utils/np_browser_stub.h index b18d52d..f208b7b 100644 --- a/o3d/gpu/np_utils/np_browser_stub.h +++ b/o3d/gpu/np_utils/np_browser_stub.h @@ -10,7 +10,7 @@ #include "gpu/np_utils/np_browser.h" -namespace gpu_plugin { +namespace np_utils { // Simple implementation of subset of the NPN functions for testing. class StubNPBrowser : public NPBrowser { @@ -79,6 +79,6 @@ class StubNPBrowser : public NPBrowser { DISALLOW_COPY_AND_ASSIGN(StubNPBrowser); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_BROWSER_STUB_H_ diff --git a/o3d/gpu/np_utils/np_class.h b/o3d/gpu/np_utils/np_class.h index 113f493..21d1d4b 100644 --- a/o3d/gpu/np_utils/np_class.h +++ b/o3d/gpu/np_utils/np_class.h @@ -13,7 +13,7 @@ // function pointers will invoke the most derived corresponding member // functions in T. -namespace gpu_plugin { +namespace np_utils { namespace np_class_impl { // This template version of the NPClass allocate function creates a subclass @@ -120,6 +120,6 @@ const NPClass* NPGetClass() { return &np_class; }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_CLASS_H_ diff --git a/o3d/gpu/np_utils/np_class_unittest.cc b/o3d/gpu/np_utils/np_class_unittest.cc index 0db632b..0e7807f 100644 --- a/o3d/gpu/np_utils/np_class_unittest.cc +++ b/o3d/gpu/np_utils/np_class_unittest.cc @@ -9,7 +9,7 @@ using testing::StrictMock; -namespace gpu_plugin { +namespace np_utils { class NPClassTest : public testing::Test { protected: @@ -140,4 +140,4 @@ TEST_F(NPClassTest, ConstructForwards) { np_class->deallocate(object); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_dispatcher.cc b/o3d/gpu/np_utils/np_dispatcher.cc index 7859f8b..63293c0 100644 --- a/o3d/gpu/np_utils/np_dispatcher.cc +++ b/o3d/gpu/np_utils/np_dispatcher.cc @@ -4,7 +4,7 @@ #include "gpu/np_utils/np_dispatcher.h" -namespace gpu_plugin { +namespace np_utils { bool DispatcherHasMethodHelper(BaseNPDispatcher* chain, NPObject* object, @@ -83,4 +83,4 @@ BaseNPDispatcher::BaseNPDispatcher(BaseNPDispatcher* next, const NPUTF8* name) BaseNPDispatcher::~BaseNPDispatcher() { } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_dispatcher.h b/o3d/gpu/np_utils/np_dispatcher.h index 5b84f86..ff6bed5 100644 --- a/o3d/gpu/np_utils/np_dispatcher.h +++ b/o3d/gpu/np_utils/np_dispatcher.h @@ -39,12 +39,13 @@ NP_UTILS_DISPATCHER_JOIN(dispatcher, __LINE__) #define NP_UTILS_BEGIN_DISPATCHER_CHAIN(Class, BaseClass) \ - static BaseNPDispatcher* GetDispatcherChain() { \ + static ::np_utils::BaseNPDispatcher* GetDispatcherChain() { \ typedef Class ThisClass; \ - BaseNPDispatcher* top_dispatcher = BaseClass::GetDispatcherChain(); \ + ::np_utils::BaseNPDispatcher* top_dispatcher = \ + BaseClass::GetDispatcherChain(); \ #define NP_UTILS_DISPATCHER(name, Signature) \ - static NPDispatcher<ThisClass, Signature> \ + static ::np_utils::NPDispatcher<ThisClass, Signature> \ NP_UTILS_DISPATCHER_UNIQUE( \ top_dispatcher, \ #name, \ @@ -55,27 +56,28 @@ return top_dispatcher; \ } \ bool HasMethod(NPIdentifier name) { \ - return DispatcherHasMethodHelper(GetDispatcherChain(), this, name); \ + return ::np_utils::DispatcherHasMethodHelper( \ + GetDispatcherChain(), this, name); \ } \ bool Invoke(NPIdentifier name, \ const NPVariant* args, \ uint32_t num_args, \ NPVariant* result) { \ - return DispatcherInvokeHelper(GetDispatcherChain(), \ - this, \ - name, \ - args, \ - num_args, \ - result); \ + return ::np_utils::DispatcherInvokeHelper(GetDispatcherChain(), \ + this, \ + name, \ + args, \ + num_args, \ + result); \ } \ bool Enumerate(NPIdentifier** names, uint32_t* num_names) { \ - return DispatcherEnumerateHelper(GetDispatcherChain(), \ - this, \ - names, \ - num_names); \ + return ::np_utils::DispatcherEnumerateHelper(GetDispatcherChain(), \ + this, \ + names, \ + num_names); \ } \ -namespace gpu_plugin { +namespace np_utils { class BaseNPDispatcher { public: @@ -217,6 +219,6 @@ struct NPDispatcher { #undef TO_NPVARIANT -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_DISPATCHER_H_ diff --git a/o3d/gpu/np_utils/np_object_mock.h b/o3d/gpu/np_utils/np_object_mock.h index 8c3d0e7..99d1ff6 100644 --- a/o3d/gpu/np_utils/np_object_mock.h +++ b/o3d/gpu/np_utils/np_object_mock.h @@ -8,7 +8,7 @@ #include "gpu/np_utils/np_browser.h" #include "testing/gmock/include/gmock/gmock.h" -namespace gpu_plugin { +namespace np_utils { class MockNPObject : public NPObject { public: @@ -31,6 +31,6 @@ class MockNPObject : public NPObject { DISALLOW_COPY_AND_ASSIGN(MockNPObject); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_OBJECT_MOCK_H_ diff --git a/o3d/gpu/np_utils/np_object_pointer.h b/o3d/gpu/np_utils/np_object_pointer.h index a8987be..44286a7 100644 --- a/o3d/gpu/np_utils/np_object_pointer.h +++ b/o3d/gpu/np_utils/np_object_pointer.h @@ -9,7 +9,7 @@ #include "gpu/np_utils/np_browser.h" #include "gpu/np_utils/np_headers.h" -namespace gpu_plugin { +namespace np_utils { // Smart pointer for NPObjects that automatically handles reference counting. template <typename NPObjectType> @@ -114,6 +114,6 @@ std::ostream& operator<<(std::ostream& stream, const NPObjectPointer<NPObjectType>& pointer) { return stream << pointer.Get(); } -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_OBJECT_POINTER_H_ diff --git a/o3d/gpu/np_utils/np_object_pointer_unittest.cc b/o3d/gpu/np_utils/np_object_pointer_unittest.cc index c14f6ed..1e48453 100644 --- a/o3d/gpu/np_utils/np_object_pointer_unittest.cc +++ b/o3d/gpu/np_utils/np_object_pointer_unittest.cc @@ -12,7 +12,7 @@ using testing::Return; using testing::StrictMock; -namespace gpu_plugin { +namespace np_utils { class DerivedNPObject : public MockNPObject { public: @@ -217,4 +217,4 @@ TEST_F(NPObjectPointerTest, NULLPointerCanBeReturnedAsARawNPObject) { EXPECT_TRUE(NULL == p.ToReturned()); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_plugin_object.h b/o3d/gpu/np_utils/np_plugin_object.h index 063079f..ad578e4 100644 --- a/o3d/gpu/np_utils/np_plugin_object.h +++ b/o3d/gpu/np_utils/np_plugin_object.h @@ -8,7 +8,7 @@ #include "gpu/np_utils/np_object_pointer.h" #include "gpu/np_utils/np_headers.h" -namespace gpu_plugin { +namespace np_utils { // Interface for a plugin instance. The NPP plugin calls forwards to an instance // of this interface. @@ -45,6 +45,6 @@ class PluginObject { DISALLOW_COPY_AND_ASSIGN(PluginObject); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_PLUGIN_OBJECT_H_ diff --git a/o3d/gpu/np_utils/np_plugin_object_factory.cc b/o3d/gpu/np_utils/np_plugin_object_factory.cc index 831a4bd..7eedcc8 100644 --- a/o3d/gpu/np_utils/np_plugin_object_factory.cc +++ b/o3d/gpu/np_utils/np_plugin_object_factory.cc @@ -5,7 +5,7 @@ #include "gpu/gpu_plugin/gpu_plugin_object_factory.h" #include "base/logging.h" -namespace gpu_plugin { +namespace np_utils { NPPluginObjectFactory* NPPluginObjectFactory::factory_; @@ -27,4 +27,4 @@ NPPluginObjectFactory::~NPPluginObjectFactory() { factory_ = previous_factory_; } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_plugin_object_factory.h b/o3d/gpu/np_utils/np_plugin_object_factory.h index 403d8d5..969f5a3 100644 --- a/o3d/gpu/np_utils/np_plugin_object_factory.h +++ b/o3d/gpu/np_utils/np_plugin_object_factory.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "gpu/np_utils/np_headers.h" -namespace gpu_plugin { +namespace np_utils { class PluginObject; @@ -32,6 +32,6 @@ class NPPluginObjectFactory { DISALLOW_COPY_AND_ASSIGN(NPPluginObjectFactory); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_H_ diff --git a/o3d/gpu/np_utils/np_plugin_object_factory_mock.h b/o3d/gpu/np_utils/np_plugin_object_factory_mock.h index e15447a..a09205c 100644 --- a/o3d/gpu/np_utils/np_plugin_object_factory_mock.h +++ b/o3d/gpu/np_utils/np_plugin_object_factory_mock.h @@ -9,7 +9,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace gpu_plugin { +namespace np_utils { // Mockable factory used to create instances of PluginObject based on plugin // mime type. @@ -18,6 +18,6 @@ class MockPluginObjectFactory : public NPPluginObjectFactory { MOCK_METHOD2(CreatePluginObject, PluginObject*(NPP, NPMIMEType)); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_PLUGIN_OBJECT_FACTORY_MOCK_H_ diff --git a/o3d/gpu/np_utils/np_plugin_object_mock.h b/o3d/gpu/np_utils/np_plugin_object_mock.h index e67861b..342b22c 100644 --- a/o3d/gpu/np_utils/np_plugin_object_mock.h +++ b/o3d/gpu/np_utils/np_plugin_object_mock.h @@ -9,7 +9,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -namespace gpu_plugin { +namespace np_utils { class MockPluginObject : public PluginObject { public: @@ -21,6 +21,6 @@ class MockPluginObject : public PluginObject { MOCK_METHOD0(GetScriptableNPObject, NPObject*()); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_PLUGIN_OBJECT_MOCK_H_ diff --git a/o3d/gpu/np_utils/np_utils.cc b/o3d/gpu/np_utils/np_utils.cc index 03c4a20..d6a15a4 100644 --- a/o3d/gpu/np_utils/np_utils.cc +++ b/o3d/gpu/np_utils/np_utils.cc @@ -4,7 +4,7 @@ #include "gpu/np_utils/np_utils.h" -namespace gpu_plugin { +namespace np_utils { bool NPVariantToValue(bool* value, const NPVariant& variant) { if (NPVARIANT_IS_BOOLEAN(variant)) { @@ -167,4 +167,4 @@ bool NPRemoveProperty(NPP npp, NPBrowser::get()->GetStringIdentifier(name)); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/np_utils.h b/o3d/gpu/np_utils/np_utils.h index 2ab9384..5c7e3b7 100644 --- a/o3d/gpu/np_utils/np_utils.h +++ b/o3d/gpu/np_utils/np_utils.h @@ -12,7 +12,7 @@ #include "gpu/np_utils/np_object_pointer.h" #include "gpu/np_utils/np_headers.h" -namespace gpu_plugin { +namespace np_utils { // Convert NPVariant to C++ type. Returns whether the conversion was successful. bool NPVariantToValue(bool* value, const NPVariant& variant); @@ -266,6 +266,6 @@ NPObjectPointer<NPObjectType> NPCreateObject(NPP npp) { return NPObjectPointer<NPObjectType>::FromReturned(object); } -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_NP_UTILS_H_ diff --git a/o3d/gpu/np_utils/np_utils_unittest.cc b/o3d/gpu/np_utils/np_utils_unittest.cc index e481187..ceb87ad 100644 --- a/o3d/gpu/np_utils/np_utils_unittest.cc +++ b/o3d/gpu/np_utils/np_utils_unittest.cc @@ -17,7 +17,7 @@ using testing::Return; using testing::SetArgumentPointee; using testing::StrictMock; -namespace gpu_plugin { +namespace np_utils { class NPUtilsTest : public testing::Test { protected: @@ -421,4 +421,4 @@ TEST_F(NPUtilsTest, CanRemovePropertyValue) { EXPECT_TRUE(NPRemoveProperty(NULL, object, "foo")); } -} // namespace gpu_plugin +} // namespace np_utils diff --git a/o3d/gpu/np_utils/webkit_browser.h b/o3d/gpu/np_utils/webkit_browser.h index 8afc167..6b57d05 100644 --- a/o3d/gpu/np_utils/webkit_browser.h +++ b/o3d/gpu/np_utils/webkit_browser.h @@ -17,7 +17,7 @@ typedef struct _NPNetscapeFuncs NPNetscapeFuncs; typedef struct _NPChromiumFuncs NPChromiumFuncs; -namespace gpu_plugin { +namespace np_utils { // This class implements NPBrowser for the WebKit WebBindings. class WebKitBrowser : public NPBrowser { @@ -112,6 +112,6 @@ class WebKitBrowser : public NPBrowser { DISALLOW_COPY_AND_ASSIGN(WebKitBrowser); }; -} // namespace gpu_plugin +} // namespace np_utils #endif // GPU_NP_UTILS_WEBKIT_BROWSER_H_ |