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

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

Issue 2560463002: aw: Fix race between first frame draw and view detach causing deadlock. (Closed)
Patch Set: unconditionally set has_received_frame_ to false in DeleteHardwareRendererOnUI Created 4 years 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/render_thread_manager.h » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
6 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_ 6 #define ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 float dip_scale_; 197 float dip_scale_;
198 float page_scale_factor_; 198 float page_scale_factor_;
199 float min_page_scale_factor_; 199 float min_page_scale_factor_;
200 float max_page_scale_factor_; 200 float max_page_scale_factor_;
201 bool on_new_picture_enable_; 201 bool on_new_picture_enable_;
202 bool clear_view_; 202 bool clear_view_;
203 203
204 bool offscreen_pre_raster_; 204 bool offscreen_pre_raster_;
205 205
206 // Must do a synchronous draw first to ensure GL bindings are initialized. 206 // Must do a synchronous draw first to ensure GL bindings are initialized.
207 // TODO(boliu): Wait on render thread and remove this. 207 // TODO(boliu): Wait on render thread and remove this. When the
208 // first synchronous draw requirement is removed,
209 // RenderThreadManager::DeleteHardwareRendererOnUI will need to
210 // change, because it will no longer be true that having received a
211 // frame means that GL bindings have been initialized.
208 bool allow_async_draw_; 212 bool allow_async_draw_;
209 213
210 gfx::Vector2d last_on_draw_scroll_offset_; 214 gfx::Vector2d last_on_draw_scroll_offset_;
211 gfx::Rect last_on_draw_global_visible_rect_; 215 gfx::Rect last_on_draw_global_visible_rect_;
212 216
213 gfx::Size size_; 217 gfx::Size size_;
214 218
215 gfx::SizeF scrollable_size_dip_; 219 gfx::SizeF scrollable_size_dip_;
216 220
217 // Current scroll offset in CSS pixels. 221 // Current scroll offset in CSS pixels.
(...skipping 11 matching lines...) Expand all
229 gfx::Vector2dF overscroll_rounding_error_; 233 gfx::Vector2dF overscroll_rounding_error_;
230 234
231 ParentCompositorDrawConstraints external_draw_constraints_; 235 ParentCompositorDrawConstraints external_draw_constraints_;
232 236
233 DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer); 237 DISALLOW_COPY_AND_ASSIGN(BrowserViewRenderer);
234 }; 238 };
235 239
236 } // namespace android_webview 240 } // namespace android_webview
237 241
238 #endif // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_ 242 #endif // ANDROID_WEBVIEW_BROWSER_BROWSER_VIEW_RENDERER_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/render_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698