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

Unified Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

Issue 2508743002: Changed EWhiteSpace to an enum class and renamed its members to keywords (Closed)
Patch Set: Small mac fix Created 4 years, 1 month 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/svg/LayoutSVGInlineText.cpp
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
index be7b9607289e57eb76fc8b7b986a8a63a48e5c0e..466390d3ab748d0bde2d8bc0fc0592ddf9eb7790 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp
@@ -67,8 +67,10 @@ void LayoutSVGInlineText::styleDidChange(StyleDifference diff,
LayoutText::styleDidChange(diff, oldStyle);
updateScaledFont();
- bool newPreserves = style() ? style()->whiteSpace() == PRE : false;
- bool oldPreserves = oldStyle ? oldStyle->whiteSpace() == PRE : false;
+ bool newPreserves =
+ style() ? style()->whiteSpace() == EWhiteSpace::Pre : false;
+ bool oldPreserves =
+ oldStyle ? oldStyle->whiteSpace() == EWhiteSpace::Pre : false;
if (oldPreserves != newPreserves) {
setText(originalText(), true);
return;
@@ -297,7 +299,7 @@ void LayoutSVGInlineText::addMetricsFromRun(const TextRun& run,
const float cachedFontHeight =
fontData->getFontMetrics().floatHeight() / m_scalingFactor;
- const bool preserveWhiteSpace = styleRef().whiteSpace() == PRE;
+ const bool preserveWhiteSpace = styleRef().whiteSpace() == EWhiteSpace::Pre;
const unsigned runLength = run.length();
// TODO(pdr): Character-based iteration is ambiguous and error-prone. It

Powered by Google App Engine
This is Rietveld 408576698