wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 743bd08df703 (bug 854421)

Browse Source
This commit is contained in:
Ed Morley 2014-05-29 10:56:01 +01:00
parent ae1524c30c
commit 70b33d439f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layout/base/nsPresShell.cpp
View File

@ -4037,6 +4037,7 @@ PresShell::FlushPendingNotifications(mozilla::ChangesToFlush aFlush)
}
if (aFlush.mFlushAnimations &&
nsLayoutUtils::AreAsyncAnimationsEnabled() &&
!mPresContext->StyleUpdateForAllAnimationsIsUpToDate()) {
mPresContext->AnimationManager()->
FlushAnimations(CommonAnimationManager::Cannot_Throttle);

7
layout/base/nsRefreshDriver.cpp
View File

@ -1096,8 +1096,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
}
if (i == 0) {
// This is the Flush_Style case.
// Grab all of our frame request callbacks up front.
nsTArray<DocumentFrameCallbacks>
frameRequestCallbacks(mFrameRequestCallbackDocs.Length());
@ -1139,6 +1137,7 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
}
profiler_tracing("Paint", "Scripts", TRACING_INTERVAL_END);
// This is the Flush_Style case.
if (mPresContext && mPresContext->GetPresShell()) {
bool tracingStyleFlush = false;
nsAutoTArray<nsIPresShell*, 16> observers;
@ -1168,10 +1167,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
profiler_tracing("Paint", "Styles", TRACING_INTERVAL_END);
}
}
if (!nsLayoutUtils::AreAsyncAnimationsEnabled()) {
mPresContext->TickLastStyleUpdateForAllAnimations();
}
} else if (i == 1) {
// This is the Flush_Layout case.
if (mPresContext && mPresContext->GetPresShell()) {