| 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_AURA_H_ | 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 317 |
| 318 // The current composition character bounds. | 318 // The current composition character bounds. |
| 319 std::vector<gfx::Rect> composition_character_bounds_; | 319 std::vector<gfx::Rect> composition_character_bounds_; |
| 320 | 320 |
| 321 // Indicates if there is onging composition text. | 321 // Indicates if there is onging composition text. |
| 322 bool has_composition_text_; | 322 bool has_composition_text_; |
| 323 | 323 |
| 324 // Current tooltip text. | 324 // Current tooltip text. |
| 325 string16 tooltip_; | 325 string16 tooltip_; |
| 326 | 326 |
| 327 // The scale factor of the display the renderer is currently on. |
| 328 float device_scale_factor_; |
| 329 |
| 327 std::vector< base::Callback<void(ui::Compositor*)> > | 330 std::vector< base::Callback<void(ui::Compositor*)> > |
| 328 on_compositing_did_commit_callbacks_; | 331 on_compositing_did_commit_callbacks_; |
| 329 | 332 |
| 330 std::vector< base::Callback<void(ui::Compositor*)> > | 333 std::vector< base::Callback<void(ui::Compositor*)> > |
| 331 on_compositing_will_start_callbacks_; | 334 on_compositing_will_start_callbacks_; |
| 332 | 335 |
| 333 std::map<uint64, scoped_refptr<ui::Texture> > | 336 std::map<uint64, scoped_refptr<ui::Texture> > |
| 334 image_transport_clients_; | 337 image_transport_clients_; |
| 335 | 338 |
| 336 uint64 current_surface_; | 339 uint64 current_surface_; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 | 387 |
| 385 // This lock is for waiting for a front surface to become available to draw. | 388 // This lock is for waiting for a front surface to become available to draw. |
| 386 scoped_refptr<aura::CompositorLock> released_front_lock_; | 389 scoped_refptr<aura::CompositorLock> released_front_lock_; |
| 387 | 390 |
| 388 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 391 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 389 }; | 392 }; |
| 390 | 393 |
| 391 } // namespace content | 394 } // namespace content |
| 392 | 395 |
| 393 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 396 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |