Title: [109422] branches/chromium/963
- Revision
- 109422
- Author
- [email protected]
- Date
- 2012-03-01 14:13:24 -0800 (Thu, 01 Mar 2012)
Log Message
Merge 108847
BUG=115681
Review URL: https://chromiumcodereview.appspot.com/9567024
Modified Paths
Added Paths
Diff
Copied: branches/chromium/963/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt (from rev 108847, trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt) (0 => 109422)
--- branches/chromium/963/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt (rev 0)
+++ branches/chromium/963/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash-expected.txt 2012-03-01 22:13:24 UTC (rev 109422)
@@ -0,0 +1 @@
+PASS
Copied: branches/chromium/963/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html (from rev 108847, trunk/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html) (0 => 109422)
--- branches/chromium/963/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html (rev 0)
+++ branches/chromium/963/LayoutTests/fast/flexbox/overhanging-floats-not-removed-crash.html 2012-03-01 22:13:24 UTC (rev 109422)
@@ -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>
Modified: branches/chromium/963/Source/WebCore/rendering/RenderBox.cpp (109421 => 109422)
--- branches/chromium/963/Source/WebCore/rendering/RenderBox.cpp 2012-03-01 22:07:29 UTC (rev 109421)
+++ branches/chromium/963/Source/WebCore/rendering/RenderBox.cpp 2012-03-01 22:13:24 UTC (rev 109422)
@@ -283,7 +283,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
