diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp index 2110a8a..266b4b5 100644 --- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp +++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/main.cpp @@ -268,10 +268,10 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc #ifdef XP_UNIX // On Unix, plugins only get events if they are windowless. - return browser->setvalue(instance, NPPVpluginWindowBool, 0); -#else - return NPERR_NO_ERROR; + browser->setvalue(instance, NPPVpluginWindowBool, 0); #endif + + return obj->pluginTest->NPP_New(pluginType, mode, argc, argn, argv, saved); } NPError NPP_Destroy(NPP instance, NPSavedData **save) |