am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev

* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
  Disable skipping frames on empty damage
This commit is contained in:
John Reck
2015-08-04 01:00:24 +00:00
committed by Android Git Automerger

View File

@@ -229,10 +229,11 @@ void CanvasContext::draw() {
SkRect dirty;
mDamageAccumulator.finish(&dirty);
if (dirty.isEmpty() && Properties::skipEmptyFrames) {
mCurrentFrameInfo->addFlag(FrameInfoFlags::SkippedFrame);
return;
}
// TODO: Re-enable after figuring out cause of b/22592975
// if (dirty.isEmpty() && Properties::skipEmptyFrames) {
// mCurrentFrameInfo->addFlag(FrameInfoFlags::SkippedFrame);
// return;
// }
mCurrentFrameInfo->markIssueDrawCommandsStart();