Modified: trunk/Source/WebCore/ChangeLog (170246 => 170247)
--- trunk/Source/WebCore/ChangeLog 2014-06-21 16:24:46 UTC (rev 170246)
+++ trunk/Source/WebCore/ChangeLog 2014-06-21 18:27:21 UTC (rev 170247)
@@ -1,3 +1,18 @@
+2014-06-21 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Mark TextRun's constructors as explicit
+ https://bugs.webkit.org/show_bug.cgi?id=134124
+
+ Reviewed by Sam Weinig.
+
+ After r170072, nobody is implicitly converting a string to a TextRun. Therefore,
+ we can make the constructors explicit.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/TextRun.h:
+ (WebCore::TextRun::TextRun):
+
2014-06-21 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r170244.
Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (170246 => 170247)
--- trunk/Source/WebCore/platform/graphics/TextRun.h 2014-06-21 16:24:46 UTC (rev 170246)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2014-06-21 18:27:21 UTC (rev 170247)
@@ -101,7 +101,7 @@
m_data.characters16 = c;
}
- TextRun(const String& s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
+ explicit TextRun(const String& s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
: m_charactersLength(s.length())
, m_len(s.length())
, m_xpos(xpos)
@@ -126,7 +126,7 @@
}
}
- TextRun(StringView s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
+ explicit TextRun(StringView s, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false, bool characterScanForCodePath = true, RoundingHacks roundingHacks = RunRounding | WordRounding)
: m_charactersLength(s.length())
, m_len(s.length())
, m_xpos(xpos)
