Moving compositor_bindings from webkit to content

content/renderer/compositor_bindings/web_layer_impl.h

Index: content/renderer/compositor_bindings/web_layer_impl.h
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl.h b/content/renderer/compositor_bindings/web_layer_impl.h
similarity index 89%
rename from webkit/renderer/compositor_bindings/web_layer_impl.h
rename to content/renderer/compositor_bindings/web_layer_impl.h
index 4e46e30a12c27895cd3b5da5c386227f121d901e..340fe4f194b1695d43738fb012004b4d3d60ee0c 100644
--- a/webkit/renderer/compositor_bindings/web_layer_impl.h
+++ b/content/renderer/compositor_bindings/web_layer_impl.h
@@ -2,14 +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_LAYER_IMPL_H_
-#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
+#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
+#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/layer_client.h"
+#include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebAnimation.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
@@ -21,9 +22,10 @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
-#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h"
 
-namespace cc { class Layer; }
+namespace cc {
+class Layer;
+}
 
 namespace blink {
 class WebFilterOperations;
@@ -37,22 +39,22 @@ class ConvertableToTraceFormat;
 }
 }
 
-namespace webkit {
+namespace content {
 
 class WebToCCAnimationDelegateAdapter;
 
 class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
  public:
-  WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImpl();
-  WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl(
+  CONTENT_EXPORT WebLayerImpl();
+  CONTENT_EXPORT explicit WebLayerImpl(
       scoped_refptr<cc::Layer>);
   virtual ~WebLayerImpl();
 
   static bool UsingPictureLayer();
-  WEBKIT_COMPOSITOR_BINDINGS_EXPORT static void SetImplSidePaintingEnabled(
+  CONTENT_EXPORT static void SetImplSidePaintingEnabled(
       bool enabled);
 
-  WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::Layer* layer() const;
+  CONTENT_EXPORT cc::Layer* layer() const;
 
   // WebLayer implementation.
   virtual int id() const;
@@ -132,8 +134,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
   virtual void setWebLayerClient(blink::WebLayerClient* client);
 
   // LayerClient implementation.
-  virtual scoped_refptr<base::debug::ConvertableToTraceFormat>
-      TakeDebugInfo() OVERRIDE;
+  virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo()
+      OVERRIDE;

[jam, 2014/06/11 00:27:04]

ditto

 
   virtual void setScrollParent(blink::WebLayer* parent);
   virtual void setClipParent(blink::WebLayer* parent);
@@ -148,6 +150,6 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient {
   DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
 };
 
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
+#endif  // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_