Make View::Paint use ui::PaintRecorder to access PaintContext's canvas

ui/views/view.cc

 // Copyright (c) 2012 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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/compositor/clip_transform_recorder.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/paint_context.h"
+#include "ui/compositor/paint_recorder.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point3_f.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
@@ skipping 730 matching lines @@
 #endif
 
     // If the View wasn't invalidated, don't waste time painting it, the output
     // would be culled.
     if (!context.IsRectInvalidated(GetLocalBounds()))
       return;
   }
 
   TRACE_EVENT1("views", "View::Paint", "class", GetClassName());
 
-  gfx::Canvas* canvas = context.canvas();
-  gfx::ScopedCanvas scoped_canvas(canvas);
-
   // If the view is backed by a layer, it should paint with itself as the origin
   // rather than relative to its parent.
+  scoped_ptr<ui::ClipTransformRecorder> clip_transform_recorder;
   if (!layer()) {
     // Set the clip rect to the bounds of this View. Note that the X (or left)
     // position we pass to ClipRect takes into consideration whether or not the
     // View uses a right-to-left layout so that we paint the View in its
     // mirrored position if need be.
-    gfx::Rect clip_rect = bounds();
-    clip_rect.Inset(clip_insets_);
+    gfx::Rect clip_rect_in_parent = bounds();
+    clip_rect_in_parent.Inset(clip_insets_);
     if (parent_)
-      clip_rect.set_x(parent_->GetMirroredXForRect(clip_rect));
-    canvas->ClipRect(clip_rect);
+      clip_rect_in_parent.set_x(
+          parent_->GetMirroredXForRect(clip_rect_in_parent));
 
     // Translate the graphics such that 0,0 corresponds to where
     // this View is located relative to its parent.
-    canvas->Translate(GetMirroredPosition().OffsetFromOrigin());
-    canvas->Transform(GetTransform());
+    gfx::Transform transform_from_parent;
+    gfx::Vector2d offset_from_parent = GetMirroredPosition().OffsetFromOrigin();
+    transform_from_parent.Translate(offset_from_parent.x(),
+                                    offset_from_parent.y());
+    transform_from_parent.PreconcatTransform(GetTransform());
+
+    clip_transform_recorder = make_scoped_ptr(new ui::ClipTransformRecorder(
+        context, clip_rect_in_parent, transform_from_parent));
   }
 
   {
+    ui::PaintRecorder recorder(context);
+    gfx::Canvas* canvas = recorder.canvas();
+    gfx::ScopedCanvas scoped_canvas(canvas);
+
     // If the View we are about to paint requested the canvas to be flipped, we
     // should change the transform appropriately.
     // The canvas mirroring is undone once the View is done painting so that we
     // don't pass the canvas with the mirrored transform to Views that didn't
     // request the canvas to be flipped.
-    gfx::ScopedCanvas scoped(canvas);
     if (FlipCanvasOnPaintForRTLUI()) {
       canvas->Translate(gfx::Vector2d(width(), 0));
       canvas->Scale(-1, 1);
     }
 
     // Delegate painting the contents of the View to the virtual OnPaint method.
     OnPaint(canvas);
   }
 
+  // View::Paint() recursion over the subtree.
   PaintChildren(context);
 }
 
 void View::set_background(Background* b) {
   background_.reset(b);
 }
 
 void View::SetBorder(scoped_ptr<Border> b) { border_ = b.Pass(); }
 
 ui::ThemeProvider* View::GetThemeProvider() const {
@@ skipping 1531 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views