| Index: content/browser/compositor/gl_helper.h
|
| diff --git a/content/common/gpu/client/gl_helper.h b/content/browser/compositor/gl_helper.h
|
| similarity index 98%
|
| rename from content/common/gpu/client/gl_helper.h
|
| rename to content/browser/compositor/gl_helper.h
|
| index 2be3f5ae21068c2d9e6836284d4737354dba7856..ebfc1a33c0b2c75bcb4bd08bb18f551d65c61538 100644
|
| --- a/content/common/gpu/client/gl_helper.h
|
| +++ b/content/browser/compositor/gl_helper.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 CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
|
| -#define CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
|
| +#ifndef CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_
|
| +#define CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_
|
|
|
| #include "base/atomicops.h"
|
| #include "base/callback.h"
|
| @@ -338,10 +338,7 @@ class CONTENT_EXPORT GLHelper {
|
| // Creates |scaler_impl_| if NULL.
|
| void InitScalerImpl();
|
|
|
| - enum ReadbackSwizzle {
|
| - kSwizzleNone = 0,
|
| - kSwizzleBGRA
|
| - };
|
| + enum ReadbackSwizzle { kSwizzleNone = 0, kSwizzleBGRA };
|
|
|
| gpu::gles2::GLES2Interface* gl_;
|
| gpu::ContextSupport* context_support_;
|
| @@ -379,4 +376,4 @@ class CONTENT_EXPORT ReadbackYUVInterface {
|
|
|
| } // namespace content
|
|
|
| -#endif // CONTENT_COMMON_GPU_CLIENT_GL_HELPER_H_
|
| +#endif // CONTENT_BROWSER_COMPOSITOR_GL_HELPER_H_
|
|
|