Attachment 372821 Details for Bug 198909 – Patch

[patch] Patch

bug-198909-20190625165924.patch (text/plain), 6.68 KB, created by Fujii Hironori on 2019-06-25 00:59:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-06-25 00:59:25 PDT

Size: 6.68 KB

patch

obsolete

>Subversion Revision: 246727
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index be3669f837f0142b1964176d55a3801c779bb46b..a91f888f97916729be7787d4066c7b0c28dfa86d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-25  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo] incorrect font height for 'Google Sans Display' font
>+        https://bugs.webkit.org/show_bug.cgi?id=198909
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        otmDescent of OUTLINETEXTMETRIC is a negative value. Should be
>+        inverted.
>+
>+        Test: fonts/use-typo-metrics-2.html
>+
>+        * platform/graphics/win/SimpleFontDataCairoWin.cpp:
>+        (WebCore::Font::platformInit): Inverted metrics.otmDescent.
>+
> 2019-06-23  Simon Fraser  <simon.fraser@apple.com>
> 
>         [Async overflow scroll] Clipped composited layers inside overflow scroll jitter and get incorrectly clipped
>diff --git a/Source/WebCore/platform/graphics/win/SimpleFontDataCairoWin.cpp b/Source/WebCore/platform/graphics/win/SimpleFontDataCairoWin.cpp
>index 157f80b51f2b8a7eb08d08a39250c7a61c6aa1f8..2dc023651c30fd1635853a4a60f17e488545c5be 100644
>--- a/Source/WebCore/platform/graphics/win/SimpleFontDataCairoWin.cpp
>+++ b/Source/WebCore/platform/graphics/win/SimpleFontDataCairoWin.cpp
>@@ -76,7 +76,7 @@ void Font::platformInit()
>     const UINT useTypoMetricsMask = 1 << 7;
>     if (metrics.otmfsSelection & useTypoMetricsMask) {
>         ascent = metrics.otmAscent * metricsMultiplier;
>-        descent = metrics.otmDescent * metricsMultiplier;
>+        descent = -metrics.otmDescent * metricsMultiplier;
>         lineGap = metrics.otmLineGap * metricsMultiplier;
>     } else {
>         ascent = textMetrics.tmAscent * metricsMultiplier;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c49086ac4855c4c3c4e7b9a803028daa11c6a2c0..9c4f6de664e8be18d3b69771e324b2cddda6cc9f 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-06-25  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [WinCairo] incorrect font height for 'Google Sans Display' font
>+        https://bugs.webkit.org/show_bug.cgi?id=198909
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fonts/UseTypo.ttf: Added.
>+        * fonts/use-typo-metrics-2.html: Added.
>+
> 2019-06-23  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [WinCairo] Unreviewed test gardening
>diff --git a/LayoutTests/fonts/UseTypo.ttf b/LayoutTests/fonts/UseTypo.ttf
>new file mode 100644
>index 0000000000000000000000000000000000000000..8fd00d5844005430566018304364606289cc4f74
>GIT binary patch
>literal 2040
>zcmdT_&u<$=6#mxhB!!eFjv`v5NK8_aqAGD?mxeT|1WAa?B_wLnma0hUW<Bv*c)jlK
>zT23S)1&+OxzW|jxKMruHL=TY=QaQB;gg}7AF(<ebgiyhJZ+6|9AO8Tenw|H)_ue<(
>z%<j&@0`L^}U}LpZT3^1lKN|ymcZiOhe`TqJlTh@(p|4ifP8GLrUA+oeuhYNg`c4Bw
>z_V4uXvM*GesDYz+g83gXK3J*kY;D}Q@)}?tqrc#3r~LCr<ImFmo_)q6F!26wFR*r)
>z{&SumZ};8DF8$l|kJJL!!5KWy`or{}^quVn`h?$_rLXFauaC|xzQy<(K=ybeh~oAw
>zDnQ>J<0m0&v#?<8e{O9Iocjg+_5l%m5^P+N@!J>QIS;gF?E_oUJ%o&)Y^>|Q{oqyd
>znta}csk_+*$v&$2XPk2E1M6M%0GT_P8!Ww<jMf(@S~gK+xejT2z{i77oGodWPcJI$
>zV+AX=YIB{`c2~j5z09z!j8eMP#C_^06pK$V=_9Gyb3{bf2(nNdv%JJ#X}6Pm`_nWN
>zR<Bt!VUDs3(!1Ng*Vi5WFI&|7|JpF*8l~`z?63VM_uJ+>hts*y-1um2bT{+UA2+QB
>ze;&5g!yk7u6S9Np8^jeeY1BS=c#J`L<3X-pJ9~_K^pkzG$apWcGqk@>Z5zk&LuzNc
>za(d9u!lbsh3m-(*>QC`p7tfHv`Sj%-v);1?<V~P$;YjAg)XvcUEVXTvGGC^4wkxLx
>zPurc^-Y$F)hwSk*Ki9=GB=|DFLgji+=(w>CBjtoz#hzB$SJCw*y-B6FUEPS)#L~Rm
>zjJ0y=Wi{3qn^Y~Y>Ut{jf|hb3SJ&fHWo<^a6$ZXx*>oaZtJZa1U5xZrv!=F!P{lfm
>ztM!U<1D|I=HLeDA741Z^_M^O74TEyi)n&E0qt=6RS(O|wtm`nTq_D-cHMQpW&Cscy
>zh}32nv?4}R&OE1C-)RIFbfsBy!ctI=OF>xCs+gZvb0R{bw2Eh@W~PeMg|nBqXc17z
>z7v??fV;KP=#87bI!9mFG($};iqJn6SF{3hS_`FBBj%FI0H0U;~G#Z9!0!x^u-!weJ
>zQAe3sV~meM@>^u9ni+-5qlOkyhqkcPS$B#Ry31GCqLRSO-qEsYDl}^3sxv!Jj*G0(
>z%xw~tnt)ZJUbteDSE273rUvg3F~I{eh?X6bC##GM->R9lOg>R2tJq|Y!a6I;#xGHY
>z$1G7Gb3L9j*|9~e@lxy#S)0spINu5K3zw{^MLVheyUu*Nnsv@7S}!oGVpb+krDQb6
>zW(<kT(<xH(G{-siWG6bc30C9}YYH>$MdlT77MIM-vJ1%$6v$BE(-ZCfqm#B>;aSo7
>z#^vPbv@8var%}-Ww)x`>!r~b&C#)stSI=C2Nyf+jwYR@B5&3Hl^Zd8uTjiB-nK}Og
>D5BN6&
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/fonts/use-typo-metrics-2.html b/LayoutTests/fonts/use-typo-metrics-2.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..876d18d8b592bdce79dfbc396087c07758226b58
>--- /dev/null
>+++ b/LayoutTests/fonts/use-typo-metrics-2.html
>@@ -0,0 +1,27 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<meta charset=UTF-8>
>+<style>
>+@font-face {
>+    font-family: 'UseTypoFont';
>+    src: url("UseTypo.ttf");
>+}
>+div {
>+    display: inline-block;
>+    background: blue;
>+}
>+span {
>+    font-size: 100px;
>+    font-family: 'UseTypoFont';
>+    color: green;
>+    background: pink;
>+}
>+</style>
>+</head>
>+<body>
>+<div>
>+    <span>O</span>
>+</div>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt
>index 7e2a40417c5964b86210161873355465b7214094..f822444bf4d3850b251af944563e64f20a2a94d1 100644
>--- a/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt
>+++ b/LayoutTests/platform/wincairo/css2.1/20110323/replaced-elements-001-expected.txt
>@@ -1,19 +1,19 @@
> layer at (0,0) size 800x600
>   RenderView at (0,0) size 800x600
>-layer at (0,0) size 800x172
>-  RenderBlock {HTML} at (0,0) size 800x172
>-    RenderBody {BODY} at (8,16) size 784x140
>+layer at (0,0) size 800x166
>+  RenderBlock {HTML} at (0,0) size 800x166
>+    RenderBody {BODY} at (8,16) size 784x134
>       RenderBlock {P} at (0,0) size 784x20
>         RenderText {#text} at (0,0) size 569x19
>           text run at (0,0) width 569: "Below, there should be 2 orange boxes horizontally centered within their respective green bars."
>-      RenderBlock {DIV} at (16,36) size 752x44 [bgcolor=#008000]
>+      RenderBlock {DIV} at (16,36) size 752x41 [bgcolor=#008000]
>         RenderBlock (anonymous) at (0,0) size 752x20
>           RenderText {#text} at (0,0) size 36x19
>             text run at (0,0) width 36: "         "
>-        RenderButton {INPUT} at (368,22) size 16x22 [bgcolor=#FFA500] [border: (2px outset #F0F0F0)]
>-      RenderBlock {FORM} at (0,96) size 784x44
>-        RenderBlock {DIV} at (16,0) size 752x44 [bgcolor=#008000]
>+        RenderButton {INPUT} at (368,22) size 16x19 [bgcolor=#FFA500] [border: (2px outset #F0F0F0)]
>+      RenderBlock {FORM} at (0,93) size 784x41
>+        RenderBlock {DIV} at (16,0) size 752x41 [bgcolor=#008000]
>           RenderBlock (anonymous) at (0,0) size 752x20
>             RenderText {#text} at (0,0) size 36x19
>               text run at (0,0) width 36: "         "
>-          RenderButton {INPUT} at (368,22) size 16x22 [bgcolor=#FFA500] [border: (2px outset #F0F0F0)]
>+          RenderButton {INPUT} at (368,22) size 16x19 [bgcolor=#FFA500] [border: (2px outset #F0F0F0)]

Actions: View | Formatted Diff | Diff

Attachments on bug 198909: 372231 | 372232 | 372233 | 372624 | 372821 | 372822 | 372823 | 372825 | 372828 | 372829 | 372831 | 372833