Bug 1248821 - Force Flash to windowless mode regardless of sandbox level. r=jimm

MozReview-Commit-ID: B6X6DS42tYb

--HG--
extra : rebase_source : e76a22ee8790d67d7416f1a2b38bc00c9abfbc74
extra : histedit_source : dedc94e4adad27e3d1c5cb800da100ed682ef959

dom/plugins/ipc/PluginModuleParent.cpp

@@ -2680,8 +2680,12 @@ PluginModuleParent::NPP_NewInternal(NPMIMEType pluginType, NPP instance,
     if (mIsFlashPlugin) {
         parentInstance->InitMetadata(strPluginType, srcAttribute);
 #ifdef XP_WIN
-        // Force windowless mode (bug 1201904) when sandbox level >= 2
+        // Force windowless mode (bug 1201904) when sandbox level >= 2 or Win64
+#ifdef _WIN64
+        {
+#else
         if (mSandboxLevel >= 2) {
+#endif
            NS_NAMED_LITERAL_CSTRING(wmodeAttributeName, "wmode");
            NS_NAMED_LITERAL_CSTRING(opaqueAttributeValue, "opaque");
            auto wmodeAttributeIndex =

dom/plugins/test/mochitest/mochitest.ini

@@ -136,7 +136,7 @@ skip-if = toolkit == "cocoa"
 [test_windowed_invalidate.html]
 skip-if = os != "win"
 [test_windowless_flash.html]
-skip-if = !(os == "win" && processor == "x86_64" && !e10s) # Bug 1253957
+skip-if = !(os == "win" && processor == "x86_64")
 [test_windowless_ime.html]
 skip-if = os != "win"
 [test_zero_opacity.html]