Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Unified Diff: webkit/compositor_bindings/web_layer_tree_view_impl.cc

Issue 11264056: cc: Use gfx:: Geometry types for positions, bounds, and related things. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ScaleAsVector Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/compositor_bindings/web_layer_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
index df19b32124970e4a99283845d310556e82696f72..c40802db4879d99a109a6a3b2b0c2c61b81050f1 100644
--- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
+++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
@@ -51,8 +51,8 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
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;
@@ -77,24 +77,24 @@ void WebLayerTreeViewImpl::clearRootLayer()
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)
@@ -195,9 +195,9 @@ void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
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());
}
« no previous file with comments | « webkit/compositor_bindings/web_layer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698