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

Unified Diff: Source/core/layout/LayoutTextControl.cpp

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/LayoutTextControl.h ('k') | Source/core/layout/LayoutTextControlMultiLine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextControl.cpp
diff --git a/Source/core/layout/LayoutTextControl.cpp b/Source/core/layout/LayoutTextControl.cpp
index 13904a336824283981bf8b5a9fe6b7d45a4dda10..dead442420d4f8010f75412b453efa9d25d37207 100644
--- a/Source/core/layout/LayoutTextControl.cpp
+++ b/Source/core/layout/LayoutTextControl.cpp
@@ -205,7 +205,7 @@ static const char* const fontFamiliesWithInvalidCharWidth[] = {
// all platforms.
bool LayoutTextControl::hasValidAvgCharWidth(AtomicString family)
{
- static HashSet<AtomicString>* fontFamiliesWithInvalidCharWidthMap = 0;
+ static HashSet<AtomicString>* fontFamiliesWithInvalidCharWidthMap = nullptr;
if (family.isEmpty())
return false;
@@ -290,9 +290,9 @@ void LayoutTextControl::addFocusRingRects(Vector<LayoutRect>& rects, const Layou
LayoutObject* LayoutTextControl::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
{
HTMLElement* placeholder = toHTMLTextFormControlElement(node())->placeholderElement();
- LayoutObject* placeholderLayoutObject = placeholder ? placeholder->layoutObject() : 0;
+ LayoutObject* placeholderLayoutObject = placeholder ? placeholder->layoutObject() : nullptr;
if (!placeholderLayoutObject)
- return 0;
+ return nullptr;
if (relayoutChildren)
layoutScope.setChildNeedsLayout(placeholderLayoutObject);
return placeholderLayoutObject;
« no previous file with comments | « Source/core/layout/LayoutTextControl.h ('k') | Source/core/layout/LayoutTextControlMultiLine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698