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.

R=piman@chromium.org, sky@chromium.org
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

5 files changed, 9 insertions, 9 deletions

diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 115b373..1f326ba 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -104,6 +104,8 @@
         'gl_switches.h',
         'gpu_switching_manager.cc',
         'gpu_switching_manager.h',
+        'io_surface_support_mac.cc',
+        'io_surface_support_mac.h',
         'scoped_binders.cc',
         'scoped_binders.h',
         'scoped_make_current.cc',
diff --git a/ui/surface/io_surface_support_mac.cc b/ui/gl/io_surface_support_mac.cc
index 53376e5..077eb81 100644
--- a/ui/surface/io_surface_support_mac.cc
+++ b/ui/gl/io_surface_support_mac.cc
@@ -5,7 +5,7 @@
 #include <dlfcn.h>
 
 #include "base/memory/singleton.h"
-#include "ui/surface/io_surface_support_mac.h"
+#include "ui/gl/io_surface_support_mac.h"
 
 typedef CFTypeRef (*IOSurfaceCreateProcPtr)(CFDictionaryRef properties);
 typedef uint32 (*IOSurfaceGetIDProcPtr)(CFTypeRef io_surface);
diff --git a/ui/surface/io_surface_support_mac.h b/ui/gl/io_surface_support_mac.h
index 3f6d6bb..d8c30e1 100644
--- a/ui/surface/io_surface_support_mac.h
+++ b/ui/gl/io_surface_support_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
-#define UI_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
+#ifndef UI_GL_IO_SURFACE_SUPPORT_MAC_H_
+#define UI_GL_IO_SURFACE_SUPPORT_MAC_H_
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreVideo/CoreVideo.h>
@@ -11,7 +11,7 @@
 #include <OpenGL/OpenGL.h>
 
 #include "base/basictypes.h"
-#include "ui/surface/surface_export.h"
+#include "ui/gl/gl_export.h"
 
 // This Mac OS X-specific class provides dynamically-linked access to
 // IOSurface.framework, which is only available on 10.6 and later.
@@ -21,7 +21,7 @@
 // See IOSurface/IOSurfaceAPI.h and OpenGL/CGLIOSurface.h on 10.6 for
 // documentation of the fields and methods of this class.
 
-class SURFACE_EXPORT IOSurfaceSupport {
+class GL_EXPORT IOSurfaceSupport {
  public:
   // Returns an instance of the IOSurfaceSupport class if the
   // operating system supports it, NULL otherwise. It is safe to call
@@ -70,4 +70,4 @@ class SURFACE_EXPORT IOSurfaceSupport {
   DISALLOW_COPY_AND_ASSIGN(IOSurfaceSupport);
 };
 
-#endif  // UI_SURFACE_IO_SURFACE_SUPPORT_MAC_H_
+#endif  // UI_GL_IO_SURFACE_SUPPORT_MAC_H_
diff --git a/ui/surface/accelerated_surface_mac.cc b/ui/surface/accelerated_surface_mac.cc
index 239836a..ce80eb0 100644
--- a/ui/surface/accelerated_surface_mac.cc
+++ b/ui/surface/accelerated_surface_mac.cc
@@ -11,8 +11,8 @@
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
+#include "ui/gl/io_surface_support_mac.h"
 #include "ui/gl/scoped_make_current.h"
-#include "ui/surface/io_surface_support_mac.h"
 
 AcceleratedSurface::AcceleratedSurface()
     : io_surface_id_(0),
diff --git a/ui/surface/surface.gyp b/ui/surface/surface.gyp
index 2c7ba5e..5887e06 100644
--- a/ui/surface/surface.gyp
+++ b/ui/surface/surface.gyp
@@ -74,8 +74,6 @@
         'accelerated_surface_win.h',
         'd3d9_utils_win.cc',
         'd3d9_utils_win.h',
-        'io_surface_support_mac.cc',
-        'io_surface_support_mac.h',
         'surface_export.h',
         'surface_switches.h',
         'surface_switches.cc',