Revert "Added crop rect to LayerDrawable to not crop TextureView..."
Revert "Adds out parameters for crop rectangle and transform"
Revert "Add test to crop TextureView and verify if outer edge ha..."
Revert submission 15339442-1texelcrop
Reason for revert: Bisection identified these CLs as the likely cause of Droidfood blocking bugs b/195620803 and b/195637414
Bug: 195637414
Bug: 195620803
Reverted Changes:
If1f448a94:Added crop rect to LayerDrawable to not crop Textu...
Iefde6bdf7:Add test to crop TextureView and verify if outer e...
Icf0ee20e8:Adds out parameters for crop rectangle and transfo...
Change-Id: I3448ebe193f25de79d186ae705911d99da2cef2b
diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h
index 656a817..e99e762 100644
--- a/libs/hwui/Layer.h
+++ b/libs/hwui/Layer.h
@@ -74,18 +74,10 @@
void setColorFilter(sk_sp<SkColorFilter> filter) { mColorFilter = filter; };
+ inline SkMatrix& getTexTransform() { return texTransform; }
+
inline SkMatrix& getTransform() { return transform; }
- inline SkRect getCropRect() { return mCropRect; }
-
- inline void setCropRect(const SkRect cropRect) { mCropRect = cropRect; }
-
- inline void setTextureTransform(uint32_t textureTransform) {
- mTextureTransform = textureTransform;
- }
-
- inline uint32_t getTextureTransform() { return mTextureTransform; }
-
/**
* Posts a decStrong call to the appropriate thread.
* Thread-safe.
@@ -124,21 +116,16 @@
SkBlendMode mode;
/**
+ * Optional texture coordinates transform.
+ */
+ SkMatrix texTransform;
+
+ /**
* Optional transform.
*/
SkMatrix transform;
/**
- * Optional crop
- */
- SkRect mCropRect;
-
- /**
- * Optional transform
- */
- uint32_t mTextureTransform;
-
- /**
* An image backing the layer.
*/
sk_sp<SkImage> layerImage;