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

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

Issue 210793002: Replace CurrentPhysicalTimeTicks with a fallback in CurrentFrameTimeTicks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 6 years, 9 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
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 Proxy* proxy, 1171 Proxy* proxy,
1172 SharedBitmapManager* manager, 1172 SharedBitmapManager* manager,
1173 RenderingStatsInstrumentation* rendering_stats_instrumentation) 1173 RenderingStatsInstrumentation* rendering_stats_instrumentation)
1174 : LayerTreeHostImpl(settings, 1174 : LayerTreeHostImpl(settings,
1175 client, 1175 client,
1176 proxy, 1176 proxy,
1177 rendering_stats_instrumentation, 1177 rendering_stats_instrumentation,
1178 manager, 1178 manager,
1179 0) {} 1179 0) {}
1180 1180
1181 virtual base::TimeTicks CurrentPhysicalTimeTicks() const OVERRIDE { 1181 virtual base::TimeTicks CurrentFrameTimeTicks() OVERRIDE {
1182 return fake_current_physical_time_; 1182 return fake_current_physical_time_;
1183 } 1183 }
1184 1184
1185 void SetCurrentPhysicalTimeTicksForTest(base::TimeTicks fake_now) { 1185 void SetCurrentPhysicalTimeTicksForTest(base::TimeTicks fake_now) {
1186 fake_current_physical_time_ = fake_now; 1186 fake_current_physical_time_ = fake_now;
1187 } 1187 }
1188 1188
1189 private: 1189 private:
1190 base::TimeTicks fake_current_physical_time_; 1190 base::TimeTicks fake_current_physical_time_;
1191 }; 1191 };
(...skipping 5021 matching lines...) Expand 10 before | Expand all | Expand 10 after
6213 EXPECT_EQ(host_impl_->global_tile_state().hard_memory_limit_in_bytes, 6213 EXPECT_EQ(host_impl_->global_tile_state().hard_memory_limit_in_bytes,
6214 300u * 1024u * 1024u); 6214 300u * 1024u * 1024u);
6215 EXPECT_EQ(host_impl_->global_tile_state().soft_memory_limit_in_bytes, 6215 EXPECT_EQ(host_impl_->global_tile_state().soft_memory_limit_in_bytes,
6216 150u * 1024u * 1024u); 6216 150u * 1024u * 1024u);
6217 EXPECT_EQ(host_impl_->global_tile_state().unused_memory_limit_in_bytes, 6217 EXPECT_EQ(host_impl_->global_tile_state().unused_memory_limit_in_bytes,
6218 75u * 1024u * 1024u); 6218 75u * 1024u * 1024u);
6219 } 6219 }
6220 6220
6221 } // namespace 6221 } // namespace
6222 } // namespace cc 6222 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698