corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1120747 - dom.ipc.plugins.flash.disable-protected-mode might not work when launching Flash is immediately. r=aklotz

Browse Source
This commit is contained in:
Makoto Kato
2015-01-13 18:00:30 +09:00
parent 6f5651b95e
commit 73115d0953
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dom/plugins/ipc/PluginModuleParent.cpp
View File

@@ -377,6 +377,7 @@ PluginModuleChromeParent::LoadModule(const char* aFilePath, uint32_t aPluginId,
parent->mShutdown = true; parent->mShutdown = true;
return nullptr; return nullptr;
} }
parent->mIsFlashPlugin = aPluginTag->mIsFlashPlugin;
if (!parent->mIsStartingAsync) { if (!parent->mIsStartingAsync) {
int32_t launchTimeoutSecs = Preferences::GetInt(kLaunchTimeoutPref, 0); int32_t launchTimeoutSecs = Preferences::GetInt(kLaunchTimeoutPref, 0);
if (!parent->mSubprocess->WaitUntilConnected(launchTimeoutSecs * 1000)) { if (!parent->mSubprocess->WaitUntilConnected(launchTimeoutSecs * 1000)) {
@@ -386,7 +387,6 @@ PluginModuleChromeParent::LoadModule(const char* aFilePath, uint32_t aPluginId,
} }
TimeStamp launchEnd = TimeStamp::Now(); TimeStamp launchEnd = TimeStamp::Now();
parent->mTimeBlocked = (launchEnd - launchStart); parent->mTimeBlocked = (launchEnd - launchStart);
parent->mIsFlashPlugin = aPluginTag->mIsFlashPlugin;
return parent.forget(); return parent.forget();
} }