From 1e656430158cb8223da7cf07314171a09ed47a9f Mon Sep 17 00:00:00 2001
From: bdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 21 Nov 2006 12:08:13 +0000
Subject: [PATCH] 2006-11-21  Alex Taylor  <darwin@techvisual.co.nz>

        Reviewed by Mitz.

        Pixel tests for border radius rendering bug
        - http://bugs.webkit.org/show_bug.cgi?id=11587

        * fast/borders/borderRadiusArcs01-expected.checksum: Added.
        * fast/borders/borderRadiusArcs01-expected.png: Added.
        * fast/borders/borderRadiusArcs01-expected.txt: Added.
        * fast/borders/borderRadiusArcs01.html: Added.
2006-11-21  Alex Taylor  <darwin@techvisual.co.nz>

        Reviewed by Mitz.

        Fixes: http://bugs.webkit.org/show_bug.cgi?id=11587

        Adds calculations for bottom right radius's position
        which was being drawn incorrectly.

        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::paintBorder):


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17869 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                         |  12 ++++++++++
 .../borderRadiusArcs01-expected.checksum      |   1 +
 .../borders/borderRadiusArcs01-expected.png   | Bin 0 -> 6212 bytes
 .../borders/borderRadiusArcs01-expected.txt   |   8 +++++++
 .../fast/borders/borderRadiusArcs01.html      |  22 ++++++++++++++++++
 WebCore/ChangeLog                             |  12 ++++++++++
 WebCore/rendering/RenderObject.cpp            |  10 ++++----
 7 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 LayoutTests/fast/borders/borderRadiusArcs01-expected.checksum
 create mode 100644 LayoutTests/fast/borders/borderRadiusArcs01-expected.png
 create mode 100644 LayoutTests/fast/borders/borderRadiusArcs01-expected.txt
 create mode 100644 LayoutTests/fast/borders/borderRadiusArcs01.html

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6e930846f74f..eb0c271d91b3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-21  Alex Taylor  <darwin@techvisual.co.nz>
+
+        Reviewed by Mitz.
+
+        Pixel tests for border radius rendering bug
+        - http://bugs.webkit.org/show_bug.cgi?id=11587
+
+        * fast/borders/borderRadiusArcs01-expected.checksum: Added.
+        * fast/borders/borderRadiusArcs01-expected.png: Added.
+        * fast/borders/borderRadiusArcs01-expected.txt: Added.
+        * fast/borders/borderRadiusArcs01.html: Added.
+
 2006-11-20  W. Andy Carrel  <wac@google.com>
 
         Reviewed by Maciej.
diff --git a/LayoutTests/fast/borders/borderRadiusArcs01-expected.checksum b/LayoutTests/fast/borders/borderRadiusArcs01-expected.checksum
new file mode 100644
index 000000000000..8b8c6888631d
--- /dev/null
+++ b/LayoutTests/fast/borders/borderRadiusArcs01-expected.checksum
@@ -0,0 +1 @@
+170d090756e82d3db2711846fe9cc93c
\ No newline at end of file
diff --git a/LayoutTests/fast/borders/borderRadiusArcs01-expected.png b/LayoutTests/fast/borders/borderRadiusArcs01-expected.png
new file mode 100644
index 0000000000000000000000000000000000000000..d452e4155cfb14bb15fb27765df71908bdde80f0
GIT binary patch
literal 6212
zcmeHLSy)q9w%!3W$XJ%jpn%v=1Y04DGLtxznns|iR0Nr{7?n975FikwgjSGH2?d4#
zf;Ld4Aj%K~AqZ6hk%UpfgsIdp2}ytiLJW{TR^PAhOW%6whx_7rI^Wvs?6cOt*Ixg>
z_swtIPN^#GRRRF0Vosm<4gh(50OULsw?meq`0LRCXenb(96gs<%$vaFO<luxFOQls
zwts(``x15lRt{6@*=b&2p!5CFXr-WAO1Cb4llfiThw~0U%g#kK>b_8OJD>Z@xpR&$
z-<lck+4dLxe3!2cvWnAn^3j;i#vj6Eo<lcxzY*}aQU#klB(a;RW=ZK63zKCXQNeem
zZAsgqM-G5*$`Y#KP&`NU<P-ofHb4VFu=vlfyD~2hoHgH;Kkr^=MCCpSFQ{PK_tuA%
zzI3J(ODL2ZY|F90g(rGng0iqxmDRr-gLQTV`BqL>*%_-(uQU6Wz3#B;*q-X!z<{-a
zV(YC^N0NMOkn@i?yT8K!(QP9KE}c_Qv}(8#$()+$D5eBh9wc`q=>S3uhVb0Xm8mPa
zlv>h1V_O&k11e;YzOyKw8tbOlpN##@lPCwwA{D>Ts_+%Ee16QR517eWH3mSpKN)=~
zpU=dw4>EAg-&dc4fw{y!0$RDvdUkfGIG--M{f8TdfX-(1R7fH;f**$4job$yu2^IH
z-_KokoO7v@WTPy}i!1N?Hw@uMlyQ<fg>-k?hEmu}nILTf&~gK$%Z3XBkCNV#ithw|
zG){Qt)Z~mZPd+n#e_K5a#KB>5$gpE119FNZqjM+EY+#r?rYQ=dE(rP-U1w-mTPVZc
zvyXods&U2QNEu|Ed~VTYU8ey{Ev|I@)!k>rF$1D{b@*}$0Pmr+5BL^x2UPqD8pC^D
zFT4+E`!)5cQTEnVv8bxuWEci=5ONB8rEa7NQi^QPg;p!)5r?&fLn|zqEzKza8aCj=
z(s$Z9F}xVt1=7Td^)~~1h{e?VG<=%0OAgFM%PE{(955_2qHv6zN!;>gCq|n%xX;Le
zcFh71+@`-gto7s}S%<X8l6EEKw_-RP%hSxgI&~Vtx=$OzA0O%d$j*?`@<3vK!L(if
z6f@C%EEt;iTp!`N@dVu+yI6rqn;Hlk9a}-Vu`F?w_~Q^n#xOaP=+$yYR{vFcYWqTI
z?~5k<1HAmFk-|$ymGJ@|W4U%Ce-ahlP2XiH7<o;}$MAHOKv{;Zyqt+BJ(e6)UsN+8
zq|L_8ze@`hKsBs;5?W>_I}^#ACbjmibX1m~-ueM^8W0}6`|@yT#zS>iwdP7TXJKo0
zMaPymN9&UZ0|$#?=||Q@Aw{)qQWCNu>I*<nd#|F{z-WXclr>e`_&>6p*jUC{_F-yc
znlT`l&wLt0rM0qKczSw0_x7mnFWCmn`gVK~O5VSp;%MK-=47QEKm)?<43K`r%i(}z
z?IvraPcqU!=AZ)5S<&i>4TDEf?iwaKNfRxT+~r1M@Iq+>2elhK*TQaB;LKHSV+@nC
z{6?RdHow2QJ)v42<iyG;aDHw_Hg6Gv!wON@u;eVLssUtNEU>Zi7K=)n8WTQ6u8%Hb
z@i`UjmV-^>?8&15*b|^2!uIN0YSe}c^dX4Q1T@v;E<1dJCUzeFw}*EduKt>LZDM&_
z2DA?VOfF)?3SC)!MW6#f$@6T*^5^K`+U|#Gx-ih?6!ItS;y*W$&(=R{v7gcTuh2OT
zKP^Mom-yYWefcfKW05v-1jpBA=#N!7*xdk>jae(^U1P;3MRJTGDgZ4Ld9b1S2kmUP
zhcmhH8jwS;s<!^FQlHo1Rj(cX*Ftp`2iBL2EIM+$ph-<_0tw;lXLW41e*TevTNbS<
z-hSm7vjduC=|iSU-e}a|l6fn&Uz>Lr0CeF#3-sC)HaplMVk%k}fX9P-EzoMz7MJ=G
z+PrH4J*Ghj0Pqd(0qh4M*`mX#E$m43*0BGv&e@bB*fWC;R32?@V2}xsc3ksG7<Nt+
z#EPdrTL=yQl#9=OfD;$bLly^f+|uJgraa{K1akW=zl}VNv>IF9BIX9`K}lv?E9Kp!
z+?h|<dce-LRMTTQLJ?|)?bgSvtl1qZG8yMtGw@Nm^M9BZw6(NCMGu6hMrwK%8;8mC
z(sE7zSQl(h>irVcmM(NgE$jErlm4e55_`C;oySWG2^8+*N754e@#K)I+i^zF4_&O)
z@(gi;VktED0~<+gZBF37;-D)W!gvIoudFGy(9$~IT#I5~#tw}w&3g^J@VO3k(ooM3
zbY<|>_=_pW>tEC^xTG#44JbPRnEUQmr94Bs<SAAWa&k?cp}Z?gy7Lpvd*cbMtJcDL
z_PtE;^~E=ZKH`bDsgSH0sL0fX(qsGTh0+tJ0?2!kZ*v1at)*o(bzs!H@ERrVeSnv=
za-OC3^le9=OgB?%K43lmgBldWi4b(sFg0!bZSD+w5oOcN3owvC+M+BwXHMlbNhMI9
z>ep_y2@fA#BxH>mo!v6V@#GC8wpydbFc{FXx@W1686ubZJnbgUz?r3a<FA)?(xF%{
z?2RE9GM0xY^CN28nk6vh;IBsgEQ*Lf#8lO`vs<jsavb0QjnFy|dEJu_G3w1)rU^HR
znAF&nP?Sd3ZPo=F@22lZes0f&I(gKq_T|L}#+qHw>z`Qacixbhwg}wPz+kFXj&gm0
zwYPX(1<6wYE&eWB+@!u%18RG*8HUC-oNu<k#r1onIL0;j@~_e&=O3LNb5I0mcqoP-
zs<dh1PmvGr>#FdKH8OG^zf*m6eYc5L)nv3w{k21yi{pP#2D;bOek!6f*DjWK{#S?4
zLIz{A-PJ?Vi=0>(cu1|GK9>6NbQM6Ee1quGXn#c7iTLKo!6h|L@<r@YBV&b9qqEJv
zb1{p&x!2h^Qi_X;6qrE?l}!^TB(KwzE#_M?1#mAJmgdhd(TT=m1#UHZ@UB<SkY|!c
zRofz2`GFlCryA4rAvPXa0gx{6+CVrl1f{su8%VsR2w%G|Cy%PpkYuQ}3%|+G_P;_~
zdnsnU<erKALnV}%AoUU_jOt@o)e;aydZ+6=@-}hRgLzu*BMv)~HD<1nZ$G^e`0P|s
z4StQg>tD1z2ki;1(9xOMM?U#y5xV(j*k!hU2c7*s-03ByNqYmc5gdzs4Z|LX$j{=n
zHw535PFQ)ZidN1DD1%!a0CahJ`?qbR*J#WLAEp(F+TYl^zBj;_IvBBM*SJ-Y%%Ba)
zOKsLW159f4jN>v4gj;d;LdAR2D{FR`xMfIrh1$s2Urg0WJ&)~7AO+Q5MCmkiT=93A
z#C<DVbx577UQ>m{%w>)q^pUt;X64^5Krr&H4aR=Im!L*>``DXCZhedi%gWHO|8R@D
zsD8vhZF$}@_PLdNyBu^3_zFfctcpyCGi{MoikLp;b*dgwr77#xT%smo%GuoO!V!C`
z*cabQItHo1ot&AhGqUk!9u*F)@K0MBvfP@f;st?s!A<F;`HCyQw6Jx-JL3Sh@0W~(
zrA|*N=L*BTFbJEOxFOn3k6GK$S?4r0#z0!CZ+N8YQX2{GpJ*#|mjrqE4P5u9(^3!P
z1lt(WewX;RSdp|Nx_bQTQqX?QHlg|!?$X~8riUrR<Q-xpqk59ZvC{?UZf!EakY-nW
za@WOC(;RW>c#G@oR8i|@G9yM4;UJ@5lXkkSiocq@OG^1@nXz-l!q4QGssGCB)`+z$
zydpJF7I52(P%W;IA{pHpbaQ$2rgdb8gUs3P-AnHCh3!+1>6@exet*~eTQ=i{Krf|_
zZ*W|Ol45sax4w>I92Bhg$De_Nf#ohoG>Kc<C=Pj>l}efR-xRLldqk(mqcVH;W)mY<
ztiHwcaZcPZs^M-(b*73|5!BYsu`%{jkyzDv{Sv#n!$xV+9wlL4X0W8HQkdetlRaWo
z9X?m`PB2_Z_i$GMW~Ol`pw`e*-CM<9k91Ds9?<suP_jR+FkQs$Muh*k*}e(&&JUhM
zd0-Z7KjTGfn`faGamV<{p%H5zhqeVcsWrSRKx`OGebya5Rhh_sMy1EacbU6tH=lzL
zuHWz*>RP95o}%BKN?BHfJo40_Hm==+?(_e6KZTn^ucmXCp6J0dc_x}AcYCK|NXgCs
z_`Mp0)lEWC*%bIv+*4=RYm+~#nG9KmV7692`cF5o{j3zh<MNoD`ukdDexV8(+58^W
zG;s(cz?-;gyCh?xr2Co|MFw@gwOI!NXnplmId2u>2ztsaF?JHiAk`CfQ^Nn6Q%<S!
zFOEgoI7KD%(gU27ptaxI1gk3#TJYeGKdWUWAn~T{4$^4iaz$TdfAAy))l=x)a6Grv
z2%@#jp*@i6tT08Rrr8A5D&+fIJCE&ukvt=ziuD$r%o&{>2^^6=V%|ics6@eL0dtPx
zJhBTqJ?-<=)JM)Prz5cMAG~PBzZg248tTe#MtG$P!s@Ov8XWOc%<4^niN)ijztsib
za%tAG3UW;fsp<Jmn;7!pkxRYs`cLdI@eZ7@l^6TUL)pTP+?{j`;?67g6~BNu#WIdb
z9e@D>AMsgNf0n}kl@$IA-)H##k9)k&rSZ8mK9|OyUUmOJY!P95n6l|lzn_WZLRSF*
N^R?TFN5?K*|0n7T1110f

literal 0
HcmV?d00001

diff --git a/LayoutTests/fast/borders/borderRadiusArcs01-expected.txt b/LayoutTests/fast/borders/borderRadiusArcs01-expected.txt
new file mode 100644
index 000000000000..f79f3a127350
--- /dev/null
+++ b/LayoutTests/fast/borders/borderRadiusArcs01-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 220x220 [bgcolor=#00FF00] [border: (10px solid #00FFFF) (10px solid #FF0000) (10px solid #0000FF) (10px solid #00FFFF)]
+        RenderText {#text} at (10,10) size 4x18
+          text run at (10,10) width 4: " "
diff --git a/LayoutTests/fast/borders/borderRadiusArcs01.html b/LayoutTests/fast/borders/borderRadiusArcs01.html
new file mode 100644
index 000000000000..512b10dd39bf
--- /dev/null
+++ b/LayoutTests/fast/borders/borderRadiusArcs01.html
@@ -0,0 +1,22 @@
+<html>
+<head>
+    <style type="text/css">
+        div {
+            width: 200px;
+            height: 200px;
+            border: 10px solid cyan;
+            border-bottom-color: blue;
+            border-right-color: red;
+            -webkit-border-top-right-radius: 40px;
+            -webkit-border-bottom-left-radius: 60px;
+            -webkit-border-bottom-right-radius: 30px;
+            background-color:lime;
+        }
+    </style>
+</head>
+<body>
+    <div>
+        &nbsp;
+    </div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index af45a4c9726a..16300ab9b50b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-21  Alex Taylor  <darwin@techvisual.co.nz>
+
+        Reviewed by Mitz.
+
+        Fixes: http://bugs.webkit.org/show_bug.cgi?id=11587
+
+        Adds calculations for bottom right radius's position
+        which was being drawn incorrectly.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::paintBorder):
+
 2006-11-20  Rob Buis  <buis@kde.org>
 
         Reviewed by Maciej.
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index b8f6eb939587..35cfb8a406f9 100644
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -1395,6 +1395,7 @@ void RenderObject::paintBorder(GraphicsContext* graphicsContext, int tx, int ty,
         if (renderRadii) {
             int leftX = tx;
             int leftY = ty + h - bottomLeft.height() * 2;
+            int rightY = ty + h - bottomRight.height() * 2;
             int rightX = tx + w - bottomRight.width() * 2;
             secondAngleStart = 270;
             secondAngleSpan = upperRightBorderStylesMatch ? 90 : 45;
@@ -1428,12 +1429,12 @@ void RenderObject::paintBorder(GraphicsContext* graphicsContext, int tx, int ty,
                 && (bs != DOUBLE || style->borderBottomWidth() > 6);
             if (applyRightInnerClip) {
                 graphicsContext->save();
-                graphicsContext->addInnerRoundedRectClip(IntRect(rightX, leftY, bottomRight.width() * 2, bottomRight.height() * 2),
+                graphicsContext->addInnerRoundedRectClip(IntRect(rightX, rightY, bottomRight.width() * 2, bottomRight.height() * 2),
                                                          style->borderBottomWidth());
             }
 
             // Draw lower right arc
-            drawBorderArc(graphicsContext, rightX, leftY, thickness, bottomRight, secondAngleStart, secondAngleSpan,
+            drawBorderArc(graphicsContext, rightX, rightY, thickness, bottomRight, secondAngleStart, secondAngleSpan,
                           BSBottom, bc, style->color(), bs, false);
             if (applyRightInnerClip)
                 graphicsContext->restore();
@@ -1524,6 +1525,7 @@ void RenderObject::paintBorder(GraphicsContext* graphicsContext, int tx, int ty,
         if (renderRadii && (!upperRightBorderStylesMatch || !lowerRightBorderStylesMatch)) {
             int topX = tx + w - topRight.width() * 2;
             int topY = ty;
+            int bottomX = tx + w - bottomRight.width() * 2;
             int bottomY = ty + h - bottomRight.height() * 2;
             firstAngleStart = 0;
             secondAngleStart = 315;
@@ -1550,12 +1552,12 @@ void RenderObject::paintBorder(GraphicsContext* graphicsContext, int tx, int ty,
                 && (rs != DOUBLE || style->borderRightWidth() > 6);
             if (applyBottomInnerClip) {
                 graphicsContext->save();
-                graphicsContext->addInnerRoundedRectClip(IntRect(topX, bottomY, bottomRight.width() * 2, bottomRight.height() * 2),
+                graphicsContext->addInnerRoundedRectClip(IntRect(bottomX, bottomY, bottomRight.width() * 2, bottomRight.height() * 2),
                                                          style->borderRightWidth());
             }
 
             // Draw bottom right arc
-            drawBorderArc(graphicsContext, topX, bottomY, thickness, bottomRight, secondAngleStart, secondAngleSpan,
+            drawBorderArc(graphicsContext, bottomX, bottomY, thickness, bottomRight, secondAngleStart, secondAngleSpan,
                           BSRight, rc, style->color(), rs, false);
             if (applyBottomInnerClip)
                 graphicsContext->restore();
-- 
2.36.0