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

Side by Side Diff: android_webview/browser/surfaces_instance.h

Issue 2136413002: Update Surface ID Terminology (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed webkit_unit_tests Created 4 years, 5 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
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // cc::DisplayClient overrides. 61 // cc::DisplayClient overrides.
62 void DisplayOutputSurfaceLost() override {} 62 void DisplayOutputSurfaceLost() override {}
63 void DisplaySetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override {} 63 void DisplaySetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override {}
64 64
65 // cc::SurfaceFactoryClient implementation. 65 // cc::SurfaceFactoryClient implementation.
66 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 66 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
67 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; 67 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
68 68
69 void SetEmptyRootFrame(); 69 void SetEmptyRootFrame();
70 70
71 uint32_t next_surface_id_namespace_; 71 uint32_t next_surface_client_id_;
72 72
73 scoped_refptr<AwGLSurface> gl_surface_; 73 scoped_refptr<AwGLSurface> gl_surface_;
74 std::unique_ptr<cc::SurfaceManager> surface_manager_; 74 std::unique_ptr<cc::SurfaceManager> surface_manager_;
75 std::unique_ptr<cc::Display> display_; 75 std::unique_ptr<cc::Display> display_;
76 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 76 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
77 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 77 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
78 78
79 cc::SurfaceId root_id_; 79 cc::SurfaceId root_id_;
80 std::vector<cc::SurfaceId> child_ids_; 80 std::vector<cc::SurfaceId> child_ids_;
81 81
82 // This is owned by |display_|. 82 // This is owned by |display_|.
83 ParentOutputSurface* output_surface_; 83 ParentOutputSurface* output_surface_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance); 85 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance);
86 }; 86 };
87 87
88 } // namespace android_webview 88 } // namespace android_webview
89 89
90 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 90 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698