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

Side by Side Diff: ui/compositor/compositor.h

Issue 10832355: Prepare ui/compositor for WebLayer type change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | ui/compositor/compositor.cc » ('j') | ui/compositor/layer.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef UI_COMPOSITOR_COMPOSITOR_H_ 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_
6 #define UI_COMPOSITOR_COMPOSITOR_H_ 6 #define UI_COMPOSITOR_COMPOSITOR_H_
7 7
8 #include "base/hash_tables.h" 8 #include "base/hash_tables.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h"
10 #include "base/observer_list.h" 11 #include "base/observer_list.h"
11 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewCli ent.h" 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewCli ent.h"
14 #include "ui/compositor/compositor_export.h" 15 #include "ui/compositor/compositor_export.h"
15 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
16 #include "ui/gfx/size.h" 17 #include "ui/gfx/size.h"
17 #include "ui/gfx/transform.h" 18 #include "ui/gfx/transform.h"
18 #include "ui/gl/gl_share_group.h" 19 #include "ui/gl/gl_share_group.h"
19 20
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 235
235 CompositorDelegate* delegate_; 236 CompositorDelegate* delegate_;
236 gfx::Size size_; 237 gfx::Size size_;
237 238
238 // The root of the Layer tree drawn by this compositor. 239 // The root of the Layer tree drawn by this compositor.
239 Layer* root_layer_; 240 Layer* root_layer_;
240 241
241 ObserverList<CompositorObserver> observer_list_; 242 ObserverList<CompositorObserver> observer_list_;
242 243
243 gfx::AcceleratedWidget widget_; 244 gfx::AcceleratedWidget widget_;
245 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
246 scoped_ptr<WebKit::WebLayer> root_web_layer_;
247 #else
244 WebKit::WebLayer root_web_layer_; 248 WebKit::WebLayer root_web_layer_;
249 #endif
245 WebKit::WebLayerTreeView host_; 250 WebKit::WebLayerTreeView host_;
246 251
247 // This is set to true when the swap buffers has been posted and we're waiting 252 // This is set to true when the swap buffers has been posted and we're waiting
248 // for completion. 253 // for completion.
249 bool swap_posted_; 254 bool swap_posted_;
250 255
251 // The device scale factor of the monitor that this compositor is compositing 256 // The device scale factor of the monitor that this compositor is compositing
252 // layers on. 257 // layers on.
253 float device_scale_factor_; 258 float device_scale_factor_;
254 259
255 int last_started_frame_; 260 int last_started_frame_;
256 int last_ended_frame_; 261 int last_ended_frame_;
257 262
258 bool disable_schedule_composite_; 263 bool disable_schedule_composite_;
259 264
260 DISALLOW_COPY_AND_ASSIGN(Compositor); 265 DISALLOW_COPY_AND_ASSIGN(Compositor);
261 }; 266 };
262 267
263 } // namespace ui 268 } // namespace ui
264 269
265 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 270 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | ui/compositor/layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698