Mozart: The great RectF-ication.

services/gfx/compositor/graph/node_def.cc

 // 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.
 
 #include "services/gfx/compositor/graph/node_def.h"
 
 #include <ostream>
 
 #include "base/logging.h"
 #include "mojo/services/gfx/composition/cpp/formatting.h"
@@ skipping 22 matching lines @@
 }
 
 bool Contains(const SkRect& bounds, const SkPoint& point) {
   return point.x() >= bounds.left() && point.x() < bounds.right() &&
          point.y() >= bounds.top() && point.y() < bounds.bottom();
 }
 }  // namespace
 
 NodeDef::NodeDef(uint32_t node_id,
                  mojo::TransformPtr content_transform,
-                 mojo::RectPtr content_clip,
+                 mojo::RectFPtr content_clip,
                  mojo::gfx::composition::HitTestBehaviorPtr hit_test_behavior,
                  Combinator combinator,
                  const std::vector<uint32_t>& child_node_ids)
     : node_id_(node_id),
       content_transform_(content_transform.Pass()),
       content_clip_(content_clip.Pass()),
       hit_test_behavior_(hit_test_behavior.Pass()),
       combinator_(combinator),
       child_node_ids_(child_node_ids) {}
 
@@ skipping 270 matching lines @@
   hit->get_node()->transform =
       mojo::ConvertTo<mojo::TransformPtr>(global_to_local_transform);
   hits->push_back(hit.Pass());
   return hit_test_behavior_->visibility ==
          mojo::gfx::composition::HitTestBehavior::Visibility::OPAQUE;
 }
 
 RectNodeDef::RectNodeDef(
     uint32_t node_id,
     mojo::TransformPtr content_transform,
-    mojo::RectPtr content_clip,
+    mojo::RectFPtr content_clip,
     mojo::gfx::composition::HitTestBehaviorPtr hit_test_behavior,
     Combinator combinator,
     const std::vector<uint32_t>& child_node_ids,
-    const mojo::Rect& content_rect,
+    const mojo::RectF& content_rect,
     const mojo::gfx::composition::Color& color)
     : NodeDef(node_id,
               content_transform.Pass(),
               content_clip.Pass(),
               hit_test_behavior.Pass(),
               combinator,
               child_node_ids),
       content_rect_(content_rect),
       color_(color) {}
 
 RectNodeDef::~RectNodeDef() {}
 
 void RectNodeDef::RecordPictureInner(const SceneContent* content,
                                      const Snapshot* snapshot,
                                      SkCanvas* canvas) const {
   DCHECK(content);
   DCHECK(snapshot);
   DCHECK(canvas);
 
   SkPaint paint;
   paint.setColor(MakeSkColor(color_));
   canvas->drawRect(content_rect_.To<SkRect>(), paint);
 
   NodeDef::RecordPictureInner(content, snapshot, canvas);
 }
 
 ImageNodeDef::ImageNodeDef(
     uint32_t node_id,
     mojo::TransformPtr content_transform,
-    mojo::RectPtr content_clip,
+    mojo::RectFPtr content_clip,
     mojo::gfx::composition::HitTestBehaviorPtr hit_test_behavior,
     Combinator combinator,
     const std::vector<uint32_t>& child_node_ids,
-    const mojo::Rect& content_rect,
-    mojo::RectPtr image_rect,
+    const mojo::RectF& content_rect,
+    mojo::RectFPtr image_rect,
     uint32 image_resource_id,
     mojo::gfx::composition::BlendPtr blend)
     : NodeDef(node_id,
               content_transform.Pass(),
               content_clip.Pass(),
               hit_test_behavior.Pass(),
               combinator,
               child_node_ids),
       content_rect_(content_rect),
       image_rect_(image_rect.Pass()),
@@ skipping 30 matching lines @@
                             : SkRect::MakeWH(image_resource->image()->width(),
                                              image_resource->image()->height()),
                         content_rect_.To<SkRect>(), &paint);
 
   NodeDef::RecordPictureInner(content, snapshot, canvas);
 }
 
 SceneNodeDef::SceneNodeDef(
     uint32_t node_id,
     mojo::TransformPtr content_transform,
-    mojo::RectPtr content_clip,
+    mojo::RectFPtr content_clip,
     mojo::gfx::composition::HitTestBehaviorPtr hit_test_behavior,
     Combinator combinator,
     const std::vector<uint32_t>& child_node_ids,
     uint32_t scene_resource_id,
     uint32_t scene_version)
     : NodeDef(node_id,
               content_transform.Pass(),
               content_clip.Pass(),
               hit_test_behavior.Pass(),
               combinator,
@@ skipping 78 matching lines @@
     auto hit = mojo::gfx::composition::Hit::New();
     hit->set_scene(scene_hit.Pass());
     hits->push_back(hit.Pass());
   }
   return opaque;
 }
 
 LayerNodeDef::LayerNodeDef(
     uint32_t node_id,
     mojo::TransformPtr content_transform,
-    mojo::RectPtr content_clip,
+    mojo::RectFPtr content_clip,
     mojo::gfx::composition::HitTestBehaviorPtr hit_test_behavior,
     Combinator combinator,
     const std::vector<uint32_t>& child_node_ids,
-    const mojo::Size& size,
+    const mojo::RectF& layer_rect,
     mojo::gfx::composition::BlendPtr blend)
     : NodeDef(node_id,
               content_transform.Pass(),
               content_clip.Pass(),
               hit_test_behavior.Pass(),
               combinator,
               child_node_ids),
-      size_(size),
+      layer_rect_(layer_rect),
       blend_(blend.Pass()) {}
 
 LayerNodeDef::~LayerNodeDef() {}
 
 void LayerNodeDef::RecordPictureInner(const SceneContent* content,
                                       const Snapshot* snapshot,
                                       SkCanvas* canvas) const {
   DCHECK(content);
   DCHECK(snapshot);
   DCHECK(canvas);
 
   SkPaint paint;
   SetPaintForBlend(&paint, blend_.get());
 
-  canvas->saveLayer(SkRect::MakeWH(size_.width, size_.height), &paint);
+  canvas->saveLayer(layer_rect_.To<SkRect>(), &paint);
   NodeDef::RecordPictureInner(content, snapshot, canvas);
   canvas->restore();
 }
 
 }  // namespace compositor