diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in index 11714948afbf..1d4fb73a0ec5 100644 --- a/dom/plugins/test/mochitest/Makefile.in +++ b/dom/plugins/test/mochitest/Makefile.in @@ -65,7 +65,6 @@ MOCHITEST_FILES = \ file_bug771202.html \ test_bug777098.html \ test_bug751809.html \ - test_bug813906.html \ test_enumerate.html \ test_npruntime_construct.html \ 307-xo-redirect.sjs \ diff --git a/dom/plugins/test/mochitest/test_bug813906.html b/dom/plugins/test/mochitest/test_bug813906.html deleted file mode 100644 index 7d5a1814b86d..000000000000 --- a/dom/plugins/test/mochitest/test_bug813906.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - Test for Bug 813906 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dom/plugins/test/testplugin/nptest.cpp b/dom/plugins/test/testplugin/nptest.cpp index db7a6d2f795c..9cb9a24a51cf 100644 --- a/dom/plugins/test/testplugin/nptest.cpp +++ b/dom/plugins/test/testplugin/nptest.cpp @@ -583,34 +583,6 @@ drawAsyncBitmapColor(InstanceData* instanceData) instanceData->backBuffer = oldFront; } -static bool bug813906(NPP npp, const char* const function, const char* const url, const char* const frame) -{ - InstanceData* id = static_cast(npp->pdata); - - NPObject *windowObj = nullptr; - NPError err = NPN_GetValue(npp, NPNVWindowNPObject, &windowObj); - if (err != NPERR_NO_ERROR) { - return false; - } - - NPVariant result; - bool res = NPN_Invoke(npp, windowObj, NPN_GetStringIdentifier(function), nullptr, 0, &result); - NPN_ReleaseObject(windowObj); - if (!res) { - return false; - } - - NPN_ReleaseVariantValue(&result); - - err = NPN_GetURL(npp, url, frame); - if (err != NPERR_NO_ERROR) { - err = NPN_GetURL(npp, "about:blank", frame); - return false; - } - - return true; -} - // // function signatures // @@ -822,7 +794,6 @@ NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* instanceData->frontBuffer = NULL; instanceData->backBuffer = NULL; instanceData->mouseUpEventCount = 0; - instanceData->bugMode = -1; instance->pdata = instanceData; TestNPObject* scriptableObject = (TestNPObject*)NPN_CreateObject(instance, &sNPClass); @@ -953,9 +924,6 @@ NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* if (!strcmp(argn[i], "closestream")) { instanceData->closeStream = true; } - if (strcmp(argn[i], "bugmode") == 0) { - instanceData->bugMode = atoi(argv[i]); - } } if (!browserSupportsWindowless || !pluginSupportsWindowlessMode()) { @@ -1048,10 +1016,6 @@ NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* } } - if ((instanceData->bugMode == 813906) && instanceData->frame.length()) { - bug813906(instance, "f", "browser.xul", instanceData->frame.c_str()); - } - return NPERR_NO_ERROR; } diff --git a/dom/plugins/test/testplugin/nptest.h b/dom/plugins/test/testplugin/nptest.h index 6e55fb30aa44..3c5cc6120c9c 100644 --- a/dom/plugins/test/testplugin/nptest.h +++ b/dom/plugins/test/testplugin/nptest.h @@ -151,7 +151,6 @@ typedef struct InstanceData { NPAsyncSurface *frontBuffer; NPAsyncSurface *backBuffer; int32_t mouseUpEventCount; - int32_t bugMode; } InstanceData; void notifyDidPaint(InstanceData* instanceData);