From d0e748cadabba2b7cbf7407c4bca665315bf00fe Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Tue, 24 Apr 2018 20:25:23 +0200 Subject: Bug 1338053: Make nsFlexContainerFrame::MarkIntrinsicISizesDirty() also call its parent class's method --- layout/generic/nsFlexContainerFrame.cpp | 1 + layout/reftests/xul/css-flex-1-ref.html | 18 ++++ layout/reftests/xul/css-flex-1.xul | 153 ++++++++++++++++++++++++++++++++ layout/reftests/xul/reftest.list | 2 + 4 files changed, 174 insertions(+) create mode 100644 layout/reftests/xul/css-flex-1-ref.html create mode 100644 layout/reftests/xul/css-flex-1.xul diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 5bc852c52..3818d3cb7 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -1857,6 +1857,7 @@ nsFlexContainerFrame::MarkIntrinsicISizesDirty() for (nsIFrame* childFrame : mFrames) { childFrame->Properties().Delete(CachedFlexMeasuringReflow()); } + nsContainerFrame::MarkIntrinsicISizesDirty(); } nscoord diff --git a/layout/reftests/xul/css-flex-1-ref.html b/layout/reftests/xul/css-flex-1-ref.html new file mode 100644 index 000000000..a47eb8e9c --- /dev/null +++ b/layout/reftests/xul/css-flex-1-ref.html @@ -0,0 +1,18 @@ + + + + + + +
+ + diff --git a/layout/reftests/xul/css-flex-1.xul b/layout/reftests/xul/css-flex-1.xul new file mode 100644 index 000000000..7955373dd --- /dev/null +++ b/layout/reftests/xul/css-flex-1.xul @@ -0,0 +1,153 @@ + + + + + + + + + + + + +mozilla-central: layout/reftests/xul/css-flex-1.xul@67bbef772796 + + + + + + + + + +
layout/reftests/xul/css-flex-1.xul
+ +
+ + + + + + + + + + + + + + + + + + + + +
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 08 Feb 2017 23:08:43 -0800
changeset 34173167bbef772796
permissions-rw-r--r--
+
+ +
Bug 1338053: Make nsFlexContainerFrame::MarkIntrinsicISizesDirty() also call its parent class's method. r=emilio + +MozReview-Commit-ID: 72oIlunLcVq
+ +
+
+
+<?xml version="1.0"?>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="reftest-wait"
+        onload="tweak()">
+  <style xmlns="http://www.w3.org/1999/xhtml">
+    <![CDATA[
+    panelview {
+      border: 1px solid black;
+      background: green;
+      display: flex;
+      height: 50px;
+    }
+    ]]>
+  </style>
+  <script>
+    <![CDATA[
+    function tweak() {
+      var tweakMe = document.getElementById("tweakMe");
+      tweakMe.style.width = "100px";
+      document.documentElement.className = "";
+    }
+    ]]>
+  </script>
+  <hbox>
+    <panelview id="tweakMe"></panelview>
+  </hbox>
+</window>
+
+
+ + + + + + + diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list index da09b7c81..35b9f9025 100644 --- a/layout/reftests/xul/reftest.list +++ b/layout/reftests/xul/reftest.list @@ -1,3 +1,5 @@ +== css-flex-1.xul css-flex-1-ref.html + == menuitem-key.xul menuitem-key-ref.xul # these random-if(Android) are due to differences between Android Native & Xul, see bug 732569 random-if(Android) == menulist-shrinkwrap-1.xul menulist-shrinkwrap-1-ref.xul -- cgit v1.2.3