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

Side by Side Diff: cc/layer_tiling_data.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 using namespace std; 10 using namespace std;
11 11
12 namespace cc { 12 namespace cc {
13 13
14 scoped_ptr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize, BorderTexelOption border) 14 scoped_ptr<LayerTilingData> LayerTilingData::create(const IntSize& tileSize, Bor derTexelOption border)
15 { 15 {
16 return make_scoped_ptr(new CCLayerTilingData(tileSize, border)); 16 return make_scoped_ptr(new LayerTilingData(tileSize, border));
17 } 17 }
18 18
19 CCLayerTilingData::CCLayerTilingData(const IntSize& tileSize, BorderTexelOption border) 19 LayerTilingData::LayerTilingData(const IntSize& tileSize, BorderTexelOption bord er)
20 : m_tilingData(tileSize, IntSize(), border == HasBorderTexels) 20 : m_tilingData(tileSize, IntSize(), border == HasBorderTexels)
21 { 21 {
22 setTileSize(tileSize); 22 setTileSize(tileSize);
23 } 23 }
24 24
25 CCLayerTilingData::~CCLayerTilingData() 25 LayerTilingData::~LayerTilingData()
26 { 26 {
27 } 27 }
28 28
29 void CCLayerTilingData::setTileSize(const IntSize& size) 29 void LayerTilingData::setTileSize(const IntSize& size)
30 { 30 {
31 if (tileSize() == size) 31 if (tileSize() == size)
32 return; 32 return;
33 33
34 reset(); 34 reset();
35 35
36 m_tilingData.setMaxTextureSize(size); 36 m_tilingData.setMaxTextureSize(size);
37 } 37 }
38 38
39 IntSize CCLayerTilingData::tileSize() const 39 IntSize LayerTilingData::tileSize() const
40 { 40 {
41 return m_tilingData.maxTextureSize(); 41 return m_tilingData.maxTextureSize();
42 } 42 }
43 43
44 void CCLayerTilingData::setBorderTexelOption(BorderTexelOption borderTexelOption ) 44 void LayerTilingData::setBorderTexelOption(BorderTexelOption borderTexelOption)
45 { 45 {
46 bool borderTexels = borderTexelOption == HasBorderTexels; 46 bool borderTexels = borderTexelOption == HasBorderTexels;
47 if (hasBorderTexels() == borderTexels) 47 if (hasBorderTexels() == borderTexels)
48 return; 48 return;
49 49
50 reset(); 50 reset();
51 m_tilingData.setHasBorderTexels(borderTexels); 51 m_tilingData.setHasBorderTexels(borderTexels);
52 } 52 }
53 53
54 const CCLayerTilingData& CCLayerTilingData::operator=(const CCLayerTilingData& t iler) 54 const LayerTilingData& LayerTilingData::operator=(const LayerTilingData& tiler)
55 { 55 {
56 m_tilingData = tiler.m_tilingData; 56 m_tilingData = tiler.m_tilingData;
57 57
58 return *this; 58 return *this;
59 } 59 }
60 60
61 void CCLayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j) 61 void LayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j)
62 { 62 {
63 ASSERT(!tileAt(i, j)); 63 ASSERT(!tileAt(i, j));
64 tile->moveTo(i, j); 64 tile->moveTo(i, j);
65 m_tiles.add(make_pair(i, j), tile.Pass()); 65 m_tiles.add(make_pair(i, j), tile.Pass());
66 } 66 }
67 67
68 scoped_ptr<CCLayerTilingData::Tile> CCLayerTilingData::takeTile(int i, int j) 68 scoped_ptr<LayerTilingData::Tile> LayerTilingData::takeTile(int i, int j)
69 { 69 {
70 return m_tiles.take_and_erase(make_pair(i, j)); 70 return m_tiles.take_and_erase(make_pair(i, j));
71 } 71 }
72 72
73 CCLayerTilingData::Tile* CCLayerTilingData::tileAt(int i, int j) const 73 LayerTilingData::Tile* LayerTilingData::tileAt(int i, int j) const
74 { 74 {
75 return m_tiles.get(make_pair(i, j)); 75 return m_tiles.get(make_pair(i, j));
76 } 76 }
77 77
78 void CCLayerTilingData::reset() 78 void LayerTilingData::reset()
79 { 79 {
80 m_tiles.clear(); 80 m_tiles.clear();
81 } 81 }
82 82
83 void CCLayerTilingData::contentRectToTileIndices(const IntRect& contentRect, int & left, int& top, int& right, int& bottom) const 83 void LayerTilingData::contentRectToTileIndices(const IntRect& contentRect, int& left, int& top, int& right, int& bottom) const
84 { 84 {
85 // 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.
86 // FIXME: Possibly we should fill a vector of tiles instead, 86 // FIXME: Possibly we should fill a vector of tiles instead,
87 // 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.
88 ASSERT(!contentRect.isEmpty()); 88 ASSERT(!contentRect.isEmpty());
89 89
90 left = m_tilingData.tileXIndexFromSrcCoord(contentRect.x()); 90 left = m_tilingData.tileXIndexFromSrcCoord(contentRect.x());
91 top = m_tilingData.tileYIndexFromSrcCoord(contentRect.y()); 91 top = m_tilingData.tileYIndexFromSrcCoord(contentRect.y());
92 right = m_tilingData.tileXIndexFromSrcCoord(contentRect.maxX() - 1); 92 right = m_tilingData.tileXIndexFromSrcCoord(contentRect.maxX() - 1);
93 bottom = m_tilingData.tileYIndexFromSrcCoord(contentRect.maxY() - 1); 93 bottom = m_tilingData.tileYIndexFromSrcCoord(contentRect.maxY() - 1);
94 } 94 }
95 95
96 IntRect CCLayerTilingData::tileRect(const Tile* tile) const 96 IntRect LayerTilingData::tileRect(const Tile* tile) const
97 { 97 {
98 IntRect tileRect = m_tilingData.tileBoundsWithBorder(tile->i(), tile->j()); 98 IntRect tileRect = m_tilingData.tileBoundsWithBorder(tile->i(), tile->j());
99 tileRect.setSize(tileSize()); 99 tileRect.setSize(tileSize());
100 return tileRect; 100 return tileRect;
101 } 101 }
102 102
103 Region CCLayerTilingData::opaqueRegionInContentRect(const IntRect& contentRect) const 103 Region LayerTilingData::opaqueRegionInContentRect(const IntRect& contentRect) co nst
104 { 104 {
105 if (contentRect.isEmpty()) 105 if (contentRect.isEmpty())
106 return Region(); 106 return Region();
107 107
108 Region opaqueRegion; 108 Region opaqueRegion;
109 int left, top, right, bottom; 109 int left, top, right, bottom;
110 contentRectToTileIndices(contentRect, left, top, right, bottom); 110 contentRectToTileIndices(contentRect, left, top, right, bottom);
111 for (int j = top; j <= bottom; ++j) { 111 for (int j = top; j <= bottom; ++j) {
112 for (int i = left; i <= right; ++i) { 112 for (int i = left; i <= right; ++i) {
113 Tile* tile = tileAt(i, j); 113 Tile* tile = tileAt(i, j);
114 if (!tile) 114 if (!tile)
115 continue; 115 continue;
116 116
117 IntRect tileOpaqueRect = intersection(contentRect, tile->opaqueRect( )); 117 IntRect tileOpaqueRect = intersection(contentRect, tile->opaqueRect( ));
118 opaqueRegion.unite(tileOpaqueRect); 118 opaqueRegion.unite(tileOpaqueRect);
119 } 119 }
120 } 120 }
121 return opaqueRegion; 121 return opaqueRegion;
122 } 122 }
123 123
124 void CCLayerTilingData::setBounds(const IntSize& size) 124 void LayerTilingData::setBounds(const IntSize& size)
125 { 125 {
126 m_tilingData.setTotalSize(size); 126 m_tilingData.setTotalSize(size);
127 if (size.isEmpty()) { 127 if (size.isEmpty()) {
128 m_tiles.clear(); 128 m_tiles.clear();
129 return; 129 return;
130 } 130 }
131 131
132 // Any tiles completely outside our new bounds are invalid and should be dro pped. 132 // Any tiles completely outside our new bounds are invalid and should be dro pped.
133 int left, top, right, bottom; 133 int left, top, right, bottom;
134 contentRectToTileIndices(IntRect(IntPoint(), size), left, top, right, bottom ); 134 contentRectToTileIndices(IntRect(IntPoint(), size), left, top, right, bottom );
135 Vector<TileMapKey> invalidTileKeys; 135 Vector<TileMapKey> invalidTileKeys;
136 for (TileMap::const_iterator it = m_tiles.begin(); it != m_tiles.end(); ++it ) { 136 for (TileMap::const_iterator it = m_tiles.begin(); it != m_tiles.end(); ++it ) {
137 if (it->first.first > right || it->first.second > bottom) 137 if (it->first.first > right || it->first.second > bottom)
138 invalidTileKeys.append(it->first); 138 invalidTileKeys.append(it->first);
139 } 139 }
140 for (size_t i = 0; i < invalidTileKeys.size(); ++i) 140 for (size_t i = 0; i < invalidTileKeys.size(); ++i)
141 m_tiles.erase(invalidTileKeys[i]); 141 m_tiles.erase(invalidTileKeys[i]);
142 } 142 }
143 143
144 IntSize CCLayerTilingData::bounds() const 144 IntSize LayerTilingData::bounds() const
145 { 145 {
146 return m_tilingData.totalSize(); 146 return m_tilingData.totalSize();
147 } 147 }
148 148
149 } // namespace cc 149 } // namespace cc
OLDNEW
« cc/active_animation.h ('K') | « cc/layer_tiling_data.h ('k') | cc/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698