diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:15:58 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 18:15:58 +0000 |
commit | aad0a007e1cd343892d7b13ce5ea8d90e8ef7f53 (patch) | |
tree | 24c9af166977bbf8f25aa5b129defb35f3f8ec05 /cc/test/tiled_layer_test_common.cc | |
parent | 33432d8c37e3b929c60097c1eb7a53b13f364fb5 (diff) | |
download | chromium_src-aad0a007e1cd343892d7b13ce5ea8d90e8ef7f53.zip chromium_src-aad0a007e1cd343892d7b13ce5ea8d90e8ef7f53.tar.gz chromium_src-aad0a007e1cd343892d7b13ce5ea8d90e8ef7f53.tar.bz2 |
cc: Use gfx:: Geometry types for positions, bounds, and related things.
This covers layers, layer tree hosts, and related classes. *phew*
I intentionally avoided anything to do with scrolling or page scale. Those
should be changed to be Vectors and need a bit more thought. This change
should be pretty mindless.
It converts to gfx Rect, Size, Vector, and Point classes. No change is
made for FloatPoint3D or FloatQuad yet.
I've added cc/geometry.h as a place for free functions that don't exist
on gfx types yet, and that we should port over in the future.
No change in behaviour; covered by existing tests.
BUG=147395
R=enne
Review URL: https://codereview.chromium.org/11264056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/tiled_layer_test_common.cc')
-rw-r--r-- | cc/test/tiled_layer_test_common.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index 56b3049..6ed95ca 100644 --- a/cc/test/tiled_layer_test_common.cc +++ b/cc/test/tiled_layer_test_common.cc @@ -49,15 +49,15 @@ void FakeLayerUpdater::prepareToUpdate(const gfx::Rect& contentRect, const gfx:: { m_prepareCount++; m_lastUpdateRect = contentRect; - if (!m_rectToInvalidate.isEmpty()) { + if (!m_rectToInvalidate.IsEmpty()) { m_layer->invalidateContentRect(m_rectToInvalidate); - m_rectToInvalidate = IntRect(); + m_rectToInvalidate = gfx::Rect(); m_layer = NULL; } resultingOpaqueRect = m_opaquePaintRect; } -void FakeLayerUpdater::setRectToInvalidate(const IntRect& rect, FakeTiledLayer* layer) +void FakeLayerUpdater::setRectToInvalidate(const gfx::Rect& rect, FakeTiledLayer* layer) { m_rectToInvalidate = rect; m_layer = layer; @@ -101,7 +101,7 @@ FakeTiledLayer::~FakeTiledLayer() { } -void FakeTiledLayer::setNeedsDisplayRect(const FloatRect& rect) +void FakeTiledLayer::setNeedsDisplayRect(const gfx::RectF& rect) { m_lastNeedsDisplayRect = rect; TiledLayer::setNeedsDisplayRect(rect); @@ -134,7 +134,7 @@ cc::LayerUpdater* FakeTiledLayer::updater() const return m_fakeUpdater.get(); } -cc::IntSize FakeTiledLayerWithScaledBounds::contentBounds() const +gfx::Size FakeTiledLayerWithScaledBounds::contentBounds() const { return m_forcedContentBounds; } |