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

Side by Side Diff: sky/viewer/compositor/layer_host.cc

Issue 1213683004: Move //sky/compositor to //sky/viewer/compositor (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « sky/viewer/compositor/layer_host.h ('k') | sky/viewer/compositor/layer_host_client.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 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 "sky/compositor/layer_host.h" 5 #include "sky/viewer/compositor/layer_host.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "mojo/converters/geometry/geometry_type_converters.h" 9 #include "mojo/converters/geometry/geometry_type_converters.h"
10 #include "mojo/gpu/gl_context.h" 10 #include "mojo/gpu/gl_context.h"
11 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h" 11 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
12 #include "mojo/skia/ganesh_context.h" 12 #include "mojo/skia/ganesh_context.h"
13 #include "sky/compositor/layer.h" 13 #include "sky/viewer/compositor/layer.h"
14 14
15 namespace sky { 15 namespace sky {
16 16
17 LayerHost::LayerHost(LayerHostClient* client) 17 LayerHost::LayerHost(LayerHostClient* client)
18 : client_(client), 18 : client_(client),
19 state_(kReadyForFrame), 19 state_(kReadyForFrame),
20 frame_requested_(false), 20 frame_requested_(false),
21 surface_holder_(this, client->GetShell()), 21 surface_holder_(this, client->GetShell()),
22 gl_context_owner_(client->GetShell()), 22 gl_context_owner_(client->GetShell()),
23 ganesh_context_(gl_context()), 23 ganesh_context_(gl_context()),
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 void LayerHost::DidCompleteFrame() { 144 void LayerHost::DidCompleteFrame() {
145 DCHECK_EQ(state_, kWaitingForFrameAcknowldgement); 145 DCHECK_EQ(state_, kWaitingForFrameAcknowldgement);
146 state_ = kReadyForFrame; 146 state_ = kReadyForFrame;
147 if (frame_requested_) 147 if (frame_requested_)
148 BeginFrame(); 148 BeginFrame();
149 } 149 }
150 150
151 } // namespace sky 151 } // namespace sky
OLDNEW
« no previous file with comments | « sky/viewer/compositor/layer_host.h ('k') | sky/viewer/compositor/layer_host_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698