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

Side by Side Diff: content/browser/renderer_host/delegated_frame_host.h

Issue 2708153005: Rename SurfaceIdAllocator to LocalSurfaceIdAllocator (Closed)
Patch Set: Delete useless include Created 3 years, 9 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_RENDERER_HOST_DELEGATED_FRAME_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 13 matching lines...) Expand all
24 #include "ui/compositor/compositor_vsync_manager.h" 24 #include "ui/compositor/compositor_vsync_manager.h"
25 #include "ui/compositor/layer.h" 25 #include "ui/compositor/layer.h"
26 #include "ui/events/event.h" 26 #include "ui/events/event.h"
27 #include "ui/gfx/geometry/rect_conversions.h" 27 #include "ui/gfx/geometry/rect_conversions.h"
28 28
29 namespace base { 29 namespace base {
30 class TickClock; 30 class TickClock;
31 } 31 }
32 32
33 namespace cc { 33 namespace cc {
34 class LocalSurfaceIdAllocator;
34 class SurfaceFactory; 35 class SurfaceFactory;
35 } 36 }
36 37
37 namespace media { 38 namespace media {
38 class VideoFrame; 39 class VideoFrame;
39 } 40 }
40 41
41 namespace display_compositor { 42 namespace display_compositor {
42 class ReadbackYUVInterface; 43 class ReadbackYUVInterface;
43 } 44 }
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 bool skipped_frames_; 281 bool skipped_frames_;
281 std::vector<ui::LatencyInfo> skipped_latency_info_list_; 282 std::vector<ui::LatencyInfo> skipped_latency_info_list_;
282 283
283 std::unique_ptr<ui::Layer> right_gutter_; 284 std::unique_ptr<ui::Layer> right_gutter_;
284 std::unique_ptr<ui::Layer> bottom_gutter_; 285 std::unique_ptr<ui::Layer> bottom_gutter_;
285 286
286 // This is the last root background color from a swapped frame. 287 // This is the last root background color from a swapped frame.
287 SkColor background_color_; 288 SkColor background_color_;
288 289
289 // State for rendering into a Surface. 290 // State for rendering into a Surface.
290 std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_; 291 std::unique_ptr<cc::LocalSurfaceIdAllocator> id_allocator_;
291 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 292 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
292 gfx::Size current_surface_size_; 293 gfx::Size current_surface_size_;
293 float current_scale_factor_; 294 float current_scale_factor_;
294 cc::ReturnedResourceArray surface_returned_resources_; 295 cc::ReturnedResourceArray surface_returned_resources_;
295 296
296 // This lock is the one waiting for a frame of the right size to come back 297 // This lock is the one waiting for a frame of the right size to come back
297 // from the renderer/GPU process. It is set from the moment the aura window 298 // from the renderer/GPU process. It is set from the moment the aura window
298 // got resized, to the moment we committed the renderer frame of the same 299 // got resized, to the moment we committed the renderer frame of the same
299 // size. It keeps track of the size we expect from the renderer, and locks the 300 // size. It keeps track of the size we expect from the renderer, and locks the
300 // compositor, as well as the UI for a short time to give a chance to the 301 // compositor, as well as the UI for a short time to give a chance to the
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 // YUV readback pipeline. 333 // YUV readback pipeline.
333 std::unique_ptr<display_compositor::ReadbackYUVInterface> 334 std::unique_ptr<display_compositor::ReadbackYUVInterface>
334 yuv_readback_pipeline_; 335 yuv_readback_pipeline_;
335 336
336 std::unique_ptr<DelegatedFrameEvictor> delegated_frame_evictor_; 337 std::unique_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
337 }; 338 };
338 339
339 } // namespace content 340 } // namespace content
340 341
341 #endif // CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_ 342 #endif // CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698