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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 2708153005: Rename SurfaceIdAllocator to LocalSurfaceIdAllocator (Closed)
Patch Set: Delete useless include Created 3 years, 10 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
OLDNEW
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <deque> 11 #include <deque>
12 #include <memory> 12 #include <memory>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "cc/resources/returned_resource.h" 18 #include "cc/resources/returned_resource.h"
19 #include "cc/scheduler/begin_frame_source.h" 19 #include "cc/scheduler/begin_frame_source.h"
20 #include "cc/surfaces/local_surface_id_allocator.h"
20 #include "cc/surfaces/surface_factory_client.h" 21 #include "cc/surfaces/surface_factory_client.h"
21 #include "cc/surfaces/surface_id_allocator.h"
22 #include "cc/surfaces/surface_info.h" 22 #include "cc/surfaces/surface_info.h"
23 #include "cc/surfaces/surface_sequence.h" 23 #include "cc/surfaces/surface_sequence.h"
24 #include "content/browser/compositor/image_transport_factory.h" 24 #include "content/browser/compositor/image_transport_factory.h"
25 #include "content/browser/renderer_host/event_with_latency_info.h" 25 #include "content/browser/renderer_host/event_with_latency_info.h"
26 #include "content/browser/renderer_host/render_widget_host_view_base.h" 26 #include "content/browser/renderer_host/render_widget_host_view_base.h"
27 #include "content/common/content_export.h" 27 #include "content/common/content_export.h"
28 #include "content/common/input/input_event_ack_state.h" 28 #include "content/common/input/input_event_ack_state.h"
29 #include "content/public/browser/readback_types.h" 29 #include "content/public/browser/readback_types.h"
30 #include "ui/gfx/geometry/rect.h" 30 #include "ui/gfx/geometry/rect.h"
31 #include "ui/gfx/native_widget_types.h" 31 #include "ui/gfx/native_widget_types.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 gfx::Vector2dF last_scroll_offset_; 219 gfx::Vector2dF last_scroll_offset_;
220 220
221 // Members will become private when RenderWidgetHostViewGuest is removed. 221 // Members will become private when RenderWidgetHostViewGuest is removed.
222 // The model object. 222 // The model object.
223 RenderWidgetHostImpl* host_; 223 RenderWidgetHostImpl* host_;
224 224
225 // The ID for FrameSink associated with this view. 225 // The ID for FrameSink associated with this view.
226 cc::FrameSinkId frame_sink_id_; 226 cc::FrameSinkId frame_sink_id_;
227 227
228 // Surface-related state. 228 // Surface-related state.
229 std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_; 229 std::unique_ptr<cc::LocalSurfaceIdAllocator> id_allocator_;
230 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 230 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
231 cc::LocalSurfaceId local_surface_id_; 231 cc::LocalSurfaceId local_surface_id_;
232 uint32_t next_surface_sequence_; 232 uint32_t next_surface_sequence_;
233 uint32_t last_compositor_frame_sink_id_; 233 uint32_t last_compositor_frame_sink_id_;
234 gfx::Size current_surface_size_; 234 gfx::Size current_surface_size_;
235 float current_surface_scale_factor_; 235 float current_surface_scale_factor_;
236 gfx::Rect last_screen_rect_; 236 gfx::Rect last_screen_rect_;
237 uint32_t ack_pending_count_; 237 uint32_t ack_pending_count_;
238 cc::ReturnedResourceArray surface_returned_resources_; 238 cc::ReturnedResourceArray surface_returned_resources_;
239 239
(...skipping 26 matching lines...) Expand all
266 // The surface client ID of the parent RenderWidgetHostView. 0 if none. 266 // The surface client ID of the parent RenderWidgetHostView. 0 if none.
267 cc::FrameSinkId parent_frame_sink_id_; 267 cc::FrameSinkId parent_frame_sink_id_;
268 268
269 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_; 269 base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
270 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame); 270 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
271 }; 271 };
272 272
273 } // namespace content 273 } // namespace content
274 274
275 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_ 275 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_WIDGET_HOST_VIEW_CHILD_FRAME_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/surface_utils.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698