Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-15 04:39:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out ecac2ce4eada (bug 828126) for busting b2g's arm

Browse Source
This commit is contained in:
Phil Ringnalda 2013-01-13 17:48:33 -08:00
parent f3bbbf0dac
commit dfaf3bab2c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/base/nsDOMWindowUtils.cpp
View File

@ -2194,7 +2194,12 @@ nsDOMWindowUtils::StopFrameTimeRecording(float** paintTimes, uint32_t *frameCoun
/* copy over the frame intervals and paint times into the arrays we just allocated */
for (uint32_t i = 0; i < *frameCount; i++) {
(*frameIntervals)[i] = tmpFrameIntervals[i];
#ifndef ANDROID
(*paintTimes)[i] = tmpPaintTimes[i];
#else
// Waiting for bug 785597 to work on android.
(*paintTimes)[i] = 0;
#endif
}
}

3
layout/base/nsRefreshDriver.cpp
View File

@ -942,10 +942,13 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
#ifdef DEBUG_INVALIDATIONS
printf("Starting ProcessPendingUpdates\n");
#endif
#ifndef ANDROID
// Waiting for bug 785597 to work on android.
nsRefPtr<layers::LayerManager> mgr = mPresContext->GetPresShell()->GetLayerManager();
if (mgr) {
mgr->SetPaintStartTime(mMostRecentRefresh);
}
#endif
mViewManagerFlushIsPending = false;
nsRefPtr<nsViewManager> vm = mPresContext->GetPresShell()->GetViewManager();