Revert "Fix for saveLayer() with filters vs. the BBox Hierarchy." and

src/core/SkBBoxRecord.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBBoxRecord_DEFINED
 #define SkBBoxRecord_DEFINED
 
 #include "SkPictureRecord.h"
-#include "SkTDStack.h"
 
 /**
   * This is an abstract SkPictureRecord subclass that intercepts draw calls and computes an
   * axis-aligned bounding box for each draw that it sees, subclasses implement handleBBox()
   * which will be called every time we get a new bounding box.
   */
 class SkBBoxRecord : public SkPictureRecord {
 public:
 
     SkBBoxRecord(const SkISize& size, uint32_t recordFlags)
         : INHERITED(size, recordFlags) {
     }
-    virtual ~SkBBoxRecord();
+    virtual ~SkBBoxRecord() { }
 
     /**
      * This is called each time we get a bounding box, it will be axis-aligned,
      * in device coordinates, and expanded to include stroking, shadows, etc.
      */
     virtual void handleBBox(const SkRect& bbox) = 0;
 
     virtual void drawOval(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE;
@@ skipping 23 matching lines @@
     virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
     virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
                             const SkPaint&) SK_OVERRIDE;
     virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
                                const SkPaint&) SK_OVERRIDE;
     virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
                                 SkScalar constY, const SkPaint&) SK_OVERRIDE;
     virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
                                   const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE;
     virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE;
-    virtual void willSave() SK_OVERRIDE;
-    virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void willRestore() SK_OVERRIDE;
 
 private:
     /**
      * Takes a bounding box in current canvas view space, accounts for stroking and effects, and
      * computes an axis-aligned bounding box in device coordinates, then passes it to handleBBox()
      * returns false if the draw is completely clipped out, and may safely be ignored.
      **/
     bool transformBounds(const SkRect& bounds, const SkPaint* paint);
 
-    /**
-     * Paints from currently-active saveLayers that need to be applied to bounding boxes of all
-     * primitives drawn inside them. We own these pointers.
-     **/
-    SkTDStack<const SkPaint*> fSaveStack;
-
     typedef SkPictureRecord INHERITED;
 };
 
 #endif