Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/ChangeLog 2019-09-23 08:39:16 UTC (rev 250210)
@@ -1642,47 +1642,6 @@
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
-2019-08-27 Antti Koivisto <an...@apple.com>
-
- InlineTextBox::end() should return first-past-end offset
- https://bugs.webkit.org/show_bug.cgi?id=201181
-
- Reviewed by Zalan Bujtas.
-
- It currently points to the last character, except for empty text boxes.
- This is awkward in itself and also inconsistent, as we use first-past-end offset everywhere else.
-
- * dom/Position.cpp:
- (WebCore::Position::downstream const):
-
- Add a check for zero length case to avoid changing behavior.
-
- * layout/Verification.cpp:
- (WebCore::Layout::checkForMatchingTextRuns):
- (WebCore::Layout::outputMismatchingComplexLineInformationIfNeeded):
- * rendering/InlineFlowBox.cpp:
- (WebCore::InlineFlowBox::placeBoxRangeInInlineDirection):
- * rendering/InlineTextBox.cpp:
- (WebCore::InlineTextBox::paint):
- (WebCore::InlineTextBox::calculateDocumentMarkerBounds const):
- (WebCore::InlineTextBox::collectMarkedTextsForDocumentMarkers const):
- (WebCore::InlineTextBox::paintCompositionUnderlines const):
- (WebCore::InlineTextBox::paintCompositionUnderline const):
- * rendering/InlineTextBox.h:
- (WebCore::InlineTextBox::end const):
-
- end = start + len
-
- * rendering/RenderText.cpp:
- (WebCore::RenderText::setTextWithOffset):
- * rendering/RenderTextLineBoxes.cpp:
- (WebCore::localQuadForTextBox):
- (WebCore::RenderTextLineBoxes::absoluteRectsForRange const):
- (WebCore::RenderTextLineBoxes::absoluteQuadsForRange const):
- (WebCore::RenderTextLineBoxes::dirtyRange):
-
- Here the incoming 'end' used linebox style too, move that to the new definition too.
-
2019-08-27 Chris Dumez <cdu...@apple.com>
Crash under WebCore::jsNotificationConstructorPermission
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/dom/Position.cpp (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/dom/Position.cpp 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/dom/Position.cpp 2019-09-23 08:39:16 UTC (rev 250210)
@@ -873,10 +873,7 @@
unsigned textOffset = currentPosition.offsetInLeafNode();
auto lastTextBox = textRenderer.lastTextBox();
for (auto* box = textRenderer.firstTextBox(); box; box = box->nextTextBox()) {
- if (!box->len() && textOffset == box->start())
- return currentPosition;
-
- if (textOffset < box->end()) {
+ if (textOffset <= box->end()) {
if (textOffset >= box->start())
return currentPosition;
continue;
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/layout/Verification.cpp (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/layout/Verification.cpp 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/layout/Verification.cpp 2019-09-23 08:39:16 UTC (rev 250210)
@@ -120,7 +120,7 @@
&& areEssentiallyEqual(inlineTextBox.logicalTop(), inlineRun.logicalTop())
&& areEssentiallyEqual(inlineTextBox.logicalBottom(), inlineRun.logicalBottom())
&& inlineTextBox.start() == inlineRun.textContext()->start()
- && inlineTextBox.end() == inlineRun.textContext()->end();
+ && (inlineTextBox.end() + 1) == inlineRun.textContext()->end();
}
static void collectFlowBoxSubtree(const InlineFlowBox& flowbox, Vector<WebCore::InlineBox*>& inlineBoxes)
@@ -184,7 +184,7 @@
stream << "Mismatching: run";
if (inlineTextBox)
- stream << " (" << inlineTextBox->start() << ", " << inlineTextBox->end() << ")";
+ stream << " (" << inlineTextBox->start() << ", " << inlineTextBox->end() + 1 << ")";
stream << " (" << inlineBox->logicalLeft() << ", " << inlineBox->logicalTop() << ") (" << inlineBox->logicalWidth() << "x" << inlineBox->logicalHeight() << ")";
stream << " inline run";
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineFlowBox.cpp (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineFlowBox.cpp 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineFlowBox.cpp 2019-09-23 08:39:16 UTC (rev 250210)
@@ -392,7 +392,7 @@
if (renderText.text().length()) {
if (needsWordSpacing && isSpaceOrNewline(renderText.characterAt(textBox.start())))
logicalLeft += textBox.lineStyle().fontCascade().wordSpacing();
- needsWordSpacing = !isSpaceOrNewline(renderText.characterAt(textBox.end() - 1));
+ needsWordSpacing = !isSpaceOrNewline(renderText.characterAt(textBox.end()));
}
textBox.setLogicalLeft(logicalLeft);
if (knownToHaveNoOverflow())
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineTextBox.cpp (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineTextBox.cpp 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineTextBox.cpp 2019-09-23 08:39:16 UTC (rev 250210)
@@ -554,7 +554,7 @@
Vector<MarkedText> markedTexts;
if (paintInfo.phase != PaintPhase::Selection) {
// The marked texts for the gaps between document markers and selection are implicitly created by subdividing the entire line.
- markedTexts.append({ clampedOffset(m_start), clampedOffset(end()), MarkedText::Unmarked });
+ markedTexts.append({ clampedOffset(m_start), clampedOffset(end() + 1), MarkedText::Unmarked });
if (!isPrinting) {
markedTexts.appendVector(collectMarkedTextsForDocumentMarkers(TextPaintPhase::Foreground));
@@ -697,7 +697,7 @@
auto height = 0.13247 * fontSize;
// Avoid measuring the text when the entire line box is selected as an optimization.
- if (markedText.startOffset || markedText.endOffset != clampedOffset(end())) {
+ if (markedText.startOffset || markedText.endOffset != clampedOffset(end() + 1)) {
TextRun run = createTextRun();
LayoutRect selectionRect = LayoutRect(0, y, 0, height);
lineFont().adjustSelectionRectForText(run, selectionRect, markedText.startOffset, markedText.endOffset);
@@ -932,7 +932,7 @@
continue;
}
- if (marker->startOffset() >= end()) {
+ if (marker->startOffset() > end()) {
// Marker is completely after this run, bail. A later run will paint it.
break;
}
@@ -1138,13 +1138,13 @@
continue;
}
- if (underline.startOffset >= end())
+ if (underline.startOffset > end())
break; // Underline is completely after this run, bail. A later run will paint it.
// Underline intersects this run. Paint it.
paintCompositionUnderline(paintInfo, boxOrigin, underline);
- if (underline.endOffset > end())
+ if (underline.endOffset > end() + 1)
break; // Underline also runs into the next run. Bail now, no more marker advancement.
}
}
@@ -1165,7 +1165,7 @@
float width = logicalWidth(); // how much line to draw
bool useWholeWidth = true;
unsigned paintStart = m_start;
- unsigned paintEnd = end();
+ unsigned paintEnd = end() + 1; // end points at the last char, not past it
if (paintStart <= underline.startOffset) {
paintStart = underline.startOffset;
useWholeWidth = false;
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineTextBox.h (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineTextBox.h 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/InlineTextBox.h 2019-09-23 08:39:16 UTC (rev 250210)
@@ -66,7 +66,7 @@
// FIXME: These accessors should ASSERT(!isDirty()). See https://bugs.webkit.org/show_bug.cgi?id=97264
// Note len() == 1 for combined text regardless of whether the composition is empty. Use hasTextContent() to
unsigned start() const { return m_start; }
- unsigned end() const { return m_start + m_len; }
+ unsigned end() const { return m_len ? m_start + m_len - 1 : m_start; }
unsigned len() const { return m_len; }
void setStart(unsigned start) { m_start = start; }
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/RenderText.cpp (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/RenderText.cpp 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/RenderText.cpp 2019-09-23 08:39:16 UTC (rev 250210)
@@ -360,10 +360,11 @@
for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
LayoutRect rect;
- if (start <= box->start() && box->end() <= end)
+ // Note, box->end() returns the index of the last character, not the index past it.
+ if (start <= box->start() && box->end() < end)
rect = box->localSelectionRect(start, end);
else {
- unsigned realEnd = std::min(box->end(), end);
+ unsigned realEnd = std::min(box->end() + 1, end);
rect = box->localSelectionRect(start, realEnd);
if (rect.isEmpty())
continue;
@@ -397,8 +398,8 @@
if (containingBlock->isRubyBase() || containingBlock->isRubyText())
isLastOnLine = !containingBlock->containingBlock()->inlineBoxWrapper()->nextOnLineExists();
- bool containsStart = box->start() <= start && box->end() >= start;
- bool containsEnd = box->start() <= end && box->end() >= end;
+ bool containsStart = box->start() <= start && box->end() + 1 >= start;
+ bool containsEnd = box->start() <= end && box->end() + 1 >= end;
bool isFixed = false;
IntRect absRect = localToAbsoluteQuad(FloatRect(rect), UseTransforms, &isFixed).enclosingBoundingBox();
@@ -1108,7 +1109,7 @@
return;
int delta = newText.length() - text().length();
- unsigned end = offset + length;
+ unsigned end = length ? offset + length - 1 : offset;
m_linesDirty = simpleLineLayout() || m_lineBoxes.dirtyRange(*this, offset, end, delta);
Modified: releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/RenderTextLineBoxes.cpp (250209 => 250210)
--- releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/RenderTextLineBoxes.cpp 2019-09-23 08:39:11 UTC (rev 250209)
+++ releases/WebKitGTK/webkit-2.26/Source/WebCore/rendering/RenderTextLineBoxes.cpp 2019-09-23 08:39:16 UTC (rev 250210)
@@ -515,7 +515,7 @@
static FloatRect localQuadForTextBox(const InlineTextBox& box, unsigned start, unsigned end, bool useSelectionHeight)
{
- unsigned realEnd = std::min(box.end(), end);
+ unsigned realEnd = std::min(box.end() + 1, end);
LayoutRect boxSelectionRect = box.localSelectionRect(start, realEnd);
if (!boxSelectionRect.height())
return FloatRect();
@@ -537,7 +537,8 @@
{
Vector<IntRect> rects;
for (auto* box = m_first; box; box = box->nextTextBox()) {
- if (start <= box->start() && box->end() <= end) {
+ // Note: box->end() returns the index of the last character, not the index past it
+ if (start <= box->start() && box->end() < end) {
FloatRect boundaries = box->calculateBoundaries();
if (useSelectionHeight) {
LayoutRect selectionRect = box->localSelectionRect(start, end);
@@ -583,7 +584,8 @@
{
Vector<FloatQuad> quads;
for (auto* box = m_first; box; box = box->nextTextBox()) {
- if (start <= box->start() && box->end() <= end) {
+ // Note: box->end() returns the index of the last character, not the index past it
+ if (start <= box->start() && box->end() < end) {
FloatRect boundaries = box->calculateBoundaries();
if (useSelectionHeight) {
LayoutRect selectionRect = box->localSelectionRect(start, end);
@@ -621,10 +623,10 @@
for (auto* current = m_first; current; current = current->nextTextBox()) {
// FIXME: This shouldn't rely on the end of a dirty line box. See https://bugs.webkit.org/show_bug.cgi?id=97264
// Text run is entirely before the affected range.
- if (current->end() <= start)
+ if (current->end() < start)
continue;
// Text run is entirely after the affected range.
- if (current->start() >= end) {
+ if (current->start() > end) {
current->offsetRun(lengthDelta);
auto& rootBox = current->root();
if (!firstRootBox) {
@@ -638,7 +640,7 @@
lastRootBox = &rootBox;
continue;
}
- if (current->end() > start && current->end() <= end) {
+ if (current->end() >= start && current->end() <= end) {
// Text run overlaps with the left end of the affected range.
current->dirtyLineBoxes();
dirtiedLines = true;
@@ -650,7 +652,7 @@
dirtiedLines = true;
continue;
}
- if (current->start() < end && current->end() >= end) {
+ if (current->start() <= end && current->end() >= end) {
// Text run overlaps with right end of the affected range.
current->dirtyLineBoxes();
dirtiedLines = true;
