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

Unified Diff: cc/test/layer_tree_test.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/test/pixel_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index a22c7af9183a26656b6570833a9de7b5c20eb21f..80e9f114b9c3a96da2597ba5354c40a2bc3e66b1 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -380,6 +380,10 @@ class LayerTreeHostClientForTesting : public LayerTreeHostClient,
test_hooks_->DidInitializeOutputSurface();
}
+ void SendBeginFramesToChildren(const BeginFrameArgs& args) override {
+ test_hooks_->SendBeginFramesToChildren(args);
+ }
+
void DidFailToInitializeOutputSurface() override {
test_hooks_->DidFailToInitializeOutputSurface();
}
@@ -607,8 +611,8 @@ void LayerTreeTest::DoBeginTest() {
scoped_ptr<ExternalBeginFrameSourceForTest> external_begin_frame_source;
if (settings_.use_external_begin_frame_source &&
settings_.throttle_frame_production) {
- external_begin_frame_source.reset(
- new ExternalBeginFrameSourceForTest(settings_.refresh_rate));
+ external_begin_frame_source.reset(new ExternalBeginFrameSourceForTest(
+ settings_.renderer_settings.refresh_rate));
external_begin_frame_source_ = external_begin_frame_source.get();
}
@@ -741,7 +745,7 @@ void LayerTreeTest::RunTest(bool threaded,
// Spend less time waiting for BeginFrame because the output is
// mocked out.
- settings_.refresh_rate = 200.0;
+ settings_.renderer_settings.refresh_rate = 200.0;
settings_.background_animation_rate = 200.0;
settings_.impl_side_painting = impl_side_painting;
InitializeSettings(&settings_);
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/test/pixel_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698