| 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 184 |
| 185 void ImageTransportHelper::OnBufferPresented( | 185 void ImageTransportHelper::OnBufferPresented( |
| 186 const AcceleratedSurfaceMsg_BufferPresented_Params& params) { | 186 const AcceleratedSurfaceMsg_BufferPresented_Params& params) { |
| 187 surface_->OnBufferPresented(params); | 187 surface_->OnBufferPresented(params); |
| 188 } | 188 } |
| 189 | 189 |
| 190 void ImageTransportHelper::OnResizeViewACK() { | 190 void ImageTransportHelper::OnResizeViewACK() { |
| 191 surface_->OnResizeViewACK(); | 191 surface_->OnResizeViewACK(); |
| 192 } | 192 } |
| 193 | 193 |
| 194 void ImageTransportHelper::Resize(gfx::Size size) { | 194 void ImageTransportHelper::Resize(gfx::Size size, float scale_factor) { |
| 195 surface_->OnResize(size); | 195 surface_->OnResize(size, scale_factor); |
| 196 | 196 |
| 197 #if defined(OS_ANDROID) | 197 #if defined(OS_ANDROID) |
| 198 manager_->gpu_memory_manager()->ScheduleManage( | 198 manager_->gpu_memory_manager()->ScheduleManage( |
| 199 GpuMemoryManager::kScheduleManageNow); | 199 GpuMemoryManager::kScheduleManageNow); |
| 200 #endif | 200 #endif |
| 201 } | 201 } |
| 202 | 202 |
| 203 void ImageTransportHelper::SetLatencyInfo( | 203 void ImageTransportHelper::SetLatencyInfo( |
| 204 const cc::LatencyInfo& latency_info) { | 204 const cc::LatencyInfo& latency_info) { |
| 205 surface_->SetLatencyInfo(latency_info); | 205 surface_->SetLatencyInfo(latency_info); |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 } | 319 } |
| 320 | 320 |
| 321 void PassThroughImageTransportSurface::OnResizeViewACK() { | 321 void PassThroughImageTransportSurface::OnResizeViewACK() { |
| 322 DCHECK(transport_); | 322 DCHECK(transport_); |
| 323 Resize(new_size_); | 323 Resize(new_size_); |
| 324 | 324 |
| 325 TRACE_EVENT_ASYNC_END0("gpu", "OnResize", this); | 325 TRACE_EVENT_ASYNC_END0("gpu", "OnResize", this); |
| 326 helper_->SetScheduled(true); | 326 helper_->SetScheduled(true); |
| 327 } | 327 } |
| 328 | 328 |
| 329 void PassThroughImageTransportSurface::OnResize(gfx::Size size) { | 329 void PassThroughImageTransportSurface::OnResize(gfx::Size size, |
| 330 float scale_factor) { |
| 330 new_size_ = size; | 331 new_size_ = size; |
| 331 | 332 |
| 332 if (transport_) { | 333 if (transport_) { |
| 333 helper_->SendResizeView(size); | 334 helper_->SendResizeView(size); |
| 334 helper_->SetScheduled(false); | 335 helper_->SetScheduled(false); |
| 335 TRACE_EVENT_ASYNC_BEGIN2("gpu", "OnResize", this, | 336 TRACE_EVENT_ASYNC_BEGIN2("gpu", "OnResize", this, |
| 336 "width", size.width(), "height", size.height()); | 337 "width", size.width(), "height", size.height()); |
| 337 } else { | 338 } else { |
| 338 Resize(new_size_); | 339 Resize(new_size_); |
| 339 } | 340 } |
| 340 } | 341 } |
| 341 | 342 |
| 342 gfx::Size PassThroughImageTransportSurface::GetSize() { | 343 gfx::Size PassThroughImageTransportSurface::GetSize() { |
| 343 return GLSurfaceAdapter::GetSize(); | 344 return GLSurfaceAdapter::GetSize(); |
| 344 } | 345 } |
| 345 | 346 |
| 346 PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {} | 347 PassThroughImageTransportSurface::~PassThroughImageTransportSurface() {} |
| 347 | 348 |
| 348 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() { | 349 void PassThroughImageTransportSurface::SendVSyncUpdateIfAvailable() { |
| 349 gfx::VSyncProvider* vsync_provider = GetVSyncProvider(); | 350 gfx::VSyncProvider* vsync_provider = GetVSyncProvider(); |
| 350 if (vsync_provider) { | 351 if (vsync_provider) { |
| 351 vsync_provider->GetVSyncParameters( | 352 vsync_provider->GetVSyncParameters( |
| 352 base::Bind(&ImageTransportHelper::SendUpdateVSyncParameters, | 353 base::Bind(&ImageTransportHelper::SendUpdateVSyncParameters, |
| 353 helper_->AsWeakPtr())); | 354 helper_->AsWeakPtr())); |
| 354 } | 355 } |
| 355 } | 356 } |
| 356 | 357 |
| 357 } // namespace content | 358 } // namespace content |
| OLD | NEW |