Update from https://crrev.com/308996

cc/layers/layer.cc

 // Copyright 2010 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 "cc/layers/layer.h"
 
 #include <algorithm>
 
 #include "base/atomic_sequence_num.h"
 #include "base/debug/trace_event.h"
@@ skipping 31 matching lines @@
       num_dependents_need_push_properties_(false),
       stacking_order_changed_(false),
       // Layer IDs start from 1.
       layer_id_(g_next_layer_id.GetNext() + 1),
       ignore_set_needs_commit_(false),
       sorting_context_id_(0),
       parent_(nullptr),
       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),
       user_scrollable_horizontal_(true),
       user_scrollable_vertical_(true),
       is_root_for_isolated_group_(false),
       is_container_for_fixed_position_layers_(false),
       is_drawable_(false),
       draws_content_(false),
       hide_layer_and_subtree_(false),
       masks_to_bounds_(false),
       contents_opaque_(false),
       double_sided_(true),
       should_flatten_transform_(true),
       use_parent_backface_visibility_(false),
       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),
       scroll_parent_(nullptr),
       clip_parent_(nullptr),
       replica_layer_(nullptr),
       raster_scale_(0.f),
       client_(nullptr) {
   layer_animation_controller_ = LayerAnimationController::Create(layer_id_);
   layer_animation_controller_->AddValueObserver(this);
@@ skipping 1154 matching lines @@
 }
 
 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) {
   benchmark->RunOnLayer(this);
 }
 
 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