diff options
Diffstat (limited to 'webkit/glue/plugins/test')
10 files changed, 28 insertions, 28 deletions
diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc index b0e7e91..b7158ce 100644 --- a/webkit/glue/plugins/test/plugin_client.cc +++ b/webkit/glue/plugins/test/plugin_client.cc @@ -118,14 +118,14 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, "npobject_lifetime_test") == 0) { new_test = new NPAPIClient::NPObjectLifetimeTest(instance, NPAPIClient::PluginClient::HostFunctions()); - } else if (base::strcasecmp(argv[name_index], + } else if (base::strcasecmp(argv[name_index], "npobject_lifetime_test_second_instance") == 0) { new_test = new NPAPIClient::NPObjectLifetimeTestInstance2(instance, NPAPIClient::PluginClient::HostFunctions()); } else if (base::strcasecmp(argv[name_index], "new_fails") == 0) { new_test = new NPAPIClient::NewFailsTest(instance, NPAPIClient::PluginClient::HostFunctions()); - } else if (base::strcasecmp(argv[name_index], + } else if (base::strcasecmp(argv[name_index], "npobject_delete_plugin_in_evaluate") == 0) { new_test = new NPAPIClient::NPObjectDeletePluginInNPN_Evaluate(instance, NPAPIClient::PluginClient::HostFunctions()); diff --git a/webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h b/webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h index 2c98cfc..60413cb 100644 --- a/webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h +++ b/webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h @@ -9,7 +9,7 @@ namespace NPAPIClient { -// This class tests +// This class tests class DeletePluginInStreamTest : public PluginTest { public: // Constructor. diff --git a/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc b/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc index 3f1d0e1..b71ded7 100644 --- a/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc +++ b/webkit/glue/plugins/test/plugin_execute_script_delete_test.cc @@ -16,8 +16,8 @@ ExecuteScriptDeleteTest::ExecuteScriptDeleteTest( int16 ExecuteScriptDeleteTest::HandleEvent(void* event) { - NPNetscapeFuncs* browser = NPAPIClient::PluginClient::HostFunctions(); - + NPNetscapeFuncs* browser = NPAPIClient::PluginClient::HostFunctions(); + NPBool supports_windowless = 0; NPError result = browser->getvalue(id(), NPNVSupportsWindowless, &supports_windowless); @@ -28,20 +28,20 @@ int16 ExecuteScriptDeleteTest::HandleEvent(void* event) { } NPEvent* np_event = reinterpret_cast<NPEvent*>(event); - if (WM_PAINT == np_event->event && + if (WM_PAINT == np_event->event && base::strcasecmp(test_name_.c_str(), "execute_script_delete_in_paint") == 0) { NPUTF8* urlString = "javascript:DeletePluginWithinScript()"; NPUTF8* targetString = NULL; browser->geturl(id(), urlString, targetString); SignalTestCompleted(); - } else if (WM_MOUSEMOVE == np_event->event && + } else if (WM_MOUSEMOVE == np_event->event && base::strcasecmp(test_name_.c_str(), "execute_script_delete_in_mouse_move") == 0) { std::string script = "javascript:DeletePluginWithinScript()"; NPString script_string; script_string.UTF8Characters = script.c_str(); - script_string.UTF8Length = + script_string.UTF8Length = static_cast<unsigned int>(script.length()); NPObject *window_obj = NULL; diff --git a/webkit/glue/plugins/test/plugin_get_javascript_url_test.cc b/webkit/glue/plugins/test/plugin_get_javascript_url_test.cc index 43281f7..054c3d2 100644 --- a/webkit/glue/plugins/test/plugin_get_javascript_url_test.cc +++ b/webkit/glue/plugins/test/plugin_get_javascript_url_test.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" -// url for "self". +// url for "self". #define SELF_URL "javascript:window.location+\"\"" // The identifier for the self url stream. #define SELF_URL_STREAM_ID 1 diff --git a/webkit/glue/plugins/test/plugin_javascript_open_popup.cc b/webkit/glue/plugins/test/plugin_javascript_open_popup.cc index cd9c121..2ddf698 100644 --- a/webkit/glue/plugins/test/plugin_javascript_open_popup.cc +++ b/webkit/glue/plugins/test/plugin_javascript_open_popup.cc @@ -8,7 +8,7 @@ namespace NPAPIClient { ExecuteJavascriptOpenPopupWithPluginTest:: - ExecuteJavascriptOpenPopupWithPluginTest(NPP id, + ExecuteJavascriptOpenPopupWithPluginTest(NPP id, NPNetscapeFuncs *host_functions) : PluginTest(id, host_functions), popup_window_test_started_(false) { diff --git a/webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc b/webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc index 4e0b20f..8f3a89f 100644 --- a/webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc +++ b/webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc @@ -11,10 +11,10 @@ const int kNPObjectLifetimeTimerElapse = 2000; NPObject* NPObjectLifetimeTestInstance2::plugin_instance_object_ = NULL; -NPObjectDeletePluginInNPN_Evaluate* +NPObjectDeletePluginInNPN_Evaluate* NPObjectDeletePluginInNPN_Evaluate::g_npn_evaluate_test_instance_ = NULL; -NPObjectLifetimeTest::NPObjectLifetimeTest(NPP id, +NPObjectLifetimeTest::NPObjectLifetimeTest(NPP id, NPNetscapeFuncs *host_functions) : PluginTest(id, host_functions), other_plugin_instance_object_(NULL) { @@ -34,15 +34,15 @@ NPError NPObjectLifetimeTest::SetWindow(NPWindow* pNPWindow) { } void CALLBACK NPObjectLifetimeTest::TimerProc( - HWND window, UINT message, UINT timer_id, + HWND window, UINT message, UINT timer_id, unsigned long elapsed_milli_seconds) { KillTimer(window, kNPObjectLifetimeTimer); - NPObjectLifetimeTest* this_instance = + NPObjectLifetimeTest* this_instance = reinterpret_cast<NPObjectLifetimeTest*> (::GetProp(window, L"Plugin_Instance")); - this_instance->other_plugin_instance_object_ = + this_instance->other_plugin_instance_object_ = NPObjectLifetimeTestInstance2::plugin_instance_object_; this_instance->HostFunctions()->retainobject( this_instance->other_plugin_instance_object_); @@ -56,7 +56,7 @@ void CALLBACK NPObjectLifetimeTest::TimerProc( reinterpret_cast<void*>(1)); } -void NPObjectLifetimeTest::URLNotify(const char* url, NPReason reason, +void NPObjectLifetimeTest::URLNotify(const char* url, NPReason reason, void* data) { // Create a "location" identifier. NPIdentifier identifier = HostFunctions()->getstringidentifier("location"); @@ -85,7 +85,7 @@ NPObjectLifetimeTestInstance2::~NPObjectLifetimeTestInstance2() { NPError NPObjectLifetimeTestInstance2::SetWindow(NPWindow* pNPWindow) { if (!plugin_instance_object_) { - if (!HostFunctions()->getvalue(id(), NPNVWindowNPObject, + if (!HostFunctions()->getvalue(id(), NPNVWindowNPObject, &plugin_instance_object_)) { SetError("Failed to get NPObject for plugin instance2"); SignalTestCompleted(); @@ -98,7 +98,7 @@ NPError NPObjectLifetimeTestInstance2::SetWindow(NPWindow* pNPWindow) { NPObjectDeletePluginInNPN_Evaluate::NPObjectDeletePluginInNPN_Evaluate( - NPP id, NPNetscapeFuncs *host_functions) + NPP id, NPNetscapeFuncs *host_functions) : PluginTest(id, host_functions), plugin_instance_object_(NULL), npn_evaluate_timer_proc_set_(false) { @@ -132,7 +132,7 @@ NPError NPObjectDeletePluginInNPN_Evaluate::SetWindow(NPWindow* np_window) { } void CALLBACK NPObjectDeletePluginInNPN_Evaluate::TimerProc( - HWND window, UINT message, UINT timer_id, + HWND window, UINT message, UINT timer_id, unsigned long elapsed_milli_seconds) { KillTimer(window, kNPObjectLifetimeTimer); @@ -151,7 +151,7 @@ void CALLBACK NPObjectDeletePluginInNPN_Evaluate::TimerProc( std::string script = "javascript:DeletePluginWithinScript()"; NPString script_string; script_string.UTF8Characters = script.c_str(); - script_string.UTF8Length = + script_string.UTF8Length = static_cast<unsigned int>(script.length()); NPVariant result_var; diff --git a/webkit/glue/plugins/test/plugin_npobject_lifetime_test.h b/webkit/glue/plugins/test/plugin_npobject_lifetime_test.h index 4ffda5f..935f626 100644 --- a/webkit/glue/plugins/test/plugin_npobject_lifetime_test.h +++ b/webkit/glue/plugins/test/plugin_npobject_lifetime_test.h @@ -10,7 +10,7 @@ namespace NPAPIClient { // The NPObjectLifeTime class tests the case where a plugin has an NPObject -// which points to a different plugin instance on a different frame in the +// which points to a different plugin instance on a different frame in the // page and whether refcounts on this npobject are valid when the source frame // is destroyed. class NPObjectLifetimeTest : public PluginTest { @@ -25,7 +25,7 @@ class NPObjectLifetimeTest : public PluginTest { protected: NPObject* other_plugin_instance_object_; - static void CALLBACK TimerProc(HWND window, UINT message, UINT timer_id, + static void CALLBACK TimerProc(HWND window, UINT message, UINT timer_id, unsigned long elapsed_milli_seconds); }; @@ -58,7 +58,7 @@ class NPObjectDeletePluginInNPN_Evaluate : public PluginTest { protected: NPObject* plugin_instance_object_; - static void CALLBACK TimerProc(HWND window, UINT message, UINT timer_id, + static void CALLBACK TimerProc(HWND window, UINT message, UINT timer_id, unsigned long elapsed_milli_seconds); private: bool npn_evaluate_timer_proc_set_; diff --git a/webkit/glue/plugins/test/plugin_window_size_test.cc b/webkit/glue/plugins/test/plugin_window_size_test.cc index b1b5927..ea8894c 100644 --- a/webkit/glue/plugins/test/plugin_window_size_test.cc +++ b/webkit/glue/plugins/test/plugin_window_size_test.cc @@ -7,13 +7,13 @@ namespace NPAPIClient { -PluginWindowSizeTest::PluginWindowSizeTest(NPP id, +PluginWindowSizeTest::PluginWindowSizeTest(NPP id, NPNetscapeFuncs *host_functions) : PluginTest(id, host_functions) { } NPError PluginWindowSizeTest::SetWindow(NPWindow* pNPWindow) { - if (!pNPWindow || + if (!pNPWindow || !::IsWindow(reinterpret_cast<HWND>(pNPWindow->window))) { SetError("Invalid arguments passed in"); return NPERR_INVALID_PARAM; @@ -24,7 +24,7 @@ NPError PluginWindowSizeTest::SetWindow(NPWindow* pNPWindow) { window_rect.top = pNPWindow->y; window_rect.right = pNPWindow->width; window_rect.bottom = pNPWindow->height; - + if (!::IsRectEmpty(&window_rect)) { RECT client_rect = {0}; ::GetClientRect(reinterpret_cast<HWND>(pNPWindow->window), diff --git a/webkit/glue/plugins/test/plugin_window_size_test.h b/webkit/glue/plugins/test/plugin_window_size_test.h index 7eea3fa..e372940 100644 --- a/webkit/glue/plugins/test/plugin_window_size_test.h +++ b/webkit/glue/plugins/test/plugin_window_size_test.h @@ -9,7 +9,7 @@ namespace NPAPIClient { -// This class tests whether the plugin window has a non zero rect +// This class tests whether the plugin window has a non zero rect // on the second SetWindow call. class PluginWindowSizeTest : public PluginTest { public: diff --git a/webkit/glue/plugins/test/resource.h b/webkit/glue/plugins/test/resource.h index 2f2bf3b..f9680f7 100644 --- a/webkit/glue/plugins/test/resource.h +++ b/webkit/glue/plugins/test/resource.h @@ -3,7 +3,7 @@ // Used by npapitest.rc // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 101 |