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

Unified Diff: third_party/WebKit/Source/core/layout/TextAutosizer.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/TextAutosizer.cpp
diff --git a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
index 9c5dc91b6d2a7ca9002cdbd0f249cf60f458bb17..61cc389f4821d01b822528cf4d3c1408b13495dc 100644
--- a/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
+++ b/third_party/WebKit/Source/core/layout/TextAutosizer.cpp
@@ -80,8 +80,9 @@ static void writeDebugInfo(LayoutObject* layoutObject,
node = toDocument(node)->documentElement();
if (!node->isElementNode())
return;
- node->document().postTask(BLINK_FROM_HERE, wrapUnique(new WriteDebugInfoTask(
- toElement(node), output)));
+ node->document().postTask(
+ BLINK_FROM_HERE,
+ WTF::wrapUnique(new WriteDebugInfoTask(toElement(node), output)));
}
void TextAutosizer::writeClusterDebugInfo(Cluster* cluster) {
@@ -362,7 +363,7 @@ void TextAutosizer::prepareClusterStack(const LayoutObject* layoutObject) {
m_blocksThatHaveBegunLayout.add(block);
#endif
if (Cluster* cluster = maybeCreateCluster(block))
- m_clusterStack.append(wrapUnique(cluster));
+ m_clusterStack.append(WTF::wrapUnique(cluster));
}
}
@@ -376,7 +377,7 @@ void TextAutosizer::beginLayout(LayoutBlock* block,
ASSERT(!m_clusterStack.isEmpty() || block->isLayoutView());
if (Cluster* cluster = maybeCreateCluster(block))
- m_clusterStack.append(wrapUnique(cluster));
+ m_clusterStack.append(WTF::wrapUnique(cluster));
ASSERT(!m_clusterStack.isEmpty());
@@ -815,7 +816,7 @@ TextAutosizer::Supercluster* TextAutosizer::getSupercluster(
return addResult.storedValue->value.get();
Supercluster* supercluster = new Supercluster(roots);
- addResult.storedValue->value = wrapUnique(supercluster);
+ addResult.storedValue->value = WTF::wrapUnique(supercluster);
return supercluster;
}
@@ -1188,7 +1189,7 @@ void TextAutosizer::FingerprintMapper::addTentativeClusterRoot(
ReverseFingerprintMap::AddResult addResult =
m_blocksForFingerprint.add(fingerprint, std::unique_ptr<BlockSet>());
if (addResult.isNewEntry)
- addResult.storedValue->value = wrapUnique(new BlockSet);
+ addResult.storedValue->value = WTF::wrapUnique(new BlockSet);
addResult.storedValue->value->add(block);
#if ENABLE(ASSERT)
assertMapsAreConsistent();
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutView.cpp ('k') | third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698