Bug 978620: Make nsFrameSetFrame call FinishAndStoreOverflow. r=roc
authorL. David Baron <dbaron@dbaron.org>
Mon, 03 Mar 2014 00:54:39 -0800
changeset 171768 ba9b13653eee2d4f1e3da156420eca6643088628
parent 171767 31b472f3e282a08ca53db8eaf137c4924cd1dc69
child 171769 5ddb2542c961fa2bda1943ec3a27a7961a15349e
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersroc
bugs978620
milestone30.0a1
Bug 978620: Make nsFrameSetFrame call FinishAndStoreOverflow. r=roc
layout/generic/crashtests/crashtests.list
layout/generic/crashtests/outline-on-frameset.xhtml
layout/generic/nsFrameSetFrame.cpp
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -520,8 +520,9 @@ asserts(1-4) load 876074-1.html # bug 87
 load 885009-1.html
 load 893496-1.html
 load 893523.html
 test-pref(layout.css.sticky.enabled,true) load 914891.html
 test-pref(layout.css.sticky.enabled,true) load 915475.xhtml
 load 943509-1.html
 asserts(4-8) load 944909-1.html
 test-pref(layout.css.sticky.enabled,true) load 949932.html
+load outline-on-frameset.xhtml
new file mode 100644
--- /dev/null
+++ b/layout/generic/crashtests/outline-on-frameset.xhtml
@@ -0,0 +1,1 @@
+<html xmlns="http://www.w3.org/1999/xhtml"><frameset style="outline-style: solid;"></frameset></html>
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -1132,16 +1132,17 @@ nsHTMLFramesetFrame::Reflow(nsPresContex
     mChildFrameborder = nullptr;
     mChildBorderColors = nullptr;
   }
 
   aStatus = NS_FRAME_COMPLETE;
   mDrag.UnSet();
 
   aDesiredSize.SetOverflowAreasToDesiredBounds();
+  FinishAndStoreOverflow(&aDesiredSize);
 
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
   return NS_OK;
 }
 
 nsIAtom*
 nsHTMLFramesetFrame::GetType() const
 {