| Index: cc/blink/web_content_layer_impl.h
|
| diff --git a/content/renderer/compositor_bindings/web_content_layer_impl.h b/cc/blink/web_content_layer_impl.h
|
| similarity index 76%
|
| rename from content/renderer/compositor_bindings/web_content_layer_impl.h
|
| rename to cc/blink/web_content_layer_impl.h
|
| index 435acfd57ab13218d15a2aed93d7ce7fc8591cea..913fa390665d329c877161d4aa70cda5e62a8d70 100644
|
| --- a/content/renderer/compositor_bindings/web_content_layer_impl.h
|
| +++ b/cc/blink/web_content_layer_impl.h
|
| @@ -2,13 +2,13 @@
|
| // 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_CONTENT_LAYER_IMPL_H_
|
| -#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_
|
| +#ifndef CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
|
| +#define CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/blink/cc_blink_export.h"
|
| +#include "cc/blink/web_layer_impl.h"
|
| #include "cc/layers/content_layer_client.h"
|
| -#include "content/common/content_export.h"
|
| -#include "content/renderer/compositor_bindings/web_layer_impl.h"
|
| #include "third_party/WebKit/public/platform/WebContentLayer.h"
|
|
|
| namespace cc {
|
| @@ -20,13 +20,12 @@ namespace blink {
|
| class WebContentLayerClient;
|
| }
|
|
|
| -namespace content {
|
| +namespace cc_blink {
|
|
|
| class WebContentLayerImpl : public blink::WebContentLayer,
|
| public cc::ContentLayerClient {
|
| public:
|
| - CONTENT_EXPORT explicit WebContentLayerImpl(
|
| - blink::WebContentLayerClient*);
|
| + CC_BLINK_EXPORT explicit WebContentLayerImpl(blink::WebContentLayerClient*);
|
|
|
| // WebContentLayer implementation.
|
| virtual blink::WebLayer* layer();
|
| @@ -56,7 +55,6 @@ class WebContentLayerImpl : public blink::WebContentLayer,
|
| DISALLOW_COPY_AND_ASSIGN(WebContentLayerImpl);
|
| };
|
|
|
| -} // namespace content
|
| -
|
| -#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_
|
| +} // namespace cc_blink
|
|
|
| +#endif // CC_BLINK_WEB_CONTENT_LAYER_IMPL_H_
|
|
|