From daf848c2d7e2a9e3ad1daa8db67b5d12550f9793 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Mon, 10 Oct 2016 09:37:29 -0500
Subject: [PATCH] servo: Merge #13674 - Implement column-count in stylo (from
 Manishearth:column_count); r=emilio

Unblocks column-fill easy property
r? @emilio

Source-Repo: https://github.com/servo/servo
Source-Revision: aef6054dc64043860e90ca962b60c51c683789f2
---
 servo/components/style/properties/gecko.mako.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs
index 3c61bba4577d..add67265fdf1 100644
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -468,8 +468,6 @@ impl Debug for ${style_struct.gecko_struct_name} {
                    # transition
                    "transition-duration", "transition-timing-function",
                    "transition-property", "transition-delay",
-
-                   "column-count", # column
                    ]
 
     # Types used with predefined_type()-defined properties that we can auto-generate.
@@ -1911,7 +1909,7 @@ clip-path
 </%self:impl_trait>
 
 <%self:impl_trait style_struct_name="Column"
-                  skip_longhands="column-width">
+                  skip_longhands="column-width column-count">
 
     pub fn set_column_width(&mut self, v: longhands::column_width::computed_value::T) {
         match v.0 {
@@ -1921,6 +1919,17 @@ clip-path
     }
 
     ${impl_coord_copy('column_width', 'mColumnWidth')}
+
+    pub fn set_column_count(&mut self, v: longhands::column_count::computed_value::T) {
+        use gecko_bindings::structs::{NS_STYLE_COLUMN_COUNT_AUTO, nsStyleColumn_kMaxColumnCount};
+
+        self.gecko.mColumnCount = match v.0 {
+            Some(number) => cmp::min(number, nsStyleColumn_kMaxColumnCount),
+            None => NS_STYLE_COLUMN_COUNT_AUTO
+        };
+    }
+
+    ${impl_simple_copy('column_count', 'mColumnCount')}
 </%self:impl_trait>
 
 <%self:impl_trait style_struct_name="Counters"