| Index: content/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| diff --git a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h b/content/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| similarity index 81%
|
| rename from webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| rename to content/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| index c51b0a2131329c3d857e99affe3ea7c69d9ca74c..a14b279db793fa7226650892043e2a16f0c63bab 100644
|
| --- a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| +++ b/content/renderer/compositor_bindings/web_external_texture_layer_impl.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 WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| -#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| +#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| +#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "cc/layers/texture_layer_client.h"
|
| +#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
|
| -#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h"
|
|
|
| namespace cc {
|
| class SingleReleaseCallback;
|
| @@ -22,7 +22,7 @@ struct WebFloatRect;
|
| struct WebExternalTextureMailbox;
|
| }
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| class WebLayerImpl;
|
| class WebExternalBitmapImpl;
|
| @@ -32,7 +32,7 @@ class WebExternalTextureLayerImpl
|
| public cc::TextureLayerClient,
|
| public base::SupportsWeakPtr<WebExternalTextureLayerImpl> {
|
| public:
|
| - WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebExternalTextureLayerImpl(
|
| + CONTENT_EXPORT explicit WebExternalTextureLayerImpl(
|
| blink::WebExternalTextureLayerClient*);
|
| virtual ~WebExternalTextureLayerImpl();
|
|
|
| @@ -67,6 +67,6 @@ class WebExternalTextureLayerImpl
|
| DISALLOW_COPY_AND_ASSIGN(WebExternalTextureLayerImpl);
|
| };
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| +#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
|
|