OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 | 10 |
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 | 351 |
352 int accelerated_surface_route_id_; | 352 int accelerated_surface_route_id_; |
353 | 353 |
354 // Size to use if we have no backing ContentViewCore | 354 // Size to use if we have no backing ContentViewCore |
355 gfx::Size default_size_; | 355 gfx::Size default_size_; |
356 | 356 |
357 const bool using_synchronous_compositor_; | 357 const bool using_synchronous_compositor_; |
358 | 358 |
359 scoped_ptr<DelegatedFrameEvictor> frame_evictor_; | 359 scoped_ptr<DelegatedFrameEvictor> frame_evictor_; |
360 | 360 |
| 361 bool using_delegated_renderer_; |
| 362 |
361 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); | 363 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); |
362 }; | 364 }; |
363 | 365 |
364 } // namespace content | 366 } // namespace content |
365 | 367 |
366 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ | 368 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ |
OLD | NEW |