Attachment 461604 Details for Bug 243922 – Patch

[patch] Patch

bug-243922-20220813203716.patch (text/plain), 7.25 KB, created by alan on 2022-08-13 20:37:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: alan

Created: 2022-08-13 20:37:17 PDT

Size: 7.25 KB

patch

obsolete

>From 14ea8a3015662414f37b175471411d884c499782 Mon Sep 17 00:00:00 2001
>From: Alan Bujtas <zalan@apple.com>
>Date: Sat, 13 Aug 2022 15:23:47 -0700
>Subject: [PATCH] [Legacy line layout] Do not integral snap non-baseline
> aligned content https://bugs.webkit.org/show_bug.cgi?id=243922
>
>Reviewed by NOBODY (OOPS!).
>
>This also ensures that block container height matches IFC (and Chrome and Firefox) when non-baseline aligned content is present (with integral ceiling the inline content (and the block container) may end up being one CSS pixel different than with other engines).
>
>* Source/WebCore/rendering/LegacyRootInlineBox.cpp:
>(WebCore::LegacyRootInlineBox::verticalPositionForBox):
>---
> Source/WebCore/rendering/LegacyRootInlineBox.cpp                | 2 +-
> .../platform/ios/editing/selection/3690703-2-expected.txt       | 2 +-
> LayoutTests/platform/ios/editing/selection/3690703-expected.txt | 2 +-
> LayoutTests/platform/ios/editing/selection/3690719-expected.txt | 2 +-
> .../platform/mac/editing/selection/3690703-2-expected.txt       | 2 +-
> LayoutTests/platform/mac/editing/selection/3690703-expected.txt | 2 +-
> LayoutTests/platform/mac/editing/selection/3690719-expected.txt | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/Source/WebCore/rendering/LegacyRootInlineBox.cpp b/Source/WebCore/rendering/LegacyRootInlineBox.cpp
>index 93fa11edf1ce..904986d02677 100644
>--- a/Source/WebCore/rendering/LegacyRootInlineBox.cpp
>+++ b/Source/WebCore/rendering/LegacyRootInlineBox.cpp
>@@ -820,7 +820,7 @@ LayoutUnit LegacyRootInlineBox::verticalPositionForBox(LegacyInlineBox* box, Ver
>         const RenderStyle& parentLineStyle = firstLine ? parent->firstLineStyle() : parent->style();
>         const FontCascade& font = parentLineStyle.fontCascade();
>         const FontMetrics& fontMetrics = font.metricsOfPrimaryFont();
>-        int fontSize = font.pixelSize();
>+        auto fontSize = font.size();
> 
>         LineDirectionMode lineDirection = parent->isHorizontalWritingMode() ? HorizontalLine : VerticalLine;
> 
>diff --git a/LayoutTests/platform/ios/editing/selection/3690703-2-expected.txt b/LayoutTests/platform/ios/editing/selection/3690703-2-expected.txt
>index 9d98aa481574..70cf73de7d47 100644
>--- a/LayoutTests/platform/ios/editing/selection/3690703-2-expected.txt
>+++ b/LayoutTests/platform/ios/editing/selection/3690703-2-expected.txt
>@@ -63,7 +63,7 @@ layer at (0,0) size 800x600
>                     RenderInline {A} at (0,0) size 30x15 [color=#0000CC]
>                       RenderText {#text} at (240,4) size 30x15
>                         text run at (240,4) width 30: "Local"
>-                      RenderInline {SUP} at (0,0) size 1x13
>+                      RenderInline {SUP} at (0,0) size 1x14
>                     RenderInline {A} at (0,0) size 30x15
>                       RenderInline {FONT} at (0,0) size 30x15 [color=#FF0000]
>                         RenderText {#text} at (269,4) size 30x15
>diff --git a/LayoutTests/platform/ios/editing/selection/3690703-expected.txt b/LayoutTests/platform/ios/editing/selection/3690703-expected.txt
>index d39d5757f4d4..4fe8b1fcfd5e 100644
>--- a/LayoutTests/platform/ios/editing/selection/3690703-expected.txt
>+++ b/LayoutTests/platform/ios/editing/selection/3690703-expected.txt
>@@ -65,7 +65,7 @@ layer at (0,0) size 800x600
>                     RenderInline {A} at (0,0) size 30x15 [color=#0000CC]
>                       RenderText {#text} at (240,4) size 30x15
>                         text run at (240,4) width 30: "Local"
>-                      RenderInline {SUP} at (0,0) size 1x13
>+                      RenderInline {SUP} at (0,0) size 1x14
>                     RenderInline {A} at (0,0) size 30x15
>                       RenderInline {FONT} at (0,0) size 30x15 [color=#FF0000]
>                         RenderText {#text} at (269,4) size 30x15
>diff --git a/LayoutTests/platform/ios/editing/selection/3690719-expected.txt b/LayoutTests/platform/ios/editing/selection/3690719-expected.txt
>index bcb14ddaa507..a6bcb66c054c 100644
>--- a/LayoutTests/platform/ios/editing/selection/3690719-expected.txt
>+++ b/LayoutTests/platform/ios/editing/selection/3690719-expected.txt
>@@ -57,7 +57,7 @@ layer at (0,0) size 800x600
>                     RenderInline {A} at (0,0) size 30x15 [color=#0000CC]
>                       RenderText {#text} at (240,4) size 30x15
>                         text run at (240,4) width 30: "Local"
>-                      RenderInline {SUP} at (0,0) size 1x13
>+                      RenderInline {SUP} at (0,0) size 1x14
>                     RenderInline {A} at (0,0) size 30x15
>                       RenderInline {FONT} at (0,0) size 30x15 [color=#FF0000]
>                         RenderText {#text} at (269,4) size 30x15
>diff --git a/LayoutTests/platform/mac/editing/selection/3690703-2-expected.txt b/LayoutTests/platform/mac/editing/selection/3690703-2-expected.txt
>index 355e811d0ca3..77709fbb01e2 100644
>--- a/LayoutTests/platform/mac/editing/selection/3690703-2-expected.txt
>+++ b/LayoutTests/platform/mac/editing/selection/3690703-2-expected.txt
>@@ -63,7 +63,7 @@ layer at (0,0) size 800x600
>                     RenderInline {A} at (0,0) size 30x15 [color=#0000CC]
>                       RenderText {#text} at (240,4) size 30x15
>                         text run at (240,4) width 30: "Local"
>-                      RenderInline {SUP} at (0,0) size 1x13
>+                      RenderInline {SUP} at (0,0) size 1x14
>                     RenderInline {A} at (0,0) size 30x15
>                       RenderInline {FONT} at (0,0) size 30x15 [color=#FF0000]
>                         RenderText {#text} at (269,4) size 30x15
>diff --git a/LayoutTests/platform/mac/editing/selection/3690703-expected.txt b/LayoutTests/platform/mac/editing/selection/3690703-expected.txt
>index 9b7af1dd8437..d9e4cec101c2 100644
>--- a/LayoutTests/platform/mac/editing/selection/3690703-expected.txt
>+++ b/LayoutTests/platform/mac/editing/selection/3690703-expected.txt
>@@ -65,7 +65,7 @@ layer at (0,0) size 800x600
>                     RenderInline {A} at (0,0) size 30x15 [color=#0000CC]
>                       RenderText {#text} at (240,4) size 30x15
>                         text run at (240,4) width 30: "Local"
>-                      RenderInline {SUP} at (0,0) size 1x13
>+                      RenderInline {SUP} at (0,0) size 1x14
>                     RenderInline {A} at (0,0) size 30x15
>                       RenderInline {FONT} at (0,0) size 30x15 [color=#FF0000]
>                         RenderText {#text} at (269,4) size 30x15
>diff --git a/LayoutTests/platform/mac/editing/selection/3690719-expected.txt b/LayoutTests/platform/mac/editing/selection/3690719-expected.txt
>index 3d076903e71f..b25d732cdce8 100644
>--- a/LayoutTests/platform/mac/editing/selection/3690719-expected.txt
>+++ b/LayoutTests/platform/mac/editing/selection/3690719-expected.txt
>@@ -57,7 +57,7 @@ layer at (0,0) size 800x600
>                     RenderInline {A} at (0,0) size 30x15 [color=#0000CC]
>                       RenderText {#text} at (240,4) size 30x15
>                         text run at (240,4) width 30: "Local"
>-                      RenderInline {SUP} at (0,0) size 1x13
>+                      RenderInline {SUP} at (0,0) size 1x14
>                     RenderInline {A} at (0,0) size 30x15
>                       RenderInline {FONT} at (0,0) size 30x15 [color=#FF0000]
>                         RenderText {#text} at (269,4) size 30x15

Actions: View | Formatted Diff | Diff

Attachments on bug 243922: 461602 | 461604