author | Jim Mathies <jmathies@mozilla.com> |
Thu, 30 Oct 2014 13:52:30 -0500 | |
changeset 213231 | b05655e457ad5e17e595fdb3a3498ea45cff8ea8 |
parent 213230 | c1d47db66068f2ffca07bba4b6a473899d797dce |
child 213232 | 418f66cde83d5f5d57edb9e5afa20e218586188a |
push id | 27745 |
push user | cbook@mozilla.com |
push date | Fri, 31 Oct 2014 13:09:12 +0000 |
treeherder | mozilla-central@6bd2071b373f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | billm |
bugs | 1091621 |
milestone | 36.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
|
--- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -238,16 +238,24 @@ static bool UnloadPluginsASAP() { return (Preferences::GetUint(kPrefUnloadPluginTimeoutSecs, kDefaultPluginUnloadingTimeout) == 0); } nsPluginHost::nsPluginHost() // No need to initialize members to nullptr, false etc because this class // has a zeroing operator new. { + // Bump the pluginchanged epoch on startup. This insures content gets a + // good plugin list the first time it requests it. Normally we'd just + // init this to 1, but due to the unique nature of our ctor we need to do + // this manually. + if (XRE_GetProcessType() == GeckoProcessType_Default) { + IncrementChromeEpoch(); + } + // check to see if pref is set at startup to let plugins take over in // full page mode for certain image mime types that we handle internally mOverrideInternalTypes = Preferences::GetBool("plugin.override_internal_types", false); mPluginsDisabled = Preferences::GetBool("plugin.disable", false); mPluginsClickToPlay = Preferences::GetBool("plugins.click_to_play", false);