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

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

Issue 2286273003: Make cc::Display not own its BeginFrameSource (Closed)
Patch Set: Fix webview Created 4 years, 3 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
« no previous file with comments | « no previous file | android_webview/browser/surfaces_instance.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/scheduler/begin_frame_source.h"
12 #include "cc/surfaces/display_client.h" 13 #include "cc/surfaces/display_client.h"
13 #include "cc/surfaces/surface_factory_client.h" 14 #include "cc/surfaces/surface_factory_client.h"
14 #include "cc/surfaces/surface_id.h" 15 #include "cc/surfaces/surface_id.h"
15 16
16 namespace cc { 17 namespace cc {
17 class Display; 18 class Display;
18 class SurfaceIdAllocator; 19 class SurfaceIdAllocator;
19 class SurfaceFactory; 20 class SurfaceFactory;
20 class SurfaceManager; 21 class SurfaceManager;
21 } 22 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 69
69 // cc::SurfaceFactoryClient implementation. 70 // cc::SurfaceFactoryClient implementation.
70 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 71 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
71 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; 72 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
72 73
73 void SetEmptyRootFrame(); 74 void SetEmptyRootFrame();
74 75
75 uint32_t next_surface_client_id_; 76 uint32_t next_surface_client_id_;
76 77
77 scoped_refptr<AwGLSurface> gl_surface_; 78 scoped_refptr<AwGLSurface> gl_surface_;
79 cc::StubBeginFrameSource begin_frame_source_;
78 std::unique_ptr<cc::SurfaceManager> surface_manager_; 80 std::unique_ptr<cc::SurfaceManager> surface_manager_;
79 std::unique_ptr<cc::Display> display_; 81 std::unique_ptr<cc::Display> display_;
80 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 82 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
81 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 83 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
82 84
83 cc::SurfaceId root_id_; 85 cc::SurfaceId root_id_;
84 std::vector<cc::SurfaceId> child_ids_; 86 std::vector<cc::SurfaceId> child_ids_;
85 87
86 // This is owned by |display_|. 88 // This is owned by |display_|.
87 ParentOutputSurface* output_surface_; 89 ParentOutputSurface* output_surface_;
88 90
89 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance); 91 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance);
90 }; 92 };
91 93
92 } // namespace android_webview 94 } // namespace android_webview
93 95
94 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 96 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/surfaces_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698