| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 skia::PlatformCanvas* output, | 102 skia::PlatformCanvas* output, |
| 103 base::Callback<void(bool)> callback) OVERRIDE; | 103 base::Callback<void(bool)> callback) OVERRIDE; |
| 104 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; | 104 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; |
| 105 virtual void AcceleratedSurfaceBuffersSwapped( | 105 virtual void AcceleratedSurfaceBuffersSwapped( |
| 106 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, | 106 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, |
| 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, | 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 void AcceleratedSurfaceNew( | 113 virtual void AcceleratedSurfaceNew( |
| 113 int32 width, | 114 int32 width, |
| 114 int32 height, | 115 int32 height, |
| 115 uint64* surface_id, | 116 uint64* surface_id, |
| 116 TransportDIB::Handle* surface_handle) OVERRIDE; | 117 TransportDIB::Handle* surface_handle) OVERRIDE; |
| 117 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; | 118 virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE; |
| 118 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; | 119 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE; |
| 119 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; | 120 virtual gfx::Rect GetRootWindowBounds() OVERRIDE; |
| 120 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, | 121 virtual void ProcessTouchAck(WebKit::WebInputEvent::Type type, |
| 121 bool processed) OVERRIDE; | 122 bool processed) OVERRIDE; |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 // These locks are the ones waiting for a texture of the right size to come | 301 // These locks are the ones waiting for a texture of the right size to come |
| 301 // back from the renderer/GPU process. | 302 // back from the renderer/GPU process. |
| 302 std::vector<linked_ptr<ResizeLock> > resize_locks_; | 303 std::vector<linked_ptr<ResizeLock> > resize_locks_; |
| 303 // These locks are the ones waiting for a frame to be drawn. | 304 // These locks are the ones waiting for a frame to be drawn. |
| 304 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; | 305 std::vector<linked_ptr<ResizeLock> > locks_pending_draw_; |
| 305 | 306 |
| 306 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); | 307 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); |
| 307 }; | 308 }; |
| 308 | 309 |
| 309 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ | 310 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ |
| OLD | NEW |