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

1 files changed, 6 insertions, 19 deletions

diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h
index 656a81783716..e99e76299317 100644
--- a/libs/hwui/Layer.h
+++ b/libs/hwui/Layer.h
@@ -74,17 +74,9 @@ public:
 
     void setColorFilter(sk_sp<SkColorFilter> filter) { mColorFilter = filter; };
 
-    inline SkMatrix& getTransform() { return transform; }
-
-    inline SkRect getCropRect() { return mCropRect; }
+    inline SkMatrix& getTexTransform() { return texTransform; }
 
-    inline void setCropRect(const SkRect cropRect) { mCropRect = cropRect; }
-
-    inline void setTextureTransform(uint32_t textureTransform) {
-        mTextureTransform = textureTransform;
-    }
-
-    inline uint32_t getTextureTransform() { return mTextureTransform; }
+    inline SkMatrix& getTransform() { return transform; }
 
     /**
      * Posts a decStrong call to the appropriate thread.
@@ -124,19 +116,14 @@ private:
     SkBlendMode mode;
 
     /**
-     * Optional transform.
+     * Optional texture coordinates transform.
      */
-    SkMatrix transform;
-
-    /**
-     * Optional crop
-     */
-    SkRect mCropRect;
+    SkMatrix texTransform;
 
     /**
-     * Optional transform
+     * Optional transform.
      */
-    uint32_t mTextureTransform;
+    SkMatrix transform;
 
     /**
      * An image backing the layer.