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: ui/compositor/compositor.h

Issue 10831396: Remove transitional WEBLAYER_IS_PURE_VIRTUAL code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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') | no next file with comments »
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/memory/scoped_ptr.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 CompositorDelegate* delegate_; 234 CompositorDelegate* delegate_;
235 gfx::Size size_; 235 gfx::Size size_;
236 236
237 // The root of the Layer tree drawn by this compositor. 237 // The root of the Layer tree drawn by this compositor.
238 Layer* root_layer_; 238 Layer* root_layer_;
239 239
240 ObserverList<CompositorObserver> observer_list_; 240 ObserverList<CompositorObserver> observer_list_;
241 241
242 gfx::AcceleratedWidget widget_; 242 gfx::AcceleratedWidget widget_;
243 #if defined(WEBLAYER_IS_PURE_VIRTUAL)
244 scoped_ptr<WebKit::WebLayer> root_web_layer_; 243 scoped_ptr<WebKit::WebLayer> root_web_layer_;
245 #else
246 WebKit::WebLayer root_web_layer_;
247 #endif
248 WebKit::WebLayerTreeView host_; 244 WebKit::WebLayerTreeView host_;
249 245
250 // This is set to true when the swap buffers has been posted and we're waiting 246 // This is set to true when the swap buffers has been posted and we're waiting
251 // for completion. 247 // for completion.
252 bool swap_posted_; 248 bool swap_posted_;
253 249
254 // The device scale factor of the monitor that this compositor is compositing 250 // The device scale factor of the monitor that this compositor is compositing
255 // layers on. 251 // layers on.
256 float device_scale_factor_; 252 float device_scale_factor_;
257 253
258 int last_started_frame_; 254 int last_started_frame_;
259 int last_ended_frame_; 255 int last_ended_frame_;
260 256
261 bool disable_schedule_composite_; 257 bool disable_schedule_composite_;
262 258
263 DISALLOW_COPY_AND_ASSIGN(Compositor); 259 DISALLOW_COPY_AND_ASSIGN(Compositor);
264 }; 260 };
265 261
266 } // namespace ui 262 } // namespace ui
267 263
268 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 264 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « no previous file | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698