Split ClipTransformRecorder into {Clip,Transform}Recorder.

ui/views/view.cc

Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 46bb7be9d230e22aa84dff30ff9952cc16e9fbdf..42707b3fbadef54fd1079e6d6bb1f0757825822c 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -20,13 +20,14 @@
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/ime/input_method.h"
-#include "ui/compositor/clip_transform_recorder.h"
+#include "ui/compositor/clip_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/compositor/transform_recorder.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point3_f.h"
@@ -778,7 +779,8 @@ void View::Paint(const ui::PaintContext& parent_context) {
 
   // If the view is backed by a layer, it should paint with itself as the origin
   // rather than relative to its parent.
-  ui::ClipTransformRecorder clip_transform_recorder(context);
+  ui::ClipRecorder clip_recorder(context);
+  ui::TransformRecorder transform_recorder(context);
   if (!layer()) {

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

can you refactor this just slightly. it's important now that they are
constructed in the same order that the calls inside this block are made, which
isn't very obvious and could be messed up in the future. I suggest

// If the view is bac....
bool paint_relative_to_parent = !layer();

ui::ClipRecorder ...;
if (paint_relative_to_parent) {
  .. clip_recorder.ClipRect();
}

ui::TransformRecorder ...;
if (paint_relative_to_parent) {
  .. transform_recorder.Transform();
}

ie 2 blocks one for each RAII object.
}

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

Done.

     // 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
@@ -789,7 +791,7 @@ void View::Paint(const ui::PaintContext& parent_context) {
     if (parent_)
       clip_rect_in_parent.set_x(
           parent_->GetMirroredXForRect(clip_rect_in_parent));
-    clip_transform_recorder.ClipRect(clip_rect_in_parent);
+    clip_recorder.ClipRect(clip_rect_in_parent);
 
     // Translate the graphics such that 0,0 corresponds to where
     // this View is located relative to its parent.
@@ -798,7 +800,7 @@ void View::Paint(const ui::PaintContext& parent_context) {
     transform_from_parent.Translate(offset_from_parent.x(),
                                     offset_from_parent.y());
     transform_from_parent.PreconcatTransform(GetTransform());
-    clip_transform_recorder.Transform(transform_from_parent);
+    transform_recorder.Transform(transform_from_parent);
   }
 
   if (is_invalidated || !paint_cache_.UseCache(context)) {