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

Unified Diff: Source/core/rendering/line/TrailingObjects.cpp

Issue 300853007: Empty inline elements always get a line box. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 6 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
« no previous file with comments | « Source/core/rendering/line/TrailingObjects.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/line/TrailingObjects.cpp
diff --git a/Source/core/rendering/line/TrailingObjects.cpp b/Source/core/rendering/line/TrailingObjects.cpp
index c91e2ae1ff343581fa0accc3d9ddd5bd0192d60f..62c489b84b5719b543307c92d413b698b2bdfad1 100644
--- a/Source/core/rendering/line/TrailingObjects.cpp
+++ b/Source/core/rendering/line/TrailingObjects.cpp
@@ -28,7 +28,7 @@
namespace WebCore {
-void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMidpointState, const InlineIterator& lBreak, CollapseFirstSpaceOrNot collapseFirstSpace)
+void TrailingObjects::updateMidpointsForTrailingObjects(LineMidpointState& lineMidpointState, const InlineIterator& lBreak, CollapseFirstSpaceOrNot collapseFirstSpace)
{
if (!m_whitespace)
return;
@@ -46,13 +46,13 @@ void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMid
// Now make sure every single trailingPositionedBox following the trailingSpaceMidpoint properly stops and starts
// ignoring spaces.
size_t currentMidpoint = trailingSpaceMidpoint + 1;
- for (size_t i = 0; i < m_boxes.size(); ++i) {
+ for (size_t i = 0; i < m_objects.size(); ++i) {
if (currentMidpoint >= lineMidpointState.numMidpoints()) {
// We don't have a midpoint for this box yet.
- lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_boxes[i]);
+ lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i]);
} else {
- ASSERT(lineMidpointState.midpoints()[currentMidpoint].object() == m_boxes[i]);
- ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].object() == m_boxes[i]);
+ ASSERT(lineMidpointState.midpoints()[currentMidpoint].object() == m_objects[i]);
+ ASSERT(lineMidpointState.midpoints()[currentMidpoint + 1].object() == m_objects[i]);
}
currentMidpoint += 2;
}
@@ -64,8 +64,8 @@ void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMid
unsigned pos = length >= 2 ? length - 2 : UINT_MAX;
InlineIterator endMid(0, m_whitespace, pos);
lineMidpointState.startIgnoringSpaces(endMid);
- for (size_t i = 0; i < m_boxes.size(); ++i) {
- lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_boxes[i]);
+ for (size_t i = 0; i < m_objects.size(); ++i) {
+ lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_objects[i]);
}
}
}
« no previous file with comments | « Source/core/rendering/line/TrailingObjects.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698