Index: content/renderer/compositor_bindings/web_content_layer_impl.h |
diff --git a/webkit/renderer/compositor_bindings/web_content_layer_impl.h b/content/renderer/compositor_bindings/web_content_layer_impl.h |
similarity index 73% |
rename from webkit/renderer/compositor_bindings/web_content_layer_impl.h |
rename to content/renderer/compositor_bindings/web_content_layer_impl.h |
index e58f332e68240a0b9e4cef1a7b5baa19ac383445..6bf3b03d5f053983832dd55409f67efa497ac5a9 100644 |
--- a/webkit/renderer/compositor_bindings/web_content_layer_impl.h |
+++ b/content/renderer/compositor_bindings/web_content_layer_impl.h |
@@ -2,28 +2,30 @@ |
// 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_CONTENT_LAYER_IMPL_H_ |
-#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_ |
+#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_ |
+#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_ |
#include "base/memory/scoped_ptr.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" |
-#include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
-#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h" |
namespace cc { |
class IntRect; |
class FloatRect; |
} |
-namespace blink { class WebContentLayerClient; } |
+namespace blink { |
+class WebContentLayerClient; |
+} |
-namespace webkit { |
+namespace content { |
class WebContentLayerImpl : public blink::WebContentLayer, |
public cc::ContentLayerClient { |
public: |
- WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebContentLayerImpl( |
+ CONTENT_EXPORT explicit WebContentLayerImpl( |
blink::WebContentLayerClient*); |
// WebContentLayer implementation. |
@@ -54,6 +56,7 @@ class WebContentLayerImpl : public blink::WebContentLayer, |
DISALLOW_COPY_AND_ASSIGN(WebContentLayerImpl); |
}; |
-} // namespace webkit |
+} // namespace content |
+ |
+#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_ |
-#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_CONTENT_LAYER_IMPL_H_ |