mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 06:15:43 +00:00
Bug 1120747 - dom.ipc.plugins.flash.disable-protected-mode might not work when launching Flash is immediately. r=aklotz
This commit is contained in:
parent
c1206b4f7c
commit
99d55a9966
@ -377,6 +377,7 @@ PluginModuleChromeParent::LoadModule(const char* aFilePath, uint32_t aPluginId,
|
||||
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)) {
|
||||
@ -386,7 +387,6 @@ PluginModuleChromeParent::LoadModule(const char* aFilePath, uint32_t aPluginId,
|
||||
}
|
||||
TimeStamp launchEnd = TimeStamp::Now();
|
||||
parent->mTimeBlocked = (launchEnd - launchStart);
|
||||
parent->mIsFlashPlugin = aPluginTag->mIsFlashPlugin;
|
||||
return parent.forget();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user