Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1 (0aaa11ed) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20DisplayList.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -40,13 +40,6 @@ class GLES20DisplayList extends DisplayList {
		hostView = new WeakReference<View>(view);
		}

		public void invalidateView() {
		View v = hostView.get();
		if (v != null) {
		v.invalidate();
		}
		}

		@Override
		HardwareCanvas start() {
		if (mStarted) {

+0 −6

Original line number	Diff line number	Diff line
		@@ -8563,8 +8563,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		canvas.onPreDraw(mLocalDirtyRect);
		mLocalDirtyRect.setEmpty();

		final int restoreCount = canvas.save();

		computeScroll();
		canvas.translate(-mScrollX, -mScrollY);

		@@ -8578,7 +8576,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		draw(canvas);
		}

		canvas.restoreToCount(restoreCount);
		} finally {
		canvas.onPostDraw();
		mHardwareLayer.end(currentCanvas);
		@@ -8728,8 +8725,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		// The dirty rect should always be null for a display list
		canvas.onPreDraw(null);

		final int restoreCount = canvas.save();

		computeScroll();
		canvas.translate(-mScrollX, -mScrollY);
		mPrivateFlags \|= DRAWN \| DRAWING_CACHE_VALID;
		@@ -8742,7 +8737,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
		draw(canvas);
		}

		canvas.restoreToCount(restoreCount);
		} finally {
		canvas.onPostDraw();

+1 −1

Original line number	Diff line number	Diff line
		@@ -4115,7 +4115,7 @@ public class WebView extends AbsoluteLayout
		}
		if (animateZoom) {
		mZoomManager.animateZoom(canvas);
		} else {
		} else if (!canvas.isHardwareAccelerated()) {
		canvas.scale(mZoomManager.getScale(), mZoomManager.getScale());
		}