Move compositor bindings implementations out of WebKit::, fix style

webkit/compositor_bindings/web_layer_impl.h

Index: webkit/compositor_bindings/web_layer_impl.h
diff --git a/webkit/compositor_bindings/web_layer_impl.h b/webkit/compositor_bindings/web_layer_impl.h
index fb6da6310b309034d5d648e4233f94add35a7a43..e7252b01d37b3fc1f0e8f7daa965dcd7395393fa 100644
--- a/webkit/compositor_bindings/web_layer_impl.h
+++ b/webkit/compositor_bindings/web_layer_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WebLayerImpl_h
-#define WebLayerImpl_h
+#ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
+#define WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
@@ -28,8 +28,11 @@ class WebAnimationDelegate;
 class WebFilterOperations;
 class WebLayerScrollClient;
 struct WebFloatRect;
+}
 
-class WebLayerImpl : public WebLayer {
+namespace webkit {
+
+class WebLayerImpl : public WebKit::WebLayer {
  public:
   WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebLayerImpl();
   WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl(
@@ -40,77 +43,84 @@ class WebLayerImpl : public WebLayer {
 
   // WebLayer implementation.
   virtual int id() const;
-  virtual void invalidateRect(const WebFloatRect&);
+  virtual void invalidateRect(const WebKit::WebFloatRect&);
   virtual void invalidate();
-  virtual void addChild(WebLayer*);
-  virtual void insertChild(WebLayer*, size_t index);
-  virtual void replaceChild(WebLayer* reference, WebLayer* new_layer);
+  virtual void addChild(WebKit::WebLayer* child);
+  virtual void insertChild(WebKit::WebLayer* child, size_t index);
+  virtual void replaceChild(WebKit::WebLayer* reference,
+                            WebKit::WebLayer* new_layer);
   virtual void removeFromParent();
   virtual void removeAllChildren();
-  virtual void setAnchorPoint(const WebFloatPoint&);
-  virtual WebFloatPoint anchorPoint() const;
-  virtual void setAnchorPointZ(float);
+  virtual void setAnchorPoint(const WebKit::WebFloatPoint&);
+  virtual WebKit::WebFloatPoint anchorPoint() const;
+  virtual void setAnchorPointZ(float anchor_point_z);
   virtual float anchorPointZ() const;
-  virtual void setBounds(const WebSize&);
-  virtual WebSize bounds() const;
-  virtual void setMasksToBounds(bool);
+  virtual void setBounds(const WebKit::WebSize& bounds);
+  virtual WebKit::WebSize bounds() const;
+  virtual void setMasksToBounds(bool masks_to_bounds);
   virtual bool masksToBounds() const;
-  virtual void setMaskLayer(WebLayer*);
-  virtual void setReplicaLayer(WebLayer*);
-  virtual void setOpacity(float);
+  virtual void setMaskLayer(WebKit::WebLayer* mask);
+  virtual void setReplicaLayer(WebKit::WebLayer* replica);
+  virtual void setOpacity(float opacity);
   virtual float opacity() const;
-  virtual void setOpaque(bool);
+  virtual void setOpaque(bool opaque);
   virtual bool opaque() const;
-  virtual void setPosition(const WebFloatPoint&);
-  virtual WebFloatPoint position() const;
+  virtual void setPosition(const WebKit::WebFloatPoint& position);
+  virtual WebKit::WebFloatPoint position() const;
   virtual void setSublayerTransform(const SkMatrix44&);
   virtual SkMatrix44 sublayerTransform() const;
-  virtual void setTransform(const SkMatrix44&);
+  virtual void setTransform(const SkMatrix44& transform);
   virtual SkMatrix44 transform() const;
-  virtual void setDrawsContent(bool);
+  virtual void setDrawsContent(bool draws_content);
   virtual bool drawsContent() const;
-  virtual void setPreserves3D(bool);
-  virtual void setUseParentBackfaceVisibility(bool);
-  virtual void setBackgroundColor(WebColor);
-  virtual WebColor backgroundColor() const;
-  virtual void setFilter(SkImageFilter*);
-  virtual void setFilters(const WebFilterOperations&);
-  virtual void setBackgroundFilters(const WebFilterOperations&);
-  virtual void setDebugName(WebString);
-  virtual void setAnimationDelegate(WebAnimationDelegate*);
-  virtual bool addAnimation(WebAnimation*);
+  virtual void setPreserves3D(bool preserves_3d);
+  virtual void setUseParentBackfaceVisibility(bool visible);
+  virtual void setBackgroundColor(WebKit::WebColor color);
+  virtual WebKit::WebColor backgroundColor() const;
+  virtual void setFilter(SkImageFilter* filter);
+  virtual void setFilters(const WebKit::WebFilterOperations& filters);
+  virtual void setBackgroundFilters(const WebKit::WebFilterOperations& filters);
+  virtual void setDebugName(WebKit::WebString name);
+  virtual void setAnimationDelegate(WebKit::WebAnimationDelegate* delegate);
+  virtual bool addAnimation(WebKit::WebAnimation* animation);
   virtual void removeAnimation(int animation_id);
-  virtual void removeAnimation(int animation_id, WebAnimation::TargetProperty);
+  virtual void removeAnimation(int animation_id,
+                               WebKit::WebAnimation::TargetProperty);
   virtual void pauseAnimation(int animation_id, double time_offset);
   virtual void suspendAnimations(double monotonic_time);
   virtual void resumeAnimations(double monotonic_time);
   virtual bool hasActiveAnimation();
-  virtual void transferAnimationsTo(WebLayer*);
-  virtual void setForceRenderSurface(bool);
-  virtual void setScrollPosition(WebPoint);
-  virtual WebPoint scrollPosition() const;
-  virtual void setMaxScrollPosition(WebSize);
-  virtual WebSize maxScrollPosition() const;
-  virtual void setScrollable(bool);
+  virtual void transferAnimationsTo(WebKit::WebLayer* layer);
+  virtual void setForceRenderSurface(bool force);
+  virtual void setScrollPosition(WebKit::WebPoint position);
+  virtual WebKit::WebPoint scrollPosition() const;
+  virtual void setMaxScrollPosition(WebKit::WebSize max_position);
+  virtual WebKit::WebSize maxScrollPosition() const;
+  virtual void setScrollable(bool scrollable);
   virtual bool scrollable() const;
-  virtual void setHaveWheelEventHandlers(bool);
+  virtual void setHaveWheelEventHandlers(bool have_wheel_event_handlers);
   virtual bool haveWheelEventHandlers() const;
-  virtual void setShouldScrollOnMainThread(bool);
+  virtual void setShouldScrollOnMainThread(bool scroll_on_main);
   virtual bool shouldScrollOnMainThread() const;
-  virtual void setNonFastScrollableRegion(const WebVector<WebRect>&);
-  virtual WebVector<WebRect> nonFastScrollableRegion() const;
-  virtual void setTouchEventHandlerRegion(const WebVector<WebRect>&);
-  virtual WebVector<WebRect> touchEventHandlerRegion() const;
-  virtual void setIsContainerForFixedPositionLayers(bool);
+  virtual void setNonFastScrollableRegion(
+      const WebKit::WebVector<WebKit::WebRect>& region);
+  virtual WebKit::WebVector<WebKit::WebRect> nonFastScrollableRegion() const;
+  virtual void setTouchEventHandlerRegion(
+      const WebKit::WebVector<WebKit::WebRect>& region);
+  virtual WebKit::WebVector<WebKit::WebRect> touchEventHandlerRegion() const;
+  virtual void setIsContainerForFixedPositionLayers(bool is_container);
   virtual bool isContainerForFixedPositionLayers() const;
-  virtual void setFixedToContainerLayer(bool);
+  virtual void setFixedToContainerLayer(bool is_fixed);
   virtual bool fixedToContainerLayer() const;
-  virtual void setScrollClient(WebLayerScrollClient*);
+  virtual void setScrollClient(WebKit::WebLayerScrollClient* client);
 
  protected:
   scoped_refptr<cc::Layer> layer_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WebLayerImpl);
 };
 
 }  // namespace WebKit
 
-#endif  // WebLayerImpl_h
+#endif  // WEBKIT_COMPOSITOR_BINDINGS_WEB_LAYER_IMPL_H_