| 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, | 106 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, |
| 107 int gpu_host_id) OVERRIDE; | 107 int gpu_host_id) OVERRIDE; |
| 108 virtual void AcceleratedSurfacePostSubBuffer( | 108 virtual void AcceleratedSurfacePostSubBuffer( |
| 109 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel, | 109 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel, |
| 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_in_pixel, | 114 int32 width_in_pixel, |
| 115 int32 height_in_pixel, | 115 int32 height_in_pixel, |
| 116 uint64* surface_id, | 116 uint64 surface_id) OVERRIDE; |
| 117 TransportDIB::Handle* surface_handle) OVERRIDE; | |
| 118 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; | 117 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; |
| 119 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; | 118 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
| 120 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; | 119 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
| 121 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, | 120 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 122 bool processed) OVERRIDE; | 121 bool processed) OVERRIDE; |
| 123 virtual void SetHasHorizontalScrollbar( | 122 virtual void SetHasHorizontalScrollbar( |
| 124 bool has_horizontal_scrollbar) OVERRIDE; | 123 bool has_horizontal_scrollbar) OVERRIDE; |
| 125 virtual void SetScrollOffsetPinning( | 124 virtual void SetScrollOffsetPinning( |
| 126 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; | 125 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; |
| 127 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; | 126 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 // These locks are the ones waiting for a frame to be drawn. | 340 // These locks are the ones waiting for a frame to be drawn. |
| 342 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; | 341 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; |
| 343 | 342 |
| 344 // This lock is for waiting for a front surface to become available to draw. | 343 // This lock is for waiting for a front surface to become available to draw. |
| 345 scoped_refptr<aura::CompositorLock> released_front_lock_; | 344 scoped_refptr<aura::CompositorLock> released_front_lock_; |
| 346 | 345 |
| 347 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 346 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 348 }; | 347 }; |
| 349 | 348 |
| 350 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 349 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |