| Index: cc/layers/tiled_layer_impl.cc
|
| diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc
|
| index 5816fc51c0c03a17a95955c87dbb5bb9d1448cd6..535744d51293a8b9a637be2a0b9b7cf7a2982cce 100644
|
| --- a/cc/layers/tiled_layer_impl.cc
|
| +++ b/cc/layers/tiled_layer_impl.cc
|
| @@ -5,8 +5,8 @@
|
| #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"
|
| @@ -48,7 +48,15 @@ class DrawableTile : public LayerTilingData::Tile {
|
| };
|
|
|
| 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() {
|
| }
|
| @@ -102,7 +110,7 @@ void TiledLayerImpl::GetDebugBorderProperties(SkColor* color,
|
|
|
| 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 {
|
|
|