Attachment 362695 Details for Bug 194932 – Patch

[patch] Patch

bug-194932-20190221211811.patch (text/plain), 3.74 KB, created by zalan on 2019-02-21 21:18:21 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-02-21 21:18:21 PST

Size: 3.74 KB

patch

obsolete

>Subversion Revision: 241866
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 384c6eda7a23d255259b38b1a533b77d868a0cf4..d3651fa15cddf35d796c0e61a530bc64e5c447e2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-21  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][Verification] Check for trimmed trailing whitespace
>+        https://bugs.webkit.org/show_bug.cgi?id=194932
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Do not fail when trailing whitespace is trimmed.
>+
>+        * layout/Verification.cpp:
>+        (WebCore::Layout::outputMismatchingComplexLineInformationIfNeeded):
>+
> 2019-02-21  Rob Buis  <rbuis@igalia.com>
> 
>         Update MIME type parser
>diff --git a/Source/WebCore/layout/Verification.cpp b/Source/WebCore/layout/Verification.cpp
>index 2e77c39e92144942ef29e40e4c7436e511200bc2..c27245023fd767c0fb25b5073bc6a3e3e7963e60 100644
>--- a/Source/WebCore/layout/Verification.cpp
>+++ b/Source/WebCore/layout/Verification.cpp
>@@ -163,7 +163,10 @@ static bool outputMismatchingComplexLineInformationIfNeeded(TextStream& stream,
> 
>         auto& inlineRun = inlineRunList[runIndex];
>         auto matchingRuns = false;
>-        if (inlineTextBox) {
>+        if (inlineTextBox && !inlineRun.textContext()) {
>+            // This must be some trailing whitespace that we've decided to trim.
>+            matchingRuns = !inlineTextBox->nextTextBox() && inlineTextBox->len() == 1;
>+        } else if (inlineTextBox) {
>             auto xOffset = resolveForRelativePositionIfNeeded(*inlineTextBox);
>             matchingRuns = checkForMatchingTextRuns(inlineRun, inlineTextBox->logicalLeft() + xOffset,
>                 inlineTextBox->logicalRight() + xOffset,
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index acbbe25aee018c70ad13c97f96792d145189c677..3d3a3c1eab98e7788a3514fe89e0275ca44dcc89 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-02-21  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][Verification] Check for trimmed trailing whitespace
>+        https://bugs.webkit.org/show_bug.cgi?id=194932
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * LayoutReloaded/misc/LFC-passing-tests.txt:
>+
> 2019-02-21  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE] Do not hardcode WPEBackend-fdo library name for linking tests
>diff --git a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>index 5affc292f1d23fe72056a4343df250ffa0661432..ae1cd0375823829a1355a23478eb3bdc13b6dbbf 100644
>--- a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>+++ b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>@@ -539,6 +539,7 @@ css2.1/t1001-abs-pos-cb-07-b.html
> css2.1/t1001-abs-pos-cb-08-b.html
> css2.1/t1001-abs-pos-cb-09-b.html
> css2.1/t1002-c5523-width-02-b-g.html
>+css2.1/t1004-c43-rpl-bbx-00-d-ag.html
> css2.1/t1202-counter-00-b.html
> css2.1/t1202-counter-01-b.html
> css2.1/t1202-counter-02-b.html
>@@ -577,6 +578,7 @@ css2.1/t1506-c525-font-wt-00-b.html
> css2.1/t1507-c526-font-sz-01-b-a.html
> css2.1/t1507-c526-font-sz-02-b-a.html
> css2.1/t1507-c526-font-sz-03-f-a.html
>+css2.1/t1602-c43-center-00-d-ag.html
> css2.1/t1604-c542-letter-sp-00-b-a.html
> css2.1/t1605-c545-txttrans-00-b-ag.html
> css2.1/t010403-shand-border-00-c.html
>@@ -843,9 +845,9 @@ css2.1/20110323/float-replaced-width-004.htm
> css2.1/20110323/float-replaced-width-005.htm
> css2.1/20110323/float-replaced-width-006.htm
> css2.1/20110323/float-replaced-width-011.htm
>-css2.1/20110323/floats-wrap-top-below-bfc-002l.htm
> css2.1/20110323/floats-001.html
> css2.1/20110323/floats-102.html
>+css2.1/20110323/floats-wrap-top-below-bfc-002l.htm
> css2.1/20110323/inline-block-non-replaced-width-001.htm
> css2.1/20110323/inline-block-non-replaced-width-002.htm
> css2.1/20110323/inline-block-non-replaced-width-003.htm

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 194932: 362695