Implement initial ClipRect....

gfx/canvas_direct2d.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GFX_CANVAS_DIRECT2D_H_
 #define GFX_CANVAS_DIRECT2D_H_
 
 #include <d2d1.h>
 
 #include <stack>
@@ skipping 10 matching lines @@
   virtual ~CanvasDirect2D();
 
   // Retrieves the application's D2D1 Factory.
   static ID2D1Factory* GetD2D1Factory();
 
   // Overridden from Canvas:
   virtual void Save();
   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,
                            const SkPaint& paint);
   virtual void FillRectInt(const SkColor& color, int x, int y, int w,
                            int h);
   virtual void DrawRectInt(const SkColor& color, int x, int y, int w,
                            int h);
   virtual void DrawRectInt(const SkColor& color, int x, int y, int w, int h,
                            SkXfermode::Mode mode);
@@ skipping 21 matching lines @@
   virtual void DrawFocusRect(int x, int y, int width, int height);
   virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
   virtual void TileImageInt(const SkBitmap& bitmap, int src_x, int src_y,
                             int dest_x, int dest_y, int w, int h);
   virtual gfx::NativeDrawingContext BeginPlatformPaint();
   virtual void EndPlatformPaint();
   virtual CanvasSkia* AsCanvasSkia();
   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);
 };
 
 }  // namespace gfx;
 
 #endif  // GFX_CANVAS_DIRECT2D_H_