| commit | 423e644f968f8a13dbc54dc9113d4aa7ce5dad8f | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Wed Jun 19 00:48:27 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Wed Jun 19 00:48:27 2013 |
| tree | eae826909e515f7a699b2a53776a07a1768fa233 | |
| parent | 0390b81932bb0d95ecc0250706854adc11f4f2c2 [diff] [blame] |
Move io_surface_support_mac to ui/gl. This removes a dependency on media/ via ui/surface from gpu.gyp, allowing media to use gpu.gyp for gpu::Mailbox. [email protected], [email protected] BUG=179729 Review URL: https://codereview.chromium.org/17381009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207129 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index d6f5702b..d008515b 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -62,8 +62,9 @@ #include "ui/gl/gl_image.h" #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface.h" + #if defined(OS_MACOSX) -#include "ui/surface/io_surface_support_mac.h" +#include "ui/gl/io_surface_support_mac.h" #endif // TODO(zmo): we can't include "City.h" due to type def conflicts.