Bug 1120747 - dom.ipc.plugins.flash.disable-protected-mode might not work when launching Flash is immediately. r=aklotz
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 13 Jan 2015 18:00:30 +0900
changeset 223520 0a0e57c4e420fdf01b9f25114ba50d74e5bce86b
parent 223519 52156df5e29890d8ee6aea7bac4aa7f3c4a8e471
child 223521 3c07d940b04329a0929474e0c5f85cca447a60d2
push id28095
push usercbook@mozilla.com
push dateTue, 13 Jan 2015 13:24:48 +0000
treeherdermozilla-central@a5700bec72e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz
bugs1120747
milestone38.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 1120747 - dom.ipc.plugins.flash.disable-protected-mode might not work when launching Flash is immediately. r=aklotz
dom/plugins/ipc/PluginModuleParent.cpp
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -372,26 +372,26 @@ PluginModuleChromeParent::LoadModule(con
     parent->mSubprocess->SetCallRunnableImmediately(!parent->mIsStartingAsync);
     TimeStamp launchStart = TimeStamp::Now();
     bool launched = parent->mSubprocess->Launch(Move(onLaunchedRunnable));
     if (!launched) {
         // We never reached open
         parent->mShutdown = true;
         return nullptr;
     }
+    parent->mIsFlashPlugin = aPluginTag->mIsFlashPlugin;
     if (!parent->mIsStartingAsync) {
         int32_t launchTimeoutSecs = Preferences::GetInt(kLaunchTimeoutPref, 0);
         if (!parent->mSubprocess->WaitUntilConnected(launchTimeoutSecs * 1000)) {
             parent->mShutdown = true;
             return nullptr;
         }
     }
     TimeStamp launchEnd = TimeStamp::Now();
     parent->mTimeBlocked = (launchEnd - launchStart);
-    parent->mIsFlashPlugin = aPluginTag->mIsFlashPlugin;
     return parent.forget();
 }
 
 void
 PluginModuleChromeParent::OnProcessLaunched(const bool aSucceeded)
 {
     if (!aSucceeded) {
         mShutdown = true;