| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; | 166 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
| 167 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; | 167 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
| 168 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; | 168 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; |
| 169 virtual bool CanFocus() OVERRIDE; | 169 virtual bool CanFocus() OVERRIDE; |
| 170 virtual void OnCaptureLost() OVERRIDE; | 170 virtual void OnCaptureLost() OVERRIDE; |
| 171 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 171 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| 172 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; | 172 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; |
| 173 virtual void OnWindowDestroying() OVERRIDE; | 173 virtual void OnWindowDestroying() OVERRIDE; |
| 174 virtual void OnWindowDestroyed() OVERRIDE; | 174 virtual void OnWindowDestroyed() OVERRIDE; |
| 175 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; | 175 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; |
| 176 virtual bool HasHitTestMask() const OVERRIDE; |
| 177 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; |
| 176 | 178 |
| 177 // Overridden from aura::client::ActivationDelegate: | 179 // Overridden from aura::client::ActivationDelegate: |
| 178 virtual bool ShouldActivate(const aura::Event* event) OVERRIDE; | 180 virtual bool ShouldActivate(const aura::Event* event) OVERRIDE; |
| 179 virtual void OnActivated() OVERRIDE; | 181 virtual void OnActivated() OVERRIDE; |
| 180 virtual void OnLostActive() OVERRIDE; | 182 virtual void OnLostActive() OVERRIDE; |
| 181 | 183 |
| 182 protected: | 184 protected: |
| 183 friend class content::RenderWidgetHostView; | 185 friend class content::RenderWidgetHostView; |
| 184 | 186 |
| 185 // Should construct only via RenderWidgetHostView::CreateViewForWidget. | 187 // Should construct only via RenderWidgetHostView::CreateViewForWidget. |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 // These locks are the ones waiting for a frame to be drawn. | 323 // These locks are the ones waiting for a frame to be drawn. |
| 322 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; | 324 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; |
| 323 | 325 |
| 324 // This lock is for waiting for a front surface to become available to draw. | 326 // This lock is for waiting for a front surface to become available to draw. |
| 325 scoped_refptr<aura::CompositorLock> released_front_lock_; | 327 scoped_refptr<aura::CompositorLock> released_front_lock_; |
| 326 | 328 |
| 327 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 329 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 328 }; | 330 }; |
| 329 | 331 |
| 330 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 332 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |