Title: [108847] trunk
- Revision
- 108847
- Author
- [email protected]
- Date
- 2012-02-24 14:24:25 -0800 (Fri, 24 Feb 2012)
Log Message
Overhanging floats not removed from new flex box.
https://bugs.webkit.org/show_bug.cgi?id=79522
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: trunk/LayoutTests/ChangeLog (108846 => 108847)
--- trunk/LayoutTests/ChangeLog 2012-02-24 22:15:49 UTC (rev 108846)
+++ trunk/LayoutTests/ChangeLog 2012-02-24 22:24:25 UTC (rev 108847)
@@ -1,3 +1,13 @@
+2012-02-24 Abhishek Arya <[email protected]>
+
+ 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-24 Gavin Barraclough <[email protected]>
Should not allow malformed \x escapes
Added: trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt (0 => 108847)
--- trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt 2012-02-24 22:24:25 UTC (rev 108847)
@@ -0,0 +1 @@
+PASS
Added: trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html (0 => 108847)
--- trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html (rev 0)
+++ trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html 2012-02-24 22:24:25 UTC (rev 108847)
@@ -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: trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html
___________________________________________________________________
Added: svn:executable
Modified: trunk/Source/WebCore/ChangeLog (108846 => 108847)
--- trunk/Source/WebCore/ChangeLog 2012-02-24 22:15:49 UTC (rev 108846)
+++ trunk/Source/WebCore/ChangeLog 2012-02-24 22:24:25 UTC (rev 108847)
@@ -1,3 +1,17 @@
+2012-02-24 Abhishek Arya <[email protected]>
+
+ 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-24 Brent Fulgham <[email protected]>
[WinCairo] Compute more acurate font heights.
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (108846 => 108847)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2012-02-24 22:15:49 UTC (rev 108846)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2012-02-24 22:24:25 UTC (rev 108847)
@@ -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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
