| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 skia::PlatformBitmap* output) OVERRIDE; | 121 skia::PlatformBitmap* output) OVERRIDE; |
| 122 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; | 122 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; |
| 123 virtual void AcceleratedSurfaceBuffersSwapped( | 123 virtual void AcceleratedSurfaceBuffersSwapped( |
| 124 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, | 124 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params_in_pixel, |
| 125 int gpu_host_id) OVERRIDE; | 125 int gpu_host_id) OVERRIDE; |
| 126 virtual void AcceleratedSurfacePostSubBuffer( | 126 virtual void AcceleratedSurfacePostSubBuffer( |
| 127 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel, | 127 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params_in_pixel, |
| 128 int gpu_host_id) OVERRIDE; | 128 int gpu_host_id) OVERRIDE; |
| 129 virtual void AcceleratedSurfaceSuspend() OVERRIDE; | 129 virtual void AcceleratedSurfaceSuspend() OVERRIDE; |
| 130 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; | 130 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; |
| 131 virtual void AcceleratedSurfaceNew(int32 width_in_pixel, | 131 virtual void AcceleratedSurfaceNew(uint64 surface_id, |
| 132 int32 height_in_pixel, | |
| 133 uint64 surface_id, | |
| 134 const std::string& mailbox_name) OVERRIDE; | 132 const std::string& mailbox_name) OVERRIDE; |
| 135 virtual void AcceleratedSurfaceRelease() OVERRIDE; | 133 virtual void AcceleratedSurfaceRelease() OVERRIDE; |
| 136 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; | 134 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
| 137 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; | 135 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; |
| 138 virtual void ProcessAckedTouchEvent( | 136 virtual void ProcessAckedTouchEvent( |
| 139 const WebKit::WebTouchEvent& touch, | 137 const WebKit::WebTouchEvent& touch, |
| 140 InputEventAckState ack_result) OVERRIDE; | 138 InputEventAckState ack_result) OVERRIDE; |
| 141 virtual void SetHasHorizontalScrollbar( | 139 virtual void SetHasHorizontalScrollbar( |
| 142 bool has_horizontal_scrollbar) OVERRIDE; | 140 bool has_horizontal_scrollbar) OVERRIDE; |
| 143 virtual void SetScrollOffsetPinning( | 141 virtual void SetScrollOffsetPinning( |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 NO_PENDING_COMMIT, | 437 NO_PENDING_COMMIT, |
| 440 }; | 438 }; |
| 441 CanLockCompositorState can_lock_compositor_; | 439 CanLockCompositorState can_lock_compositor_; |
| 442 | 440 |
| 443 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 441 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 444 }; | 442 }; |
| 445 | 443 |
| 446 } // namespace content | 444 } // namespace content |
| 447 | 445 |
| 448 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 446 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |