Rename paint data structures

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 <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "cc/paint/paint_recorder.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 class DisplayItemList;
 }
 
-class SkPictureRecorder;
-
 namespace ui {
 class ClipRecorder;
 class CompositingRecorder;
 class PaintRecorder;
 class TransformRecorder;
 
 class COMPOSITOR_EXPORT PaintContext {
  public:
   // Construct a PaintContext that may only re-paint the area in the
   // |invalidation|.
@@ skipping 48 matching lines @@
   friend class PaintCache;
 
   // Returns a rect with the given size in the space of the context's
   // containing layer.
   gfx::Rect ToLayerSpaceBounds(const gfx::Size& size_in_context) const;
 
   // Returns the given rect translated by the layer space offset.
   gfx::Rect ToLayerSpaceRect(const gfx::Rect& rect) const;
 
   cc::DisplayItemList* list_;
-  std::unique_ptr<SkPictureRecorder> owned_recorder_;
+  std::unique_ptr<cc::PaintRecorder> 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_;
+  cc::PaintRecorder* recorder_;
   // The device scale of the frame being painted. Used to determine which bitmap
   // resources to use in the frame.
   float device_scale_factor_;
   // Invalidation in the space of the paint root (ie the space of the layer
   // backing the paint taking place).
   gfx::Rect invalidation_;
   // Offset from the PaintContext to the space of the paint root and the
   // |invalidation_|.
   gfx::Vector2d offset_;
 
 #if DCHECK_IS_ON()
   // Used to verify that the |invalidation_| is only used to compare against
   // rects in the same space.
   mutable void* root_visited_;
   // Used to verify that paint recorders are not nested. True while a paint
   // recorder is active.
   mutable bool inside_paint_recorder_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PaintContext);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_PAINT_CONTEXT_H_