| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 TransportDIB::Handle* surface_handle) OVERRIDE; | 119 TransportDIB::Handle* surface_handle) OVERRIDE; |
| 120 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; | 120 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; |
| 121 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; | 121 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
| 122 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; | 122 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
| 123 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, | 123 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 124 bool processed) OVERRIDE; | 124 bool processed) OVERRIDE; |
| 125 virtual void SetHasHorizontalScrollbar( | 125 virtual void SetHasHorizontalScrollbar( |
| 126 bool has_horizontal_scrollbar) OVERRIDE; | 126 bool has_horizontal_scrollbar) OVERRIDE; |
| 127 virtual void SetScrollOffsetPinning( | 127 virtual void SetScrollOffsetPinning( |
| 128 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; | 128 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; |
| 129 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; | |
| 130 virtual bool LockMouse() OVERRIDE; | 129 virtual bool LockMouse() OVERRIDE; |
| 131 virtual void UnlockMouse() OVERRIDE; | 130 virtual void UnlockMouse() OVERRIDE; |
| 132 | 131 |
| 133 // Overridden from ui::TextInputClient: | 132 // Overridden from ui::TextInputClient: |
| 134 virtual void SetCompositionText( | 133 virtual void SetCompositionText( |
| 135 const ui::CompositionText& composition) OVERRIDE; | 134 const ui::CompositionText& composition) OVERRIDE; |
| 136 virtual void ConfirmCompositionText() OVERRIDE; | 135 virtual void ConfirmCompositionText() OVERRIDE; |
| 137 virtual void ClearCompositionText() OVERRIDE; | 136 virtual void ClearCompositionText() OVERRIDE; |
| 138 virtual void InsertText(const string16& text) OVERRIDE; | 137 virtual void InsertText(const string16& text) OVERRIDE; |
| 139 virtual void InsertChar(char16 ch, int flags) OVERRIDE; | 138 virtual void InsertChar(char16 ch, int flags) OVERRIDE; |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 class ResizeLock; | 330 class ResizeLock; |
| 332 // These locks are the ones waiting for a texture of the right size to come | 331 // These locks are the ones waiting for a texture of the right size to come |
| 333 // back from the renderer/GPU process. | 332 // back from the renderer/GPU process. |
| 334 std::vector<linked_ptr<ResizeLock> > resize_locks_; | 333 std::vector<linked_ptr<ResizeLock> > resize_locks_; |
| 335 // These locks are the ones waiting for a frame to be drawn. | 334 // These locks are the ones waiting for a frame to be drawn. |
| 336 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; | 335 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; |
| 337 | 336 |
| 338 // This lock is for waiting for a front surface to become available to draw. | 337 // This lock is for waiting for a front surface to become available to draw. |
| 339 scoped_refptr<aura::CompositorLock> released_front_lock_; | 338 scoped_refptr<aura::CompositorLock> released_front_lock_; |
| 340 | 339 |
| 340 class CompositingDelegateAura : public CompositingDelegate { |
| 341 public: |
| 342 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; |
| 343 virtual bool ResizeNeedsNewSurface() OVERRIDE; |
| 344 |
| 345 private: |
| 346 friend class RenderWidgetHostViewAura; |
| 347 CompositingDelegateAura(RenderWidgetHostViewAura* view) |
| 348 : view_(view) |
| 349 {} |
| 350 RenderWidgetHostViewAura* view_; |
| 351 }; |
| 352 |
| 341 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 353 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 342 }; | 354 }; |
| 343 | 355 |
| 344 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 356 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |