OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
7 | 7 |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "cc/resources/returned_resource.h" | 9 #include "cc/resources/returned_resource.h" |
10 #include "cc/surfaces/surface_factory_client.h" | 10 #include "cc/surfaces/surface_factory_client.h" |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 bool use_surfaces_; | 178 bool use_surfaces_; |
179 | 179 |
180 // Surface-related state. | 180 // Surface-related state. |
181 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; | 181 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; |
182 scoped_ptr<cc::SurfaceFactory> surface_factory_; | 182 scoped_ptr<cc::SurfaceFactory> surface_factory_; |
183 cc::SurfaceId surface_id_; | 183 cc::SurfaceId surface_id_; |
184 uint32 next_surface_sequence_; | 184 uint32 next_surface_sequence_; |
185 uint32 last_output_surface_id_; | 185 uint32 last_output_surface_id_; |
186 gfx::Size current_surface_size_; | 186 gfx::Size current_surface_size_; |
187 float current_surface_scale_factor_; | 187 float current_surface_scale_factor_; |
| 188 bool has_started_rendering_; |
188 uint32 ack_pending_count_; | 189 uint32 ack_pending_count_; |
189 cc::ReturnedResourceArray surface_returned_resources_; | 190 cc::ReturnedResourceArray surface_returned_resources_; |
190 | 191 |
191 // frame_connector_ provides a platform abstraction. Messages | 192 // frame_connector_ provides a platform abstraction. Messages |
192 // sent through it are routed to the embedding renderer process. | 193 // sent through it are routed to the embedding renderer process. |
193 CrossProcessFrameConnector* frame_connector_; | 194 CrossProcessFrameConnector* frame_connector_; |
194 | 195 |
195 base::WeakPtr<RenderWidgetHostViewChildFrame> AsWeakPtr() { | 196 base::WeakPtr<RenderWidgetHostViewChildFrame> AsWeakPtr() { |
196 return weak_factory_.GetWeakPtr(); | 197 return weak_factory_.GetWeakPtr(); |
197 } | 198 } |
198 | 199 |
199 private: | 200 private: |
200 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; | 201 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; |
201 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); | 202 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); |
202 }; | 203 }; |
203 | 204 |
204 } // namespace content | 205 } // namespace content |
205 | 206 |
206 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ | 207 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ |
OLD | NEW |