aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-02-07 22:48:48 -0800
committerGitHub <noreply@github.com>2017-02-07 22:48:48 -0800
commit8ca1383c419dec9f5bcd23bb0caf87cb4774a7e6 (patch)
tree0adc8deb84bf784d00a0f16bacfc4394489a2f26
parentf7e75fd0012b9a063718f56e5aab093dde40d42f (diff)
parent80541219bcbd81a70d82f04e0dfca1d450fab309 (diff)
downloadservo-8ca1383c419dec9f5bcd23bb0caf87cb4774a7e6.tar.gz
servo-8ca1383c419dec9f5bcd23bb0caf87cb4774a7e6.zip
Auto merge of #15418 - upsuper:blockify-flow-root, r=emilio
Not blockify flow-root <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15418) <!-- Reviewable:end -->
-rw-r--r--components/style/properties/properties.mako.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 1f3174391ea..2db64837374 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -1969,7 +1969,7 @@ pub fn apply_declarations<'a, F, I>(viewport_size: Size2D<Au>,
// Values that are not changed by blockification.
T::none | T::block | T::flex | T::list_item | T::table => None,
% if product == "gecko":
- T::contents | T::grid | T::_webkit_box => None,
+ T::contents | T::flow_root | T::grid | T::_webkit_box => None,
% endif
// Everything becomes block.