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

Side by Side Diff: content/renderer/android/synchronous_compositor_frame_sink.h

Issue 2848223003: Enforce constant size and device scale factor for surfaces (Closed)
Patch Set: Fixed Android Created 3 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ 5 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_
6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ 6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 const cc::RenderPassList& render_passes) override {} 148 const cc::RenderPassList& render_passes) override {}
149 void DisplayDidDrawAndSwap() override {} 149 void DisplayDidDrawAndSwap() override {}
150 }; 150 };
151 151
152 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface 152 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface
153 // is owned/destroyed on the compositor thread. 153 // is owned/destroyed on the compositor thread.
154 std::unique_ptr<cc::SurfaceManager> surface_manager_; 154 std::unique_ptr<cc::SurfaceManager> surface_manager_;
155 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_; 155 std::unique_ptr<cc::LocalSurfaceIdAllocator> local_surface_id_allocator_;
156 cc::LocalSurfaceId child_local_surface_id_; 156 cc::LocalSurfaceId child_local_surface_id_;
157 cc::LocalSurfaceId root_local_surface_id_; 157 cc::LocalSurfaceId root_local_surface_id_;
158 gfx::Size child_size_;
159 gfx::Size display_size_;
160 float device_scale_factor_;
158 // Uses surface_manager_. 161 // Uses surface_manager_.
159 std::unique_ptr<cc::CompositorFrameSinkSupport> root_support_; 162 std::unique_ptr<cc::CompositorFrameSinkSupport> root_support_;
160 // Uses surface_manager_. 163 // Uses surface_manager_.
161 std::unique_ptr<cc::CompositorFrameSinkSupport> child_support_; 164 std::unique_ptr<cc::CompositorFrameSinkSupport> child_support_;
162 StubDisplayClient display_client_; 165 StubDisplayClient display_client_;
163 // Uses surface_manager_. 166 // Uses surface_manager_.
164 std::unique_ptr<cc::Display> display_; 167 std::unique_ptr<cc::Display> display_;
165 // Owned by |display_|. 168 // Owned by |display_|.
166 SoftwareOutputSurface* software_output_surface_ = nullptr; 169 SoftwareOutputSurface* software_output_surface_ = nullptr;
167 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_; 170 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
168 171
169 gfx::Rect sw_viewport_for_current_draw_; 172 gfx::Rect sw_viewport_for_current_draw_;
170 173
171 base::ThreadChecker thread_checker_; 174 base::ThreadChecker thread_checker_;
172 175
173 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink); 176 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorFrameSink);
174 }; 177 };
175 178
176 } // namespace content 179 } // namespace content
177 180
178 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_ 181 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_FRAME_SINK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698