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

Side by Side Diff: cc/resources/layer_tiling_data.h

Issue 565043002: cc: Remove the opaque rect return-parameter from ContentLayerClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: contentlayerclientopaque: build Created 6 years, 3 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
« no previous file with comments | « cc/resources/layer_painter.h ('k') | cc/resources/layer_tiling_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CC_RESOURCES_LAYER_TILING_DATA_H_ 5 #ifndef CC_RESOURCES_LAYER_TILING_DATA_H_
6 #define CC_RESOURCES_LAYER_TILING_DATA_H_ 6 #define CC_RESOURCES_LAYER_TILING_DATA_H_
7 7
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 Tile() : i_(-1), j_(-1) {} 56 Tile() : i_(-1), j_(-1) {}
57 virtual ~Tile() {} 57 virtual ~Tile() {}
58 58
59 int i() const { return i_; } 59 int i() const { return i_; }
60 int j() const { return j_; } 60 int j() const { return j_; }
61 void move_to(int i, int j) { 61 void move_to(int i, int j) {
62 i_ = i; 62 i_ = i;
63 j_ = j; 63 j_ = j;
64 } 64 }
65 65
66 gfx::Rect opaque_rect() const { return opaque_rect_; }
67 void set_opaque_rect(const gfx::Rect& opaque_rect) {
68 opaque_rect_ = opaque_rect;
69 }
70 private: 66 private:
71 int i_; 67 int i_;
72 int j_; 68 int j_;
73 gfx::Rect opaque_rect_;
74 DISALLOW_COPY_AND_ASSIGN(Tile); 69 DISALLOW_COPY_AND_ASSIGN(Tile);
75 }; 70 };
76 typedef std::pair<int, int> TileMapKey; 71 typedef std::pair<int, int> TileMapKey;
77 typedef base::ScopedPtrHashMap<TileMapKey, Tile> TileMap; 72 typedef base::ScopedPtrHashMap<TileMapKey, Tile> TileMap;
78 73
79 void AddTile(scoped_ptr<Tile> tile, int i, int j); 74 void AddTile(scoped_ptr<Tile> tile, int i, int j);
80 scoped_ptr<Tile> TakeTile(int i, int j); 75 scoped_ptr<Tile> TakeTile(int i, int j);
81 Tile* TileAt(int i, int j) const; 76 Tile* TileAt(int i, int j) const;
82 const TileMap& tiles() const { return tiles_; } 77 const TileMap& tiles() const { return tiles_; }
83 78
84 void SetTilingSize(const gfx::Size& tiling_size); 79 void SetTilingSize(const gfx::Size& tiling_size);
85 gfx::Size tiling_size() const { return tiling_data_.tiling_size(); } 80 gfx::Size tiling_size() const { return tiling_data_.tiling_size(); }
86 81
87 void ContentRectToTileIndices(const gfx::Rect& rect, 82 void ContentRectToTileIndices(const gfx::Rect& rect,
88 int* left, 83 int* left,
89 int* top, 84 int* top,
90 int* right, 85 int* right,
91 int* bottom) const; 86 int* bottom) const;
92 gfx::Rect TileRect(const Tile* tile) const; 87 gfx::Rect TileRect(const Tile* tile) const;
93 88
94 SimpleEnclosedRegion OpaqueRegionInContentRect(const gfx::Rect& rect) const;
95
96 void reset() { tiles_.clear(); } 89 void reset() { tiles_.clear(); }
97 90
98 protected: 91 protected:
99 LayerTilingData(const gfx::Size& tile_size, BorderTexelOption option); 92 LayerTilingData(const gfx::Size& tile_size, BorderTexelOption option);
100 93
101 TileMap tiles_; 94 TileMap tiles_;
102 TilingData tiling_data_; 95 TilingData tiling_data_;
103 96
104 DISALLOW_COPY(LayerTilingData); 97 DISALLOW_COPY(LayerTilingData);
105 }; 98 };
106 99
107 } // namespace cc 100 } // namespace cc
108 101
109 #endif // CC_RESOURCES_LAYER_TILING_DATA_H_ 102 #endif // CC_RESOURCES_LAYER_TILING_DATA_H_
OLDNEW
« no previous file with comments | « cc/resources/layer_painter.h ('k') | cc/resources/layer_tiling_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698