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

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

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_PROXY_H_ 5 #ifndef CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_ 6 #define CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ui::SynchronousInputHandlerProxy* const input_handler_proxy_; 134 ui::SynchronousInputHandlerProxy* const input_handler_proxy_;
135 InputHandlerManagerClient::Handler* const input_handler_; 135 InputHandlerManagerClient::Handler* const input_handler_;
136 const bool use_in_process_zero_copy_software_draw_; 136 const bool use_in_process_zero_copy_software_draw_;
137 SynchronousCompositorOutputSurface* output_surface_; 137 SynchronousCompositorOutputSurface* output_surface_;
138 bool inside_receive_; 138 bool inside_receive_;
139 IPC::Message* hardware_draw_reply_; 139 IPC::Message* hardware_draw_reply_;
140 IPC::Message* software_draw_reply_; 140 IPC::Message* software_draw_reply_;
141 141
142 // From browser. 142 // From browser.
143 size_t bytes_limit_; 143 size_t bytes_limit_;
144 scoped_ptr<SharedMemoryWithSize> software_draw_shm_; 144 std::unique_ptr<SharedMemoryWithSize> software_draw_shm_;
145 145
146 // To browser. 146 // To browser.
147 mutable uint32_t version_; // Mustable so PopulateCommonParams can be const. 147 mutable uint32_t version_; // Mustable so PopulateCommonParams can be const.
148 gfx::ScrollOffset total_scroll_offset_; // Modified by both. 148 gfx::ScrollOffset total_scroll_offset_; // Modified by both.
149 gfx::ScrollOffset max_scroll_offset_; 149 gfx::ScrollOffset max_scroll_offset_;
150 gfx::SizeF scrollable_size_; 150 gfx::SizeF scrollable_size_;
151 float page_scale_factor_; 151 float page_scale_factor_;
152 float min_page_scale_factor_; 152 float min_page_scale_factor_;
153 float max_page_scale_factor_; 153 float max_page_scale_factor_;
154 bool need_animate_scroll_; 154 bool need_animate_scroll_;
155 uint32_t need_invalidate_count_; 155 uint32_t need_invalidate_count_;
156 bool need_begin_frame_; 156 bool need_begin_frame_;
157 uint32_t did_activate_pending_tree_count_; 157 uint32_t did_activate_pending_tree_count_;
158 158
159 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorProxy); 159 DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorProxy);
160 }; 160 };
161 161
162 } // namespace content 162 } // namespace content
163 163
164 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_ 164 #endif // CONTENT_RENDERER_ANDROID_SYNCHRONOUS_COMPOSITOR_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698