diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebKitTools/DumpRenderTree/win/TestNetscapePlugin | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebKitTools/DumpRenderTree/win/TestNetscapePlugin')
| -rw-r--r-- | WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp b/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp index 89873b6..321d9cf 100644 --- a/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp +++ b/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp @@ -106,7 +106,9 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc pluginLog(instance, "src: %s", argv[i]); } else if (_stricmp(argn[i], "testdocumentopenindestroystream") == 0) obj->testDocumentOpenInDestroyStream = TRUE; - else if (_stricmp(argn[i], "testwindowopen") == 0) + else if (_stricmp(argn[i], "testGetURLOnDestroy") == 0) + obj->testGetURLOnDestroy = TRUE; + else if (_stricmp(argn[i], "testwindowopen") == 0) obj->testWindowOpen = TRUE; else if (_stricmp(argn[i], "onSetWindow") == 0 && !obj->onSetWindow) obj->onSetWindow = strdup(argv[i]); @@ -122,6 +124,9 @@ NPError NPP_Destroy(NPP instance, NPSavedData **save) { PluginObject *obj = (PluginObject*)instance->pdata; if (obj) { + if (obj->testGetURLOnDestroy) + browser->geturlnotify(obj->npp, "about:blank", "", ""); + if (obj->onStreamLoad) free(obj->onStreamLoad); @@ -137,7 +142,7 @@ NPError NPP_Destroy(NPP instance, NPSavedData **save) } if (obj->logDestroy) - printf("PLUGIN: NPP_Destroy\n"); + pluginLog(instance, "NPP_Destroy\n"); if (obj->onSetWindow) free(obj->onSetWindow); |