Don't depend on WEBKIT_IMPLEMENTATION guarded geometry conversion c'tors

webkit/compositor_bindings/WebLayerImpl.cpp

Index: webkit/compositor_bindings/WebLayerImpl.cpp
diff --git a/webkit/compositor_bindings/WebLayerImpl.cpp b/webkit/compositor_bindings/WebLayerImpl.cpp
index c087bf8b28b7d69dd97b3e8385d8aeeb3f84dd98..df3f430c49b8290eeb54907744fb2f1a9290083b 100644
--- a/webkit/compositor_bindings/WebLayerImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerImpl.cpp
@@ -13,6 +13,7 @@
 #undef LOG
 #endif
 #include "base/string_util.h"
+#include "webcore_convert.h"
 #include <public/WebFloatPoint.h>
 #include <public/WebFloatRect.h>
 #include <public/WebSize.h>
@@ -57,8 +58,7 @@ SkMatrix44 skMatrix44FromTransformationMatrix(const WebTransformationMatrix& mat
     return skMatrix;
 }
 
-} // anonymous namespace
-
+}
 
 WebLayer* WebLayer::create()
 {
@@ -89,7 +89,7 @@ int WebLayerImpl::id() const
 
 void WebLayerImpl::invalidateRect(const WebFloatRect& rect)
 {
-    m_layer->setNeedsDisplayRect(rect);
+    m_layer->setNeedsDisplayRect(convert(rect));
 }
 
 void WebLayerImpl::invalidate()
@@ -124,12 +124,12 @@ void WebLayerImpl::removeAllChildren()
 
 void WebLayerImpl::setAnchorPoint(const WebFloatPoint& anchorPoint)
 {
-    m_layer->setAnchorPoint(anchorPoint);
+    m_layer->setAnchorPoint(convert(anchorPoint));
 }
 
 WebFloatPoint WebLayerImpl::anchorPoint() const
 {
-    return WebFloatPoint(m_layer->anchorPoint());
+    return WebFloatPoint(m_layer->anchorPoint().x(), m_layer->anchorPoint().y());
 }
 
 void WebLayerImpl::setAnchorPointZ(float anchorPointZ)
@@ -144,12 +144,12 @@ float WebLayerImpl::anchorPointZ() const
 
 void WebLayerImpl::setBounds(const WebSize& size)
 {
-    m_layer->setBounds(size);
+    m_layer->setBounds(convert(size));
 }
 
 WebSize WebLayerImpl::bounds() const
 {
-    return WebSize(m_layer->bounds());
+    return convert(m_layer->bounds());
 }
 
 void WebLayerImpl::setMasksToBounds(bool masksToBounds)
@@ -194,12 +194,12 @@ bool WebLayerImpl::opaque() const
 
 void WebLayerImpl::setPosition(const WebFloatPoint& position)
 {
-    m_layer->setPosition(position);
+    m_layer->setPosition(convert(position));
 }
 
 WebFloatPoint WebLayerImpl::position() const
 {
-    return WebFloatPoint(m_layer->position());
+    return WebFloatPoint(m_layer->position().x(), m_layer->position().y());
 }
 
 void WebLayerImpl::setSublayerTransform(const SkMatrix44& matrix)
@@ -335,17 +335,17 @@ void WebLayerImpl::setForceRenderSurface(bool forceRenderSurface)
 
 void WebLayerImpl::setScrollPosition(WebPoint position)
 {
-    m_layer->setScrollPosition(position);
+    m_layer->setScrollPosition(convert(position));
 }
 
 WebPoint WebLayerImpl::scrollPosition() const
 {
-    return m_layer->scrollPosition();
+    return WebPoint(m_layer->scrollPosition().x(), m_layer->scrollPosition().y());
 }
 
 void WebLayerImpl::setMaxScrollPosition(WebSize maxScrollPosition)
 {
-    m_layer->setMaxScrollPosition(maxScrollPosition);
+    m_layer->setMaxScrollPosition(convert(maxScrollPosition));
 }
 
 void WebLayerImpl::setScrollable(bool scrollable)
@@ -367,7 +367,7 @@ void WebLayerImpl::setNonFastScrollableRegion(const WebVector<WebRect>& rects)
 {
     WebCore::Region region;
     for (size_t i = 0; i < rects.size(); ++i) {
-        WebCore::IntRect rect = rects[i];
+        WebCore::IntRect rect = convert(rects[i]);
         region.unite(rect);
     }
     m_layer->setNonFastScrollableRegion(region);