diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 00:19:06 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 00:19:06 +0000 |
| commit | d455d55745439727d00254ef85a5386290a51cd3 (patch) | |
| tree | cc1f7dd184a8fa7565c9fc45961e553deb4b8834 /webkit | |
| parent | c2b20d05b32184ffa24102ea70a14a456f16f581 (diff) | |
| download | chromium_src-d455d55745439727d00254ef85a5386290a51cd3.zip chromium_src-d455d55745439727d00254ef85a5386290a51cd3.tar.gz chromium_src-d455d55745439727d00254ef85a5386290a51cd3.tar.bz2 | |
Remove most remaining webcore points and sizes.
The remaining sizes should all be becoming vectors. Some or all of the
remaining points should as well.
The only Int/Float Point/Size types left are in the scrolling and page scaling
code, or in the LayerTilingData.
R=enne
BUG=147395
Review URL: https://codereview.chromium.org/11358050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
3 files changed, 4 insertions, 6 deletions
diff --git a/webkit/compositor_bindings/web_external_texture_layer_impl.cc b/webkit/compositor_bindings/web_external_texture_layer_impl.cc index e43e4f1..54e71ad 100644 --- a/webkit/compositor_bindings/web_external_texture_layer_impl.cc +++ b/webkit/compositor_bindings/web_external_texture_layer_impl.cc @@ -11,7 +11,6 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" #include "web_layer_impl.h" -#include "webcore_convert.h" using namespace cc; @@ -88,7 +87,7 @@ public: virtual void appendCopy(unsigned sourceTexture, unsigned destinationTexture, WebSize size) OVERRIDE { - TextureCopier::Parameters copy = { sourceTexture, destinationTexture, convert(size) }; + TextureCopier::Parameters copy = { sourceTexture, destinationTexture, size }; m_queue.appendCopy(copy); } diff --git a/webkit/compositor_bindings/web_io_surface_layer_impl.cc b/webkit/compositor_bindings/web_io_surface_layer_impl.cc index ee56546..3469503 100644 --- a/webkit/compositor_bindings/web_io_surface_layer_impl.cc +++ b/webkit/compositor_bindings/web_io_surface_layer_impl.cc @@ -6,7 +6,6 @@ #include "web_io_surface_layer_impl.h" #include "cc/io_surface_layer.h" -#include "webcore_convert.h" #include "web_layer_impl.h" using cc::IOSurfaceLayer; @@ -30,7 +29,7 @@ WebIOSurfaceLayerImpl::~WebIOSurfaceLayerImpl() void WebIOSurfaceLayerImpl::setIOSurfaceProperties(unsigned ioSurfaceId, WebSize size) { - static_cast<IOSurfaceLayer*>(m_layer->layer())->setIOSurfaceProperties(ioSurfaceId, convert(size)); + static_cast<IOSurfaceLayer*>(m_layer->layer())->setIOSurfaceProperties(ioSurfaceId, size); } WebLayer* WebIOSurfaceLayerImpl::layer() diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc index 165a1fb..58794b5 100644 --- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc +++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc @@ -49,12 +49,12 @@ public: virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERRIDE { - return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(convert(point), static_cast<cc::InputHandlerClient::ScrollInputType>(type))); + return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(point, static_cast<cc::InputHandlerClient::ScrollInputType>(type))); } virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE { - m_client->scrollBy(convert(point), convert(offset)); + m_client->scrollBy(point, convert(offset)); } virtual void scrollEnd() OVERRIDE |