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/image_layer.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/image_layer.cc')
| -rw-r--r-- | cc/image_layer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/image_layer.cc b/cc/image_layer.cc index 3c1712e..224f938 100644 --- a/cc/image_layer.cc +++ b/cc/image_layer.cc @@ -119,7 +119,7 @@ void ImageLayer::update(ResourceUpdateQueue& queue, const OcclusionTracker* occl if (m_needsDisplay) { m_updater->setBitmap(m_bitmap); updateTileSizeAndTilingOption(); - invalidateContentRect(IntRect(IntPoint(), contentBounds())); + invalidateContentRect(gfx::Rect(gfx::Point(), contentBounds())); m_needsDisplay = false; } TiledLayer::update(queue, occlusion, stats); @@ -140,9 +140,9 @@ LayerUpdater* ImageLayer::updater() const return m_updater.get(); } -IntSize ImageLayer::contentBounds() const +gfx::Size ImageLayer::contentBounds() const { - return IntSize(m_bitmap.width(), m_bitmap.height()); + return gfx::Size(m_bitmap.width(), m_bitmap.height()); } bool ImageLayer::drawsContent() const @@ -152,14 +152,14 @@ bool ImageLayer::drawsContent() const float ImageLayer::contentsScaleX() const { - if (bounds().isEmpty() || contentBounds().isEmpty()) + if (bounds().IsEmpty() || contentBounds().IsEmpty()) return 1; return static_cast<float>(m_bitmap.width()) / bounds().width(); } float ImageLayer::contentsScaleY() const { - if (bounds().isEmpty() || contentBounds().isEmpty()) + if (bounds().IsEmpty() || contentBounds().IsEmpty()) return 1; return static_cast<float>(m_bitmap.height()) / bounds().height(); } |