From add8103aa5165b691690a4a52474acf68424d7d6 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Wed, 21 Oct 2015 16:27:50 +1300 Subject: [PATCH] Bug 1209994. Take block-wrapper path only for blocks that are wrappers. r=bz --HG-- extra : commitid : BUBPKQYEZGy extra : rebase_source : b949adb895716866f545e00dbf88734fd0138fd1 --- layout/generic/nsHTMLReflowState.cpp | 2 +- layout/reftests/bugs/1209994-1-ref.html | 17 +++++++++++++++++ layout/reftests/bugs/1209994-1.html | 21 +++++++++++++++++++++ layout/reftests/bugs/1209994-2-ref.html | 17 +++++++++++++++++ layout/reftests/bugs/1209994-2.html | 21 +++++++++++++++++++++ layout/reftests/bugs/1209994-3-ref.html | 17 +++++++++++++++++ layout/reftests/bugs/1209994-3.html | 21 +++++++++++++++++++++ layout/reftests/bugs/1209994-4-ref.html | 17 +++++++++++++++++ layout/reftests/bugs/1209994-4.html | 21 +++++++++++++++++++++ layout/reftests/bugs/reftest.list | 4 ++++ 10 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 layout/reftests/bugs/1209994-1-ref.html create mode 100644 layout/reftests/bugs/1209994-1.html create mode 100644 layout/reftests/bugs/1209994-2-ref.html create mode 100644 layout/reftests/bugs/1209994-2.html create mode 100644 layout/reftests/bugs/1209994-3-ref.html create mode 100644 layout/reftests/bugs/1209994-3.html create mode 100644 layout/reftests/bugs/1209994-4-ref.html create mode 100644 layout/reftests/bugs/1209994-4.html diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp index 1002a067d309..37816b925573 100644 --- a/layout/generic/nsHTMLReflowState.cpp +++ b/layout/generic/nsHTMLReflowState.cpp @@ -619,7 +619,7 @@ nsHTMLReflowState::InitResizeFlags(nsPresContext* aPresContext, nsIAtom* aFrameT // mCBReflowState->IsBResize() is set correctly below when // reflowing descendant. SetBResize(true); - } else if (mCBReflowState && !nsLayoutUtils::IsNonWrapperBlock(frame)) { + } else if (mCBReflowState && frame->IsBlockWrapper()) { // XXX Is this problematic for relatively positioned inlines acting // as containing block for absolutely positioned elements? // Possibly; in that case we should at least be checking diff --git a/layout/reftests/bugs/1209994-1-ref.html b/layout/reftests/bugs/1209994-1-ref.html new file mode 100644 index 000000000000..1b6f7cdd4637 --- /dev/null +++ b/layout/reftests/bugs/1209994-1-ref.html @@ -0,0 +1,17 @@ + + +There should be a visible fieldset below: +
+
This is fieldset
+
+ diff --git a/layout/reftests/bugs/1209994-1.html b/layout/reftests/bugs/1209994-1.html new file mode 100644 index 000000000000..d362c00872e3 --- /dev/null +++ b/layout/reftests/bugs/1209994-1.html @@ -0,0 +1,21 @@ + + +There should be a visible fieldset below: +
+
This is fieldset
+
+ + diff --git a/layout/reftests/bugs/1209994-2-ref.html b/layout/reftests/bugs/1209994-2-ref.html new file mode 100644 index 000000000000..8858616b69a0 --- /dev/null +++ b/layout/reftests/bugs/1209994-2-ref.html @@ -0,0 +1,17 @@ + + +There should be a visible button below: +
+ +
+ diff --git a/layout/reftests/bugs/1209994-2.html b/layout/reftests/bugs/1209994-2.html new file mode 100644 index 000000000000..485b0fe5854b --- /dev/null +++ b/layout/reftests/bugs/1209994-2.html @@ -0,0 +1,21 @@ + + +There should be a visible button below: +
+ +
+ + diff --git a/layout/reftests/bugs/1209994-3-ref.html b/layout/reftests/bugs/1209994-3-ref.html new file mode 100644 index 000000000000..bd219e03ae55 --- /dev/null +++ b/layout/reftests/bugs/1209994-3-ref.html @@ -0,0 +1,17 @@ + + +There should be a visible table below: +
+ This is a table
+
+ diff --git a/layout/reftests/bugs/1209994-3.html b/layout/reftests/bugs/1209994-3.html new file mode 100644 index 000000000000..94df02fabb1b --- /dev/null +++ b/layout/reftests/bugs/1209994-3.html @@ -0,0 +1,21 @@ + + +There should be a visible table below: +
+ This is a table
+
+ + diff --git a/layout/reftests/bugs/1209994-4-ref.html b/layout/reftests/bugs/1209994-4-ref.html new file mode 100644 index 000000000000..2f15740fc164 --- /dev/null +++ b/layout/reftests/bugs/1209994-4-ref.html @@ -0,0 +1,17 @@ + + +There should be a visible select below: +
+ +
+ diff --git a/layout/reftests/bugs/1209994-4.html b/layout/reftests/bugs/1209994-4.html new file mode 100644 index 000000000000..95e2d062faca --- /dev/null +++ b/layout/reftests/bugs/1209994-4.html @@ -0,0 +1,21 @@ + + +There should be a visible select below: +
+ +
+ + diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 5297adbbaf60..ec093885652b 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1937,3 +1937,7 @@ fuzzy(1,74) fuzzy-if(gtkWidget,6,79) == 1174332-1.html 1174332-1-ref.html == 1202512-2.html 1202512-2-ref.html != 1207326-1.html about:blank == 1209603-1.html 1209603-1-ref.html +== 1209994-1.html 1209994-1-ref.html +== 1209994-2.html 1209994-2-ref.html +== 1209994-3.html 1209994-3-ref.html +== 1209994-4.html 1209994-4-ref.html