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

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

Issue 606113003: Revert of Make cc output surface creation async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 2 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_unittest_context.cc ('k') | cc/trees/occlusion_tracker_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/message_loop/message_loop_proxy.h" 5 #include "base/message_loop/message_loop_proxy.h"
6 #include "base/threading/simple_thread.h" 6 #include "base/threading/simple_thread.h"
7 #include "cc/layers/delegated_frame_provider.h" 7 #include "cc/layers/delegated_frame_provider.h"
8 #include "cc/layers/delegated_frame_resource_collection.h" 8 #include "cc/layers/delegated_frame_resource_collection.h"
9 #include "cc/layers/delegated_renderer_layer.h" 9 #include "cc/layers/delegated_renderer_layer.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual ~LayerTreeHostNoMessageLoopTest() {} 53 virtual ~LayerTreeHostNoMessageLoopTest() {}
54 54
55 // LayerTreeHostClient overrides. 55 // LayerTreeHostClient overrides.
56 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 56 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
57 virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {} 57 virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {}
58 virtual void DidBeginMainFrame() OVERRIDE {} 58 virtual void DidBeginMainFrame() OVERRIDE {}
59 virtual void Layout() OVERRIDE {} 59 virtual void Layout() OVERRIDE {}
60 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, 60 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
61 float page_scale, 61 float page_scale,
62 float top_controls_delta) OVERRIDE {} 62 float top_controls_delta) OVERRIDE {}
63 virtual void RequestNewOutputSurface(bool fallback) OVERRIDE { 63 virtual scoped_ptr<OutputSurface> CreateOutputSurface(
64 layer_tree_host_->SetOutputSurface( 64 bool fallback) OVERRIDE {
65 make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface)); 65 return make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface);
66 } 66 }
67 virtual void DidInitializeOutputSurface() OVERRIDE { 67 virtual void DidInitializeOutputSurface() OVERRIDE {
68 did_initialize_output_surface_ = true; 68 did_initialize_output_surface_ = true;
69 } 69 }
70 virtual void WillCommit() OVERRIDE {} 70 virtual void WillCommit() OVERRIDE {}
71 virtual void DidCommit() OVERRIDE { did_commit_ = true; } 71 virtual void DidCommit() OVERRIDE { did_commit_ = true; }
72 virtual void DidCommitAndDrawFrame() OVERRIDE { 72 virtual void DidCommitAndDrawFrame() OVERRIDE {
73 did_commit_and_draw_frame_ = true; 73 did_commit_and_draw_frame_ = true;
74 } 74 }
75 virtual void DidCompleteSwapBuffers() OVERRIDE {} 75 virtual void DidCompleteSwapBuffers() OVERRIDE {}
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 scoped_refptr<DelegatedFrameProvider> frame_provider_; 227 scoped_refptr<DelegatedFrameProvider> frame_provider_;
228 scoped_refptr<DelegatedRendererLayer> delegated_layer_; 228 scoped_refptr<DelegatedRendererLayer> delegated_layer_;
229 }; 229 };
230 230
231 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { 231 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) {
232 RunTest(); 232 RunTest();
233 } 233 }
234 234
235 } // namespace 235 } // namespace
236 } // namespace cc 236 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_context.cc ('k') | cc/trees/occlusion_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698