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_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_ | 5 #ifndef CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_ |
6 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_ | 6 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
15 #include "content/common/content_export.h" | 15 #include "content/common/content_export.h" |
16 #include "ipc/ipc_listener.h" | 16 #include "ipc/ipc_listener.h" |
17 #include "ipc/ipc_message.h" | 17 #include "ipc/ipc_message.h" |
18 #include "ui/events/latency_info.h" | 18 #include "ui/events/latency_info.h" |
19 #include "ui/gfx/geometry/rect.h" | 19 #include "ui/gfx/geometry/rect.h" |
20 #include "ui/gfx/geometry/size.h" | 20 #include "ui/gfx/geometry/size.h" |
21 #include "ui/gfx/native_widget_types.h" | 21 #include "ui/gfx/native_widget_types.h" |
| 22 #include "ui/gfx/swap_result.h" |
22 #include "ui/gl/gl_surface.h" | 23 #include "ui/gl/gl_surface.h" |
23 | 24 |
24 struct AcceleratedSurfaceMsg_BufferPresented_Params; | 25 struct AcceleratedSurfaceMsg_BufferPresented_Params; |
25 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; | 26 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; |
26 | 27 |
27 namespace gfx { | 28 namespace gfx { |
28 class GLSurface; | 29 class GLSurface; |
29 } | 30 } |
30 | 31 |
31 namespace gpu { | 32 namespace gpu { |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 : public gfx::GLSurfaceAdapter, | 169 : public gfx::GLSurfaceAdapter, |
169 public ImageTransportSurface { | 170 public ImageTransportSurface { |
170 public: | 171 public: |
171 PassThroughImageTransportSurface(GpuChannelManager* manager, | 172 PassThroughImageTransportSurface(GpuChannelManager* manager, |
172 GpuCommandBufferStub* stub, | 173 GpuCommandBufferStub* stub, |
173 gfx::GLSurface* surface); | 174 gfx::GLSurface* surface); |
174 | 175 |
175 // GLSurface implementation. | 176 // GLSurface implementation. |
176 bool Initialize() override; | 177 bool Initialize() override; |
177 void Destroy() override; | 178 void Destroy() override; |
178 bool SwapBuffers() override; | 179 gfx::SwapResult SwapBuffers() override; |
179 bool PostSubBuffer(int x, int y, int width, int height) override; | 180 gfx::SwapResult PostSubBuffer(int x, int y, int width, int height) override; |
180 bool OnMakeCurrent(gfx::GLContext* context) override; | 181 bool OnMakeCurrent(gfx::GLContext* context) override; |
181 | 182 |
182 // ImageTransportSurface implementation. | 183 // ImageTransportSurface implementation. |
183 #if defined(OS_MACOSX) | 184 #if defined(OS_MACOSX) |
184 void OnBufferPresented( | 185 void OnBufferPresented( |
185 const AcceleratedSurfaceMsg_BufferPresented_Params& params) override; | 186 const AcceleratedSurfaceMsg_BufferPresented_Params& params) override; |
186 #endif | 187 #endif |
187 void OnResize(gfx::Size size, float scale_factor) override; | 188 void OnResize(gfx::Size size, float scale_factor) override; |
188 gfx::Size GetSize() override; | 189 gfx::Size GetSize() override; |
189 void SetLatencyInfo( | 190 void SetLatencyInfo( |
190 const std::vector<ui::LatencyInfo>& latency_info) override; | 191 const std::vector<ui::LatencyInfo>& latency_info) override; |
191 void WakeUpGpu() override; | 192 void WakeUpGpu() override; |
192 | 193 |
193 protected: | 194 protected: |
194 ~PassThroughImageTransportSurface() override; | 195 ~PassThroughImageTransportSurface() override; |
195 | 196 |
196 // If updated vsync parameters can be determined, send this information to | 197 // If updated vsync parameters can be determined, send this information to |
197 // the browser. | 198 // the browser. |
198 virtual void SendVSyncUpdateIfAvailable(); | 199 virtual void SendVSyncUpdateIfAvailable(); |
199 void SwapBuffersCallBack(std::vector<ui::LatencyInfo>* latency_info_ptr); | 200 void SwapBuffersCallBack(std::vector<ui::LatencyInfo>* latency_info_ptr, |
| 201 gfx::SwapResult result); |
200 | 202 |
201 ImageTransportHelper* GetHelper() { return helper_.get(); } | 203 ImageTransportHelper* GetHelper() { return helper_.get(); } |
202 | 204 |
203 private: | 205 private: |
204 scoped_ptr<ImageTransportHelper> helper_; | 206 scoped_ptr<ImageTransportHelper> helper_; |
205 bool did_set_swap_interval_; | 207 bool did_set_swap_interval_; |
206 std::vector<ui::LatencyInfo> latency_info_; | 208 std::vector<ui::LatencyInfo> latency_info_; |
207 base::WeakPtrFactory<PassThroughImageTransportSurface> weak_ptr_factory_; | 209 base::WeakPtrFactory<PassThroughImageTransportSurface> weak_ptr_factory_; |
208 | 210 |
209 DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface); | 211 DISALLOW_COPY_AND_ASSIGN(PassThroughImageTransportSurface); |
210 }; | 212 }; |
211 | 213 |
212 } // namespace content | 214 } // namespace content |
213 | 215 |
214 #endif // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_ | 216 #endif // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_H_ |
OLD | NEW |