Title: [164805] trunk
- Revision
- 164805
- Author
- [email protected]
- Date
- 2014-02-27 08:08:56 -0800 (Thu, 27 Feb 2014)
Log Message
Unreviewed, rolling out r164783.
http://trac.webkit.org/changeset/164783
https://bugs.webkit.org/show_bug.cgi?id=129425
Broke number of multicol tests (Requested by anttik on
#webkit).
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::containingColumnsBlock):
LayoutTests:
* fast/css/crash-on-column-splitting-expected.txt: Removed.
* fast/css/crash-on-column-splitting.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (164804 => 164805)
--- trunk/LayoutTests/ChangeLog 2014-02-27 15:52:28 UTC (rev 164804)
+++ trunk/LayoutTests/ChangeLog 2014-02-27 16:08:56 UTC (rev 164805)
@@ -1,3 +1,15 @@
+2014-02-27 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r164783.
+ http://trac.webkit.org/changeset/164783
+ https://bugs.webkit.org/show_bug.cgi?id=129425
+
+ Broke number of multicol tests (Requested by anttik on
+ #webkit).
+
+ * fast/css/crash-on-column-splitting-expected.txt: Removed.
+ * fast/css/crash-on-column-splitting.html: Removed.
+
2014-02-27 Antoine Quint <[email protected]>
Respect SVG fragment identifiers in <img> src attribute
Deleted: trunk/LayoutTests/fast/css/crash-on-column-splitting-expected.txt (164804 => 164805)
--- trunk/LayoutTests/fast/css/crash-on-column-splitting-expected.txt 2014-02-27 15:52:28 UTC (rev 164804)
+++ trunk/LayoutTests/fast/css/crash-on-column-splitting-expected.txt 2014-02-27 16:08:56 UTC (rev 164805)
@@ -1,7 +0,0 @@
-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
- RenderText {#text} at (0,0) size 273x17
- text run at (0,0) width 273: "PASS if it does not crash. See bug 125449."
Deleted: trunk/LayoutTests/fast/css/crash-on-column-splitting.html (164804 => 164805)
--- trunk/LayoutTests/fast/css/crash-on-column-splitting.html 2014-02-27 15:52:28 UTC (rev 164804)
+++ trunk/LayoutTests/fast/css/crash-on-column-splitting.html 2014-02-27 16:08:56 UTC (rev 164805)
@@ -1,24 +0,0 @@
-<html>
-<head>
- <style type="text/css">
- .c1 { -webkit-column-width: 1px; }
- </style>
- <script>
- function afterload() {
- document.getElementById("details").setAttribute('class', 'c1');
- document.body.offsetTop;
- document.getElementById("legend").style["color"] = "red";
- document.body.innerHTML = "PASS if it does not crash. See bug 125449.";
- }
- </script>
-</head>
-<body _onload_="afterload()">
- <b id="legend">
- <div class="c1">
- <details id="details" open>a
- <summary id="summary" style="-webkit-column-span: all;"></summary>
- </details>
- </div>
- </b>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (164804 => 164805)
--- trunk/Source/WebCore/ChangeLog 2014-02-27 15:52:28 UTC (rev 164804)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 16:08:56 UTC (rev 164805)
@@ -1,3 +1,15 @@
+2014-02-27 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r164783.
+ http://trac.webkit.org/changeset/164783
+ https://bugs.webkit.org/show_bug.cgi?id=129425
+
+ Broke number of multicol tests (Requested by anttik on
+ #webkit).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::containingColumnsBlock):
+
2014-02-27 Antoine Quint <[email protected]>
Respect SVG fragment identifiers in <img> src attribute
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (164804 => 164805)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-27 15:52:28 UTC (rev 164804)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-02-27 16:08:56 UTC (rev 164805)
@@ -465,7 +465,7 @@
RenderBlock* RenderBlock::containingColumnsBlock(bool allowAnonymousColumnBlock)
{
RenderBlock* firstChildIgnoringAnonymousWrappers = 0;
- for (RenderElement* curr = parent(); curr; curr = curr->parent()) {
+ for (RenderElement* curr = this; curr; curr = curr->parent()) {
if (!curr->isRenderBlock() || curr->isFloatingOrOutOfFlowPositioned() || curr->isTableCell() || curr->isRoot() || curr->isRenderView() || curr->hasOverflowClip()
|| curr->isInlineBlockOrInlineTable())
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
