cc: Rename LayerTreeHost::commit_number to source_frame_number.

This matches the name used everywhere else, and makes tests less
confusing to read.

R=enne@chromium.org, nduca@chromium.org
BUG=

Review URL: https://codereview.chromium.org/19778013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213510 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 56 insertions, 57 deletions

diff --git a/cc/debug/benchmark_instrumentation.h b/cc/debug/benchmark_instrumentation.h
index 006bdf7..615fbe9 100644
--- a/cc/debug/benchmark_instrumentation.h
+++ b/cc/debug/benchmark_instrumentation.h
@@ -11,10 +11,9 @@ namespace cc {
 namespace benchmark_instrumentation {
 // Please do not change the string constants in this file (or the TRACE_EVENT
 // calls that use them) without updating
-// tools/perf/perf_tools/rasterize_and_record_benchmark.py accordingly.
+// tools/perf/measurements/rasterize_and_record_benchmark.py accordingly.
 // The benchmark searches for events and their arguments by name.
 const char kCategory[] = "cc,benchmark";
-const char kCommitNumber[] = "commit_number";
 const char kSourceFrameNumber[] = "source_frame_number";
 const char kData[] = "data";
 const char kWidth[] = "width";
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index a5cd2ad..5438a8c 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -87,8 +87,8 @@ bool PictureLayer::Update(ResourceUpdateQueue*,
 
   TRACE_EVENT1(benchmark_instrumentation::kCategory,
                benchmark_instrumentation::kPictureLayerUpdate,
-               benchmark_instrumentation::kCommitNumber,
-               layer_tree_host()->commit_number());
+               benchmark_instrumentation::kSourceFrameNumber,
+               layer_tree_host()->source_frame_number());
 
   pile_->Resize(paint_properties().bounds);
 
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 0d90c59..3f4a279 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -82,7 +82,7 @@ LayerTreeHost::LayerTreeHost(LayerTreeHostClient* client,
       needs_full_tree_sync_(true),
       needs_filter_context_(false),
       client_(client),
-      commit_number_(0),
+      source_frame_number_(0),
       rendering_stats_instrumentation_(RenderingStatsInstrumentation::Create()),
       output_surface_can_be_initialized_(true),
       output_surface_lost_(true),
@@ -293,7 +293,7 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
     sync_tree = host_impl->active_tree();
   }
 
-  sync_tree->set_source_frame_number(commit_number());
+  sync_tree->set_source_frame_number(source_frame_number());
 
   if (needs_full_tree_sync_)
     sync_tree->SetRootLayer(TreeSynchronizer::SynchronizeTrees(
@@ -367,7 +367,7 @@ void LayerTreeHost::FinishCommitOnImplThread(LayerTreeHostImpl* host_impl) {
     sync_tree->DidBecomeActive();
   }
 
-  commit_number_++;
+  source_frame_number_++;
 }
 
 void LayerTreeHost::WillCommit() {
@@ -696,8 +696,8 @@ bool LayerTreeHost::UpdateLayers(Layer* root_layer,
                                  ResourceUpdateQueue* queue) {
   TRACE_EVENT1(benchmark_instrumentation::kCategory,
                benchmark_instrumentation::kLayerTreeHostUpdateLayers,
-               benchmark_instrumentation::kCommitNumber,
-               commit_number());
+               benchmark_instrumentation::kSourceFrameNumber,
+               source_frame_number());
 
   RenderSurfaceLayerList update_list;
   {
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 0fd3abb..f04871a 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -152,7 +152,7 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
   // Test only hook
   virtual void DidDeferCommit();
 
-  int commit_number() const { return commit_number_; }
+  int source_frame_number() const { return source_frame_number_; }
 
   void SetNeedsDisplayOnAllLayers();
 
@@ -299,7 +299,7 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
   LayerTreeHostClient* client_;
   scoped_ptr<Proxy> proxy_;
 
-  int commit_number_;
+  int source_frame_number_;
   scoped_ptr<RenderingStatsInstrumentation> rendering_stats_instrumentation_;
 
   bool output_surface_can_be_initialized_;
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 7c940bb..4d768205 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -350,7 +350,7 @@ class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
   }
 
   virtual void DidCommit() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // Changing the device scale factor causes a commit. It also changes
         // the content bounds of |scaled_layer_|, which should not generate
@@ -359,7 +359,7 @@ class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
         break;
       default:
         // No extra commits.
-        EXPECT_EQ(2, layer_tree_host()->commit_number());
+        EXPECT_EQ(2, layer_tree_host()->source_frame_number());
     }
   }
 
@@ -411,7 +411,7 @@ class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
   }
 
   virtual void DidCommit() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // Changing the device scale factor causes a commit. It also changes
         // the content bounds of |scrollbar_|, which should not generate
@@ -420,7 +420,7 @@ class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
         break;
       default:
         // No extra commits.
-        EXPECT_EQ(2, layer_tree_host()->commit_number());
+        EXPECT_EQ(2, layer_tree_host()->source_frame_number());
     }
   }
 
@@ -849,7 +849,7 @@ class LayerTreeHostTestStartPageScaleAnimation : public LayerTreeHostTest {
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.5f, 2.f);
         layer_tree_host()->StartPageScaleAnimation(
@@ -1277,7 +1277,7 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         parent_->SetNeedsDisplay();
         child_->SetNeedsDisplay();
@@ -1306,7 +1306,7 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
         EndTest();
         break;
       default:
-        NOTREACHED() << layer_tree_host()->commit_number();
+        NOTREACHED() << layer_tree_host()->source_frame_number();
         break;
     }
   }
@@ -1552,7 +1552,7 @@ class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    if (layer_tree_host()->commit_number() < 2)
+    if (layer_tree_host()->source_frame_number() < 2)
       root_layer_->SetNeedsDisplay();
   }
 
@@ -2170,7 +2170,7 @@ class LayerTreeHostTestLCDNotification : public LayerTreeHostTest {
   virtual void AfterTest() OVERRIDE {}
 
   virtual void DidCommit() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // The first update consists one LCD notification and one paint.
         EXPECT_EQ(1, client_.lcd_notification_count());
@@ -2192,7 +2192,7 @@ class LayerTreeHostTestLCDNotification : public LayerTreeHostTest {
         break;
       default:
         // Verify that there is not extra commit due to layer invalidation.
-        EXPECT_EQ(3, layer_tree_host()->commit_number());
+        EXPECT_EQ(3, layer_tree_host()->source_frame_number());
         // LCD notification count should have incremented due to
         // change in layer opacity.
         EXPECT_EQ(2, client_.lcd_notification_count());
@@ -2519,7 +2519,7 @@ class LayerTreeHostTestAsyncReadback : public LayerTreeHostTest {
   }
 
   void NextStep() {
-    int frame = layer_tree_host()->commit_number();
+    int frame = layer_tree_host()->source_frame_number();
     switch (frame) {
       case 1:
         child->RequestCopyOfOutput(CopyOutputRequest::CreateBitmapRequest(
@@ -2648,7 +2648,7 @@ class LayerTreeHostTestAsyncReadbackLayerDestroyed : public LayerTreeHostTest {
   }
 
   virtual void DidCommit() OVERRIDE {
-    int frame = layer_tree_host()->commit_number();
+    int frame = layer_tree_host()->source_frame_number();
     switch (frame) {
       case 1:
         main_destroyed_->RequestCopyOfOutput(
@@ -2988,7 +2988,7 @@ class LayerTreeHostTestAsyncTwoReadbacksWithoutDraw : public LayerTreeHostTest {
   }
 
   virtual void DidCommit() OVERRIDE {
-    if (layer_tree_host()->commit_number() == 1) {
+    if (layer_tree_host()->source_frame_number() == 1) {
       // Allow drawing.
       layer_tree_host()->SetViewportSize(gfx::Size(root_->bounds()));
 
@@ -3032,7 +3032,7 @@ class LayerTreeHostTestNumFramesPending : public LayerTreeHostTest {
   // Round 5: commit + draw
 
   virtual void DidCommit() OVERRIDE {
-    int commit = layer_tree_host()->commit_number();
+    int commit = layer_tree_host()->source_frame_number();
     switch (commit) {
       case 2:
         // Round 2 done.
@@ -3053,7 +3053,7 @@ class LayerTreeHostTestNumFramesPending : public LayerTreeHostTest {
   }
 
   virtual void DidCompleteSwapBuffers() OVERRIDE {
-    int commit = layer_tree_host()->commit_number();
+    int commit = layer_tree_host()->source_frame_number();
     ++frame_;
     char pixels[4] = {0};
     switch (frame_) {
@@ -3455,7 +3455,7 @@ class LayerTreeHostTestPropertyChangesDuringUpdateArePushed
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 0:
         break;
       case 1: {
@@ -3538,7 +3538,7 @@ class LayerTreeHostTestPushPropertiesAddingToTreeRequiresPush
     : public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
  protected:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int last_source_frame_number = layer_tree_host()->commit_number() - 1;
+    int last_source_frame_number = layer_tree_host()->source_frame_number() - 1;
     switch (last_source_frame_number) {
       case 0:
         EXPECT_FALSE(root_->needs_push_properties());
@@ -3578,7 +3578,7 @@ class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursion
     : public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
  protected:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int last_source_frame_number = layer_tree_host()->commit_number() - 1;
+    int last_source_frame_number = layer_tree_host()->source_frame_number() - 1;
     switch (last_source_frame_number) {
       case 0:
         layer_tree_host()->SetRootLayer(root_);
@@ -3661,7 +3661,7 @@ class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursionWithPersistence
     : public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
  protected:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int last_source_frame_number = layer_tree_host()->commit_number() - 1;
+    int last_source_frame_number = layer_tree_host()->source_frame_number() - 1;
     switch (last_source_frame_number) {
       case 0:
         layer_tree_host()->SetRootLayer(root_);
@@ -3709,7 +3709,7 @@ class LayerTreeHostTestPushPropertiesSetPropertiesWhileOutsideTree
     : public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
  protected:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int last_source_frame_number = layer_tree_host()->commit_number() - 1;
+    int last_source_frame_number = layer_tree_host()->source_frame_number() - 1;
     switch (last_source_frame_number) {
       case 0:
         layer_tree_host()->SetRootLayer(root_);
@@ -3777,7 +3777,7 @@ class LayerTreeHostTestPushPropertiesSetPropertyInParentThenChild
     : public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
  protected:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int last_source_frame_number = layer_tree_host()->commit_number() - 1;
+    int last_source_frame_number = layer_tree_host()->source_frame_number() - 1;
     switch (last_source_frame_number) {
       case 0:
         layer_tree_host()->SetRootLayer(root_);
@@ -3841,7 +3841,7 @@ class LayerTreeHostTestPushPropertiesSetPropertyInChildThenParent
     : public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
  protected:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int last_source_frame_number = layer_tree_host()->commit_number() - 1;
+    int last_source_frame_number = layer_tree_host()->source_frame_number() - 1;
     switch (last_source_frame_number) {
       case 0:
         layer_tree_host()->SetRootLayer(root_);
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index fa4b886..703ad75 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -492,7 +492,7 @@ class LayerTreeHostAnimationTestLayerAddedWithAnimation
   }
 
   virtual void DidCommit() OVERRIDE {
-    if (layer_tree_host()->commit_number() == 1) {
+    if (layer_tree_host()->source_frame_number() == 1) {
       scoped_refptr<Layer> layer = Layer::Create();
       layer->set_layer_animation_delegate(this);
 
@@ -530,7 +530,7 @@ class LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount
   virtual void Animate(base::TimeTicks) OVERRIDE {
     // We shouldn't animate on the CompositeAndReadback-forced commit, but we
     // should for the SetNeedsCommit-triggered commit.
-    animated_commit_ = layer_tree_host()->commit_number();
+    animated_commit_ = layer_tree_host()->source_frame_number();
     EXPECT_NE(2, animated_commit_);
   }
 
@@ -539,7 +539,7 @@ class LayerTreeHostAnimationTestCompositeAndReadbackAnimateCount
   }
 
   virtual void DidCommit() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         layer_tree_host()->SetNeedsCommit();
         break;
@@ -751,7 +751,7 @@ class LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 1:
         // The animation is longer than 1 BeginFrame interval.
         AddOpacityTransitionToLayer(content_.get(), 0.1, 0.2f, 0.8f, false);
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 94f15c2..ccb7afd 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -1294,7 +1294,7 @@ class LayerTreeHostContextTestDontUseLostResources
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     ASSERT_TRUE(layer_tree_host()->hud_layer());
     // End the test once we know the 3nd frame drew.
-    if (layer_tree_host()->commit_number() == 4)
+    if (layer_tree_host()->source_frame_number() == 4)
       EndTest();
     else
       layer_tree_host()->SetNeedsCommit();
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index 0feabf7..523eecd 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -74,7 +74,7 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
   }
 
   virtual void DidCommit() OVERRIDE {
-    int next_frame = layer_tree_host()->commit_number();
+    int next_frame = layer_tree_host()->source_frame_number();
     switch (next_frame) {
       case 1:
         layer_tree_host()->SetNeedsCommit();
@@ -157,7 +157,7 @@ class LayerTreeHostDamageTestNoDamageReadbackDoesDraw
   }
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
-    int next_frame = layer_tree_host()->commit_number();
+    int next_frame = layer_tree_host()->source_frame_number();
     switch (next_frame) {
       case 1: {
         char pixels[4];
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index 141f3af..08ba3e0 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -204,7 +204,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
         first_draw_for_source_frame_(true) {}
 
   virtual void DidCommit() OVERRIDE {
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // The first time the layer gets a frame the whole layer should be
@@ -483,7 +483,7 @@ class LayerTreeHostDelegatedTestReturnUnusedResources
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with two resources in it.
@@ -555,7 +555,7 @@ class LayerTreeHostDelegatedTestReusedResources
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
@@ -616,7 +616,7 @@ class LayerTreeHostDelegatedTestFrameBeforeAck
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
@@ -715,7 +715,7 @@ class LayerTreeHostDelegatedTestFrameBeforeTakeResources
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
@@ -821,7 +821,7 @@ class LayerTreeHostDelegatedTestBadFrame
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // Generate a frame with some resources in it.
@@ -965,7 +965,7 @@ class LayerTreeHostDelegatedTestUnnamedResource
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // This frame includes two resources in it, but only uses one.
@@ -1022,7 +1022,7 @@ class LayerTreeHostDelegatedTestDontLeakResource
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // This frame includes two resources in it.
@@ -1087,7 +1087,7 @@ class LayerTreeHostDelegatedTestResourceSentToParent
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         // This frame includes two resources in it.
@@ -1207,7 +1207,7 @@ class LayerTreeHostDelegatedTestCommitWithoutTake
     scoped_ptr<DelegatedFrameData> frame;
     TransferableResourceArray resources;
 
-    int next_source_frame_number = layer_tree_host()->commit_number();
+    int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
       case 1:
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
diff --git a/cc/trees/layer_tree_host_unittest_picture.cc b/cc/trees/layer_tree_host_unittest_picture.cc
index f9f302e..731f6921 100644
--- a/cc/trees/layer_tree_host_unittest_picture.cc
+++ b/cc/trees/layer_tree_host_unittest_picture.cc
@@ -38,7 +38,7 @@ class LayerTreeHostPictureTestTwinLayer
   }
 
   virtual void DidCommit() OVERRIDE {
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 2:
         // Drop the picture layer from the tree.
         layer_tree_host()->root_layer()->children()[0]->RemoveFromParent();
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index e531194..b07b386 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -38,7 +38,7 @@ class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest {
 
   virtual void Layout() OVERRIDE {
     Layer* root = layer_tree_host()->root_layer();
-    if (!layer_tree_host()->commit_number()) {
+    if (!layer_tree_host()->source_frame_number()) {
       EXPECT_VECTOR_EQ(initial_scroll_, root->scroll_offset());
     } else {
       EXPECT_VECTOR_EQ(initial_scroll_ + scroll_amount_, root->scroll_offset());
@@ -103,7 +103,7 @@ class LayerTreeHostScrollTestScrollMultipleRedraw
 
   virtual void BeginCommitOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     Layer* root = layer_tree_host()->root_layer();
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 0:
         EXPECT_VECTOR_EQ(root->scroll_offset(), initial_scroll_);
         break;
@@ -300,7 +300,7 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
     EXPECT_VECTOR_EQ(gfx::Vector2d(),
                      expected_no_scroll_layer_->scroll_offset());
 
-    switch (layer_tree_host()->commit_number()) {
+    switch (layer_tree_host()->source_frame_number()) {
       case 0:
         EXPECT_VECTOR_EQ(initial_offset_,
                          expected_scroll_layer_->scroll_offset());
@@ -559,7 +559,7 @@ class ImplSidePaintingScrollTestSimple : public ImplSidePaintingScrollTest {
 
   virtual void Layout() OVERRIDE {
     Layer* root = layer_tree_host()->root_layer();
-    if (!layer_tree_host()->commit_number()) {
+    if (!layer_tree_host()->source_frame_number()) {
       EXPECT_VECTOR_EQ(root->scroll_offset(), initial_scroll_);
     } else {
       EXPECT_VECTOR_EQ(root->scroll_offset(),
diff --git a/tools/perf/measurements/rasterize_and_record.py b/tools/perf/measurements/rasterize_and_record.py
index cedf4bf..ee1ddf9 100644
--- a/tools/perf/measurements/rasterize_and_record.py
+++ b/tools/perf/measurements/rasterize_and_record.py
@@ -39,7 +39,7 @@ class StatsCollector(object):
     if start_event is None:
       raise LookupError, \
           'no LayterTreeHost::UpdateLayers after measureNextFrame found'
-    return start_event.args["commit_number"]
+    return start_event.args["source_frame_number"]
 
   def GatherRasterizeStats(self, frame_number):
     for event in self.timeline.GetAllEventsOfName(
@@ -60,7 +60,7 @@ class StatsCollector(object):
 
   def GatherRecordStats(self, frame_number):
     for event in self.timeline.GetAllEventsOfName("PictureLayer::Update"):
-      if event.args["commit_number"] == frame_number:
+      if event.args["source_frame_number"] == frame_number:
         for record_loop_event in event.GetAllSubSlicesOfName("RecordLoop"):
           best_record_time = float('inf')
           for record_event in record_loop_event.GetAllSubSlicesOfName(