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

Unified Diff: Source/core/layout/svg/LayoutSVGText.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/svg/LayoutSVGText.h ('k') | Source/core/layout/svg/LayoutSVGTransformableContainer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/LayoutSVGText.cpp
diff --git a/Source/core/layout/svg/LayoutSVGText.cpp b/Source/core/layout/svg/LayoutSVGText.cpp
index 7c426eefbadb6282de5d7ec20ec1f66bd961c45f..c74404e94014eef9122a2bc0886bdf42e2ab6410 100644
--- a/Source/core/layout/svg/LayoutSVGText.cpp
+++ b/Source/core/layout/svg/LayoutSVGText.cpp
@@ -79,7 +79,7 @@ LayoutSVGText* LayoutSVGText::locateLayoutSVGTextAncestor(LayoutObject* start)
while (start && !start->isSVGText())
start = start->parent();
if (!start || !start->isSVGText())
- return 0;
+ return nullptr;
return toLayoutSVGText(start);
}
@@ -89,7 +89,7 @@ const LayoutSVGText* LayoutSVGText::locateLayoutSVGTextAncestor(const LayoutObje
while (start && !start->isSVGText())
start = start->parent();
if (!start || !start->isSVGText())
- return 0;
+ return nullptr;
return toLayoutSVGText(start);
}
@@ -169,13 +169,13 @@ void LayoutSVGText::subtreeChildWasAdded(LayoutObject* child)
// Compare m_layoutAttributes with newLayoutAttributes to figure out which attribute got added.
size_t size = newLayoutAttributes.size();
- SVGTextLayoutAttributes* attributes = 0;
+ SVGTextLayoutAttributes* attributes = nullptr;
for (size_t i = 0; i < size; ++i) {
attributes = newLayoutAttributes[i];
if (m_layoutAttributes.find(attributes) == kNotFound) {
// Every time this is invoked, there's only a single new entry in the newLayoutAttributes list, compared to the old in m_layoutAttributes.
- SVGTextLayoutAttributes* previous = 0;
- SVGTextLayoutAttributes* next = 0;
+ SVGTextLayoutAttributes* previous = nullptr;
+ SVGTextLayoutAttributes* next = nullptr;
ASSERT_UNUSED(child, attributes->context() == child);
findPreviousAndNextAttributes(this, attributes->context(), previous, next);
@@ -230,8 +230,8 @@ void LayoutSVGText::subtreeChildWillBeRemoved(LayoutObject* child, Vector<SVGTex
// This logic requires that the 'text' child is still inserted in the tree.
LayoutSVGInlineText* text = toLayoutSVGInlineText(child);
- SVGTextLayoutAttributes* previous = 0;
- SVGTextLayoutAttributes* next = 0;
+ SVGTextLayoutAttributes* previous = nullptr;
+ SVGTextLayoutAttributes* next = nullptr;
if (!documentBeingDestroyed())
findPreviousAndNextAttributes(this, text, previous, next);
@@ -298,7 +298,7 @@ void LayoutSVGText::subtreeTextDidChange(LayoutSVGInlineText* text)
}
}
-static inline void updateFontInAllDescendants(LayoutObject* start, SVGTextLayoutAttributesBuilder* builder = 0)
+static inline void updateFontInAllDescendants(LayoutObject* start, SVGTextLayoutAttributesBuilder* builder = nullptr)
{
for (LayoutObject* descendant = start; descendant; descendant = descendant->nextInPreOrder(start)) {
if (!descendant->isSVGInlineText())
« no previous file with comments | « Source/core/layout/svg/LayoutSVGText.h ('k') | Source/core/layout/svg/LayoutSVGTransformableContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698