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

Unified Diff: Source/core/layout/line/InlineFlowBox.cpp

Issue 1119663002: Making Unicode character names consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Code changes to correct Test Expectation Created 5 years, 7 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
Index: Source/core/layout/line/InlineFlowBox.cpp
diff --git a/Source/core/layout/line/InlineFlowBox.cpp b/Source/core/layout/line/InlineFlowBox.cpp
index f81ae36630fef868145a7073fa9c1be0f8911085..bf120f0b52efbbef0c0e7d36c343a4179e973877 100644
--- a/Source/core/layout/line/InlineFlowBox.cpp
+++ b/Source/core/layout/line/InlineFlowBox.cpp
@@ -387,18 +387,18 @@ FloatWillBeLayoutUnit InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* f
if (curr->layoutObject().isText()) {
InlineTextBox* text = toInlineTextBox(curr);
LayoutText& rt = text->layoutObject();
- FloatWillBeLayoutUnit space;
+ FloatWillBeLayoutUnit characterSpace;
if (rt.textLength()) {
if (needsWordSpacing && isSpaceOrNewline(rt.characterAt(text->start())))
- space = rt.style(isFirstLineStyle())->font().fontDescription().wordSpacing();
+ characterSpace = rt.style(isFirstLineStyle())->font().fontDescription().wordSpacing();
needsWordSpacing = !isSpaceOrNewline(rt.characterAt(text->end()));
}
if (isLeftToRightDirection()) {
- logicalLeft += space;
+ logicalLeft += characterSpace;
text->setLogicalLeft(logicalLeft);
} else {
text->setLogicalLeft(logicalLeft);
- logicalLeft += space;
+ logicalLeft += characterSpace;
}
if (knownToHaveNoOverflow())
minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
@@ -440,7 +440,7 @@ FloatWillBeLayoutUnit InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* f
if (knownToHaveNoOverflow())
maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
logicalLeft += logicalRightMargin;
- // If we encounter any space after this inline block then ensure it is treated as the space between two words.
+ // If we encounter any characterSpace after this inline block then ensure it is treated as the characterSpace between two words.
needsWordSpacing = true;
}
}
@@ -495,7 +495,7 @@ void InlineFlowBox::computeLogicalBoxHeights(RootInlineBox* rootBox, LayoutUnit&
//
// A secondary purpose of this function is to store the offset of every box's baseline from the root box's
// baseline. This information is cached in the logicalTop() of every box. We're effectively just using
- // the logicalTop() as scratch space.
+ // the logicalTop() as scratch characterSpace.
//
// Because a box can be positioned such that it ends up fully above or fully below the
// root line box, we only consider it to affect the maxAscent and maxDescent values if some
@@ -1047,7 +1047,7 @@ bool InlineFlowBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& lo
rect.moveBy(accumulatedOffset);
if (visibleToHitTestRequest(result.hitTestRequest()) && locationInContainer.intersects(rect)) {
- layoutObject().updateHitTestResult(result, flipForWritingMode(locationInContainer.point() - toLayoutSize(accumulatedOffset))); // Don't add in m_x or m_y here, we want coords in the containing block's space.
+ layoutObject().updateHitTestResult(result, flipForWritingMode(locationInContainer.point() - toLayoutSize(accumulatedOffset))); // Don't add in m_x or m_y here, we want coords in the containing block's characterSpace.
if (!result.addNodeToListBasedTestResult(layoutObject().node(), locationInContainer, rect))
return true;
}

Powered by Google App Engine
This is Rietveld 408576698