Merge "Enter RectangleMode when the clip region is a rectangle" (f6967e68) · Commits · e / os / android_frameworks_base

libs/hwui/ClipArea.cpp

+12 −7

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ bool ClipArea::clipRectWithTransform(const Rect& r, const mat4* transform,
		bool ClipArea::clipRegion(const SkRegion& region, SkRegion::Op op) {
		enterRegionMode();
		mClipRegion.op(region, op);
		setClipRectToRegionBounds();
		onClipRegionUpdated();
		return true;
		}

		@@ -263,6 +263,9 @@ void ClipArea::enterRectangleMode() {
		bool ClipArea::rectangleModeClipRectWithTransform(const Rect& r,
		const mat4* transform, SkRegion::Op op) {

		// TODO: we should be able to handle kReplace_Op efficiently without
		// going through RegionMode and later falling back into RectangleMode.

		if (op != SkRegion::kIntersect_Op) {
		enterRegionMode();
		return regionModeClipRectWithTransform(r, transform, op);
		@@ -324,15 +327,16 @@ bool ClipArea::rectangleListModeClipRectWithTransform(float left, float top,
		*/

		void ClipArea::enterRegionMode() {
		if (mMode != kModeRegion) {
		if (mMode == kModeRectangle) {
		Mode oldMode = mMode;
		mMode = kModeRegion;
		if (oldMode != kModeRegion) {
		if (oldMode == kModeRectangle) {
		mClipRegion.setRect(mClipRect.left, mClipRect.top,
		mClipRect.right, mClipRect.bottom);
		} else {
		mClipRegion = mRectangleList.convertToRegion(createViewportRegion());
		setClipRectToRegionBounds();
		onClipRegionUpdated();
		}
		mMode = kModeRegion;
		}
		}

		@@ -342,7 +346,7 @@ bool ClipArea::regionModeClipRectWithTransform(const Rect& r,
		SkRegion transformedRectRegion;
		regionFromPath(transformedRect, transformedRectRegion);
		mClipRegion.op(transformedRectRegion, op);
		setClipRectToRegionBounds();
		onClipRegionUpdated();
		return true;
		}

		@@ -352,12 +356,13 @@ bool ClipArea::regionModeClipRectWithTransform(float left, float top,
		transform, op);
		}

		void ClipArea::setClipRectToRegionBounds() {
		void ClipArea::onClipRegionUpdated() {
		if (!mClipRegion.isEmpty()) {
		mClipRect.set(mClipRegion.getBounds());

		if (mClipRegion.isRect()) {
		mClipRegion.setEmpty();
		enterRectangleMode();
		}
		} else {
		mClipRect.setEmpty();

libs/hwui/ClipArea.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ private:
		float bottom, const mat4* transform, SkRegion::Op op);

		void ensureClipRegion();
		void setClipRectToRegionBounds();
		void onClipRegionUpdated();
		bool clipRegionOp(float left, float top, float right, float bottom,
		SkRegion::Op op);