| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 #include "config.h" | 6 #include "config.h" |
| 7 | 7 |
| 8 #include "CCLayerTilingData.h" | 8 #include "CCLayerTilingData.h" |
| 9 | 9 |
| 10 #include "base/logging.h" | |
| 11 | |
| 12 using namespace std; | 10 using namespace std; |
| 13 | 11 |
| 14 namespace cc { | 12 namespace cc { |
| 15 | 13 |
| 16 scoped_ptr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize,
BorderTexelOption border) | 14 scoped_ptr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize,
BorderTexelOption border) |
| 17 { | 15 { |
| 18 return make_scoped_ptr(new CCLayerTilingData(tileSize, border)); | 16 return make_scoped_ptr(new CCLayerTilingData(tileSize, border)); |
| 19 } | 17 } |
| 20 | 18 |
| 21 CCLayerTilingData::CCLayerTilingData(const IntSize& tileSize, BorderTexelOption
border) | 19 CCLayerTilingData::CCLayerTilingData(const IntSize& tileSize, BorderTexelOption
border) |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 53 |
| 56 const CCLayerTilingData& CCLayerTilingData::operator=(const CCLayerTilingData& t
iler) | 54 const CCLayerTilingData& CCLayerTilingData::operator=(const CCLayerTilingData& t
iler) |
| 57 { | 55 { |
| 58 m_tilingData = tiler.m_tilingData; | 56 m_tilingData = tiler.m_tilingData; |
| 59 | 57 |
| 60 return *this; | 58 return *this; |
| 61 } | 59 } |
| 62 | 60 |
| 63 void CCLayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j) | 61 void CCLayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j) |
| 64 { | 62 { |
| 65 DCHECK(!tileAt(i, j)); | 63 ASSERT(!tileAt(i, j)); |
| 66 tile->moveTo(i, j); | 64 tile->moveTo(i, j); |
| 67 m_tiles.add(make_pair(i, j), tile.Pass()); | 65 m_tiles.add(make_pair(i, j), tile.Pass()); |
| 68 } | 66 } |
| 69 | 67 |
| 70 scoped_ptr<CCLayerTilingData::Tile> CCLayerTilingData::takeTile(int i, int j) | 68 scoped_ptr<CCLayerTilingData::Tile> CCLayerTilingData::takeTile(int i, int j) |
| 71 { | 69 { |
| 72 return m_tiles.take_and_erase(make_pair(i, j)); | 70 return m_tiles.take_and_erase(make_pair(i, j)); |
| 73 } | 71 } |
| 74 | 72 |
| 75 CCLayerTilingData::Tile* CCLayerTilingData::tileAt(int i, int j) const | 73 CCLayerTilingData::Tile* CCLayerTilingData::tileAt(int i, int j) const |
| 76 { | 74 { |
| 77 return m_tiles.get(make_pair(i, j)); | 75 return m_tiles.get(make_pair(i, j)); |
| 78 } | 76 } |
| 79 | 77 |
| 80 void CCLayerTilingData::reset() | 78 void CCLayerTilingData::reset() |
| 81 { | 79 { |
| 82 m_tiles.clear(); | 80 m_tiles.clear(); |
| 83 } | 81 } |
| 84 | 82 |
| 85 void CCLayerTilingData::contentRectToTileIndices(const IntRect& contentRect, int
& left, int& top, int& right, int& bottom) const | 83 void CCLayerTilingData::contentRectToTileIndices(const IntRect& contentRect, int
& left, int& top, int& right, int& bottom) const |
| 86 { | 84 { |
| 87 // An empty rect doesn't result in an empty set of tiles, so don't pass an e
mpty rect. | 85 // An empty rect doesn't result in an empty set of tiles, so don't pass an e
mpty rect. |
| 88 // FIXME: Possibly we should fill a vector of tiles instead, | 86 // FIXME: Possibly we should fill a vector of tiles instead, |
| 89 // since the normal use of this function is to enumerate some tiles. | 87 // since the normal use of this function is to enumerate some tiles. |
| 90 DCHECK(!contentRect.isEmpty()); | 88 ASSERT(!contentRect.isEmpty()); |
| 91 | 89 |
| 92 left = m_tilingData.tileXIndexFromSrcCoord(contentRect.x()); | 90 left = m_tilingData.tileXIndexFromSrcCoord(contentRect.x()); |
| 93 top = m_tilingData.tileYIndexFromSrcCoord(contentRect.y()); | 91 top = m_tilingData.tileYIndexFromSrcCoord(contentRect.y()); |
| 94 right = m_tilingData.tileXIndexFromSrcCoord(contentRect.maxX() - 1); | 92 right = m_tilingData.tileXIndexFromSrcCoord(contentRect.maxX() - 1); |
| 95 bottom = m_tilingData.tileYIndexFromSrcCoord(contentRect.maxY() - 1); | 93 bottom = m_tilingData.tileYIndexFromSrcCoord(contentRect.maxY() - 1); |
| 96 } | 94 } |
| 97 | 95 |
| 98 IntRect CCLayerTilingData::tileRect(const Tile* tile) const | 96 IntRect CCLayerTilingData::tileRect(const Tile* tile) const |
| 99 { | 97 { |
| 100 IntRect tileRect = m_tilingData.tileBoundsWithBorder(tile->i(), tile->j()); | 98 IntRect tileRect = m_tilingData.tileBoundsWithBorder(tile->i(), tile->j()); |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 for (size_t i = 0; i < invalidTileKeys.size(); ++i) | 140 for (size_t i = 0; i < invalidTileKeys.size(); ++i) |
| 143 m_tiles.erase(invalidTileKeys[i]); | 141 m_tiles.erase(invalidTileKeys[i]); |
| 144 } | 142 } |
| 145 | 143 |
| 146 IntSize CCLayerTilingData::bounds() const | 144 IntSize CCLayerTilingData::bounds() const |
| 147 { | 145 { |
| 148 return m_tilingData.totalSize(); | 146 return m_tilingData.totalSize(); |
| 149 } | 147 } |
| 150 | 148 |
| 151 } // namespace cc | 149 } // namespace cc |
| OLD | NEW |