| Index: content/common/gpu/image_transport_surface_mac.cc
|
| diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc
|
| index 62c3265d7b1bef31e78cf8a7c4853cd197418d0f..bea7d41ba7b5a65b583e7af355ce8aa399c18280 100644
|
| --- a/content/common/gpu/image_transport_surface_mac.cc
|
| +++ b/content/common/gpu/image_transport_surface_mac.cc
|
| @@ -60,7 +60,7 @@ class IOSurfaceImageTransportSurface : public gfx::NoOpGLSurfaceCGL,
|
| const AcceleratedSurfaceMsg_BufferPresented_Params& params) OVERRIDE;
|
| virtual void OnResizeViewACK() OVERRIDE;
|
| virtual void OnResize(gfx::Size size) OVERRIDE;
|
| - virtual void SetLatencyInfo(const cc::LatencyInfo&) OVERRIDE;
|
| + virtual void SetLatencyInfo(const ui::LatencyInfo&) OVERRIDE;
|
|
|
| private:
|
| virtual ~IOSurfaceImageTransportSurface() OVERRIDE;
|
| @@ -96,7 +96,7 @@ class IOSurfaceImageTransportSurface : public gfx::NoOpGLSurfaceCGL,
|
| // Whether we unscheduled command buffer because of pending SwapBuffers.
|
| bool did_unschedule_;
|
|
|
| - cc::LatencyInfo latency_info_;
|
| + ui::LatencyInfo latency_info_;
|
|
|
| scoped_ptr<ImageTransportHelper> helper_;
|
|
|
| @@ -303,7 +303,7 @@ void IOSurfaceImageTransportSurface::OnResize(gfx::Size size) {
|
| }
|
|
|
| void IOSurfaceImageTransportSurface::SetLatencyInfo(
|
| - const cc::LatencyInfo& latency_info) {
|
| + const ui::LatencyInfo& latency_info) {
|
| latency_info_ = latency_info;
|
| }
|
|
|
|
|