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

Side by Side Diff: ui/android/delegated_frame_host_android.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 UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_ 5 #ifndef UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
6 #define UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_ 6 #define UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "cc/output/copy_output_request.h" 10 #include "cc/output/copy_output_request.h"
11 #include "cc/resources/returned_resource.h" 11 #include "cc/resources/returned_resource.h"
12 #include "cc/surfaces/surface_factory.h" 12 #include "cc/surfaces/surface_factory.h"
13 #include "cc/surfaces/surface_factory_client.h" 13 #include "cc/surfaces/surface_factory_client.h"
14 #include "ui/android/ui_android_export.h" 14 #include "ui/android/ui_android_export.h"
15 #include "ui/gfx/selection_bound.h" 15 #include "ui/gfx/selection_bound.h"
16 16
17 namespace cc { 17 namespace cc {
18 18
19 class CompositorFrame; 19 class CompositorFrame;
20 class Layer; 20 class Layer;
21 class SurfaceManager; 21 class SurfaceManager;
22 class SurfaceLayer; 22 class SurfaceLayer;
23 class SurfaceIdAllocator; 23 class LocalSurfaceIdAllocator;
24 enum class SurfaceDrawStatus; 24 enum class SurfaceDrawStatus;
25 25
26 } // namespace cc 26 } // namespace cc
27 27
28 namespace ui { 28 namespace ui {
29 class ViewAndroid; 29 class ViewAndroid;
30 class WindowAndroidCompositor; 30 class WindowAndroidCompositor;
31 31
32 class UI_ANDROID_EXPORT DelegatedFrameHostAndroid 32 class UI_ANDROID_EXPORT DelegatedFrameHostAndroid
33 : public cc::SurfaceFactoryClient { 33 : public cc::SurfaceFactoryClient {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 77 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
78 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; 78 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
79 79
80 void UpdateBackgroundLayer(); 80 void UpdateBackgroundLayer();
81 81
82 const cc::FrameSinkId frame_sink_id_; 82 const cc::FrameSinkId frame_sink_id_;
83 83
84 ViewAndroid* view_; 84 ViewAndroid* view_;
85 85
86 cc::SurfaceManager* surface_manager_; 86 cc::SurfaceManager* surface_manager_;
87 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 87 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_;
88 WindowAndroidCompositor* registered_parent_compositor_ = nullptr; 88 WindowAndroidCompositor* registered_parent_compositor_ = nullptr;
89 Client* client_; 89 Client* client_;
90 90
91 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 91 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
92 92
93 struct FrameData { 93 struct FrameData {
94 FrameData(); 94 FrameData();
95 ~FrameData(); 95 ~FrameData();
96 96
97 cc::LocalSurfaceId local_surface_id; 97 cc::LocalSurfaceId local_surface_id;
(...skipping 12 matching lines...) Expand all
110 scoped_refptr<cc::Layer> background_layer_; 110 scoped_refptr<cc::Layer> background_layer_;
111 111
112 gfx::Size container_size_in_dip_; 112 gfx::Size container_size_in_dip_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(DelegatedFrameHostAndroid); 114 DISALLOW_COPY_AND_ASSIGN(DelegatedFrameHostAndroid);
115 }; 115 };
116 116
117 } // namespace ui 117 } // namespace ui
118 118
119 #endif // UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_ 119 #endif // UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698