Split ClipTransformRecorder into {Clip,Transform}Recorder.

ui/compositor/paint_context.h

 // Copyright 2015 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 UI_COMPOSITOR_PAINT_CONTEXT_H_
 #define UI_COMPOSITOR_PAINT_CONTEXT_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 class DisplayItemList;
 }
 
 namespace gfx {
 class Canvas;
 }
 
 class SkPictureRecorder;
 
 namespace ui {
-class ClipTransformRecorder;
+class ClipRecorder;

[danakj, 2015/11/23 23:20:30]

forward declare TransformRecorder too

[wkorman, 2015/11/23 23:38:08]

Done.

 class CompositingRecorder;
 class PaintRecorder;
 
 class COMPOSITOR_EXPORT PaintContext {
  public:
   // Construct a PaintContext that may only re-paint the area in the
   // |invalidation|.
   PaintContext(cc::DisplayItemList* list,
                float device_scale_factor,
                const gfx::Rect& invalidation);
@@ skipping 29 matching lines @@
   void* RootVisited() const { return root_visited_; }
   const gfx::Vector2d& PaintOffset() const { return offset_; }
 #endif
 
   const gfx::Rect& InvalidationForTesting() const { return invalidation_; }
 
  private:
   // The Recorder classes need access to the internal canvas and friends, but we
   // don't want to expose them on this class so that people must go through the
   // recorders to access them.
-  friend class ClipTransformRecorder;
+  friend class ClipRecorder;
   friend class CompositingRecorder;
   friend class PaintRecorder;
+  friend class TransformRecorder;
   // The Cache class also needs to access the DisplayItemList to append its
   // cache contents.
   friend class PaintCache;
 
   cc::DisplayItemList* list_;
   scoped_ptr<SkPictureRecorder> owned_recorder_;
   // A pointer to the |owned_recorder_| in this PaintContext, or in another one
   // which this was copied from. We expect a copied-from PaintContext to outlive
   // copies made from it.
   SkPictureRecorder* recorder_;
@@ skipping 15 matching lines @@
   // recorder is active.
   mutable bool inside_paint_recorder_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PaintContext);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_PAINT_CONTEXT_H_