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

Side by Side Diff: android_webview/browser/surfaces_instance.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
6 #define ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 6 #define ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "cc/surfaces/compositor_frame_sink_support_client.h" 12 #include "cc/surfaces/compositor_frame_sink_support_client.h"
13 #include "cc/surfaces/display_client.h" 13 #include "cc/surfaces/display_client.h"
14 #include "cc/surfaces/frame_sink_id.h" 14 #include "cc/surfaces/frame_sink_id.h"
15 #include "cc/surfaces/surface_id.h" 15 #include "cc/surfaces/surface_id.h"
16 16
17 namespace cc { 17 namespace cc {
18 class BeginFrameSource; 18 class BeginFrameSource;
19 class CompositorFrameSinkSupport; 19 class CompositorFrameSinkSupport;
20 class Display; 20 class Display;
21 class SurfaceIdAllocator; 21 class LocalSurfaceIdAllocator;
22 class SurfaceManager; 22 class SurfaceManager;
23 } 23 }
24 24
25 namespace gfx { 25 namespace gfx {
26 class Rect; 26 class Rect;
27 class Size; 27 class Size;
28 class Transform; 28 class Transform;
29 } 29 }
30 30
31 namespace android_webview { 31 namespace android_webview {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 void SetEmptyRootFrame(); 73 void SetEmptyRootFrame();
74 74
75 uint32_t next_client_id_; 75 uint32_t next_client_id_;
76 76
77 cc::FrameSinkId frame_sink_id_; 77 cc::FrameSinkId frame_sink_id_;
78 78
79 std::unique_ptr<cc::SurfaceManager> surface_manager_; 79 std::unique_ptr<cc::SurfaceManager> surface_manager_;
80 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_; 80 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
81 std::unique_ptr<cc::Display> display_; 81 std::unique_ptr<cc::Display> display_;
82 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 82 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_;
83 std::unique_ptr<cc::CompositorFrameSinkSupport> support_; 83 std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
84 84
85 cc::LocalSurfaceId root_id_; 85 cc::LocalSurfaceId root_id_;
86 std::vector<cc::SurfaceId> child_ids_; 86 std::vector<cc::SurfaceId> child_ids_;
87 87
88 // This is owned by |display_|. 88 // This is owned by |display_|.
89 ParentOutputSurface* output_surface_; 89 ParentOutputSurface* output_surface_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance); 91 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance);
92 }; 92 };
93 93
94 } // namespace android_webview 94 } // namespace android_webview
95 95
96 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 96 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
OLDNEW
« no previous file with comments | « android_webview/browser/hardware_renderer.cc ('k') | android_webview/browser/surfaces_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698