Attachment 104985 Details for Bug 66844 – Patch V2

[patch] Patch V2

bug66844_1.patch (text/plain), 7.23 KB, created by Alexandru Chiculita on 2011-08-24 05:32:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandru Chiculita

Created: 2011-08-24 05:32:58 PDT

Size: 7.23 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d368e22..e50a794 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2011-08-24  Alexandru Chiculita  <achicu@adobe.com>
>+
>+        [CSSRegions] RenderRegion is not used if there's another renderer after it
>+        https://bugs.webkit.org/show_bug.cgi?id=66844
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/regions/content-flowed-into-regions-dynamically-inserted-expected.png: Added.
>+        * fast/regions/content-flowed-into-regions-dynamically-inserted-expected.txt: Added.
>+        * fast/regions/content-flowed-into-regions-dynamically-inserted.html: Added.
>+
> 2011-08-23  Ben Wells  <benwells@chromium.org>
> 
>         Extra baseline for bug 66036 (canvas fill composite modes)
>diff --git a/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.png b/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..8f71af641c140ab9f01745dfcd22a2d036a846fc
>GIT binary patch
>literal 11454
>zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>i1B%QlYbpRznkB9gCCM47$=SuFxeQ5`
>zX-USZ=4KX&7Ul*<MwZEmCW$GDNr_1*MkeMK<`(m>-<t(A;a#S)bAYF_vqC^oep+Tu
>zDg#3WV{6FyY+*-{e`a|rFDP+DW%F&Sn4shtxjMu3irHVmq->ts^4nY|q!@c%%QJiZ
>zPHpSbjwg>UYTa{vyO8~VgIv{z6n(GOC|8Ypt2L4qitBzno9DA_>8k_h>OS8ye_xwl
>zcAtT_=#t6T29_th$AcCLX6Dp5W&P=3=v&0;XrdZ=`;DIpn`3kF&+6wls`wkD!wy&f
>zF5gtXcGjhBv)EhyIy`WnbyI7@d+|c9NFk;UoBInjkC$-Ve|+Q9n|@2b%8G+q`L%72
>zL@L!dnChOZ_uUbER`s$&vxmi$uZ2N&bFOz!xh~6|nU{9#guq_^3Cnh$dAB-g;T*qj
>zd=vK0{Zi+*`JUY&#Y5bZYwg{3^v?U*bJhM);=?7+j<ngzNSJ>4ks!KVYUK~pLn844
>zzUqrY3UBK1ew?xHZ`dcVrh*9;r&1CdilaRIulwZv*wxNjt9D&@{iE`*z=xIn!s+*}
>z+<otQi)p<9pDd3Q&n#Y#00CE)#2Fg`9NKK83{5r_*(<MRlb&2{RH~A-yClhFqhqz%
>z9oy}JOYYkI(@-j$;=Gk((jUivTI)~xKdt<EI%dO-u<ujW&YrdF(*x_HPiO9wlDmHS
>z#N%S$xSFX~$|i@qPg_%2wP)5FDf>6!(+!_Bnf4zk-thaQZv50U(=~fUjy?|k{K~tf
>zG|JHY{`{PJYuiV9=k>N;D_+~#Z5}pzdiviikKgZB?V0>6^rwH^*N=bF&mKvBq-m&D
>z*7aPmbNW%ekCSeAujYP~kb9hC?$kETOSuz&sa#D+n6>Ateyn|T#a_31p09yZB+pz5
>z>HJ=QNGru;?oPh^U;Vd_{}F%kz3cgW4JQ4Z2PbCk$_*}jFR(CmX<qR<Ch`3jYd>tu
>z%U)b(@rNbCX0_PbAk+B@dl+TP+N<PVXwJAiZQ5DOpmv@4lXty5l@xR);I?y6&~?@8
>zsor9nXND%dEW0uDvTUBrLQALbN0xh~PX4w2qu_?W8-jlRToZJ&&QI!E<Mdzo2lo7R
>zJy6lz$-tn%;OXKRQo;E4u49+V6*1Sq;5kbt|D62uv5xD(XQy?a3yEyn^n0E9BC(qV
>z&W^Qze|&x}ZqLFYpy1HJz{mt-{Af6^Uj7G<yd#tkl4#t|!qO4X0+NQRvr|)WuycFc
>z3>V-K5KyRNN8<jN(ZKLiVk^HA%wPovhlU@raC;OS9waj{JxRV|*8#B@Y|;IF%0GVn
>z`t|OJb)zxkf1R_EOBJEE9`M)vklXO*>)QX{gX_N6|6ls=XYrr#e{YZOfBfP2|Npi}
>z&;N+8`TNhfPWyf*%)kdh2jUOzy0XO;;g<u!4h=SyHbMw@6lf|q=$YmUB1Arj2q^f=
>z^&@=C5yQnX!P_?)NyLVg<;3LU%HSY_=$sDpP0(dABoTi`#!pW^dLUW8w1HvgsB<9U
>zH5xjI{4_k$&V$#-=i9IEUcY|*_08r?%bD)~v6@#m%@F3z#`D~NzTI{IC4cCB%N}7w
>zb_-zrBf3WGX&)@t0?V67hlVpPY)GZa3MQr{UOSZ$Wl4gVfP(Qtq|C;$s)1o;&^shO
>zGk{stCj*iD7#g({99B)ShPel*IgOFgNLUKt6o&=Cj6Uj=(NGypE1+C5nuCC4#Avyq
>z;4oU+0&~M?9W+`qgL?p@jfByr6SyNh+Mpb5BtW_(qm6{oMgq7qI@(AWZ6u5~5@5r`
>zqvI>U+%P)oG&+(19)%ojB#br^MjHv>+HtgzFxp5MZ6qMgcu~2Lu+Epont_4S3$zvh
>zT;z<FyrU)WXvvG1KOP;!1?Gp*?%8Pf3|uUZPV@qUVYGWT+DO3FNch40#Z7Y6{vQU8
>Qzy-++p00i_>zopr0QZ9-rvLx|
>
>literal 0
>HcmV?d00001
>
>diff --git a/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.txt b/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.txt
>new file mode 100644
>index 0000000..bffb1d8
>--- /dev/null
>+++ b/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted-expected.txt
>@@ -0,0 +1,20 @@
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x60
>+  RenderBlock {HTML} at (0,0) size 800x60
>+    RenderBody {BODY} at (8,8) size 784x0
>+      RenderRegion {DIV} at (0,0) size 52x52 [border: (1px solid #000000)]
>+      RenderRegion {DIV} at (52,0) size 52x52 [border: (1px solid #000000)]
>+      RenderRegion {DIV} at (104,0) size 52x52 [border: (1px solid #000000)]
>+Flow Threads
>+  Thread with flow-name 'article'
>+    layer at (0,0) size 50x150
>+      RenderFlowThread at (0,0) size 50x150
>+        RenderBlock {DIV} at (0,0) size 50x150
>+          RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000]
>+          RenderBlock {DIV} at (0,50) size 50x50 [bgcolor=#0000FF]
>+          RenderBlock {DIV} at (0,100) size 50x50 [bgcolor=#FFA500]
>+  Regions for flow 'article'
>+    RenderRegion {DIV} with index 0
>+    RenderRegion {DIV} #region with index 0
>+    RenderRegion {DIV} with index 0
>diff --git a/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted.html b/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted.html
>new file mode 100644
>index 0000000..170460f
>--- /dev/null
>+++ b/LayoutTests/fast/regions/content-flowed-into-regions-dynamically-inserted.html
>@@ -0,0 +1,29 @@
>+<!doctype html>
>+<html>
>+    
>+    <head>
>+        <link rel="stylesheet" href="resources/region-style.css">
>+    </head>
>+    <body>
>+        <div class="flowArticle">
>+            <div class="greenBox"></div>
>+            <div class="blueBox"></div>
>+            <div class="orangeBox"></div>
>+        </div>
>+        <div class="regionArticle borderBox"></div>
>+        <div id="region"></div>
>+        <div class="regionArticle borderBox"></div>
>+        <script>
>+            var region = document.getElementById("region");
>+            // The next line will create a new RenderRegion and insert it
>+            // into the flow thread.
>+            region.className = "regionArticle borderBox";
>+        </script>
>+    </body>
>+</html>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 009b152..7cd97b2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2011-08-24  Alexandru Chiculita  <achicu@adobe.com>
>+
>+        [CSSRegions] RenderRegion is not used if there's another renderer after it
>+        https://bugs.webkit.org/show_bug.cgi?id=66844
>+
>+        There was no call to attachRegion in RenderObjectChildList::insertChildNode, so
>+        the region was not added to the RenderFlowThread.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: fast/regions/content-flowed-into-regions-dynamically-inserted.html
>+
>+        * rendering/RenderObjectChildList.cpp:
>+        (WebCore::RenderObjectChildList::insertChildNode):
>+
> 2011-08-23  Mark Hahnenberg  <mhahnenberg@apple.com>
> 
>         Add checks to ensure allocation does not take place during initialization of GC-managed objects
>diff --git a/Source/WebCore/rendering/RenderObjectChildList.cpp b/Source/WebCore/rendering/RenderObjectChildList.cpp
>index c08054c..d907c2f 100644
>--- a/Source/WebCore/rendering/RenderObjectChildList.cpp
>+++ b/Source/WebCore/rendering/RenderObjectChildList.cpp
>@@ -244,6 +244,9 @@ void RenderObjectChildList::insertChildNode(RenderObject* owner, RenderObject* c
> 
>         if (!child->isFloating() && owner->childrenInline())
>             owner->dirtyLinesFromChangedChild(child);
>+
>+        if (child->isRenderRegion())
>+            toRenderRegion(child)->attachRegion();
>     }
> 
>     RenderCounter::rendererSubtreeAttached(child);

Flags:

hyatt: review+
webkit.review.bot: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 66844: 104984 | 104985 | 105027