| Index: third_party/WebKit/Source/core/style/GridArea.h
|
| diff --git a/third_party/WebKit/Source/core/style/GridCoordinate.h b/third_party/WebKit/Source/core/style/GridArea.h
|
| similarity index 94%
|
| rename from third_party/WebKit/Source/core/style/GridCoordinate.h
|
| rename to third_party/WebKit/Source/core/style/GridArea.h
|
| index 65ab46cc22ba80a2cb339c537f76c1cd87c2967b..990bad278b3a39c1052a5a4ac8f9f2cfd0765059 100644
|
| --- a/third_party/WebKit/Source/core/style/GridCoordinate.h
|
| +++ b/third_party/WebKit/Source/core/style/GridArea.h
|
| @@ -28,8 +28,8 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef GridCoordinate_h
|
| -#define GridCoordinate_h
|
| +#ifndef GridArea_h
|
| +#define GridArea_h
|
|
|
| #include "core/style/GridPositionsResolver.h"
|
| #include "wtf/Allocator.h"
|
| @@ -179,28 +179,28 @@ private:
|
| };
|
|
|
| // This represents a grid area that spans in both rows' and columns' direction.
|
| -struct GridCoordinate {
|
| - USING_FAST_MALLOC(GridCoordinate);
|
| +struct GridArea {
|
| + USING_FAST_MALLOC(GridArea);
|
| public:
|
| // HashMap requires a default constuctor.
|
| - GridCoordinate()
|
| + GridArea()
|
| : columns(GridSpan::indefiniteGridSpan())
|
| , rows(GridSpan::indefiniteGridSpan())
|
| {
|
| }
|
|
|
| - GridCoordinate(const GridSpan& r, const GridSpan& c)
|
| + GridArea(const GridSpan& r, const GridSpan& c)
|
| : columns(c)
|
| , rows(r)
|
| {
|
| }
|
|
|
| - bool operator==(const GridCoordinate& o) const
|
| + bool operator==(const GridArea& o) const
|
| {
|
| return columns == o.columns && rows == o.rows;
|
| }
|
|
|
| - bool operator!=(const GridCoordinate& o) const
|
| + bool operator!=(const GridArea& o) const
|
| {
|
| return !(*this == o);
|
| }
|
| @@ -209,8 +209,8 @@ public:
|
| GridSpan rows;
|
| };
|
|
|
| -typedef HashMap<String, GridCoordinate> NamedGridAreaMap;
|
| +typedef HashMap<String, GridArea> NamedGridAreaMap;
|
|
|
| } // namespace blink
|
|
|
| -#endif // GridCoordinate_h
|
| +#endif // GridArea_h
|
|
|