add inherit-from-root-transform flag (for fixed-positioning)
git-svn-id: http://skia.googlecode.com/svn/trunk@532 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/utils/SkLayer.h b/include/utils/SkLayer.h
index c8dea48..c42261f 100644
--- a/include/utils/SkLayer.h
+++ b/include/utils/SkLayer.h
@@ -34,6 +34,7 @@
SkLayer(const SkLayer&);
virtual ~SkLayer();
+ bool isInheritFromRootTransform() const;
SkScalar getOpacity() const { return m_opacity; }
const SkSize& getSize() const { return m_size; }
const SkPoint& getPosition() const { return m_position; }
@@ -44,6 +45,7 @@
SkScalar getWidth() const { return m_size.width(); }
SkScalar getHeight() const { return m_size.height(); }
+ void setInheritFromRootTransform(bool);
void setOpacity(SkScalar opacity) { m_opacity = opacity; }
void setSize(SkScalar w, SkScalar h) { m_size.set(w, h); }
void setPosition(SkScalar x, SkScalar y) { m_position.set(x, y); }
@@ -68,10 +70,10 @@
*/
SkLayer* addChild(SkLayer* child);
- /** Remove this layer from our child list, and unref() it and return true.
- If it is not in our child list, do nothing and return false.
+ /** Remove this layer from its parent's list (or do nothing if it has no
+ parent.) If it had a parent, then unref() is called.
*/
- bool removeChild(SkLayer* child);
+ void detachFromParent();
/** Remove, and unref(), all of the layers in our child list.
*/
@@ -112,6 +114,10 @@
virtual void onDraw(SkCanvas*, SkScalar opacity);
private:
+ enum Flags {
+ kInheritFromRootTransform_Flag = 0x01
+ };
+
SkLayer* fParent;
SkScalar m_opacity;
SkSize m_size;
@@ -119,6 +125,7 @@
SkPoint m_anchorPoint;
SkMatrix fMatrix;
SkMatrix fChildrenMatrix;
+ uint32_t fFlags;
SkTDArray<SkLayer*> m_children;
};