OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 5 #ifndef CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 6 #define CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
11 #include "base/values.h" | 11 #include "base/values.h" |
12 #include "cc/base/swap_promise.h" | 12 #include "cc/base/swap_promise.h" |
13 #include "cc/base/swap_promise_monitor.h" | 13 #include "cc/base/swap_promise_monitor.h" |
14 #include "cc/input/top_controls_state.h" | 14 #include "cc/input/top_controls_state.h" |
| 15 #include "cc/output/begin_frame_args.h" |
15 #include "cc/trees/layer_tree_host_client.h" | 16 #include "cc/trees/layer_tree_host_client.h" |
16 #include "cc/trees/layer_tree_host_single_thread_client.h" | 17 #include "cc/trees/layer_tree_host_single_thread_client.h" |
17 #include "cc/trees/layer_tree_settings.h" | 18 #include "cc/trees/layer_tree_settings.h" |
18 #include "third_party/WebKit/public/platform/WebLayerTreeView.h" | 19 #include "third_party/WebKit/public/platform/WebLayerTreeView.h" |
19 #include "third_party/skia/include/core/SkBitmap.h" | 20 #include "third_party/skia/include/core/SkBitmap.h" |
20 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
21 | 22 |
22 namespace ui { | 23 namespace ui { |
23 struct LatencyInfo; | 24 struct LatencyInfo; |
24 } | 25 } |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 | 150 |
150 private: | 151 private: |
151 RenderWidgetCompositor(RenderWidget* widget, bool threaded); | 152 RenderWidgetCompositor(RenderWidget* widget, bool threaded); |
152 | 153 |
153 void Initialize(cc::LayerTreeSettings settings); | 154 void Initialize(cc::LayerTreeSettings settings); |
154 | 155 |
155 bool threaded_; | 156 bool threaded_; |
156 bool suppress_schedule_composite_; | 157 bool suppress_schedule_composite_; |
157 RenderWidget* widget_; | 158 RenderWidget* widget_; |
158 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; | 159 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; |
| 160 cc::BeginFrameArgs begin_main_frame_args_; |
159 }; | 161 }; |
160 | 162 |
161 } // namespace content | 163 } // namespace content |
162 | 164 |
163 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ | 165 #endif // CONTENT_RENDERER_GPU_RENDER_WIDGET_COMPOSITOR_H_ |
OLD | NEW |