Update from https://crrev.com/308996

cc/layers/layer.cc

Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 08f39b9a21d6d67805fef6150237b57f3c51f810..7c0341b28f0b237e8ad82fdf3db186b9249989ba 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -49,6 +49,9 @@ Layer::Layer()
       layer_tree_host_(nullptr),
       scroll_clip_layer_id_(INVALID_ID),
       num_descendants_that_draw_content_(0),
+      transform_tree_index_(-1),
+      opacity_tree_index_(-1),
+      clip_tree_index_(-1),
       should_scroll_on_main_thread_(false),
       have_wheel_event_handlers_(false),
       have_scroll_event_handlers_(false),
@@ -67,6 +70,7 @@ Layer::Layer()
       draw_checkerboard_for_missing_tiles_(false),
       force_render_surface_(false),
       transform_is_invertible_(true),
+      has_render_surface_(false),
       background_color_(0),
       opacity_(1.f),
       blend_mode_(SkXfermode::kSrcOver_Mode),
@@ -1241,4 +1245,30 @@ bool Layer::HasDelegatedContent() const {
   return false;
 }
 
+gfx::Transform Layer::screen_space_transform_from_property_trees(
+    const TransformTree& tree) const {
+  gfx::Transform xform(1, 0, 0, 1, offset_to_transform_parent().x(),
+                       offset_to_transform_parent().y());
+  if (transform_tree_index() >= 0) {
+    gfx::Transform ssxform = tree.Node(transform_tree_index())->data.to_screen;
+    xform.ConcatTransform(ssxform);
+  }
+  xform.Scale(1.0 / contents_scale_x(), 1.0 / contents_scale_y());
+  return xform;
+}
+
+gfx::Transform Layer::draw_transform_from_property_trees(
+    const TransformTree& tree) const {
+  gfx::Transform xform(1, 0, 0, 1, offset_to_transform_parent().x(),
+                       offset_to_transform_parent().y());
+  if (transform_tree_index() >= 0) {
+    const TransformNode* node = tree.Node(transform_tree_index());
+    gfx::Transform ssxform;
+    tree.ComputeTransform(node->id, node->data.target_id, &ssxform);
+    xform.ConcatTransform(ssxform);
+  }
+  xform.Scale(1.0 / contents_scale_x(), 1.0 / contents_scale_y());
+  return xform;
+}
+
 }  // namespace cc