am d902c813: am 15d8a2bc: Merge "Avoid flushing DisplayListCanvas state for noop calls" into mnc-dev

* commit 'd902c8133fdad3efa904ad1d8ef714610bc3eaba':
  Avoid flushing DisplayListCanvas state for noop calls
This commit is contained in:
Chris Craik
2015-06-23 02:52:47 +00:00
committed by Android Git Automerger

View File

@@ -135,6 +135,8 @@ int DisplayListCanvas::saveLayer(float left, float top, float right, float botto
}
void DisplayListCanvas::translate(float dx, float dy) {
if (dx == 0.0f && dy == 0.0f) return;
mHasDeferredTranslate = true;
mTranslateX += dx;
mTranslateY += dy;
@@ -143,11 +145,15 @@ void DisplayListCanvas::translate(float dx, float dy) {
}
void DisplayListCanvas::rotate(float degrees) {
if (degrees == 0.0f) return;
addStateOp(new (alloc()) RotateOp(degrees));
mState.rotate(degrees);
}
void DisplayListCanvas::scale(float sx, float sy) {
if (sx == 1.0f && sy == 1.0f) return;
addStateOp(new (alloc()) ScaleOp(sx, sy));
mState.scale(sx, sy);
}