Title: [92737] branches/chromium/835
- Revision
- 92737
- Author
- cev...@google.com
- Date
- 2011-08-09 18:15:51 -0700 (Tue, 09 Aug 2011)
Log Message
Merge 92692
BUG=91801
Review URL: http://codereview.chromium.org/7608013
Modified Paths
Added Paths
Diff
Copied: branches/chromium/835/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash-expected.txt (from rev 92692, trunk/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash-expected.txt) (0 => 92737)
--- branches/chromium/835/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash-expected.txt (rev 0)
+++ branches/chromium/835/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash-expected.txt 2011-08-10 01:15:51 UTC (rev 92737)
@@ -0,0 +1,2 @@
+PASS
+
Copied: branches/chromium/835/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html (from rev 92692, trunk/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html) (0 => 92737)
--- branches/chromium/835/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html (rev 0)
+++ branches/chromium/835/LayoutTests/fast/inline/update-always-create-line-boxes-full-layout-crash.html 2011-08-10 01:15:51 UTC (rev 92737)
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html>
+<style>
+.table:nth-last-child(even) { line-height: 100%; }
+</style>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+function runTest()
+{
+ var test = document.getElementById('test');
+ test.parentNode.removeChild(test);
+
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+
+setTimeout("runTest()", 0);
+</script>
+<table class=table>
+<td><rt>PASS</rt></junk></td>
+<table><span id="test"></table>
+</table>
+</html>
Modified: branches/chromium/835/Source/WebCore/rendering/RenderBlockLineLayout.cpp (92736 => 92737)
--- branches/chromium/835/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-10 01:12:28 UTC (rev 92736)
+++ branches/chromium/835/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2011-08-10 01:15:51 UTC (rev 92737)
@@ -1208,7 +1208,7 @@
}
} else if (o->isText() || (o->isRenderInline() && !walker.atEndOfInline())) {
if (!o->isText())
- toRenderInline(o)->updateAlwaysCreateLineBoxes();
+ toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.isFullLayout());
if (layoutState.isFullLayout() || o->selfNeedsLayout())
dirtyLineBoxesForRenderer(o, layoutState.isFullLayout());
o->setNeedsLayout(false);
Modified: branches/chromium/835/Source/WebCore/rendering/RenderInline.cpp (92736 => 92737)
--- branches/chromium/835/Source/WebCore/rendering/RenderInline.cpp 2011-08-10 01:12:28 UTC (rev 92736)
+++ branches/chromium/835/Source/WebCore/rendering/RenderInline.cpp 2011-08-10 01:15:51 UTC (rev 92737)
@@ -162,7 +162,7 @@
}
}
-void RenderInline::updateAlwaysCreateLineBoxes()
+void RenderInline::updateAlwaysCreateLineBoxes(bool fullLayout)
{
// Once we have been tainted once, just assume it will happen again. This way effects like hover highlighting that change the
// background color will only cause a layout on the first rollover.
@@ -189,7 +189,8 @@
}
if (alwaysCreateLineBoxes) {
- dirtyLineBoxes(false);
+ if (!fullLayout)
+ dirtyLineBoxes(false);
m_alwaysCreateLineBoxes = true;
}
}
Modified: branches/chromium/835/Source/WebCore/rendering/RenderInline.h (92736 => 92737)
--- branches/chromium/835/Source/WebCore/rendering/RenderInline.h 2011-08-10 01:12:28 UTC (rev 92736)
+++ branches/chromium/835/Source/WebCore/rendering/RenderInline.h 2011-08-10 01:15:51 UTC (rev 92737)
@@ -81,7 +81,7 @@
bool alwaysCreateLineBoxes() const { return m_alwaysCreateLineBoxes; }
void setAlwaysCreateLineBoxes() { m_alwaysCreateLineBoxes = true; }
- void updateAlwaysCreateLineBoxes();
+ void updateAlwaysCreateLineBoxes(bool fullLayout);
protected:
virtual void willBeDestroyed();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
