Update from https://crrev.com/314320

cc/layers/tiled_layer_impl.cc

 // Copyright 2011 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/tiled_layer_impl.h"
 
 #include "base/basictypes.h"
-#include "base/debug/trace_event_argument.h"
 #include "base/strings/stringprintf.h"
+#include "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
 #include "cc/base/simple_enclosed_region.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
 #include "cc/trees/occlusion.h"
@@ skipping 21 matching lines @@
  private:
   DrawableTile() : resource_id_(0), contents_swizzled_(false) {}
 
   ResourceProvider::ResourceId resource_id_;
   bool contents_swizzled_;
 
   DISALLOW_COPY_AND_ASSIGN(DrawableTile);
 };
 
 TiledLayerImpl::TiledLayerImpl(LayerTreeImpl* tree_impl, int id)
-    : LayerImpl(tree_impl, id), skips_draw_(true) {}
+    : TiledLayerImpl(tree_impl, id, new LayerImpl::SyncedScrollOffset) {
+}
+
+TiledLayerImpl::TiledLayerImpl(
+    LayerTreeImpl* tree_impl,
+    int id,
+    scoped_refptr<LayerImpl::SyncedScrollOffset> synced_scroll_offset)
+    : LayerImpl(tree_impl, id, synced_scroll_offset), skips_draw_(true) {
+}
 
 TiledLayerImpl::~TiledLayerImpl() {
 }
 
 void TiledLayerImpl::GetContentsResourceId(
     ResourceProvider::ResourceId* resource_id,
     gfx::Size* resource_size) const {
   // This function is only valid for single texture layers, e.g. masks.
   DCHECK(tiler_);
   // It's possible the mask layer is created but has no size or otherwise
@@ skipping 33 matching lines @@
 }
 
 void TiledLayerImpl::GetDebugBorderProperties(SkColor* color,
                                               float* width) const {
   *color = DebugColors::TiledContentLayerBorderColor();
   *width = DebugColors::TiledContentLayerBorderWidth(layer_tree_impl());
 }
 
 scoped_ptr<LayerImpl> TiledLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
-  return TiledLayerImpl::Create(tree_impl, id());
+  return TiledLayerImpl::Create(tree_impl, id(), synced_scroll_offset());
 }
 
 void TiledLayerImpl::AsValueInto(base::debug::TracedValue* state) const {
   LayerImpl::AsValueInto(state);
   MathUtil::AddToTracedValue("invalidation", update_rect(), state);
 }
 
 size_t TiledLayerImpl::GPUMemoryUsageInBytes() const {
   size_t amount = 0;
   const size_t kMemoryUsagePerTileInBytes =
@@ skipping 190 matching lines @@
 
 void TiledLayerImpl::ReleaseResources() {
   tiler_->reset();
 }
 
 const char* TiledLayerImpl::LayerTypeAsString() const {
   return "cc::TiledLayerImpl";
 }
 
 }  // namespace cc