Merge "use new clipbounds api" (f54c7639) · Commits · e / os / android_frameworks_base

libs/hwui/SkiaCanvas.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -367,7 +367,7 @@ void SkiaCanvas::translate(float dx, float dy) {
		// (see https://code.google.com/p/skia/issues/detail?id=1303)
		bool SkiaCanvas::getClipBounds(SkRect* outRect) const {
		SkIRect ibounds;
		if (!mCanvas->getClipDeviceBounds(&ibounds)) {
		if (!mCanvas->getDeviceClipBounds(&ibounds)) {
		return false;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,7 @@ void GLFunctorDrawable::onDraw(SkCanvas* canvas) {
		SkImageInfo canvasInfo = canvas->imageInfo();
		SkMatrix44 mat4(canvas->getTotalMatrix());

		SkIRect ibounds;
		canvas->getClipDeviceBounds(&ibounds);
		SkIRect ibounds = canvas->getDeviceClipBounds();

		DrawGlInfo info;
		info.clipLeft = ibounds.fLeft;

+4 −4

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@ class GLFunctorDrawable : public SkDrawable {
		public:
		GLFunctorDrawable(Functor* functor, GlFunctorLifecycleListener* listener, SkCanvas* canvas)
		: mFunctor(functor)
		, mListener(listener) {
		canvas->getClipBounds(&mBounds);
		}
		, mListener(listener)
		, mBounds(canvas->getLocalClipBounds())
		{}
		virtual ~GLFunctorDrawable();

		void syncFunctor() const;
		@@ -51,7 +51,7 @@ public:
		private:
		Functor* mFunctor;
		sp<GlFunctorLifecycleListener> mListener;
		SkRect mBounds;
		const SkRect mBounds;
		};

		}; // namespace skiapipeline

+1 −3

Original line number	Diff line number	Diff line
		@@ -193,9 +193,7 @@ SkColor TestUtils::getColor(const sk_sp<SkSurface>& surface, int x, int y) {
		}

		SkRect TestUtils::getClipBounds(const SkCanvas* canvas) {
		SkIRect bounds;
		(void)canvas->getClipDeviceBounds(&bounds);
		return SkRect::Make(bounds);
		return SkRect::Make(canvas->getDeviceClipBounds());
		}

		SkRect TestUtils::getLocalClipBounds(const SkCanvas* canvas) {