| Index: content/common/gpu/image_transport_surface.cc
|
| diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc
|
| index 922a4981c529bb6169d4144973cff85a219c49f7..ad31a8e301cde4414bf158c12729a36bd621ea7d 100644
|
| --- a/content/common/gpu/image_transport_surface.cc
|
| +++ b/content/common/gpu/image_transport_surface.cc
|
| @@ -19,10 +19,6 @@
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/gl/gl_switches.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "ui/base/win/shell.h"
|
| -#endif
|
| -
|
| namespace content {
|
|
|
| ImageTransportSurface::ImageTransportSurface() {}
|
| @@ -153,14 +149,6 @@ bool ImageTransportHelper::MakeCurrent() {
|
| }
|
|
|
| void ImageTransportHelper::SetSwapInterval(gfx::GLContext* context) {
|
| -#if defined(OS_WIN)
|
| - // If Aero Glass is enabled, then the renderer will handle ratelimiting and
|
| - // there's no tearing, so waiting for vsync is unnecessary.
|
| - if (ui::win::IsAeroGlassEnabled()) {
|
| - context->SetSwapInterval(0);
|
| - return;
|
| - }
|
| -#endif
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableGpuVsync))
|
| context->SetSwapInterval(0);
|
| else
|
|
|