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

webkit/compositor_bindings/web_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/compositor_bindings/web_layer_impl.h"
 
 #include "base/string_util.h"
 #include "cc/animation/animation.h"
 #include "cc/base/region.h"
 #include "cc/layers/layer.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "webkit/compositor_bindings/web_animation_impl.h"
 
 using cc::Animation;
 using cc::Layer;
+using WebKit::WebLayer;
+using WebKit::WebFloatPoint;
+using WebKit::WebVector;
+using WebKit::WebRect;
+using WebKit::WebSize;
+using WebKit::WebColor;
+using WebKit::WebFilterOperations;
 
-namespace WebKit {
+namespace webkit {
 
 WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {}
 
 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {}
 
 WebLayerImpl::~WebLayerImpl() {
   layer_->ClearRenderSurface();
   layer_->set_layer_animation_delegate(NULL);
 }
 
 int WebLayerImpl::id() const { return layer_->id(); }
 
-void WebLayerImpl::invalidateRect(const WebFloatRect& rect) {
+void WebLayerImpl::invalidateRect(const WebKit::WebFloatRect& rect) {
   layer_->SetNeedsDisplayRect(rect);
 }
 
 void WebLayerImpl::invalidate() { layer_->SetNeedsDisplay(); }
 
 void WebLayerImpl::addChild(WebLayer* child) {
   layer_->AddChild(static_cast<WebLayerImpl*>(child)->layer());
 }
 
 void WebLayerImpl::insertChild(WebLayer* child, size_t index) {
@@ skipping 106 matching lines @@
 
 void WebLayerImpl::setBackgroundFilters(const WebFilterOperations& filters) {
   layer_->SetBackgroundFilters(filters);
 }
 
 void WebLayerImpl::setFilter(SkImageFilter* filter) {
   SkSafeRef(filter);  // Claim a reference for the compositor.
   layer_->SetFilter(skia::AdoptRef(filter));
 }
 
-void WebLayerImpl::setDebugName(WebString name) {
+void WebLayerImpl::setDebugName(WebKit::WebString name) {
   layer_->SetDebugName(UTF16ToASCII(string16(name.data(), name.length())));
 }
 
-void WebLayerImpl::setAnimationDelegate(WebAnimationDelegate* delegate) {
+void WebLayerImpl::setAnimationDelegate(
+      WebKit::WebAnimationDelegate* delegate) {
   layer_->set_layer_animation_delegate(delegate);
 }
 
-bool WebLayerImpl::addAnimation(WebAnimation* animation) {
+bool WebLayerImpl::addAnimation(WebKit::WebAnimation* animation) {
   return layer_->AddAnimation(
-      static_cast<WebAnimationImpl*>(animation)->cloneToAnimation());
+      static_cast<WebAnimationImpl*>(animation)->CloneToAnimation());
 }
 
 void WebLayerImpl::removeAnimation(int animation_id) {
   layer_->RemoveAnimation(animation_id);
 }
 
 void WebLayerImpl::removeAnimation(
     int animation_id,
-    WebAnimation::TargetProperty target_property) {
+    WebKit::WebAnimation::TargetProperty target_property) {
   layer_->layer_animation_controller()->RemoveAnimation(
       animation_id,
       static_cast<Animation::TargetProperty>(target_property));
 }
 
 void WebLayerImpl::pauseAnimation(int animation_id, double time_offset) {
   layer_->PauseAnimation(animation_id, time_offset);
 }
 
 void WebLayerImpl::suspendAnimations(double monotonic_time) {
   layer_->SuspendAnimations(monotonic_time);
 }
 
 void WebLayerImpl::resumeAnimations(double monotonic_time) {
   layer_->ResumeAnimations(monotonic_time);
 }
 
 bool WebLayerImpl::hasActiveAnimation() { return layer_->HasActiveAnimation(); }
 
 void WebLayerImpl::transferAnimationsTo(WebLayer* other) {
   DCHECK(other);
   static_cast<WebLayerImpl*>(other)->layer_->SetLayerAnimationController(
       layer_->ReleaseLayerAnimationController());
 }
 
 void WebLayerImpl::setForceRenderSurface(bool force_render_surface) {
   layer_->SetForceRenderSurface(force_render_surface);
 }
 
-void WebLayerImpl::setScrollPosition(WebPoint position) {
+void WebLayerImpl::setScrollPosition(WebKit::WebPoint position) {
   layer_->SetScrollOffset(gfx::Point(position).OffsetFromOrigin());
 }
 
-WebPoint WebLayerImpl::scrollPosition() const {
+WebKit::WebPoint WebLayerImpl::scrollPosition() const {
   return gfx::PointAtOffsetFromOrigin(layer_->scroll_offset());
 }
 
 void WebLayerImpl::setMaxScrollPosition(WebSize max_scroll_position) {
   layer_->SetMaxScrollOffset(max_scroll_position);
 }
 
 WebSize WebLayerImpl::maxScrollPosition() const {
   return layer_->max_scroll_offset();
 }
@@ skipping 80 matching lines @@
 }
 
 void WebLayerImpl::setFixedToContainerLayer(bool enable) {
   layer_->SetFixedToContainerLayer(enable);
 }
 
 bool WebLayerImpl::fixedToContainerLayer() const {
   return layer_->fixed_to_container_layer();
 }
 
-void WebLayerImpl::setScrollClient(WebLayerScrollClient* scroll_client) {
+void WebLayerImpl::setScrollClient(
+    WebKit::WebLayerScrollClient* scroll_client) {
   layer_->set_layer_scroll_client(scroll_client);
 }
 
 Layer* WebLayerImpl::layer() const { return layer_.get(); }
 
 }  // namespace WebKit