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

Unified Diff: Source/core/layout/TextAutosizer.h

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add one more file. Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/TableLayoutAlgorithmAuto.cpp ('k') | Source/core/layout/TextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/TextAutosizer.h
diff --git a/Source/core/layout/TextAutosizer.h b/Source/core/layout/TextAutosizer.h
index 43c4d3b37d21c244e4b2a0a66040015da2c22432..be2c33a1330ae19c2c78050bd708ccae105e7e3a 100644
--- a/Source/core/layout/TextAutosizer.h
+++ b/Source/core/layout/TextAutosizer.h
@@ -148,10 +148,10 @@ private:
};
struct Cluster {
- explicit Cluster(const LayoutBlock* root, BlockFlags flags, Cluster* parent, Supercluster* supercluster = 0)
+ explicit Cluster(const LayoutBlock* root, BlockFlags flags, Cluster* parent, Supercluster* supercluster = nullptr)
: m_root(root)
, m_flags(flags)
- , m_deepestBlockContainingAllText(0)
+ , m_deepestBlockContainingAllText(nullptr)
, m_parent(parent)
, m_multiplier(0)
, m_hasEnoughTextToAutosize(UnknownAmountOfText)
@@ -260,9 +260,9 @@ private:
void resetMultipliers();
BeginLayoutBehavior prepareForLayout(const LayoutBlock*);
void prepareClusterStack(const LayoutObject*);
- bool clusterHasEnoughTextToAutosize(Cluster*, const LayoutBlock* widthProvider = 0);
- bool superclusterHasEnoughTextToAutosize(Supercluster*, const LayoutBlock* widthProvider = 0);
- bool clusterWouldHaveEnoughTextToAutosize(const LayoutBlock* root, const LayoutBlock* widthProvider = 0);
+ bool clusterHasEnoughTextToAutosize(Cluster*, const LayoutBlock* widthProvider = nullptr);
+ bool superclusterHasEnoughTextToAutosize(Supercluster*, const LayoutBlock* widthProvider = nullptr);
+ bool clusterWouldHaveEnoughTextToAutosize(const LayoutBlock* root, const LayoutBlock* widthProvider = nullptr);
Fingerprint getFingerprint(const LayoutObject*);
Fingerprint computeFingerprint(const LayoutObject*);
Cluster* maybeCreateCluster(const LayoutBlock*);
« no previous file with comments | « Source/core/layout/TableLayoutAlgorithmAuto.cpp ('k') | Source/core/layout/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698