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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 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/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index c110f781e7580fdfd6cc174ea940f6d919c7b4b9..c9298c6811f4791ed64f0cf6a6fa204ce7adcf7d 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -367,7 +367,7 @@ class LayoutGrid::GridIterator {
(m_direction == ForColumns) ? m_grid.size() : m_grid[0].size();
for (; varyingTrackIndex < endOfVaryingTrackIndex; ++varyingTrackIndex) {
if (checkEmptyCells(rowSpan, columnSpan)) {
- std::unique_ptr<GridArea> result = wrapUnique(
+ std::unique_ptr<GridArea> result = WTF::wrapUnique(
new GridArea(GridSpan::translatedDefiniteGridSpan(
m_rowIndex, m_rowIndex + rowSpan),
GridSpan::translatedDefiniteGridSpan(
@@ -1123,7 +1123,7 @@ double LayoutGrid::computeFlexFactorUnitSize(
leftOverSpace -= baseSize;
flexFactorSum -= flexFactor;
if (!additionalTracksToTreatAsInflexible)
- additionalTracksToTreatAsInflexible = makeUnique<TrackIndexSet>();
+ additionalTracksToTreatAsInflexible = WTF::makeUnique<TrackIndexSet>();
additionalTracksToTreatAsInflexible->add(index);
validFlexFactorUnit = false;
}
@@ -2045,7 +2045,7 @@ LayoutGrid::computeEmptyTracksForAutoRepeat(
firstAutoRepeatTrack + grid.autoRepeatTracks(direction);
if (!m_grid.hasGridItems()) {
- emptyTrackIndexes = wrapUnique(new OrderedTrackIndexSet);
+ emptyTrackIndexes = WTF::wrapUnique(new OrderedTrackIndexSet);
for (size_t trackIndex = firstAutoRepeatTrack;
trackIndex < lastAutoRepeatTrack; ++trackIndex)
emptyTrackIndexes->add(trackIndex);
@@ -2055,7 +2055,7 @@ LayoutGrid::computeEmptyTracksForAutoRepeat(
GridIterator iterator(grid, direction, trackIndex);
if (!iterator.nextGridItem()) {
if (!emptyTrackIndexes)
- emptyTrackIndexes = wrapUnique(new OrderedTrackIndexSet);
+ emptyTrackIndexes = WTF::wrapUnique(new OrderedTrackIndexSet);
emptyTrackIndexes->add(trackIndex);
}
}
@@ -2228,7 +2228,7 @@ LayoutGrid::createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(
crossDirection);
GridSpan crossDirectionPositions = GridSpan::translatedDefiniteGridSpan(
endOfCrossDirection, endOfCrossDirection + crossDirectionSpanSize);
- return wrapUnique(
+ return WTF::wrapUnique(
new GridArea(specifiedDirection == ForColumns ? crossDirectionPositions
: specifiedPositions,
specifiedDirection == ForColumns ? specifiedPositions
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutCounter.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698