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

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

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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 | Annotate | Revision Log
« no previous file with comments | « cc/test/fake_layer_tree_host_client.cc ('k') | cc/trees/layer_tree_host.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/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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 } 244 }
245 245
246 virtual void DidInitializeOutputSurface(bool succeeded) OVERRIDE { 246 virtual void DidInitializeOutputSurface(bool succeeded) OVERRIDE {
247 test_hooks_->DidInitializeOutputSurface(succeeded); 247 test_hooks_->DidInitializeOutputSurface(succeeded);
248 } 248 }
249 249
250 virtual void DidFailToInitializeOutputSurface() OVERRIDE { 250 virtual void DidFailToInitializeOutputSurface() OVERRIDE {
251 test_hooks_->DidFailToInitializeOutputSurface(); 251 test_hooks_->DidFailToInitializeOutputSurface();
252 } 252 }
253 253
254 virtual scoped_ptr<InputHandlerClient> CreateInputHandlerClient() OVERRIDE {
255 return scoped_ptr<InputHandlerClient>();
256 }
257
258 virtual void WillCommit() OVERRIDE {} 254 virtual void WillCommit() OVERRIDE {}
259 255
260 virtual void DidCommit() OVERRIDE { 256 virtual void DidCommit() OVERRIDE {
261 test_hooks_->DidCommit(); 257 test_hooks_->DidCommit();
262 } 258 }
263 259
264 virtual void DidCommitAndDrawFrame() OVERRIDE { 260 virtual void DidCommitAndDrawFrame() OVERRIDE {
265 test_hooks_->DidCommitAndDrawFrame(); 261 test_hooks_->DidCommitAndDrawFrame();
266 } 262 }
267 263
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 598
603 scoped_refptr<cc::ContextProvider> LayerTreeTest:: 599 scoped_refptr<cc::ContextProvider> LayerTreeTest::
604 OffscreenContextProviderForCompositorThread() { 600 OffscreenContextProviderForCompositorThread() {
605 if (!compositor_thread_contexts_ || 601 if (!compositor_thread_contexts_ ||
606 compositor_thread_contexts_->DestroyedOnMainThread()) 602 compositor_thread_contexts_->DestroyedOnMainThread())
607 compositor_thread_contexts_ = FakeContextProvider::Create(); 603 compositor_thread_contexts_ = FakeContextProvider::Create();
608 return compositor_thread_contexts_; 604 return compositor_thread_contexts_;
609 } 605 }
610 606
611 } // namespace cc 607 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_layer_tree_host_client.cc ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698