Diff
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp (294757 => 294758)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLine.cpp 2022-05-24 19:43:40 UTC (rev 294758)
@@ -123,8 +123,8 @@
if (run.hasTextCombine())
expansionBehavior = ExpansionBehavior::forbidAll();
else {
- expansionBehavior.setLeft(runIsAfterExpansion ? ExpansionBehavior::Behavior::Forbid : ExpansionBehavior::Behavior::Allow);
- expansionBehavior.setRight(ExpansionBehavior::Behavior::Allow);
+ expansionBehavior.left = runIsAfterExpansion ? ExpansionBehavior::Behavior::Forbid : ExpansionBehavior::Behavior::Allow;
+ expansionBehavior.right = ExpansionBehavior::Behavior::Allow;
auto& textContent = *run.textContent();
// Trailing hanging whitespace sequence is ignored when computing the expansion opportunities.
auto hangingTrailingContentInCurrentRun = std::min(textContent.length, hangingTrailingContentLength);
@@ -144,7 +144,7 @@
}
// Forbid right expansion in the last run to prevent trailing expansion at the end of the line.
if (lastRunIndexWithContent && runsExpansionOpportunities[*lastRunIndexWithContent]) {
- runsExpansionBehaviors[*lastRunIndexWithContent].setRight(ExpansionBehavior::Behavior::Forbid);
+ runsExpansionBehaviors[*lastRunIndexWithContent].right = ExpansionBehavior::Behavior::Forbid;
if (runIsAfterExpansion) {
// When the last run has an after expansion (e.g. CJK ideograph) we need to remove this trailing expansion opportunity.
// Note that this is not about trailing collapsible whitespace as at this point we trimmed them all.
Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp (294757 => 294758)
--- trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2022-05-24 19:43:40 UTC (rev 294758)
@@ -673,13 +673,13 @@
void ComplexTextController::adjustGlyphsAndAdvances()
{
- bool afterExpansion = m_run.expansionBehavior().left() == ExpansionBehavior::Behavior::Forbid;
+ bool afterExpansion = m_run.expansionBehavior().left == ExpansionBehavior::Behavior::Forbid;
size_t runCount = m_complexTextRuns.size();
bool hasExtraSpacing = (m_font.letterSpacing() || m_font.wordSpacing() || m_expansion) && !m_run.spacingDisabled();
- bool runForcesLeftExpansion = m_run.expansionBehavior().left() == ExpansionBehavior::Behavior::Force;
- bool runForcesRightExpansion = m_run.expansionBehavior().right() == ExpansionBehavior::Behavior::Force;
- bool runForbidsLeftExpansion = m_run.expansionBehavior().left() == ExpansionBehavior::Behavior::Forbid;
- bool runForbidsRightExpansion = m_run.expansionBehavior().right() == ExpansionBehavior::Behavior::Forbid;
+ bool runForcesLeftExpansion = m_run.expansionBehavior().left == ExpansionBehavior::Behavior::Force;
+ bool runForcesRightExpansion = m_run.expansionBehavior().right == ExpansionBehavior::Behavior::Force;
+ bool runForbidsLeftExpansion = m_run.expansionBehavior().left == ExpansionBehavior::Behavior::Forbid;
+ bool runForbidsRightExpansion = m_run.expansionBehavior().right == ExpansionBehavior::Behavior::Forbid;
// We are iterating in glyph order, not string order. Compare this to WidthIterator::advanceInternal()
for (size_t runIndex = 0; runIndex < runCount; ++runIndex) {
Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (294757 => 294758)
--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2022-05-24 19:43:40 UTC (rev 294758)
@@ -962,8 +962,8 @@
std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const LChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
{
unsigned count = 0;
- bool isAfterExpansion = expansionBehavior.left() == ExpansionBehavior::Behavior::Forbid;
- if (expansionBehavior.left() == ExpansionBehavior::Behavior::Force) {
+ bool isAfterExpansion = expansionBehavior.left == ExpansionBehavior::Behavior::Forbid;
+ if (expansionBehavior.left == ExpansionBehavior::Behavior::Force) {
++count;
isAfterExpansion = true;
}
@@ -984,10 +984,10 @@
isAfterExpansion = false;
}
}
- if (!isAfterExpansion && expansionBehavior.right() == ExpansionBehavior::Behavior::Force) {
+ if (!isAfterExpansion && expansionBehavior.right == ExpansionBehavior::Behavior::Force) {
++count;
isAfterExpansion = true;
- } else if (isAfterExpansion && expansionBehavior.right() == ExpansionBehavior::Behavior::Forbid) {
+ } else if (isAfterExpansion && expansionBehavior.right == ExpansionBehavior::Behavior::Forbid) {
ASSERT(count);
--count;
isAfterExpansion = false;
@@ -998,8 +998,8 @@
std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const UChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
{
unsigned count = 0;
- bool isAfterExpansion = expansionBehavior.left() == ExpansionBehavior::Behavior::Forbid;
- if (expansionBehavior.left() == ExpansionBehavior::Behavior::Force) {
+ bool isAfterExpansion = expansionBehavior.left == ExpansionBehavior::Behavior::Forbid;
+ if (expansionBehavior.left == ExpansionBehavior::Behavior::Force) {
++count;
isAfterExpansion = true;
}
@@ -1046,10 +1046,10 @@
isAfterExpansion = false;
}
}
- if (!isAfterExpansion && expansionBehavior.right() == ExpansionBehavior::Behavior::Force) {
+ if (!isAfterExpansion && expansionBehavior.right == ExpansionBehavior::Behavior::Force) {
++count;
isAfterExpansion = true;
- } else if (isAfterExpansion && expansionBehavior.right() == ExpansionBehavior::Behavior::Forbid) {
+ } else if (isAfterExpansion && expansionBehavior.right == ExpansionBehavior::Behavior::Forbid) {
ASSERT(count);
--count;
isAfterExpansion = false;
Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (294757 => 294758)
--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2022-05-24 19:43:40 UTC (rev 294758)
@@ -41,7 +41,7 @@
, m_run(run)
, m_fallbackFonts(fallbackFonts)
, m_expansion(run.expansion())
- , m_isAfterExpansion(run.expansionBehavior().left() == ExpansionBehavior::Behavior::Forbid)
+ , m_isAfterExpansion(run.expansionBehavior().left == ExpansionBehavior::Behavior::Forbid)
, m_accountForGlyphBounds(accountForGlyphBounds)
, m_enableKerning(font.enableKerning())
, m_requiresShaping(font.requiresShaping())
@@ -381,10 +381,10 @@
if (!m_run.ltr())
std::swap(isLeftmostCharacter, isRightmostCharacter);
- bool forceLeftExpansion = isLeftmostCharacter && m_run.expansionBehavior().left() == ExpansionBehavior::Behavior::Force;
- bool forceRightExpansion = isRightmostCharacter && m_run.expansionBehavior().right() == ExpansionBehavior::Behavior::Force;
- bool forbidLeftExpansion = isLeftmostCharacter && m_run.expansionBehavior().left() == ExpansionBehavior::Behavior::Forbid;
- bool forbidRightExpansion = isRightmostCharacter && m_run.expansionBehavior().right() == ExpansionBehavior::Behavior::Forbid;
+ bool forceLeftExpansion = isLeftmostCharacter && m_run.expansionBehavior().left == ExpansionBehavior::Behavior::Force;
+ bool forceRightExpansion = isRightmostCharacter && m_run.expansionBehavior().right == ExpansionBehavior::Behavior::Force;
+ bool forbidLeftExpansion = isLeftmostCharacter && m_run.expansionBehavior().left == ExpansionBehavior::Behavior::Forbid;
+ bool forbidRightExpansion = isRightmostCharacter && m_run.expansionBehavior().right == ExpansionBehavior::Behavior::Forbid;
bool isIdeograph = FontCascade::canExpandAroundIdeographsInComplexText() && FontCascade::isCJKIdeographOrSymbol(character);
Modified: trunk/Source/WebCore/platform/text/TextFlags.h (294757 => 294758)
--- trunk/Source/WebCore/platform/text/TextFlags.h 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/platform/text/TextFlags.h 2022-05-24 19:43:40 UTC (rev 294758)
@@ -58,8 +58,7 @@
Upright
};
-class ExpansionBehavior {
-public:
+struct ExpansionBehavior {
enum class Behavior : uint8_t {
Forbid,
Allow,
@@ -69,47 +68,38 @@
ExpansionBehavior() = default;
ExpansionBehavior(Behavior left, Behavior right)
- : m_left(static_cast<uint8_t>(left))
- , m_right(static_cast<uint8_t>(right))
+ : left(left)
+ , right(right)
{
}
- static const ExpansionBehavior defaultBehavior()
+ static ExpansionBehavior defaultBehavior()
{
return { };
}
- static const ExpansionBehavior allowRightOnly()
+ static ExpansionBehavior allowRightOnly()
{
return { Behavior::Forbid, Behavior::Allow };
}
- static const ExpansionBehavior allowLeftOnly()
+ static ExpansionBehavior allowLeftOnly()
{
return { Behavior::Allow, Behavior::Forbid };
}
- static const ExpansionBehavior forceLeftOnly()
+ static ExpansionBehavior forceLeftOnly()
{
return { Behavior::Force, Behavior::Forbid };
}
- static const ExpansionBehavior forbidAll()
+ static ExpansionBehavior forbidAll()
{
return { Behavior::Forbid, Behavior::Forbid };
}
- Behavior left() const { return static_cast<Behavior>(m_left); }
- void setLeft(Behavior behavior) { m_left = static_cast<uint8_t>(behavior); }
-
- Behavior right() const { return static_cast<Behavior>(m_right); }
- void setRight(Behavior behavior) { m_right = static_cast<uint8_t>(behavior); }
-
-private:
- // Default behavior follows the previous implementation:
- // forbids left and allows right expansions.
- uint8_t m_left : 2 { static_cast<uint8_t>(Behavior::Forbid) };
- uint8_t m_right : 2 { static_cast<uint8_t>(Behavior::Allow) };
+ Behavior left : 2 { Behavior::Forbid };
+ Behavior right : 2 { Behavior::Allow };
};
enum FontSynthesisValues {
Modified: trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp (294757 => 294758)
--- trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/rendering/LegacyInlineTextBox.cpp 2022-05-24 19:43:40 UTC (rev 294758)
@@ -491,18 +491,18 @@
ExpansionBehavior behavior;
if (forceLeftExpansion())
- behavior.setLeft(ExpansionBehavior::Behavior::Force);
+ behavior.left = ExpansionBehavior::Behavior::Force;
else if (canHaveLeftExpansion())
- behavior.setLeft(ExpansionBehavior::Behavior::Allow);
+ behavior.left = ExpansionBehavior::Behavior::Allow;
else
- behavior.setLeft(ExpansionBehavior::Behavior::Forbid);
+ behavior.left = ExpansionBehavior::Behavior::Forbid;
if (forceRightExpansion())
- behavior.setRight(ExpansionBehavior::Behavior::Force);
+ behavior.right = ExpansionBehavior::Behavior::Force;
else if (expansion() && nextLeafOnLine() && !nextLeafOnLine()->isLineBreak())
- behavior.setRight(ExpansionBehavior::Behavior::Allow);
+ behavior.right = ExpansionBehavior::Behavior::Allow;
else
- behavior.setRight(ExpansionBehavior::Behavior::Forbid);
+ behavior.right = ExpansionBehavior::Behavior::Forbid;
return behavior;
}
Modified: trunk/Source/WebCore/rendering/LegacyLineLayout.cpp (294757 => 294758)
--- trunk/Source/WebCore/rendering/LegacyLineLayout.cpp 2022-05-24 19:36:02 UTC (rev 294757)
+++ trunk/Source/WebCore/rendering/LegacyLineLayout.cpp 2022-05-24 19:43:40 UTC (rev 294758)
@@ -743,7 +743,7 @@
// FIXME: This leftExpansionOpportunity doesn't actually work because it doesn't perform the UBA
if (FontCascade::leftExpansionOpportunity(downcast<RenderText>(leafChild->renderer()).stringView(), leafChild->direction())) {
setRightExpansion = true;
- result.setRight(ExpansionBehavior::Behavior::Force);
+ result.right = ExpansionBehavior::Behavior::Force;
}
}
}
@@ -758,7 +758,7 @@
// FIXME: This leftExpansionOpportunity doesn't actually work because it doesn't perform the UBA
if (FontCascade::rightExpansionOpportunity(downcast<RenderText>(leafChild->renderer()).stringView(), leafChild->direction())) {
setLeftExpansion = true;
- result.setLeft(ExpansionBehavior::Behavior::Force);
+ result.left = ExpansionBehavior::Behavior::Force;
}
}
}
@@ -769,23 +769,23 @@
RenderRubyBase& rubyBase = downcast<RenderRubyBase>(block);
if (&textBox == rubyBase.firstRootBox()->firstLeafDescendant()) {
setLeftExpansion = true;
- result.setLeft(ExpansionBehavior::Behavior::Forbid);
+ result.left = ExpansionBehavior::Behavior::Forbid;
} if (&textBox == rubyBase.firstRootBox()->lastLeafDescendant()) {
setRightExpansion = true;
- result.setRight(ExpansionBehavior::Behavior::Forbid);
+ result.right = ExpansionBehavior::Behavior::Forbid;
}
}
}
if (!setLeftExpansion)
- result.setLeft(isAfterExpansion ? ExpansionBehavior::Behavior::Forbid : ExpansionBehavior::Behavior::Allow);
+ result.left = isAfterExpansion ? ExpansionBehavior::Behavior::Forbid : ExpansionBehavior::Behavior::Allow;
if (!setRightExpansion)
- result.setRight(ExpansionBehavior::Behavior::Allow);
+ result.right = ExpansionBehavior::Behavior::Allow;
return result;
}
static inline void applyExpansionBehavior(LegacyInlineTextBox& textBox, ExpansionBehavior expansionBehavior)
{
- switch (expansionBehavior.left()) {
+ switch (expansionBehavior.left) {
case ExpansionBehavior::Behavior::Force:
textBox.setForceLeftExpansion();
break;
@@ -800,7 +800,7 @@
break;
};
- switch (expansionBehavior.right()) {
+ switch (expansionBehavior.right) {
case ExpansionBehavior::Behavior::Force:
textBox.setForceRightExpansion();
break;
