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

Unified Diff: third_party/WebKit/Source/core/style/GridCoordinate.h

Issue 1500433003: [css-grid] Get rid of GridResolvedPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change operators overloaded in GridSpanIterator Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/GridCoordinate.h
diff --git a/third_party/WebKit/Source/core/style/GridCoordinate.h b/third_party/WebKit/Source/core/style/GridCoordinate.h
index 9287de3d8f1785947d64edd942f9a9de318a6349..bd1592f545e972c8a90b04c2ccdb6dff4efb3f72 100644
--- a/third_party/WebKit/Source/core/style/GridCoordinate.h
+++ b/third_party/WebKit/Source/core/style/GridCoordinate.h
@@ -50,7 +50,7 @@ struct GridSpan {
USING_FAST_MALLOC(GridSpan);
public:
- static GridSpan definiteGridSpan(const GridResolvedPosition& resolvedInitialPosition, const GridResolvedPosition& resolvedFinalPosition)
+ static GridSpan definiteGridSpan(size_t resolvedInitialPosition, size_t resolvedFinalPosition)
{
return GridSpan(resolvedInitialPosition, resolvedFinalPosition, Definite);
}
@@ -68,30 +68,40 @@ public:
size_t integerSpan() const
{
ASSERT(isDefinite());
- return m_resolvedFinalPosition.toInt() - m_resolvedInitialPosition.toInt();
+ ASSERT(m_resolvedFinalPosition > m_resolvedInitialPosition);
+ return m_resolvedFinalPosition - m_resolvedInitialPosition;
}
- const GridResolvedPosition& resolvedInitialPosition() const
+ size_t resolvedInitialPosition() const
{
ASSERT(isDefinite());
return m_resolvedInitialPosition;
}
- const GridResolvedPosition& resolvedFinalPosition() const
+ size_t resolvedFinalPosition() const
{
ASSERT(isDefinite());
+ ASSERT(m_resolvedFinalPosition);
return m_resolvedFinalPosition;
}
- typedef GridResolvedPosition iterator;
+ struct GridSpanIterator {
+ GridSpanIterator(size_t v) : value(v) {}
- iterator begin() const
+ size_t operator*() const { return value; }
+ size_t operator++() { return value++; }
+ bool operator!=(GridSpanIterator other) const { return value != other.value; }
+
+ size_t value;
+ };
+
+ GridSpanIterator begin() const
{
ASSERT(isDefinite());
return m_resolvedInitialPosition;
}
- iterator end() const
+ GridSpanIterator end() const
{
ASSERT(isDefinite());
return m_resolvedFinalPosition;
@@ -106,16 +116,16 @@ private:
enum GridSpanType {Definite, Indefinite};
- GridSpan(const GridResolvedPosition& resolvedInitialPosition, const GridResolvedPosition& resolvedFinalPosition, GridSpanType type)
- : m_resolvedInitialPosition(std::min(resolvedInitialPosition.toInt(), kGridMaxTracks - 1))
- , m_resolvedFinalPosition(std::min(resolvedFinalPosition.toInt(), kGridMaxTracks))
+ GridSpan(size_t resolvedInitialPosition, size_t resolvedFinalPosition, GridSpanType type)
+ : m_resolvedInitialPosition(std::min(resolvedInitialPosition, kGridMaxTracks - 1))
+ , m_resolvedFinalPosition(std::min(resolvedFinalPosition, kGridMaxTracks))
, m_type(type)
{
ASSERT(resolvedInitialPosition < resolvedFinalPosition);
}
- GridResolvedPosition m_resolvedInitialPosition;
- GridResolvedPosition m_resolvedFinalPosition;
+ size_t m_resolvedInitialPosition;
+ size_t m_resolvedFinalPosition;
GridSpanType m_type;
};
« no previous file with comments | « third_party/WebKit/Source/core/paint/GridPainter.cpp ('k') | third_party/WebKit/Source/core/style/GridResolvedPosition.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698