Mozart: Compute hits using 4x4 matrix.

services/gfx/compositor/graph/scene_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/scene_def.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/services/gfx/composition/cpp/formatting.h"
+#include "mojo/skia/type_converters.h"
 #include "services/gfx/compositor/graph/scene_content.h"
+#include "services/gfx/compositor/graph/transform_pair.h"
 #include "services/gfx/compositor/render/render_image.h"
 
 namespace compositor {
 
 namespace {
 // TODO(jeffbrown): Determine and document a more appropriate size limit
 // for transferred images as part of the image pipe abstraction instead.
 const int32_t kMaxTextureWidth = 65536;
 const int32_t kMaxTextureHeight = 65536;
 
@@ skipping 189 matching lines @@
   err << "Unsupported resource type: resource_id=" << resource_id;
   return nullptr;
 }
 
 scoped_refptr<const NodeDef> SceneDef::CreateNode(
     uint32_t node_id,
     mojo::gfx::composition::NodePtr node_decl,
     std::ostream& err) {
   DCHECK(node_decl);
 
-  mojo::TransformPtr content_transform = node_decl->content_transform.Pass();
+  std::unique_ptr<TransformPair> content_transform;
+  if (node_decl->content_transform) {
+    content_transform.reset(
+        new TransformPair(node_decl->content_transform.To<SkMatrix44>()));
+  }
   mojo::RectFPtr content_clip = node_decl->content_clip.Pass();
   mojo::gfx::composition::HitTestBehaviorPtr hit_test_behavior =
       node_decl->hit_test_behavior.Pass();
   const mojo::gfx::composition::Node::Combinator combinator =
       node_decl->combinator;
   const std::vector<uint32_t>& child_node_ids =
       node_decl->child_node_ids.storage();
 
   if (!node_decl->op) {
-    return new NodeDef(node_id, content_transform.Pass(), content_clip.Pass(),
-                       hit_test_behavior.Pass(), combinator, child_node_ids);
+    return new NodeDef(node_id, std::move(content_transform),
+                       content_clip.Pass(), hit_test_behavior.Pass(),
+                       combinator, child_node_ids);
   }
 
   if (node_decl->op->is_rect()) {
     auto& rect_node_decl = node_decl->op->get_rect();
     DCHECK(rect_node_decl->content_rect);
     DCHECK(rect_node_decl->color);
 
     const mojo::RectF& content_rect = *rect_node_decl->content_rect;
     const mojo::gfx::composition::Color& color = *rect_node_decl->color;
-    return new RectNodeDef(node_id, content_transform.Pass(),
+    return new RectNodeDef(node_id, std::move(content_transform),
                            content_clip.Pass(), hit_test_behavior.Pass(),
                            combinator, child_node_ids, content_rect, color);
   }
 
   if (node_decl->op->is_image()) {
     auto& image_node_decl = node_decl->op->get_image();
     DCHECK(image_node_decl->content_rect);
 
     const mojo::RectF& content_rect = *image_node_decl->content_rect;
     mojo::RectFPtr image_rect = image_node_decl->image_rect.Pass();
     const uint32 image_resource_id = image_node_decl->image_resource_id;
     mojo::gfx::composition::BlendPtr blend = image_node_decl->blend.Pass();
-    return new ImageNodeDef(node_id, content_transform.Pass(),
+    return new ImageNodeDef(node_id, std::move(content_transform),
                             content_clip.Pass(), hit_test_behavior.Pass(),
                             combinator, child_node_ids, content_rect,
                             image_rect.Pass(), image_resource_id, blend.Pass());
   }
 
   if (node_decl->op->is_scene()) {
     auto& scene_node_decl = node_decl->op->get_scene();
 
     const uint32_t scene_resource_id = scene_node_decl->scene_resource_id;
     const uint32_t scene_version = scene_node_decl->scene_version;
-    return new SceneNodeDef(node_id, content_transform.Pass(),
+    return new SceneNodeDef(node_id, std::move(content_transform),
                             content_clip.Pass(), hit_test_behavior.Pass(),
                             combinator, child_node_ids, scene_resource_id,
                             scene_version);
   }
 
   if (node_decl->op->is_layer()) {
     auto& layer_node_decl = node_decl->op->get_layer();
     DCHECK(layer_node_decl->layer_rect);
 
     const mojo::RectF& layer_rect = *layer_node_decl->layer_rect;
     mojo::gfx::composition::BlendPtr blend = layer_node_decl->blend.Pass();
-    return new LayerNodeDef(node_id, content_transform.Pass(),
+    return new LayerNodeDef(node_id, std::move(content_transform),
                             content_clip.Pass(), hit_test_behavior.Pass(),
                             combinator, child_node_ids, layer_rect,
                             blend.Pass());
   }
 
   err << "Unsupported node op type: node_id=" << node_id
       << ", node_op=" << node_decl->op;
   return nullptr;
 }
 
@@ skipping 22 matching lines @@
 
 SceneDef::Publication::Publication(
     mojo::gfx::composition::SceneMetadataPtr metadata)
     : metadata(metadata.Pass()) {
   DCHECK(this->metadata);
 }
 
 SceneDef::Publication::~Publication() {}
 
 }  // namespace compositor