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

Side by Side Diff: cc/test/layer_tree_test.cc

Issue 15058004: cc: Rename VSync to BeginFrame (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix test compiler errors Created 7 years, 7 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
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/test/layer_tree_test.h" 5 #include "cc/test/layer_tree_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "cc/animation/animation.h" 8 #include "cc/animation/animation.h"
9 #include "cc/animation/animation_registrar.h" 9 #include "cc/animation/animation_registrar.h"
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 bool impl_side_painting) { 541 bool impl_side_painting) {
542 if (threaded) { 542 if (threaded) {
543 impl_thread_.reset(new base::Thread("Compositor")); 543 impl_thread_.reset(new base::Thread("Compositor"));
544 ASSERT_TRUE(impl_thread_->Start()); 544 ASSERT_TRUE(impl_thread_->Start());
545 } 545 }
546 546
547 main_ccthread_ = cc::ThreadImpl::CreateForCurrentThread(); 547 main_ccthread_ = cc::ThreadImpl::CreateForCurrentThread();
548 548
549 delegating_renderer_ = delegating_renderer; 549 delegating_renderer_ = delegating_renderer;
550 550
551 // Spend less time waiting for vsync because the output is mocked out. 551 // Spend less time waiting for BeginFrame because the output is mocked out.
552 settings_.refresh_rate = 200.0; 552 settings_.refresh_rate = 200.0;
553 if (impl_side_painting) { 553 if (impl_side_painting) {
554 DCHECK(threaded) << 554 DCHECK(threaded) <<
555 "Don't run single thread + impl side painting, it doesn't exist."; 555 "Don't run single thread + impl side painting, it doesn't exist.";
556 settings_.impl_side_painting = true; 556 settings_.impl_side_painting = true;
557 } 557 }
558 InitializeSettings(&settings_); 558 InitializeSettings(&settings_);
559 559
560 main_ccthread_->PostTask( 560 main_ccthread_->PostTask(
561 base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this))); 561 base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this)));
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 602
603 scoped_refptr<cc::ContextProvider> LayerTreeTest:: 603 scoped_refptr<cc::ContextProvider> LayerTreeTest::
604 OffscreenContextProviderForCompositorThread() { 604 OffscreenContextProviderForCompositorThread() {
605 if (!compositor_thread_contexts_ || 605 if (!compositor_thread_contexts_ ||
606 compositor_thread_contexts_->DestroyedOnMainThread()) 606 compositor_thread_contexts_->DestroyedOnMainThread())
607 compositor_thread_contexts_ = FakeContextProvider::Create(); 607 compositor_thread_contexts_ = FakeContextProvider::Create();
608 return compositor_thread_contexts_; 608 return compositor_thread_contexts_;
609 } 609 }
610 610
611 } // namespace cc 611 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698