cc: Make SingleThreadProxy ignore commit requests inside Layout().

cc/trees/layer_tree_host_unittest.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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 68 matching lines @@
   LayerTreeHostTest() : contents_texture_manager_(nullptr) {}
 
   void DidInitializeOutputSurface() override {
     contents_texture_manager_ = layer_tree_host()->contents_texture_manager();
   }
 
  protected:
   PrioritizedResourceManager* contents_texture_manager_;
 };
 
+class LayerTreeHostTestSetNeedsCommitInsideLayout : public LayerTreeHostTest {
+ protected:
+  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
+
+  void Layout() override {
+    // This shouldn't cause a second commit to happen.
+    layer_tree_host()->SetNeedsCommit();
+  }
+
+  void DidCommit() override {
+    EXPECT_EQ(1, layer_tree_host()->source_frame_number());
+    EndTest();
+  }
+
+  void AfterTest() override {}
+};
+
+SINGLE_AND_MULTI_THREAD_IMPL_TEST_F(
+    LayerTreeHostTestSetNeedsCommitInsideLayout);
+
+class LayerTreeHostTestSetNeedsUpdateInsideLayout : public LayerTreeHostTest {
+ protected:
+  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
+
+  void Layout() override {
+    // This shouldn't cause a second commit to happen.
+    layer_tree_host()->SetNeedsUpdateLayers();
+  }
+
+  void DidCommit() override {
+    EXPECT_EQ(1, layer_tree_host()->source_frame_number());
+    EndTest();
+  }
+
+  void AfterTest() override {}
+};
+
+SINGLE_AND_MULTI_THREAD_IMPL_TEST_F(
+    LayerTreeHostTestSetNeedsUpdateInsideLayout);
+
 // Test if the LTHI receives ReadyToActivate notifications from the TileManager
 // when no raster tasks get scheduled.
 class LayerTreeHostTestReadyToActivateEmpty : public LayerTreeHostTest {
  public:
   LayerTreeHostTestReadyToActivateEmpty()
       : did_notify_ready_to_activate_(false),
         all_tiles_required_for_activation_are_ready_to_draw_(false),
         required_for_activation_count_(0) {}
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
@@ skipping 6853 matching lines @@
   void AfterTest() override {}
 
   scoped_refptr<FakePictureLayer> content_child_layer_;
   FakeContentLayerClient client_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeTestReflectionMaskLayerForSurfaceWithUnclippedChild);
 
 }  // namespace cc