Bug 1248821 - Force Flash to windowless mode regardless of sandbox level. r=jimm
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 15 Apr 2016 19:59:58 +0900
changeset 332123 7f64a3a95af69637ae6948b5ec340d7f1b2d0520
parent 332122 b575775f423b0750b2a4c15b28b89d122e5da6d9
child 332124 4091419d6b1c6a254da04190545e45a0c3f2833a
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1248821
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1248821 - Force Flash to windowless mode regardless of sandbox level. r=jimm MozReview-Commit-ID: B6X6DS42tYb
dom/plugins/ipc/PluginModuleParent.cpp
dom/plugins/test/mochitest/mochitest.ini
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -2675,18 +2675,22 @@ PluginModuleParent::NPP_NewInternal(NPMI
 
     nsDependentCString strPluginType(pluginType);
     PluginInstanceParent* parentInstance =
         new PluginInstanceParent(this, instance, strPluginType, mNPNIface);
 
     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 =
                names.IndexOf(wmodeAttributeName, 0, comparator);
            if (wmodeAttributeIndex != names.NoIndex) {
                if (!values[wmodeAttributeIndex].EqualsLiteral("transparent")) {
                    values[wmodeAttributeIndex].Assign(opaqueAttributeValue);
                }
--- a/dom/plugins/test/mochitest/mochitest.ini
+++ b/dom/plugins/test/mochitest/mochitest.ini
@@ -131,12 +131,12 @@ skip-if = toolkit != "cocoa"
 [test_streamNotify.html]
 [test_stringHandling.html]
 [test_twostreams.html]
 [test_visibility.html]
 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]