Index: components/display_compositor/gl_helper.h |
diff --git a/content/browser/compositor/gl_helper.h b/components/display_compositor/gl_helper.h |
similarity index 96% |
rename from content/browser/compositor/gl_helper.h |
rename to components/display_compositor/gl_helper.h |
index 8ebba5f04e2174d13dce2ab1a464d699d0d84806..83434d2d1f23e3ef8058f36d333685bf5425d11c 100644 |
--- a/content/browser/compositor/gl_helper.h |
+++ b/components/display_compositor/gl_helper.h |
@@ -2,15 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_ |
-#define CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_ |
+#ifndef COMPONENTS_DISPLAY_COMPOSITOR_GL_HELPER_H_ |
+#define COMPONENTS_DISPLAY_COMPOSITOR_GL_HELPER_H_ |
#include <memory> |
#include "base/atomicops.h" |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "content/common/content_export.h" |
+#include "components/display_compositor/display_compositor_export.h" |
#include "gpu/command_buffer/client/gles2_interface.h" |
#include "gpu/command_buffer/common/mailbox_holder.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
@@ -28,11 +28,11 @@ struct Mailbox; |
class SkRegion; |
-namespace content { |
+namespace display_compositor { |
class GLHelperScaling; |
-class ScopedGLuint { |
+class DISPLAY_COMPOSITOR_EXPORT ScopedGLuint { |
public: |
typedef void (gpu::gles2::GLES2Interface::*GenFunc)(GLsizei n, GLuint* ids); |
typedef void (gpu::gles2::GLES2Interface::*DeleteFunc)(GLsizei n, |
@@ -134,7 +134,7 @@ class GLHelperReadbackSupport; |
// Provides higher level operations on top of the gpu::gles2::GLES2Interface |
// interfaces. |
-class CONTENT_EXPORT GLHelper { |
+class DISPLAY_COMPOSITOR_EXPORT GLHelper { |
public: |
GLHelper(gpu::gles2::GLES2Interface* gl, |
gpu::ContextSupport* context_support); |
@@ -280,7 +280,7 @@ class CONTENT_EXPORT GLHelper { |
// needed to scale from a specified size to a destination size. |
// If the source or destination sizes changes, you must create |
// a new scaler. |
- class CONTENT_EXPORT ScalerInterface { |
+ class DISPLAY_COMPOSITOR_EXPORT ScalerInterface { |
public: |
ScalerInterface() {} |
virtual ~ScalerInterface() {} |
@@ -353,7 +353,7 @@ class CONTENT_EXPORT GLHelper { |
// can handle multiple outstanding readbacks at the same time, but |
// if the source or destination sizes change, you'll need to create |
// a new readback pipeline. |
-class CONTENT_EXPORT ReadbackYUVInterface { |
+class DISPLAY_COMPOSITOR_EXPORT ReadbackYUVInterface { |
public: |
ReadbackYUVInterface() {} |
virtual ~ReadbackYUVInterface() {} |
@@ -377,6 +377,6 @@ class CONTENT_EXPORT ReadbackYUVInterface { |
virtual GLHelper::ScalerInterface* scaler() = 0; |
}; |
-} // namespace content |
+} // namespace display_compositor |
-#endif // CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_ |
+#endif // COMPONENTS_DISPLAY_COMPOSITOR_GL_HELPER_H_ |