Index: content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h |
diff --git a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h b/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h |
similarity index 71% |
rename from webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h |
rename to content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h |
index fbd709d66e7e6efc3429f6433531541714a442a5..bcfd5ec2f178d83d8ec02fbcc16df13046c35d4e 100644 |
--- a/webkit/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h |
+++ b/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds.h |
@@ -2,14 +2,14 @@ |
// 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_FIXED_BOUNDS_H_ |
-#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ |
+#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ |
+#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ |
+#include "content/renderer/compositor_bindings/web_layer_impl.h" |
#include "ui/gfx/size.h" |
#include "ui/gfx/transform.h" |
-#include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
-namespace webkit { |
+namespace content { |
// A special implementation of WebLayerImpl for layers that its contents |
// need to be automatically scaled when the bounds changes. The compositor |
@@ -18,8 +18,8 @@ namespace webkit { |
// transformation scales. |
class WebLayerImplFixedBounds : public WebLayerImpl { |
public: |
- WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImplFixedBounds(); |
- WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImplFixedBounds( |
+ CONTENT_EXPORT WebLayerImplFixedBounds(); |
+ CONTENT_EXPORT explicit WebLayerImplFixedBounds( |
scoped_refptr<cc::Layer>); |
virtual ~WebLayerImplFixedBounds(); |
@@ -32,7 +32,7 @@ class WebLayerImplFixedBounds : public WebLayerImpl { |
virtual void setTransform(const SkMatrix44& transform); |
virtual SkMatrix44 transform() const; |
- WEBKIT_COMPOSITOR_BINDINGS_EXPORT void SetFixedBounds(gfx::Size bounds); |
+ CONTENT_EXPORT void SetFixedBounds(gfx::Size bounds); |
protected: |
void SetTransformInternal(const gfx::Transform& transform); |
@@ -46,6 +46,7 @@ class WebLayerImplFixedBounds : public WebLayerImpl { |
DISALLOW_COPY_AND_ASSIGN(WebLayerImplFixedBounds); |
}; |
-} // namespace webkit |
+} // namespace content |
+ |
+#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ |
-#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_FIXED_BOUNDS_H_ |