cc: Use gfx:: Geometry types for positions, bounds, and related things.

webkit/compositor_bindings/web_layer_tree_view_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_tree_view_impl.h"
 
 #include "cc/font_atlas.h"
 #include "cc/input_handler.h"
 #include "cc/layer.h"
@@ skipping 33 matching lines @@
 
 bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings)
 {
     LayerTreeSettings settings;
     settings.acceleratePainting = webSettings.acceleratePainting;
     settings.showFPSCounter = webSettings.showFPSCounter;
     settings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
     settings.showPaintRects = webSettings.showPaintRects;
     settings.renderVSyncEnabled = webSettings.renderVSyncEnabled;
     settings.refreshRate = webSettings.refreshRate;
-    settings.defaultTileSize = convert(webSettings.defaultTileSize);
-    settings.maxUntiledLayerSize = convert(webSettings.maxUntiledLayerSize);
+    settings.defaultTileSize = webSettings.defaultTileSize;
+    settings.maxUntiledLayerSize = webSettings.maxUntiledLayerSize;
     m_layerTreeHost = LayerTreeHost::create(this, settings);
     if (!m_layerTreeHost.get())
         return false;
     return true;
 }
 
 void WebLayerTreeViewImpl::setSurfaceReady()
 {
     m_layerTreeHost->setSurfaceReady();
 }
 
 void WebLayerTreeViewImpl::setRootLayer(const WebLayer& root)
 {
     m_layerTreeHost->setRootLayer(static_cast<const WebLayerImpl*>(&root)->layer());
 }
 
 void WebLayerTreeViewImpl::clearRootLayer()
 {
     m_layerTreeHost->setRootLayer(scoped_refptr<Layer>());
 }
 
 void WebLayerTreeViewImpl::setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize)
 {
     if (!deviceViewportSize.isEmpty())
-        m_layerTreeHost->setViewportSize(convert(layoutViewportSize), convert(deviceViewportSize));
+        m_layerTreeHost->setViewportSize(layoutViewportSize, deviceViewportSize);
     else
-        m_layerTreeHost->setViewportSize(convert(layoutViewportSize), convert(layoutViewportSize));
+        m_layerTreeHost->setViewportSize(layoutViewportSize, layoutViewportSize);
 }
 
 WebSize WebLayerTreeViewImpl::layoutViewportSize() const
 {
-    return convert(m_layerTreeHost->layoutViewportSize());
+    return m_layerTreeHost->layoutViewportSize();
 }
 
 WebSize WebLayerTreeViewImpl::deviceViewportSize() const
 {
-    return convert(m_layerTreeHost->deviceViewportSize());
+    return m_layerTreeHost->deviceViewportSize();
 }
 
 WebFloatPoint WebLayerTreeViewImpl::adjustEventPointForPinchZoom(const WebFloatPoint& point) const
 {
-    return convert(m_layerTreeHost->adjustEventPointForPinchZoom(convert(point)));
+    return m_layerTreeHost->adjustEventPointForPinchZoom(point);
 }
 
 void WebLayerTreeViewImpl::setDeviceScaleFactor(const float deviceScaleFactor)
 {
     m_layerTreeHost->setDeviceScaleFactor(deviceScaleFactor);
 }
 
 float WebLayerTreeViewImpl::deviceScaleFactor() const
 {
     return m_layerTreeHost->deviceScaleFactor();
@@ skipping 80 matching lines @@
     stats.totalPaintTimeInSeconds = ccStats.totalPaintTimeInSeconds;
     stats.totalRasterizeTimeInSeconds = ccStats.totalRasterizeTimeInSeconds;
     stats.totalCommitTimeInSeconds = ccStats.totalCommitTimeInSeconds;
     stats.totalCommitCount = ccStats.totalCommitCount;
     stats.numImplThreadScrolls = ccStats.numImplThreadScrolls;
     stats.numMainThreadScrolls = ccStats.numMainThreadScrolls;
 }
 
 void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectTable[128], int fontHeight)
 {
-    IntRect asciiToRectTable[128];
+    gfx::Rect asciiToRectTable[128];
     for (int i = 0; i < 128; ++i)
-        asciiToRectTable[i] = convert(asciiToWebRectTable[i]);
+        asciiToRectTable[i] = asciiToWebRectTable[i];
     scoped_ptr<FontAtlas> fontAtlas = FontAtlas::create(bitmap, asciiToRectTable, fontHeight);
     m_layerTreeHost->setFontAtlas(fontAtlas.Pass());
 }
 
 void WebLayerTreeViewImpl::loseCompositorContext(int numTimes)
 {
     m_layerTreeHost->loseContext(numTimes);
 }
 
 void WebLayerTreeViewImpl::willBeginFrame()
@@ skipping 59 matching lines @@
 {
     m_client->didCompleteSwapBuffers();
 }
 
 void WebLayerTreeViewImpl::scheduleComposite()
 {
     m_client->scheduleComposite();
 }
 
 } // namespace WebKit