Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset bba8780c5312 (bug 1342927)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-03-04 00:20:35 +01:00
parent fa5229bbea
commit 989ceac163
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/base/content/test/tabs/browser_tabSpinnerProbe.js
View File

@ -85,15 +85,7 @@ function* testProbe(aProbe) {
add_task(function* setup() {
yield SpecialPowers.pushPrefEnv({
set: [
["dom.ipc.processCount", 1],
// We can interrupt JS to paint now, which is great for
// users, but bad for testing spinners. We temporarily
// disable that feature for this test so that we can
// easily get ourselves into a predictable tab spinner
// state.
["browser.tabs.remote.force-paint", false],
]
set: [["dom.ipc.processCount", 1]]
});
});

19
dom/ipc/ProcessHangMonitor.cpp
View File

@ -275,12 +275,8 @@ private:
nsDataHashtable<nsUint32HashKey, nsString> mBrowserCrashDumpIds;
Mutex mBrowserCrashDumpHashLock;
mozilla::ipc::TaskFactory<HangMonitorParent> mMainThreadTaskFactory;
static bool sShouldForcePaint;
};
bool HangMonitorParent::sShouldForcePaint = true;
} // namespace
/* HangMonitorChild implementation */
@ -579,13 +575,6 @@ HangMonitorParent::HangMonitorParent(ProcessHangMonitor* aMonitor)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
mReportHangs = mozilla::Preferences::GetBool("dom.ipc.reportProcessHangs", false);
static bool sInited = false;
if (!sInited) {
sInited = true;
Preferences::AddBoolVarCache(&sShouldForcePaint,
"browser.tabs.remote.force-paint", true);
}
}
HangMonitorParent::~HangMonitorParent()
@ -643,11 +632,9 @@ void
HangMonitorParent::ForcePaint(dom::TabParent* aTab, uint64_t aLayerObserverEpoch)
{
MOZ_RELEASE_ASSERT(NS_IsMainThread());
if (sShouldForcePaint) {
TabId id = aTab->GetTabId();
MonitorLoop()->PostTask(NewNonOwningRunnableMethod<TabId, uint64_t>(
this, &HangMonitorParent::ForcePaintOnThread, id, aLayerObserverEpoch));
}
TabId id = aTab->GetTabId();
MonitorLoop()->PostTask(NewNonOwningRunnableMethod<TabId, uint64_t>(
this, &HangMonitorParent::ForcePaintOnThread, id, aLayerObserverEpoch));
}
void