Attachment 353807 Details for Bug 190764 – Patch

[patch] Patch

bug-190764-20181104122201.patch (text/plain), 49.83 KB, created by Myles C. Maxfield on 2018-11-04 12:22:02 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2018-11-04 12:22:02 PST

Size: 49.83 KB

patch

obsolete

>Subversion Revision: 237777
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9a5c19c5fa94502eb4617576cf777c6e59e8683a..4c44988cfd6dba4f4a3623f25df36dc99f5a6c8e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,48 @@
>+2018-11-04  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        Spelling dots are drawn in the wrong place
>+        https://bugs.webkit.org/show_bug.cgi?id=190764
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        - Dots should not be clipped.
>+        - Dots should be horizontally centered.
>+        - Dots should be drawn behind the text.
>+        - Distance from the baseline to the top of the dot should be 11.035% of font size.
>+        - Dot diameter should be 13.247% of the font size.
>+        - Distance between the dots (right side of the left dot to left side of the right dot) should be 9.457% of the font size.
>+        - The "font size" used in these calculations should be clamped so it's 10px <= font size <= 40px.
>+
>+        Tests: editing/spelling/spelling-dots-position-2.html
>+               editing/spelling/spelling-dots-position-3.html
>+               editing/spelling/spelling-dots-position.html
>+               editing/spelling/spelling-dots-repaint.html
>+
>+        * platform/graphics/cocoa/GraphicsContextCocoa.mm:
>+        (WebCore::colorForMarkerLineStyle): Align iOS and macOS implementations.
>+        (WebCore::GraphicsContext::drawDotsForDocumentMarker): Place the dots correctly.
>+        * rendering/InlineFlowBox.cpp:
>+        (WebCore::InlineFlowBox::addToLine): The KnownToHaveNoOverflow flag should be cleared if the element has spelling dots,
>+            because there is no guarantee the spelling dots will lie inside the layout rect of the element.
>+        (WebCore::InlineFlowBox::addTextBoxVisualOverflow): Update the repaint rects to include splling dot positions.
>+        * rendering/InlineFlowBox.h: Comments should explain why, not say what.
>+        * rendering/InlineTextBox.cpp:
>+        (WebCore::InlineTextBox::paint): Draw the dots behind the text.
>+        (WebCore::InlineTextBox::hasMarkers const): Convenience.
>+        (WebCore::InlineTextBox::paintPlatformDocumentMarkers): Refactor bounds information into a helper function.
>+        (WebCore::InlineTextBox::calculateUnionOfAllDocumentMarkerBounds const): Use for repaint rect calculation.
>+        (WebCore::InlineTextBox::calculateDocumentMarkerBounds const): Place the dots correctly.
>+        (WebCore::InlineTextBox::paintPlatformDocumentMarker): Call the helper method.
>+        (WebCore::InlineTextBox::collectMarkedTextsForDocumentMarkers const):
>+        (WebCore::InlineTextBox::collectMarkedTextsForDocumentMarkers): Deleted.
>+        * rendering/InlineTextBox.h: Declare the helper methods.
>+        * rendering/SimpleLineLayout.cpp: Simple line layout doesn't know how to paint spelling dots, so make the presence of
>+            spelling dots opt us out of SLL.
>+        (WebCore::SimpleLineLayout::canUseForWithReason):
>+        * rendering/SimpleLineLayoutCoverage.cpp:
>+        (WebCore::SimpleLineLayout::printReason):
>+        * rendering/SimpleLineLayoutCoverage.h: Add a new opt-out reason.
>+
> 2018-11-03  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Canvas: capture changes to <canvas> that would affect the recorded context
>diff --git a/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm b/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm
>index 48b5b9455a4e036ccfbbdaf84058f62935bf02bd..bf5e8b1d8a2799d7a30a58eb5eff8e60123335d5 100644
>--- a/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm
>@@ -185,7 +185,6 @@ static inline void setPatternPhaseInUserSpace(CGContextRef context, CGPoint phas
> 
> static CGColorRef colorForMarkerLineStyle(DocumentMarkerLineStyle::Mode style, bool useDarkMode)
> {
>-#if PLATFORM(MAC)
>     switch (style) {
>     // Red
>     case DocumentMarkerLineStyle::Mode::Spelling:
>@@ -199,19 +198,6 @@ static CGColorRef colorForMarkerLineStyle(DocumentMarkerLineStyle::Mode style, b
>     case DocumentMarkerLineStyle::Mode::Grammar:
>         return cachedCGColor(useDarkMode ? Color { 50, 215, 75, 217 } : Color { 25, 175, 50, 191 });
>     }
>-#else
>-    UNUSED_PARAM(useDarkMode);
>-    switch (style) {
>-    case DocumentMarkerLineStyle::Mode::Spelling:
>-        return [getUIColorClass() systemRedColor].CGColor;
>-    case DocumentMarkerLineStyle::Mode::DictationAlternatives:
>-    case DocumentMarkerLineStyle::Mode::TextCheckingDictationPhraseWithAlternatives:
>-    case DocumentMarkerLineStyle::Mode::AutocorrectionReplacement:
>-        return [getUIColorClass() systemBlueColor].CGColor;
>-    case DocumentMarkerLineStyle::Mode::Grammar:
>-        return [getUIColorClass() systemGreenColor].CGColor;
>-    }
>-#endif
> }
> 
> void GraphicsContext::drawDotsForDocumentMarker(const FloatRect& rect, DocumentMarkerLineStyle style)
>@@ -219,28 +205,33 @@ void GraphicsContext::drawDotsForDocumentMarker(const FloatRect& rect, DocumentM
>     if (paintingDisabled())
>         return;
> 
>-    auto circleColor = colorForMarkerLineStyle(style.mode, style.shouldUseDarkAppearance);
>-
>-    auto lineThickness = rect.height();
>-    auto patternGapWidth = lineThickness / 3;
>-    auto patternWidth = lineThickness + patternGapWidth;
>+    // We want to find the number of full dots, so we're solving the equations:
>+    // dotDiameter = height
>+    // dotDiameter / dotGap = 13.247 / 9.457
>+    // numberOfGaps = numberOfDots - 1
>+    // dotDiameter * numberOfDots + dotGap * numberOfGaps = width
> 
>-    FloatPoint offsetPoint = rect.location();
>     auto width = rect.width();
>-    float widthMod = fmodf(width, patternWidth);
>-    if (patternWidth - widthMod > patternGapWidth) {
>-        float gapIncludeWidth = 0;
>-        if (width > patternWidth)
>-            gapIncludeWidth = patternGapWidth;
>-        offsetPoint.move(floor((widthMod + gapIncludeWidth) / 2), 0);
>-        width -= widthMod;
>-    }
>+    auto dotDiameter = rect.height();
>+    auto dotGap = dotDiameter * 9.457 / 13.247;
>+    auto numberOfDots = (width + dotGap) / (dotDiameter + dotGap);
>+    auto numberOfWholeDots = static_cast<unsigned>(numberOfDots);
>+    auto numberOfWholeGaps = numberOfWholeDots - 1;
>+
>+    // Center the dots
>+    auto offset = (width - (dotDiameter * numberOfWholeDots + dotGap * numberOfWholeGaps)) / 2;
>+
>+    auto circleColor = colorForMarkerLineStyle(style.mode, style.shouldUseDarkAppearance);
> 
>     CGContextRef platformContext = this->platformContext();
>     CGContextStateSaver stateSaver { platformContext };
>     CGContextSetFillColorWithColor(platformContext, circleColor);
>-    for (int x = 0; x < width; x += patternWidth)
>-        CGContextAddEllipseInRect(platformContext, CGRectMake(offsetPoint.x() + x, offsetPoint.y(), lineThickness, lineThickness));
>+    for (unsigned i = 0; i < numberOfWholeDots; ++i) {
>+        auto location = rect.location();
>+        location.move(offset + i * (dotDiameter + dotGap), 0);
>+        auto size = FloatSize(dotDiameter, dotDiameter);
>+        CGContextAddEllipseInRect(platformContext, FloatRect(location, size));
>+    }
>     CGContextSetCompositeOperation(platformContext, kCGCompositeSover);
>     CGContextFillPath(platformContext);
> }
>diff --git a/Source/WebCore/rendering/InlineFlowBox.cpp b/Source/WebCore/rendering/InlineFlowBox.cpp
>index 2876b17a08d94521527f7311e4280402b9e1e1a7..09501f7319a28a84773a70d5fb7d245c6ca3bda4 100644
>--- a/Source/WebCore/rendering/InlineFlowBox.cpp
>+++ b/Source/WebCore/rendering/InlineFlowBox.cpp
>@@ -158,7 +158,12 @@ void InlineFlowBox::addToLine(InlineBox* child)
>         const RenderStyle& childStyle = child->lineStyle();
>         if (child->behavesLikeText()) {
>             const RenderStyle* childStyle = &child->lineStyle();
>-            if (childStyle->letterSpacing() < 0 || childStyle->textShadow() || childStyle->textEmphasisMark() != TextEmphasisMark::None || childStyle->hasPositiveStrokeWidth())
>+            bool hasMarkers = false;
>+            if (is<InlineTextBox>(child)) {
>+                const auto* textBox = downcast<InlineTextBox>(child);
>+                hasMarkers = textBox->hasMarkers();
>+            }
>+            if (childStyle->letterSpacing() < 0 || childStyle->textShadow() || childStyle->textEmphasisMark() != TextEmphasisMark::None || childStyle->hasPositiveStrokeWidth() || hasMarkers)
>                 child->clearKnownToHaveNoOverflow();
>         } else if (child->renderer().isReplaced()) {
>             const RenderBox& box = downcast<RenderBox>(child->renderer());
>@@ -928,6 +933,10 @@ inline void InlineFlowBox::addTextBoxVisualOverflow(InlineTextBox& textBox, Glyp
>     
>     logicalVisualOverflow = LayoutRect(logicalLeftVisualOverflow, logicalTopVisualOverflow,
>                                        logicalRightVisualOverflow - logicalLeftVisualOverflow, logicalBottomVisualOverflow - logicalTopVisualOverflow);
>+
>+    auto documentMarkerBounds = textBox.calculateUnionOfAllDocumentMarkerBounds();
>+    documentMarkerBounds.move(textBox.logicalLeft(), textBox.logicalTop());
>+    logicalVisualOverflow = unionRect(logicalVisualOverflow, LayoutRect(documentMarkerBounds));
>                                     
>     textBox.setLogicalOverflowRect(logicalVisualOverflow);
> }
>diff --git a/Source/WebCore/rendering/InlineFlowBox.h b/Source/WebCore/rendering/InlineFlowBox.h
>index 27c6229466ca51d47a82a5a32e3518a2bba47f35..0991aa734faa36bceda78f73ec5b48a863a8c564 100644
>--- a/Source/WebCore/rendering/InlineFlowBox.h
>+++ b/Source/WebCore/rendering/InlineFlowBox.h
>@@ -292,8 +292,7 @@ public:
>     }
> 
>     void computeReplacedAndTextLineTopAndBottom(LayoutUnit& lineTop, LayoutUnit& lineBottom) const;
>-    
>-    // Used to calculate the underline offset for TextUnderlinePosition::Under.
>+
>     void maxLogicalBottomForTextDecorationLine(float& maxLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecoration>) const;
>     void minLogicalTopForTextDecorationLine(float& minLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecoration>) const;
> 
>diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
>index 7cbc078cab27ea2e2154007c14ecc91bc227d2f6..9e71a71bafa656aae8cd00f0e35d9003471b1f00 100644
>--- a/Source/WebCore/rendering/InlineTextBox.cpp
>+++ b/Source/WebCore/rendering/InlineTextBox.cpp
>@@ -543,6 +543,9 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
>     if (paintInfo.phase == PaintPhase::Foreground)
>         renderer().page().addRelevantRepaintedObject(&renderer(), IntRect(boxOrigin.x(), boxOrigin.y(), logicalWidth(), logicalHeight()));
> 
>+    if (paintInfo.phase == PaintPhase::Foreground)
>+        paintPlatformDocumentMarkers(context, boxOrigin);
>+
>     // 2. Now paint the foreground, including text and decorations like underline/overline (in quirks mode only).
>     bool shouldPaintSelectionForeground = haveSelection && !useCustomUnderlines;
>     Vector<MarkedText> markedTexts;
>@@ -620,12 +623,8 @@ void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset,
>     }
> 
>     // 3. Paint fancy decorations, including composition underlines and platform-specific underlines for spelling errors, grammar errors, et cetera.
>-    if (paintInfo.phase == PaintPhase::Foreground) {
>-        paintPlatformDocumentMarkers(context, boxOrigin);
>-
>-        if (useCustomUnderlines)
>-            paintCompositionUnderlines(paintInfo, boxOrigin);
>-    }
>+    if (paintInfo.phase == PaintPhase::Foreground && useCustomUnderlines)
>+        paintCompositionUnderlines(paintInfo, boxOrigin);
>     
>     if (shouldRotate)
>         context.concatCTM(rotation(boxRect, Counterclockwise));
>@@ -665,12 +664,46 @@ std::pair<unsigned, unsigned> InlineTextBox::selectionStartEnd() const
>     return { clampedOffset(start), clampedOffset(end) };
> }
> 
>+bool InlineTextBox::hasMarkers() const
>+{
>+    return collectMarkedTextsForDocumentMarkers(TextPaintPhase::Decoration).size();
>+}
>+
> void InlineTextBox::paintPlatformDocumentMarkers(GraphicsContext& context, const FloatPoint& boxOrigin)
> {
>+    // This must match calculateUnionOfAllDocumentMarkerBounds().
>     for (auto& markedText : subdivide(collectMarkedTextsForDocumentMarkers(TextPaintPhase::Decoration), OverlapStrategy::Frontmost))
>         paintPlatformDocumentMarker(context, boxOrigin, markedText);
> }
> 
>+FloatRect InlineTextBox::calculateUnionOfAllDocumentMarkerBounds() const
>+{
>+    // This must match paintPlatformDocumentMarkers().
>+    FloatRect result;
>+    for (auto& markedText : subdivide(collectMarkedTextsForDocumentMarkers(TextPaintPhase::Decoration), OverlapStrategy::Frontmost))
>+        result = unionRect(result, calculateDocumentMarkerBounds(markedText));
>+    return result;
>+}
>+
>+FloatRect InlineTextBox::calculateDocumentMarkerBounds(const MarkedText& markedText) const
>+{
>+    auto& font = lineFont();
>+    auto ascent = font.fontMetrics().ascent();
>+    auto fontSize = std::min(std::max(font.size(), 10.0f), 40.0f);
>+    auto y = ascent + 0.11035 * fontSize;
>+    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() + 1)) {
>+        TextRun run = createTextRun();
>+        LayoutRect selectionRect = LayoutRect(0, y, 0, height);
>+        lineFont().adjustSelectionRectForText(run, selectionRect, markedText.startOffset, markedText.endOffset);
>+        return selectionRect;
>+    }
>+
>+    return FloatRect(0, y, logicalWidth(), height);
>+}
>+
> void InlineTextBox::paintPlatformDocumentMarker(GraphicsContext& context, const FloatPoint& boxOrigin, const MarkedText& markedText)
> {
>     // Never print spelling/grammar markers (5327887)
>@@ -680,27 +713,11 @@ void InlineTextBox::paintPlatformDocumentMarker(GraphicsContext& context, const
>     if (m_truncation == cFullTruncation)
>         return;
> 
>-    float start = 0; // start of line to draw, relative to tx
>-    float width = logicalWidth(); // how much line to draw
>+    auto bounds = calculateDocumentMarkerBounds(markedText);
> 
>-    // Avoid measuring the text when the entire line box is selected as an optimization.
>-    if (markedText.startOffset || markedText.endOffset != clampedOffset(end() + 1)) {
>-        // Calculate start & width
>-        int deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - selectionTop();
>-        int selHeight = selectionHeight();
>-        FloatPoint startPoint(boxOrigin.x(), boxOrigin.y() - deltaY);
>-        TextRun run = createTextRun();
>-
>-        LayoutRect selectionRect = LayoutRect(startPoint, FloatSize(0, selHeight));
>-        lineFont().adjustSelectionRectForText(run, selectionRect, markedText.startOffset, markedText.endOffset);
>-        IntRect markerRect = enclosingIntRect(selectionRect);
>-        start = markerRect.x() - startPoint.x();
>-        width = markerRect.width();
>-    }
>-
>-    auto lineStyleForMarkedTextType = [&] (MarkedText::Type type) -> DocumentMarkerLineStyle {
>+    auto lineStyleForMarkedTextType = [&]() -> DocumentMarkerLineStyle {
>         bool shouldUseDarkAppearance = renderer().document().useDarkAppearance();
>-        switch (type) {
>+        switch (markedText.type) {
>         case MarkedText::SpellingError:
>             return { DocumentMarkerLineStyle::Mode::Spelling, shouldUseDarkAppearance };
>         case MarkedText::GrammarError:
>@@ -720,25 +737,8 @@ void InlineTextBox::paintPlatformDocumentMarker(GraphicsContext& context, const
>         }
>     };
> 
>-    // IMPORTANT: The misspelling underline is not considered when calculating the text bounds, so we have to
>-    // make sure to fit within those bounds.  This means the top pixel(s) of the underline will overlap the
>-    // bottom pixel(s) of the glyphs in smaller font sizes.  The alternatives are to increase the line spacing (bad!!)
>-    // or decrease the underline thickness.  The overlap is actually the most useful, and matches what AppKit does.
>-    // So, we generally place the underline at the bottom of the text, but in larger fonts that's not so good so
>-    // we pin to two pixels under the baseline.
>-    int lineThickness = 3;
>-    int baseline = lineStyle().fontMetrics().ascent();
>-    int descent = logicalHeight() - baseline;
>-    int underlineOffset;
>-    if (descent <= (2 + lineThickness)) {
>-        // Place the underline at the very bottom of the text in small/medium fonts.
>-        underlineOffset = logicalHeight() - lineThickness;
>-    } else {
>-        // In larger fonts, though, place the underline up near the baseline to prevent a big gap.
>-        underlineOffset = baseline + 2;
>-    }
>-
>-    context.drawDotsForDocumentMarker(FloatRect(boxOrigin.x() + start, boxOrigin.y() + underlineOffset, width, lineThickness), lineStyleForMarkedTextType(markedText.type));
>+    bounds.moveBy(boxOrigin);
>+    context.drawDotsForDocumentMarker(bounds, lineStyleForMarkedTextType());
> }
> 
> auto InlineTextBox::computeStyleForUnmarkedMarkedText(const PaintInfo& paintInfo) const -> MarkedTextStyle
>@@ -855,7 +855,7 @@ Vector<MarkedText> InlineTextBox::collectMarkedTextsForDraggedContent()
>     return result;
> }
> 
>-Vector<MarkedText> InlineTextBox::collectMarkedTextsForDocumentMarkers(TextPaintPhase phase)
>+Vector<MarkedText> InlineTextBox::collectMarkedTextsForDocumentMarkers(TextPaintPhase phase) const
> {
>     ASSERT_ARG(phase, phase == TextPaintPhase::Background || phase == TextPaintPhase::Foreground || phase == TextPaintPhase::Decoration);
> 
>diff --git a/Source/WebCore/rendering/InlineTextBox.h b/Source/WebCore/rendering/InlineTextBox.h
>index 37ee5e10cfe48788e8a47545e31deff3e25b6675..ae77a66986ae8b260977087c609c2bba2a0f0991 100644
>--- a/Source/WebCore/rendering/InlineTextBox.h
>+++ b/Source/WebCore/rendering/InlineTextBox.h
>@@ -157,6 +157,10 @@ public:
>     virtual int offsetForPosition(float x, bool includePartialGlyphs = true) const;
>     virtual float positionForOffset(unsigned offset) const;
> 
>+    bool hasMarkers() const;
>+    FloatRect calculateUnionOfAllDocumentMarkerBounds() const;
>+    FloatRect calculateDocumentMarkerBounds(const MarkedText&) const;
>+
> private:
>     struct MarkedTextStyle;
>     struct StyledMarkedText;
>@@ -164,7 +168,7 @@ private:
>     enum class TextPaintPhase { Background, Foreground, Decoration };
> 
>     Vector<MarkedText> collectMarkedTextsForDraggedContent();
>-    Vector<MarkedText> collectMarkedTextsForDocumentMarkers(TextPaintPhase);
>+    Vector<MarkedText> collectMarkedTextsForDocumentMarkers(TextPaintPhase) const;
> 
>     MarkedTextStyle computeStyleForUnmarkedMarkedText(const PaintInfo&) const;
>     StyledMarkedText resolveStyleForMarkedText(const MarkedText&, const MarkedTextStyle& baseStyle, const PaintInfo&);
>diff --git a/Source/WebCore/rendering/SimpleLineLayout.cpp b/Source/WebCore/rendering/SimpleLineLayout.cpp
>index e0c7bea71a0cf07af3eb042af723a996cd53c8bb..e3fea3fab29e4db722e8a8e9347f6421675318b0 100644
>--- a/Source/WebCore/rendering/SimpleLineLayout.cpp
>+++ b/Source/WebCore/rendering/SimpleLineLayout.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "SimpleLineLayout.h"
> 
>+#include "DocumentMarkerController.h"
> #include "FontCache.h"
> #include "Frame.h"
> #include "GraphicsContext.h"
>@@ -313,6 +314,9 @@ AvoidanceReasonFlags canUseForWithReason(const RenderBlockFlow& flow, IncludeRea
>         if (child->selectionState() != RenderObject::SelectionNone)
>             SET_REASON_AND_RETURN_IF_NEEDED(FlowChildIsSelected, reasons, includeReasons);
>         if (is<RenderText>(*child)) {
>+            const auto& renderText = downcast<RenderText>(*child);
>+            if (!renderText.document().markers().markersFor(renderText.textNode()).isEmpty())
>+                SET_REASON_AND_RETURN_IF_NEEDED(FlowIncludesDocumentMarkers, reasons, includeReasons);
>             child = child->nextSibling();
>             continue;
>         }
>diff --git a/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp b/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp
>index b29235b6374c7c3580ed53a20c3a8c9965ae0fa9..f6ba927b5675008cbb686127e4b2c101bbf67277 100644
>--- a/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp
>+++ b/Source/WebCore/rendering/SimpleLineLayoutCoverage.cpp
>@@ -193,7 +193,10 @@ static void printReason(AvoidanceReason reason, TextStream& stream)
>         stream << "column with vertical-align != baseline";
>         break;
>     case MultiColumnFlowIsFloating:
>-        stream << "column with floating objecgts";
>+        stream << "column with floating objects";
>+        break;
>+    case FlowIncludesDocumentMarkers:
>+        stream << "text includes document markers";
>         break;
>     case FlowTextIsEmpty:
>     case FlowHasNoChild:
>diff --git a/Source/WebCore/rendering/SimpleLineLayoutCoverage.h b/Source/WebCore/rendering/SimpleLineLayoutCoverage.h
>index cda44ddd405e537475cfbb23e711482744b68eeb..5581470b5bda65f53ce5d3238edfa2166a37f942 100644
>--- a/Source/WebCore/rendering/SimpleLineLayoutCoverage.h
>+++ b/Source/WebCore/rendering/SimpleLineLayoutCoverage.h
>@@ -90,7 +90,8 @@ enum AvoidanceReason_ : uint64_t {
>     MultiColumnFlowHasColumnSpanner       = 1LLU  << 52,
>     MultiColumnFlowVerticalAlign          = 1LLU  << 53,
>     MultiColumnFlowIsFloating             = 1LLU  << 54,
>-    EndOfReasons                          = 1LLU  << 55
>+    FlowIncludesDocumentMarkers           = 1LLU  << 55,
>+    EndOfReasons                          = 1LLU  << 56
> };
> const unsigned NoReason = 0;
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index f98da802118d1391f35661be83230f46e3f8fc8a..7c52c218330ae19dcf17653a8b799cfbbe865dbf 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-11-04  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        Spelling dots are drawn in the wrong place
>+        https://bugs.webkit.org/show_bug.cgi?id=190764
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Previously, it was impossible for WebKitTestRunner to draw spelling dots. This patch adds support for a header
>+        at the top of test files, of the form  which will cause
>+        dots to be drawn.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::resetStateToConsistentValues):
>+        (WTR::updateTestOptionsFromTestHeader):
>+        (WTR::TestController::platformResetStateToConsistentValues):
>+        * WebKitTestRunner/TestController.h:
>+        * WebKitTestRunner/TestOptions.h:
>+        (WTR::TestOptions::hasSameInitializationOptions const):
>+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
>+        (WTR::TestController::cocoaResetStateToConsistentValues):
>+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.h:
>+        * WebKitTestRunner/ios/TestControllerIOS.mm:
>+        (WTR::TestController::platformResetStateToConsistentValues):
>+        * WebKitTestRunner/mac/TestControllerMac.mm:
>+        (WTR::TestController::platformResetStateToConsistentValues):
>+
> 2018-11-02  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Resolve percentage height values.
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 817f0f4da90987941ae37ef226e75a58fb80bb22..d55a9fc81f9322c9a589c2a05c4e3e7e974e4356 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -926,7 +926,7 @@ bool TestController::resetStateToConsistentValues(const TestOptions& options, Re
> 
>     setHidden(false);
> 
>-    platformResetStateToConsistentValues();
>+    platformResetStateToConsistentValues(options);
> 
>     m_shouldDecideNavigationPolicyAfterDelay = false;
>     m_shouldDecideResponsePolicyAfterDelay = false;
>@@ -1237,6 +1237,8 @@ static void updateTestOptionsFromTestHeader(TestOptions& testOptions, const std:
>             testOptions.runSingly = parseBooleanTestHeaderValue(value);
>         else if (key == "shouldIgnoreMetaViewport")
>             testOptions.shouldIgnoreMetaViewport = parseBooleanTestHeaderValue(value);
>+        else if (key == "spellCheckingDots")
>+            testOptions.shouldShowSpellCheckingDots = parseBooleanTestHeaderValue(value);
>         pairStart = pairEnd + 1;
>     }
> }
>@@ -2649,7 +2651,7 @@ WKContextRef TestController::platformAdjustContext(WKContextRef context, WKConte
>     return context;
> }
> 
>-void TestController::platformResetStateToConsistentValues()
>+void TestController::platformResetStateToConsistentValues(const TestOptions&)
> {
> }
> 
>diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
>index 93e8886a748a4082282b511ae2085129d02760ed..a0c906b9fab5e29de18d16ab84d6c7272bb330e8 100644
>--- a/Tools/WebKitTestRunner/TestController.h
>+++ b/Tools/WebKitTestRunner/TestController.h
>@@ -283,10 +283,10 @@ private:
>     void platformCreateWebView(WKPageConfigurationRef, const TestOptions&);
>     static PlatformWebView* platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions&);
>     void platformResetPreferencesToConsistentValues();
>-    void platformResetStateToConsistentValues();
>+    void platformResetStateToConsistentValues(const TestOptions&);
> #if PLATFORM(COCOA)
>     void cocoaPlatformInitialize();
>-    void cocoaResetStateToConsistentValues();
>+    void cocoaResetStateToConsistentValues(const TestOptions&);
> #endif
>     void platformConfigureViewForTest(const TestInvocation&);
>     void platformWillRunTest(const TestInvocation&);
>diff --git a/Tools/WebKitTestRunner/TestOptions.h b/Tools/WebKitTestRunner/TestOptions.h
>index 5d7ee8b1ee978731fd3bd9c74601529cf1437e61..2293f9db03d48a17a2234c8f42f88619e94e8b6f 100644
>--- a/Tools/WebKitTestRunner/TestOptions.h
>+++ b/Tools/WebKitTestRunner/TestOptions.h
>@@ -63,6 +63,7 @@ struct TestOptions {
>     bool runSingly { false };
>     bool checkForWorldLeaks { false };
>     bool shouldIgnoreMetaViewport { false };
>+    bool shouldShowSpellCheckingDots { false };
> 
>     float deviceScaleFactor { 1 };
>     Vector<String> overrideLanguages;
>@@ -102,7 +103,8 @@ struct TestOptions {
>             || punchOutWhiteBackgroundsInDarkMode != options.punchOutWhiteBackgroundsInDarkMode
>             || jscOptions != options.jscOptions
>             || runSingly != options.runSingly
>-            || checkForWorldLeaks != options.checkForWorldLeaks)
>+            || checkForWorldLeaks != options.checkForWorldLeaks
>+            || shouldShowSpellCheckingDots != options.shouldShowSpellCheckingDots)
>             return false;
> 
>         if (experimentalFeatures != options.experimentalFeatures)
>diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>index 959c8f3606eda01ec2447996343aca55716ad23f..bb5e71d7542d608d007d728542f643d9c37c6606 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>@@ -203,7 +203,7 @@ void TestController::platformRunUntil(bool& done, WTF::Seconds timeout)
>         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:endDate];
> }
> 
>-void TestController::cocoaResetStateToConsistentValues()
>+void TestController::cocoaResetStateToConsistentValues(const TestOptions& options)
> {
> #if WK_API_ENABLED
>     __block bool doneRemoving = false;
>@@ -213,10 +213,15 @@ void TestController::cocoaResetStateToConsistentValues()
>     platformRunUntil(doneRemoving, noTimeout);
>     [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
> 
>+
>     if (auto* webView = mainWebView()) {
>         TestRunnerWKWebView *platformView = webView->platformView();
>         [platformView.configuration.userContentController _removeAllUserContentFilters];
>         platformView._viewScale = 1;
>+
>+        // Toggle on before the test, and toggle off after the test.
>+        if (options.shouldShowSpellCheckingDots)
>+            [platformView toggleContinuousSpellChecking:nil];
>     }
> #endif
> }
>diff --git a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h
>index fcdeb5170636509507035195cc2bffe35590b5d4..5bc2cb7288bd075b31cf7dc08b03360707d369d7 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h
>+++ b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.h
>@@ -27,6 +27,10 @@
> 
> #if WK_API_ENABLED
> 
>+@interface WKWebView(SpellChecking)
>+- (IBAction)toggleContinuousSpellChecking:(id)sender;
>+@end
>+
> @interface TestRunnerWKWebView : WKWebView
> 
> #if PLATFORM(IOS_FAMILY)
>diff --git a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>index ab4af111de235f2e55d4564c0336b961f17b6e69..7b5146a74cd80b247981d8187451b4e9700871d9 100644
>--- a/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/TestControllerIOS.mm
>@@ -101,9 +101,9 @@ void TestController::platformResetPreferencesToConsistentValues()
>     WKPreferencesSetTextAutosizingEnabled(preferences, false);
> }
> 
>-void TestController::platformResetStateToConsistentValues()
>+void TestController::platformResetStateToConsistentValues(const TestOptions& options)
> {
>-    cocoaResetStateToConsistentValues();
>+    cocoaResetStateToConsistentValues(options);
> 
>     [[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];
>     
>diff --git a/Tools/WebKitTestRunner/mac/TestControllerMac.mm b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
>index f9dd39d9b75b82408781f5945a0b79f43b262ee7..053633b225c4983f0cad61ab3353fec05b395d61 100644
>--- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm
>+++ b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
>@@ -102,9 +102,9 @@ void TestController::platformResetPreferencesToConsistentValues()
> {
> }
> 
>-void TestController::platformResetStateToConsistentValues()
>+void TestController::platformResetStateToConsistentValues(const TestOptions& options)
> {
>-    cocoaResetStateToConsistentValues();
>+    cocoaResetStateToConsistentValues(options);
> 
>     while ([NSApp nextEventMatchingMask:NSEventMaskGesture | NSEventMaskScrollWheel untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]) {
>         // Clear out (and ignore) any pending gesture and scroll wheel events.
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 8189be40fc45955ab628a948864c7a835f79d5b9..691f614217e402aab03c05cf6f0299e74a22e2b9 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-11-04  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        Spelling dots are drawn in the wrong place
>+        https://bugs.webkit.org/show_bug.cgi?id=190764
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * editing/spelling/resources/VerySmallDescentAhem.ttf: Added. In order to test repaint rects,
>+              this is a version of Ahem with a very small descent, so that the dots don't intersect
>+              with the text itself.
>+        * editing/spelling/spelling-dots-position-2-expected-mismatch.html: Added.
>+        * editing/spelling/spelling-dots-position-2.html: Added. Make sure dots are painted in the
>+              correct vertical place.
>+        * editing/spelling/spelling-dots-position-3-expected-mismatch.html: Added.
>+        * editing/spelling/spelling-dots-position-3.html: Added. Make sure dots are painted in the
>+              correct vertical place.
>+        * editing/spelling/spelling-dots-position-expected.html: Added.
>+        * editing/spelling/spelling-dots-position.html: Added. Make sure dots are not painted in
>+              the wrong place.
>+        * editing/spelling/spelling-dots-repaint-expected.html: Added.
>+        * editing/spelling/spelling-dots-repaint.html: Added. Test repaint by drawing an element
>+              with spelling dots, and then deleting the element from the document. The spelling
>+              dots should be removed too.
>+        * fast/writing-mode/english-bt-text-with-spelling-marker-expected.html:
>+        * fast/writing-mode/english-bt-text-with-spelling-marker.html: Update the test to compensate
>+              for new spelling dot positions.
>+
> 2018-11-03  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Canvas: capture changes to <canvas> that would affect the recorded context
>diff --git a/LayoutTests/editing/spelling/resources/VerySmallDescentAhem.ttf b/LayoutTests/editing/spelling/resources/VerySmallDescentAhem.ttf
>new file mode 100644
>index 0000000000000000000000000000000000000000..9093b79a7a81955426a06eb4211982debbd730d9
>GIT binary patch
>literal 21772
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
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-position-2-expected-mismatch.html b/LayoutTests/editing/spelling/spelling-dots-position-2-expected-mismatch.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2655f4e778ae9afa01df35d60c2d87473b4fbc6f
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-position-2-expected-mismatch.html
>@@ -0,0 +1,7 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+</head>
>+<body>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-position-2.html b/LayoutTests/editing/spelling/spelling-dots-position-2.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..f787f9dd1d3f2cd66661f9719d1e189c5fab642e
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-position-2.html
>@@ -0,0 +1,67 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+
>+<style>
>+.editing {
>+    font-family: 'Times New Roman';
>+    font-size: 36px;
>+    color: transparent;
>+}
>+</style>
>+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
>+
>+<script>
>+function editingTest() {
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('r');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('d');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand(' ');
>+    let ascentSetter = document.createElement("div");
>+    ascentSetter.style.width = "1px";
>+    ascentSetter.style.height = "150px";
>+    ascentSetter.style.display = "inline-block";
>+    let root = document.getElementById("root");
>+    root.appendChild(ascentSetter);
>+    let baseline = ascentSetter.offsetTop + ascentSetter.offsetHeight;
>+    let left = root.offsetLeft;
>+    let width = ascentSetter.offsetLeft - left;
>+    let fontSize = Number.parseInt(window.getComputedStyle(root).getPropertyValue("font-size"));
>+    let blocker = document.createElement("div");
>+    blocker.style.background = "white";
>+    blocker.style.position = "absolute";
>+    blocker.style.left = `${left}px`;
>+    blocker.style.top = `${baseline + 1 + fontSize * 0.11035}px`;
>+    blocker.style.width = `${width}px`;
>+    blocker.style.height = `${fontSize * 0.13247}px`;
>+    document.body.appendChild(blocker);
>+    root.blur();
>+}
>+
>+</script>
>+
>+<title>Editing Test</title>
>+</head>
>+<body>
>+<div contenteditable id="root" class="editing">
>+<span id="test"></span>
>+</div>
>+
>+<script>
>+    if (window.internals)
>+        internals.setContinuousSpellCheckingEnabled(true);
>+    runEditingTest();
>+</script>
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-position-3-expected-mismatch.html b/LayoutTests/editing/spelling/spelling-dots-position-3-expected-mismatch.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2655f4e778ae9afa01df35d60c2d87473b4fbc6f
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-position-3-expected-mismatch.html
>@@ -0,0 +1,7 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+</head>
>+<body>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-position-3.html b/LayoutTests/editing/spelling/spelling-dots-position-3.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..9fd7beb4ddb49f81170b05c965afacf642264b83
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-position-3.html
>@@ -0,0 +1,67 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+
>+<style>
>+.editing {
>+    font-family: 'Times New Roman';
>+    font-size: 36px;
>+    color: transparent;
>+}
>+</style>
>+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
>+
>+<script>
>+function editingTest() {
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('r');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('d');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand(' ');
>+    let ascentSetter = document.createElement("div");
>+    ascentSetter.style.width = "1px";
>+    ascentSetter.style.height = "150px";
>+    ascentSetter.style.display = "inline-block";
>+    let root = document.getElementById("root");
>+    root.appendChild(ascentSetter);
>+    let baseline = ascentSetter.offsetTop + ascentSetter.offsetHeight;
>+    let left = root.offsetLeft;
>+    let width = ascentSetter.offsetLeft - left;
>+    let fontSize = Number.parseInt(window.getComputedStyle(root).getPropertyValue("font-size"));
>+    let blocker = document.createElement("div");
>+    blocker.style.background = "white";
>+    blocker.style.position = "absolute";
>+    blocker.style.left = `${left}px`;
>+    blocker.style.top = `${baseline - 1 + fontSize * 0.11035}px`;
>+    blocker.style.width = `${width}px`;
>+    blocker.style.height = `${fontSize * 0.13247}px`;
>+    document.body.appendChild(blocker);
>+    root.blur();
>+}
>+
>+</script>
>+
>+<title>Editing Test</title>
>+</head>
>+<body>
>+<div contenteditable id="root" class="editing">
>+<span id="test"></span>
>+</div>
>+
>+<script>
>+    if (window.internals)
>+        internals.setContinuousSpellCheckingEnabled(true);
>+    runEditingTest();
>+</script>
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-position-expected.html b/LayoutTests/editing/spelling/spelling-dots-position-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..7daf53f7d8782e0e82e253de2b8a7d3701832884
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-position-expected.html
>@@ -0,0 +1,18 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<style>
>+.editing {
>+    font-family: 'Times New Roman';
>+    font-size: 36px;
>+}
>+</style>
>+</head>
>+<body>
>+<div>There should be no misspelling dots visible below (because they're covered up by a div)</div>
>+<div contenteditable="" id="root" class="editing">wafewerewdfea&nbsp;<span id="test"></span><div style="background-color: black; width: 1px; height: 150px; display: inline-block; background-position: initial initial; background-repeat: initial initial;"></div></div>
>+<script>
>+    runEditingTest();
>+</script><div style="background-color: black; position: absolute; left: 8px; top: 179.9726px; width: 237px; height: 4.7689200000000005px; background-position: initial initial; background-repeat: initial initial;"></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-position.html b/LayoutTests/editing/spelling/spelling-dots-position.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..70c1dac6221201876c07c086b5dba56e7f2da5d2
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-position.html
>@@ -0,0 +1,68 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+
>+<style>
>+.editing {
>+    font-family: 'Times New Roman';
>+    font-size: 36px;
>+}
>+</style>
>+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
>+
>+<script>
>+function editingTest() {
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('r');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('d');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand(' ');
>+    let ascentSetter = document.createElement("div");
>+    ascentSetter.style.background = "black";
>+    ascentSetter.style.width = "1px";
>+    ascentSetter.style.height = "150px";
>+    ascentSetter.style.display = "inline-block";
>+    let root = document.getElementById("root");
>+    root.appendChild(ascentSetter);
>+    let baseline = ascentSetter.offsetTop + ascentSetter.offsetHeight;
>+    let left = root.offsetLeft;
>+    let width = ascentSetter.offsetLeft - left;
>+    let fontSize = Number.parseInt(window.getComputedStyle(root).getPropertyValue("font-size"));
>+    let blocker = document.createElement("div");
>+    blocker.style.background = "black";
>+    blocker.style.position = "absolute";
>+    blocker.style.left = `${left}px`;
>+    blocker.style.top = `${baseline + fontSize * 0.11035}px`;
>+    blocker.style.width = `${width}px`;
>+    blocker.style.height = `${fontSize * 0.13247}px`;
>+    document.body.appendChild(blocker);
>+    root.blur();
>+}
>+
>+</script>
>+
>+<title>Editing Test</title>
>+</head>
>+<body>
>+<div>There should be no misspelling dots visible below (because they're covered up by a div)</div>
>+<div contenteditable id="root" class="editing">
>+<span id="test"></span>
>+</div>
>+
>+<script>
>+    if (window.internals)
>+        internals.setContinuousSpellCheckingEnabled(true);
>+    runEditingTest();
>+</script>
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-repaint-expected.html b/LayoutTests/editing/spelling/spelling-dots-repaint-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..f2848b7258cecb6ae323e5a511019c51345ef008
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-repaint-expected.html
>@@ -0,0 +1,9 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<title>Editing Test</title>
>+</head>
>+<body>
>+This test passes if you don't see any dots below.
>+</body>
>+</html>
>diff --git a/LayoutTests/editing/spelling/spelling-dots-repaint.html b/LayoutTests/editing/spelling/spelling-dots-repaint.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ca1468b8654a216d41d3b878c63b1bc7968473f5
>--- /dev/null
>+++ b/LayoutTests/editing/spelling/spelling-dots-repaint.html
>@@ -0,0 +1,59 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+
>+<style>
>+@font-face {
>+    font-family: "WebFont";
>+    src: url("resources/VerySmallDescentAhem.ttf") format("truetype");
>+}
>+.editing {
>+    font: 36px "WebFont";
>+}
>+</style>
>+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
>+
>+<script>
>+function editingTest() {
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('r');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('w');
>+    typeCharacterCommand('d');
>+    typeCharacterCommand('f');
>+    typeCharacterCommand('e');
>+    typeCharacterCommand('a');
>+    typeCharacterCommand(' ');
>+    window.setTimeout(function() {
>+        let root = document.getElementById("root");
>+        root.parentElement.removeChild(root);
>+        if (window.testRunner)
>+            testRunner.notifyDone();
>+    }, 20);
>+}
>+
>+</script>
>+
>+<title>Editing Test</title>
>+</head>
>+<body>
>+This test passes if you don't see any dots below.
>+<div contenteditable id="root" class="editing">
>+<span id="test"></span>
>+</div>
>+
>+<script>
>+    if (window.internals)
>+        internals.setContinuousSpellCheckingEnabled(true);
>+    if (window.testRunner)
>+        testRunner.waitUntilDone();
>+    runEditingTest();
>+</script>
>+
>+</body>
>+</html>
>diff --git a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html
>index d0fcabc24116b2941a8451a6012ba28a84e0387d..54ee161f103984bd2fbb47283e2780397e5946f6 100644
>--- a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html
>+++ b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html
>@@ -15,6 +15,7 @@
>     left: 0;
>     width: 200px;
>     font: 20px/1 Ahem;
>+    line-height: 1.2;
> }
> </style>
> </head>
>diff --git a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html
>index a96e7018122e89ca452c9eaf5ca8d2553b4ff5ca..b3c1be1c5642c30e895385fa8daabcb0089630f6 100644
>--- a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html
>+++ b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html
>@@ -11,6 +11,7 @@
> body {
>     -webkit-writing-mode: horizontal-bt;
>     font: 20px/1 Ahem;
>+    line-height: 1.2;
> }
> 
> #test {

Flags:

dino: review+
commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 190764: 352854 | 352855 | 352856 | 352857 | 352860 | 353758 | 353766 | 353795 | 353796 | 353798 | 353800 | 353807