| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index d72d5d241ee6ad18d6d046139476dea4fe4301fa..9cf216966e338fb3a07301686294a3623844c7b2 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -18,9 +18,6 @@
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/debug/trace_event.h"
|
| -#if defined(OS_MACOSX)
|
| -#include "base/mac/scoped_cftyperef.h"
|
| -#endif
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/stringprintf.h"
|
| @@ -61,7 +58,10 @@
|
| #include "ui/gl/gl_image.h"
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/gl/gl_surface.h"
|
| +
|
| #if defined(OS_MACOSX)
|
| +#include "base/mac/scoped_cftyperef.h"
|
| +#include "ui/gl/gl_context_cgl.h"
|
| #include "ui/surface/io_surface_support_mac.h"
|
| #endif
|
|
|
| @@ -2573,6 +2573,11 @@ bool GLES2DecoderImpl::Initialize(
|
| glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT);
|
| }
|
|
|
| +#if defined(OS_MACOSX)
|
| + if (feature_info_->workarounds().force_cgl_set_virtual_screen)
|
| + gfx::GLContextCGL::ForceCGLSetVirtualScreen();
|
| +#endif
|
| +
|
| // Create a delegate to perform async pixel transfers.
|
| async_pixel_transfer_delegate_ =
|
| gfx::AsyncPixelTransferDelegate::Create(context.get());
|
|
|