Implement initial ClipRect.

Move IntersectsClipRectInt and GetClipRect functions to CanvasSkia private, since they are only used internally.

BUG=none
TEST=see unittest.

Review URL: http://codereview.chromium.org/2959014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53218 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 3 deletions

diff --git a/gfx/canvas_direct2d.h b/gfx/canvas_direct2d.h
index f4bc143..26c3f87 100644
--- a/gfx/canvas_direct2d.h
+++ b/gfx/canvas_direct2d.h
@@ -28,9 +28,7 @@ class CanvasDirect2D : public Canvas {
   virtual void SaveLayerAlpha(uint8 alpha);
   virtual void SaveLayerAlpha(uint8 alpha, const gfx::Rect& layer_bounds);
   virtual void Restore();
-  virtual bool GetClipRect(gfx::Rect* clip_rect);
   virtual bool ClipRectInt(int x, int y, int w, int h);
-  virtual bool IntersectsClipRectInt(int x, int y, int w, int h);
   virtual void TranslateInt(int x, int y);
   virtual void ScaleInt(int x, int y);
   virtual void FillRectInt(int x, int y, int w, int h,
@@ -72,11 +70,28 @@ class CanvasDirect2D : public Canvas {
   virtual const CanvasSkia* AsCanvasSkia() const;
 
  private:
+  void SaveInternal(ID2D1Layer* layer);
+
   ID2D1RenderTarget* rt_;
   ScopedComPtr<ID2D1GdiInteropRenderTarget> interop_rt_;
   ScopedComPtr<ID2D1DrawingStateBlock> drawing_state_block_;
   static ID2D1Factory* d2d1_factory_;
-  std::stack<ID2D1Layer*> layers_;
+
+  // Every time Save* is called, a RenderState object is pushed onto the
+  // RenderState stack.
+  struct RenderState {
+    explicit RenderState(ID2D1Layer* layer) : layer(layer), clip_count(0) {}
+    RenderState() : layer(NULL), clip_count(0) {}
+
+    // A D2D layer associated with this state, or NULL if there is no layer.
+    // The layer is created and owned by the Canvas.
+    ID2D1Layer* layer;
+    // The number of clip operations performed. This is used to balance calls to
+    // PushAxisAlignedClip with calls to PopAxisAlignedClip when Restore() is
+    // called.
+    int clip_count;
+  };
+  std::stack<RenderState> state_;
 
   DISALLOW_COPY_AND_ASSIGN(CanvasDirect2D);
 };