Update from https://crrev.com/314320

cc/layers/picture_layer_impl_perftest.cc

 // Copyright 2014 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/picture_layer_impl.h"
 
 #include "cc/debug/lap_timer.h"
 #include "cc/resources/tiling_set_raster_queue_all.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 76 matching lines @@
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("tiling_set_raster_queue_construct_and_iterate", "",
                            test_name, timer_.LapsPerSecond(), "runs/s", true);
   }
 
   void RunRasterQueueConstructTest(const std::string& test_name,
                                    const gfx::Rect& viewport) {
     host_impl_.SetViewportSize(viewport.size());
-    pending_layer_->SetScrollOffset(
+    pending_layer_->PushScrollOffsetFromMainThread(
         gfx::ScrollOffset(viewport.x(), viewport.y()));
     host_impl_.pending_tree()->UpdateDrawProperties();
 
     timer_.Reset();
     do {
       scoped_ptr<TilingSetRasterQueueAll> queue(new TilingSetRasterQueueAll(
           pending_layer_->picture_layer_tiling_set(), false));
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
@@ skipping 28 matching lines @@
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("tiling_set_eviction_queue_construct_and_iterate",
                            "", test_name, timer_.LapsPerSecond(), "runs/s",
                            true);
   }
 
   void RunEvictionQueueConstructTest(const std::string& test_name,
                                      const gfx::Rect& viewport) {
     host_impl_.SetViewportSize(viewport.size());
-    pending_layer_->SetScrollOffset(
+    pending_layer_->PushScrollOffsetFromMainThread(
         gfx::ScrollOffset(viewport.x(), viewport.y()));
     host_impl_.pending_tree()->UpdateDrawProperties();
 
     TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES,
                                  SMOOTHNESS_TAKES_PRIORITY,
                                  NEW_CONTENT_TAKES_PRIORITY};
     int priority_count = 0;
     timer_.Reset();
     do {
       scoped_ptr<TilingSetEvictionQueue> queue(
@@ skipping 91 matching lines @@
   ASSERT_TRUE(host_impl_.tile_manager() != nullptr);
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles);
 
   RunEvictionQueueConstructTest("0_0_100x100", gfx::Rect(0, 0, 100, 100));
   RunEvictionQueueConstructTest("5000_0_100x100", gfx::Rect(5000, 0, 100, 100));
   RunEvictionQueueConstructTest("9999_0_100x100", gfx::Rect(9999, 0, 100, 100));
 }
 
 }  // namespace
 }  // namespace cc