| Index: cc/blink/web_external_texture_layer_impl.h
|
| diff --git a/content/renderer/compositor_bindings/web_external_texture_layer_impl.h b/cc/blink/web_external_texture_layer_impl.h
|
| similarity index 83%
|
| rename from content/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| rename to cc/blink/web_external_texture_layer_impl.h
|
| index bc46b937e8e5b7f08fe408f4c206fe49e5ff10e8..044be1a22c718de22968e2219a1fc9b0e4d0079a 100644
|
| --- a/content/renderer/compositor_bindings/web_external_texture_layer_impl.h
|
| +++ b/cc/blink/web_external_texture_layer_impl.h
|
| @@ -2,27 +2,27 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| -#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| +#ifndef CC_BLINK_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| +#define CC_BLINK_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| +#include "cc/blink/cc_blink_export.h"
|
| #include "cc/layers/texture_layer_client.h"
|
| -#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
|
|
|
| -namespace cc {
|
| -class SingleReleaseCallback;
|
| -class TextureMailbox;
|
| -}
|
| -
|
| namespace blink {
|
| struct WebFloatRect;
|
| struct WebExternalTextureMailbox;
|
| }
|
|
|
| -namespace content {
|
| +namespace cc {
|
| +class SingleReleaseCallback;
|
| +class TextureMailbox;
|
| +}
|
| +
|
| +namespace cc_blink {
|
|
|
| class WebLayerImpl;
|
| class WebExternalBitmapImpl;
|
| @@ -32,7 +32,7 @@ class WebExternalTextureLayerImpl
|
| public cc::TextureLayerClient,
|
| public base::SupportsWeakPtr<WebExternalTextureLayerImpl> {
|
| public:
|
| - CONTENT_EXPORT explicit WebExternalTextureLayerImpl(
|
| + CC_BLINK_EXPORT explicit WebExternalTextureLayerImpl(
|
| blink::WebExternalTextureLayerClient*);
|
| virtual ~WebExternalTextureLayerImpl();
|
|
|
| @@ -67,7 +67,6 @@ class WebExternalTextureLayerImpl
|
| DISALLOW_COPY_AND_ASSIGN(WebExternalTextureLayerImpl);
|
| };
|
|
|
| -} // namespace content
|
| -
|
| -#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
| +} // namespace cc_blink
|
|
|
| +#endif // CC_BLINK_WEB_EXTERNAL_TEXTURE_LAYER_IMPL_H_
|
|
|