1 files changed, 2 insertions, 65 deletions

diff --git a/libs/hwui/Snapshot.h b/libs/hwui/Snapshot.h
index d8f926ef3925..4ab58302df8f 100644
--- a/libs/hwui/Snapshot.h
+++ b/libs/hwui/Snapshot.h
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_HWUI_SNAPSHOT_H
-#define ANDROID_HWUI_SNAPSHOT_H
+#pragma once
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ -63,18 +62,6 @@ public:
     float radius;
 };
 
-// TODO: remove for HWUI_NEW_OPS
-class ProjectionPathMask {
-public:
-    static void* operator new(size_t size) = delete;
-    static void* operator new(size_t size, LinearAllocator& allocator) {
-        return allocator.alloc<ProjectionPathMask>(size);
-    }
-
-    const SkPath* projectionMask;
-    Matrix4 projectionMaskTransform;
-};
-
 /**
  * A snapshot holds information about the current state of the rendering
  * surface. A snapshot is usually created whenever the user calls save()
@@ -113,11 +100,6 @@ public:
          * restored when this snapshot is restored.
          */
         kFlagIsFboLayer = 0x4,
-        /**
-         * Indicates that this snapshot or an ancestor snapshot is
-         * an FBO layer.
-         */
-        kFlagFboTarget = 0x8, // TODO: remove for HWUI_NEW_OPS
     };
 
     /**
@@ -179,11 +161,6 @@ public:
      */
     void resetClip(float left, float top, float right, float bottom);
 
-    /**
-     * Resets the current transform to a pure 3D translation.
-     */
-    void resetTransform(float x, float y, float z);
-
     void initializeViewport(int width, int height) {
         mViewportData.initialize(width, height);
         mClipAreaRoot.setViewportDimensions(width, height);
@@ -207,13 +184,7 @@ public:
     /**
      * Sets (and replaces) the current projection mask
      */
-    void setProjectionPathMask(LinearAllocator& allocator, const SkPath* path);
-
-    /**
-     * Indicates whether this snapshot should be ignored. A snapshot
-     * is typically ignored if its layer is invisible or empty.
-     */
-    bool isIgnored() const;
+    void setProjectionPathMask(const SkPath* path);
 
     /**
      * Indicates whether the current transform has perspective components.
@@ -221,13 +192,6 @@ public:
     bool hasPerspectiveTransform() const;
 
     /**
-     * Fills outTransform with the current, total transform to screen space,
-     * across layer boundaries.
-     */
-    // TODO: remove for HWUI_NEW_OPS
-    void buildScreenSpaceTransform(Matrix4* outTransform) const;
-
-    /**
      * Dirty flags.
      */
     int flags;
@@ -251,19 +215,6 @@ public:
     GLuint fbo;
 
     /**
-     * Indicates that this snapshot is invisible and nothing should be drawn
-     * inside it. This flag is set only when the layer clips drawing to its
-     * bounds and is passed to subsequent snapshots.
-     */
-    bool invisible;
-
-    /**
-     * If set to true, the layer will not be composited. This is similar to
-     * invisible but this flag is not passed to subsequent snapshots.
-     */
-    bool empty;
-
-    /**
      * Local transformation. Holds the current translation, scale and
      * rotation values.
      *
@@ -273,14 +224,6 @@ public:
     mat4* transform;
 
     /**
-     * The ancestor layer's dirty region.
-     *
-     * This is a reference to a region owned by a layer. This pointer must
-     * not be freed.
-     */
-    Region* region;
-
-    /**
      * Current alpha value. This value is 1 by default, but may be set by a DisplayList which
      * has translucent rendering in a non-overlapping View. This value will be used by
      * the renderer to set the alpha in the current color being used for ensuing drawing
@@ -302,11 +245,7 @@ public:
     /**
      * Current projection masking path - used exclusively to mask projected, tessellated circles.
      */
-#if HWUI_NEW_OPS
     const SkPath* projectionPathMask;
-#else
-    const ProjectionPathMask* projectionPathMask;
-#endif
 
     void dump() const;
 
@@ -345,5 +284,3 @@ private:
 
 }; // namespace uirenderer
 }; // namespace android
-
-#endif // ANDROID_HWUI_SNAPSHOT_H