| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 bool is_loading_; | 136 bool is_loading_; |
| 137 | 137 |
| 138 // The cursor for the page. This is passed up from the renderer. | 138 // The cursor for the page. This is passed up from the renderer. |
| 139 WebCursor current_cursor_; | 139 WebCursor current_cursor_; |
| 140 | 140 |
| 141 // The touch-event. Its touch-points are updated as necessary. A new | 141 // The touch-event. Its touch-points are updated as necessary. A new |
| 142 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is | 142 // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is |
| 143 // removed from the list on an ET_TOUCH_RELEASED event. | 143 // removed from the list on an ET_TOUCH_RELEASED event. |
| 144 WebKit::WebTouchEvent touch_event_; | 144 WebKit::WebTouchEvent touch_event_; |
| 145 | 145 |
| 146 // Current tooltip text. |
| 147 string16 tooltip_; |
| 148 |
| 146 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 149 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 147 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; | 150 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; |
| 148 | 151 |
| 149 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > | 152 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > |
| 150 accelerated_surface_containers_; | 153 accelerated_surface_containers_; |
| 151 #endif | 154 #endif |
| 152 | 155 |
| 153 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 156 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 154 }; | 157 }; |
| 155 | 158 |
| 156 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 159 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |