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 |
11 #include "content/browser/renderer_host/render_widget_host_view.h" | 11 #include "content/browser/renderer_host/render_widget_host_view.h" |
12 #include "ui/aura/window_delegate.h" | 12 #include "ui/aura/window_delegate.h" |
13 #include "ui/gfx/compositor/compositor_observer.h" | 13 #include "ui/gfx/compositor/compositor_observer.h" |
14 #include "webkit/glue/webcursor.h" | 14 #include "webkit/glue/webcursor.h" |
15 | 15 |
| 16 namespace WebKit { |
| 17 class WebTouchEvent; |
| 18 } |
| 19 |
16 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 20 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
17 class AcceleratedSurfaceContainerLinux; | 21 class AcceleratedSurfaceContainerLinux; |
18 #endif | 22 #endif |
19 | 23 |
20 class RenderWidgetHostViewAura : public RenderWidgetHostView, | 24 class RenderWidgetHostViewAura : public RenderWidgetHostView, |
21 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 25 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
22 public ui::CompositorObserver, | 26 public ui::CompositorObserver, |
23 #endif | 27 #endif |
24 public aura::WindowDelegate { | 28 public aura::WindowDelegate { |
25 public: | 29 public: |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 RenderWidgetHost* host_; | 131 RenderWidgetHost* host_; |
128 | 132 |
129 aura::Window* window_; | 133 aura::Window* window_; |
130 | 134 |
131 // True when content is being loaded. Used to show an hourglass cursor. | 135 // True when content is being loaded. Used to show an hourglass cursor. |
132 bool is_loading_; | 136 bool is_loading_; |
133 | 137 |
134 // 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. |
135 WebCursor current_cursor_; | 139 WebCursor current_cursor_; |
136 | 140 |
| 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 |
| 143 // removed from the list on an ET_TOUCH_RELEASED event. |
| 144 WebKit::WebTouchEvent touch_event_; |
| 145 |
137 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 146 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
138 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; | 147 std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_; |
139 | 148 |
140 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > | 149 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > |
141 accelerated_surface_containers_; | 150 accelerated_surface_containers_; |
142 #endif | 151 #endif |
143 | 152 |
144 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 153 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
145 }; | 154 }; |
146 | 155 |
147 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 156 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
OLD | NEW |