Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 429743003: Rename Animate as Begin(Main)Frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a typo that made tests fail. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 Proxy* proxy, 1305 Proxy* proxy,
1306 SharedBitmapManager* manager, 1306 SharedBitmapManager* manager,
1307 RenderingStatsInstrumentation* rendering_stats_instrumentation) 1307 RenderingStatsInstrumentation* rendering_stats_instrumentation)
1308 : LayerTreeHostImpl(settings, 1308 : LayerTreeHostImpl(settings,
1309 client, 1309 client,
1310 proxy, 1310 proxy,
1311 rendering_stats_instrumentation, 1311 rendering_stats_instrumentation,
1312 manager, 1312 manager,
1313 0) {} 1313 0) {}
1314 1314
1315 virtual base::TimeTicks CurrentFrameTimeTicks() OVERRIDE { 1315 virtual BeginFrameArgs CurrentBeginFrameArgs() const OVERRIDE {
1316 return fake_current_physical_time_; 1316 return BeginFrameArgs::Create(fake_current_physical_time_,
1317 base::TimeTicks(),
1318 BeginFrameArgs::DefaultInterval());
mithro-old 2014/08/11 07:33:33 src/cc/test/begin_frame_args_test.h has helpers fo
Sami 2014/08/11 17:51:26 Done.
1317 } 1319 }
1318 1320
1319 void SetCurrentPhysicalTimeTicksForTest(base::TimeTicks fake_now) { 1321 void SetCurrentPhysicalTimeTicksForTest(base::TimeTicks fake_now) {
1320 fake_current_physical_time_ = fake_now; 1322 fake_current_physical_time_ = fake_now;
1321 } 1323 }
1322 1324
1323 private: 1325 private:
1324 base::TimeTicks fake_current_physical_time_; 1326 base::TimeTicks fake_current_physical_time_;
1325 }; 1327 };
1326 1328
(...skipping 5483 matching lines...) Expand 10 before | Expand all | Expand 10 after
6810 EXPECT_EQ(1u, raw_mask_layer->did_become_active_call_count()); 6812 EXPECT_EQ(1u, raw_mask_layer->did_become_active_call_count());
6811 EXPECT_EQ(0u, raw_replica_mask_layer->did_become_active_call_count()); 6813 EXPECT_EQ(0u, raw_replica_mask_layer->did_become_active_call_count());
6812 pending_tree->DidBecomeActive(); 6814 pending_tree->DidBecomeActive();
6813 EXPECT_EQ(3u, raw_pending_layer->did_become_active_call_count()); 6815 EXPECT_EQ(3u, raw_pending_layer->did_become_active_call_count());
6814 EXPECT_EQ(2u, raw_mask_layer->did_become_active_call_count()); 6816 EXPECT_EQ(2u, raw_mask_layer->did_become_active_call_count());
6815 EXPECT_EQ(1u, raw_replica_mask_layer->did_become_active_call_count()); 6817 EXPECT_EQ(1u, raw_replica_mask_layer->did_become_active_call_count());
6816 } 6818 }
6817 6819
6818 } // namespace 6820 } // namespace
6819 } // namespace cc 6821 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698