| OLD | NEW | 
|    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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  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   scoped_ptr<WebKit::WebLayer> root_web_layer_; |  243   scoped_ptr<WebKit::WebLayer> root_web_layer_; | 
 |  244 #if defined(WEBLAYERTREEVIEW_IS_PURE_VIRTUAL) | 
 |  245   scoped_ptr<WebKit::WebLayerTreeView> host_; | 
 |  246 #else | 
|  244   WebKit::WebLayerTreeView host_; |  247   WebKit::WebLayerTreeView host_; | 
 |  248 #endif | 
|  245  |  249  | 
|  246   // This is set to true when the swap buffers has been posted and we're waiting |  250   // This is set to true when the swap buffers has been posted and we're waiting | 
|  247   // for completion. |  251   // for completion. | 
|  248   bool swap_posted_; |  252   bool swap_posted_; | 
|  249  |  253  | 
|  250   // The device scale factor of the monitor that this compositor is compositing |  254   // The device scale factor of the monitor that this compositor is compositing | 
|  251   // layers on. |  255   // layers on. | 
|  252   float device_scale_factor_; |  256   float device_scale_factor_; | 
|  253  |  257  | 
|  254   int last_started_frame_; |  258   int last_started_frame_; | 
|  255   int last_ended_frame_; |  259   int last_ended_frame_; | 
|  256  |  260  | 
|  257   bool disable_schedule_composite_; |  261   bool disable_schedule_composite_; | 
|  258  |  262  | 
|  259   DISALLOW_COPY_AND_ASSIGN(Compositor); |  263   DISALLOW_COPY_AND_ASSIGN(Compositor); | 
|  260 }; |  264 }; | 
|  261  |  265  | 
|  262 }  // namespace ui |  266 }  // namespace ui | 
|  263  |  267  | 
|  264 #endif  // UI_COMPOSITOR_COMPOSITOR_H_ |  268 #endif  // UI_COMPOSITOR_COMPOSITOR_H_ | 
| OLD | NEW |