| 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, | 109 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, |
| 110 int gpu_host_id) OVERRIDE; | 110 int gpu_host_id) OVERRIDE; |
| 111 virtual void AcceleratedSurfaceSuspend() OVERRIDE; | 111 virtual void AcceleratedSurfaceSuspend() OVERRIDE; |
| 112 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; | 112 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; |
| 113 virtual void AcceleratedSurfaceNew( | 113 virtual void AcceleratedSurfaceNew( |
| 114 int32 width, | 114 int32 width, |
| 115 int32 height, | 115 int32 height, |
| 116 uint64* surface_id, | 116 uint64* surface_id, |
| 117 TransportDIB::Handle* surface_handle) OVERRIDE; | 117 TransportDIB::Handle* surface_handle) OVERRIDE; |
| 118 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; | 118 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; |
| 119 virtual void AcceleratedSurfaceSuggestDiscard(uint64 surface_id, |
| 120 int32 route_id, |
| 121 int gpu_host_id) OVERRIDE; |
| 119 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; | 122 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
| 120 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; | 123 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
| 121 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, | 124 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 122 bool processed) OVERRIDE; | 125 bool processed) OVERRIDE; |
| 123 virtual void SetHasHorizontalScrollbar( | 126 virtual void SetHasHorizontalScrollbar( |
| 124 bool has_horizontal_scrollbar) OVERRIDE; | 127 bool has_horizontal_scrollbar) OVERRIDE; |
| 125 virtual void SetScrollOffsetPinning( | 128 virtual void SetScrollOffsetPinning( |
| 126 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; | 129 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; |
| 127 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; | 130 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; |
| 128 virtual bool LockMouse() OVERRIDE; | 131 virtual bool LockMouse() OVERRIDE; |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 // These locks are the ones waiting for a texture of the right size to come | 304 // These locks are the ones waiting for a texture of the right size to come |
| 302 // back from the renderer/GPU process. | 305 // back from the renderer/GPU process. |
| 303 std::vector<linked_ptr<ResizeLock> > resize_locks_; | 306 std::vector<linked_ptr<ResizeLock> > resize_locks_; |
| 304 // These locks are the ones waiting for a frame to be drawn. | 307 // These locks are the ones waiting for a frame to be drawn. |
| 305 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; | 308 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; |
| 306 | 309 |
| 307 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 310 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 308 }; | 311 }; |
| 309 | 312 |
| 310 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 313 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |