Title: [122027] releases/WebKitGTK/webkit-1.8
- Revision
- 122027
- Author
- mrobin...@webkit.org
- Date
- 2012-07-06 13:20:25 -0700 (Fri, 06 Jul 2012)
Log Message
Merge 108847 - Overhanging floats not removed from new flex box.
https://bugs.webkit.org/show_bug.cgi?id=79522
Patch by Abhishek Arya <infe...@chromium.org> on 2012-02-24
Reviewed by Ojan Vafai.
Source/WebCore:
Similar to r69476.
Test: fast/flexbox/overhanging-floats-not-removed-crash.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):
LayoutTests:
* fast/flexbox/overhanging-floats-not-removed-crash-expected.txt: Added.
* fast/flexbox/overhanging-floats-not-removed-crash.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog (122026 => 122027)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-07-06 20:20:16 UTC (rev 122026)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/ChangeLog 2012-07-06 20:20:25 UTC (rev 122027)
@@ -1,3 +1,13 @@
+2012-02-24 Abhishek Arya <infe...@chromium.org>
+
+ Overhanging floats not removed from new flex box.
+ https://bugs.webkit.org/show_bug.cgi?id=79522
+
+ Reviewed by Ojan Vafai.
+
+ * fast/flexbox/overhanging-floats-not-removed-crash-expected.txt: Added.
+ * fast/flexbox/overhanging-floats-not-removed-crash.html: Added.
+
2012-02-21 Abhishek Arya <infe...@chromium.org>
Crash in RenderTableSection::nodeAtPoint.
Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt (0 => 122027)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt 2012-07-06 20:20:25 UTC (rev 122027)
@@ -0,0 +1 @@
+PASS
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html (0 => 122027)
--- releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html 2012-07-06 20:20:25 UTC (rev 122027)
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<body>
+<style>
+#test1 {
+ display: -webkit-flexbox;
+}
+#test1::before {
+ content: "A";
+}
+#test2::before {
+ content: "B";
+ float: right;
+}
+</style>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+function runTest() {
+ document.body.offsetTop;
+
+ test1 = document.createElement('div');
+ test1.setAttribute('id', 'test1');
+ document.body.appendChild(test1);
+
+ test2 = document.createElement('span');
+ test2.setAttribute('id', 'test2');
+ test1.appendChild(test2);
+
+ test3 = document.createElement('div');
+ test1.appendChild(test3);
+ test3Child = document.createElement('div');
+ test3.appendChild(test3Child);
+
+ document.body.offsetTop;
+ test2.style.display = '-webkit-flexbox';
+
+ document.body.offsetTop;
+ document.body.innerHTML = "PASS";
+}
+
+window._onload_ = runTest;
+</script>
+</body>
+</html>
Property changes on: releases/WebKitGTK/webkit-1.8/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html
___________________________________________________________________
Added: svn:executable
Added: svn:eol-style
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (122026 => 122027)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-07-06 20:20:16 UTC (rev 122026)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-07-06 20:20:25 UTC (rev 122027)
@@ -1,3 +1,17 @@
+2012-02-24 Abhishek Arya <infe...@chromium.org>
+
+ Overhanging floats not removed from new flex box.
+ https://bugs.webkit.org/show_bug.cgi?id=79522
+
+ Reviewed by Ojan Vafai.
+
+ Similar to r69476.
+
+ Test: fast/flexbox/overhanging-floats-not-removed-crash.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::removeFloatingOrPositionedChildFromBlockLists):
+
2012-02-21 Abhishek Arya <infe...@chromium.org>
Crash in RenderTableSection::nodeAtPoint.
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBox.cpp (122026 => 122027)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBox.cpp 2012-07-06 20:20:16 UTC (rev 122026)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/rendering/RenderBox.cpp 2012-07-06 20:20:25 UTC (rev 122027)
@@ -285,7 +285,7 @@
if (parentBlock) {
RenderObject* parent = parentBlock->parent();
- if (parent && parent->isDeprecatedFlexibleBox())
+ if (parent && parent->isFlexibleBoxIncludingDeprecated())
parentBlock = toRenderBlock(parent);
parentBlock->markSiblingsWithFloatsForLayout(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
