| 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 #include "content/common/gpu/image_transport_surface.h" | 5 #include "content/common/gpu/image_transport_surface.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #if defined(OS_ANDROID) | 38 #if defined(OS_ANDROID) |
| 39 surface = CreateTransportSurface(manager, stub, handle); | 39 surface = CreateTransportSurface(manager, stub, handle); |
| 40 #else | 40 #else |
| 41 surface = new NullTransportSurface(manager, stub, handle); | 41 surface = new NullTransportSurface(manager, stub, handle); |
| 42 #endif | 42 #endif |
| 43 } else { | 43 } else { |
| 44 surface = CreateNativeSurface(manager, stub, handle); | 44 surface = CreateNativeSurface(manager, stub, handle); |
| 45 } | 45 } |
| 46 | 46 |
| 47 if (!surface.get() || !surface->Initialize()) | 47 if (!surface.get() || !surface->Initialize()) |
| 48 return NULL; | 48 return nullptr; |
| 49 return surface; | 49 return surface; |
| 50 } | 50 } |
| 51 | 51 |
| 52 ImageTransportHelper::ImageTransportHelper(ImageTransportSurface* surface, | 52 ImageTransportHelper::ImageTransportHelper(ImageTransportSurface* surface, |
| 53 GpuChannelManager* manager, | 53 GpuChannelManager* manager, |
| 54 GpuCommandBufferStub* stub, | 54 GpuCommandBufferStub* stub, |
| 55 gfx::PluginWindowHandle handle) | 55 gfx::PluginWindowHandle handle) |
| 56 : surface_(surface), | 56 : surface_(surface), |
| 57 manager_(manager), | 57 manager_(manager), |
| 58 stub_(stub->AsWeakPtr()), | 58 stub_(stub->AsWeakPtr()), |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 } | 162 } |
| 163 #endif | 163 #endif |
| 164 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync)) | 164 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync)) |
| 165 context->SetSwapInterval(0); | 165 context->SetSwapInterval(0); |
| 166 else | 166 else |
| 167 context->SetSwapInterval(1); | 167 context->SetSwapInterval(1); |
| 168 } | 168 } |
| 169 | 169 |
| 170 gpu::GpuScheduler* ImageTransportHelper::Scheduler() { | 170 gpu::GpuScheduler* ImageTransportHelper::Scheduler() { |
| 171 if (!stub_.get()) | 171 if (!stub_.get()) |
| 172 return NULL; | 172 return nullptr; |
| 173 return stub_->scheduler(); | 173 return stub_->scheduler(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 gpu::gles2::GLES2Decoder* ImageTransportHelper::Decoder() { | 176 gpu::gles2::GLES2Decoder* ImageTransportHelper::Decoder() { |
| 177 if (!stub_.get()) | 177 if (!stub_.get()) |
| 178 return NULL; | 178 return nullptr; |
| 179 return stub_->decoder(); | 179 return stub_->decoder(); |
| 180 } | 180 } |
| 181 | 181 |
| 182 #if defined(OS_MACOSX) | 182 #if defined(OS_MACOSX) |
| 183 void ImageTransportHelper::OnBufferPresented( | 183 void ImageTransportHelper::OnBufferPresented( |
| 184 const AcceleratedSurfaceMsg_BufferPresented_Params& params) { | 184 const AcceleratedSurfaceMsg_BufferPresented_Params& params) { |
| 185 surface_->OnBufferPresented(params); | 185 surface_->OnBufferPresented(params); |
| 186 } | 186 } |
| 187 #endif | 187 #endif |
| 188 | 188 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() { | 297 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() { |
| 298 gfx::VSyncProvider* vsync_provider = GetVSyncProvider(); | 298 gfx::VSyncProvider* vsync_provider = GetVSyncProvider(); |
| 299 if (vsync_provider) { | 299 if (vsync_provider) { |
| 300 vsync_provider->GetVSyncParameters( | 300 vsync_provider->GetVSyncParameters( |
| 301 base::Bind(&ImageTransportHelper::SendUpdateVSyncParameters, | 301 base::Bind(&ImageTransportHelper::SendUpdateVSyncParameters, |
| 302 helper_->AsWeakPtr())); | 302 helper_->AsWeakPtr())); |
| 303 } | 303 } |
| 304 } | 304 } |
| 305 | 305 |
| 306 } // namespace content | 306 } // namespace content |
| OLD | NEW |