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

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

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