Update source frame number even when commits abort

cc/trees/layer_tree_host_unittest_scroll.cc

 // Copyright 2012 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/trees/layer_tree_host.h"
 
 #include "base/memory/weak_ptr.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 223 matching lines @@
         EXPECT_EQ(1, num_impl_scrolls_);
         EXPECT_EQ(1, layer_tree_host()->source_frame_number());
         EXPECT_VECTOR_EQ(root_scroll_layer->scroll_offset(),
                          initial_scroll_ + impl_scroll_);
         EXPECT_EQ(impl_scale_, layer_tree_host()->page_scale_factor());
         PostSetNeedsRedrawToMainThread();
         break;
       case 3:
         // This commit will not be aborted because of the scroll change.
         EXPECT_EQ(2, num_impl_scrolls_);
-        EXPECT_EQ(1, layer_tree_host()->source_frame_number());
+        // The source frame number still increases even with the abort.

[enne (OOO), 2014/05/29 19:29:58]

Hey look, we already had tests, and I just had to fix them!

+        EXPECT_EQ(2, layer_tree_host()->source_frame_number());
         EXPECT_VECTOR_EQ(root_scroll_layer->scroll_offset(),
                          initial_scroll_ + impl_scroll_ + impl_scroll_);
         EXPECT_EQ(impl_scale_ * impl_scale_,
                   layer_tree_host()->page_scale_factor());
         root_scroll_layer->SetScrollOffset(root_scroll_layer->scroll_offset() +
                                            second_main_scroll_);
         break;
       case 4:
         // This commit will also be aborted.
         EXPECT_EQ(3, num_impl_scrolls_);
-        EXPECT_EQ(2, layer_tree_host()->source_frame_number());
+        EXPECT_EQ(3, layer_tree_host()->source_frame_number());
         EXPECT_VECTOR_EQ(root_scroll_layer->scroll_offset(),
                          initial_scroll_ + impl_scroll_ + impl_scroll_ +
                              impl_scroll_ + second_main_scroll_);
         // End the test by drawing to verify this commit is also aborted.
         PostSetNeedsRedrawToMainThread();
         break;
     }
   }
 
   virtual void DidBeginMainFrame() OVERRIDE { num_did_begin_main_frames_++; }
@@ skipping 38 matching lines @@
                        initial_scroll_ + impl_scroll_);
 
       EXPECT_EQ(1.f, impl->active_tree()->page_scale_delta());
       EXPECT_EQ(impl_scale_, impl->active_tree()->total_page_scale_factor());
       impl->active_tree()->SetPageScaleDelta(impl_scale_);
       EXPECT_EQ(impl_scale_, impl->active_tree()->page_scale_delta());
       EXPECT_EQ(impl_scale_ * impl_scale_,
                 impl->active_tree()->total_page_scale_factor());
 
       impl->SetNeedsCommit();
-    } else if (impl->active_tree()->source_frame_number() == 1 &&
+    } else if (impl->active_tree()->source_frame_number() == 1) {
+      // Commit for source frame 1 is aborted.
+      NOTREACHED();
+    } else if (impl->active_tree()->source_frame_number() == 2 &&
                impl->SourceAnimationFrameNumber() == 3) {
       // Third draw after the second full commit.
       EXPECT_EQ(root_scroll_layer->ScrollDelta(), gfx::Vector2d());
       root_scroll_layer->ScrollBy(impl_scroll_);
       impl->SetNeedsCommit();
       EXPECT_VECTOR_EQ(root_scroll_layer->ScrollDelta(), impl_scroll_);
       EXPECT_VECTOR_EQ(
           root_scroll_layer->scroll_offset(),
           initial_scroll_ + impl_scroll_ + impl_scroll_ + second_main_scroll_);
-    } else if (impl->active_tree()->source_frame_number() == 1 &&
+    } else if (impl->active_tree()->source_frame_number() == 2 &&
                impl->SourceAnimationFrameNumber() == 4) {
       // Final draw after the second aborted commit.
       EXPECT_VECTOR_EQ(root_scroll_layer->ScrollDelta(), gfx::Vector2d());
       EXPECT_VECTOR_EQ(root_scroll_layer->scroll_offset(),
                        initial_scroll_ + impl_scroll_ + impl_scroll_ +
                            impl_scroll_ + second_main_scroll_);
       EndTest();
+    } else {
+      // Commit for source frame 3 is aborted.
+      NOTREACHED();
     }
   }
 
   virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
                                    float scale) OVERRIDE {
     num_impl_scrolls_++;
   }
 
   virtual void AfterTest() OVERRIDE {
     EXPECT_EQ(3, num_impl_scrolls_);
@@ skipping 886 matching lines @@
     RunTest(true, false, false);
 }
 
 TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) {
     scroll_destroy_whole_tree_ = true;
     RunTest(true, false, false);
 }
 
 }  // namespace
 }  // namespace cc