Title: [97181] trunk/LayoutTests/ChangeLog
Revision
97181
Author
[email protected]
Date
2011-10-11 14:09:24 -0700 (Tue, 11 Oct 2011)

Log Message

Generalize r95461 change to include table-cell and
allow splitting between :before, :after content.
https://bugs.webkit.org/show_bug.cgi?id=69854

Reviewed by Eric Seidel.

* fast/table/table-row-before-after-content-around-table-cell-expected.png: Added.
* fast/table/table-row-before-after-content-around-table-cell-expected.txt: Added.
* fast/table/table-row-before-after-content-around-table-cell.html: Added.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (97180 => 97181)


--- trunk/LayoutTests/ChangeLog	2011-10-11 21:05:20 UTC (rev 97180)
+++ trunk/LayoutTests/ChangeLog	2011-10-11 21:09:24 UTC (rev 97181)
@@ -1,25 +1,3 @@
-2011-10-05  Abhishek Arya  <[email protected]>
-
-        Style for updated due to inability to locate
-        :before content in presence of listmarkers and runins.
-        https://bugs.webkit.org/show_bug.cgi?id=68624
-
-        Reviewed by Eric Seidel.
-
-        * fast/lists/inline-before-content-after-list-marker-expected.png: Added.
-        * fast/lists/inline-before-content-after-list-marker-expected.txt: Added.
-        * fast/lists/inline-before-content-after-list-marker.html: Added.
-        * fast/runin/runin-between-list-marker-and-before-content-expected.png: Added.
-        * fast/runin/runin-between-list-marker-and-before-content-expected.txt: Added.
-        * fast/runin/runin-between-list-marker-and-before-content.html: Added.
-        * fast/runin/runin-into-div-with-float-child-expected.png: Added.
-        * fast/runin/runin-into-div-with-float-child-expected.txt: Added.
-        * fast/runin/runin-into-div-with-float-child.html: Added.
-        * fast/runin/runin-not-go-into-float-expected.png: Added.
-        * fast/runin/runin-not-go-into-float-expected.txt: Added.
-        * fast/runin/runin-not-go-into-float.html: Added.
-
-<<<<<<< .mine
 2011-10-11  Abhishek Arya  <[email protected]>
 
         Generalize r95461 change to include table-cell and
@@ -32,7 +10,6 @@
         * fast/table/table-row-before-after-content-around-table-cell-expected.txt: Added.
         * fast/table/table-row-before-after-content-around-table-cell.html: Added.
 
-=======
 2011-10-11  Ryosuke Niwa  <[email protected]>
 
         Mac rebaseline after r96958.
@@ -62,7 +39,6 @@
         * accessibility/menu-list-sends-change-notification.html: Added.
         * platform/chromium/accessibility/menu-list-sends-change-notification-expected.txt: Added.
 
->>>>>>> .r97177
 2011-10-11  Dimitri Glazkov  <[email protected]>
 
         [Chromium] Suddenly, things are crashing sporadically.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to