cc: Remove all remaining use of WebCore Rect/Point/Size types from the compositor.

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 "config.h"
 #include "web_layer_impl.h"
 
 #include "Region.h"
 #include "SkMatrix44.h"
 #ifdef LOG
 #undef LOG
 #endif
 #include "base/string_util.h"
 #include "cc/active_animation.h"
 #include "cc/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/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 #include "web_animation_impl.h"
-#include "webcore_convert.h"
 
 using cc::ActiveAnimation;
 using cc::Layer;
 
 namespace WebKit {
 
 namespace {
 
 WebTransformationMatrix transformationMatrixFromSkMatrix44(const SkMatrix44& matrix)
 {
@@ skipping 307 matching lines @@
     static_cast<WebLayerImpl*>(other)->m_layer->setLayerAnimationController(m_layer->releaseLayerAnimationController());
 }
 
 void WebLayerImpl::setForceRenderSurface(bool forceRenderSurface)
 {
     m_layer->setForceRenderSurface(forceRenderSurface);
 }
 
 void WebLayerImpl::setScrollPosition(WebPoint position)
 {
-    m_layer->setScrollPosition(convert(position));
+    m_layer->setScrollOffset(gfx::Point(position).OffsetFromOrigin());
 }
 
 WebPoint WebLayerImpl::scrollPosition() const
 {
-    return WebPoint(m_layer->scrollPosition().x(), m_layer->scrollPosition().y());
+    return gfx::PointAtOffsetFromOrigin(m_layer->scrollOffset());
 }
 
 void WebLayerImpl::setMaxScrollPosition(WebSize maxScrollPosition)
 {
-    m_layer->setMaxScrollPosition(convert(maxScrollPosition));
+    m_layer->setMaxScrollOffset(maxScrollPosition);
 }
 
 WebSize WebLayerImpl::maxScrollPosition() const
 {
-    return convert(m_layer->maxScrollPosition());
+    return m_layer->maxScrollOffset();
 }
 
 void WebLayerImpl::setScrollable(bool scrollable)
 {
     m_layer->setScrollable(scrollable);
 }
 
 bool WebLayerImpl::scrollable() const
 {
     return m_layer->scrollable();
@@ skipping 60 matching lines @@
 {
     m_layer->setLayerScrollClient(scrollClient);
 }
 
 Layer* WebLayerImpl::layer() const
 {
     return m_layer.get();
 }
 
 } // namespace WebKit