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

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

Issue 60353002: cc: add DevTools instrumentation for impl-side frames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Insturment tree activation instead of commit for linking main thread frames to imple-side ones Created 7 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 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/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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 LayerTreeHostImplForTesting( 65 LayerTreeHostImplForTesting(
66 TestHooks* test_hooks, 66 TestHooks* test_hooks,
67 const LayerTreeSettings& settings, 67 const LayerTreeSettings& settings,
68 LayerTreeHostImplClient* host_impl_client, 68 LayerTreeHostImplClient* host_impl_client,
69 Proxy* proxy, 69 Proxy* proxy,
70 RenderingStatsInstrumentation* stats_instrumentation) 70 RenderingStatsInstrumentation* stats_instrumentation)
71 : LayerTreeHostImpl(settings, 71 : LayerTreeHostImpl(settings,
72 host_impl_client, 72 host_impl_client,
73 proxy, 73 proxy,
74 stats_instrumentation, 74 stats_instrumentation,
75 NULL), 75 NULL,
76 0),
76 test_hooks_(test_hooks), 77 test_hooks_(test_hooks),
77 block_notify_ready_to_activate_for_testing_(false), 78 block_notify_ready_to_activate_for_testing_(false),
78 notify_ready_to_activate_was_blocked_(false) {} 79 notify_ready_to_activate_was_blocked_(false) {}
79 80
80 virtual void BeginImplFrame(const BeginFrameArgs& args) OVERRIDE { 81 virtual void BeginImplFrame(const BeginFrameArgs& args) OVERRIDE {
81 test_hooks_->WillBeginImplFrameOnThread(this, args); 82 test_hooks_->WillBeginImplFrameOnThread(this, args);
82 LayerTreeHostImpl::BeginImplFrame(args); 83 LayerTreeHostImpl::BeginImplFrame(args);
83 test_hooks_->DidBeginImplFrameOnThread(this, args); 84 test_hooks_->DidBeginImplFrameOnThread(this, args);
84 } 85 }
85 86
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 } 669 }
669 670
670 scoped_refptr<ContextProvider> LayerTreeTest::OffscreenContextProvider() { 671 scoped_refptr<ContextProvider> LayerTreeTest::OffscreenContextProvider() {
671 if (!compositor_contexts_.get() || 672 if (!compositor_contexts_.get() ||
672 compositor_contexts_->DestroyedOnMainThread()) 673 compositor_contexts_->DestroyedOnMainThread())
673 compositor_contexts_ = TestContextProvider::Create(); 674 compositor_contexts_ = TestContextProvider::Create();
674 return compositor_contexts_; 675 return compositor_contexts_;
675 } 676 }
676 677
677 } // namespace cc 678 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698