From 9f5237b87c767d8a7c78ea33af917871aab0c3b3 Mon Sep 17 00:00:00 2001 From: Ting-Yu Lin Date: Fri, 20 Jul 2018 17:09:31 -0700 Subject: [PATCH] style: Use static const class variable to represent column-count: auto. NS_STYLE_COLUMN_COUNT_UNLIMITED is unused, so I remove it. Bug: 1477533 Reviewed-by: heycam MozReview-Commit-ID: HLHLn9ZbkUY --- components/style/properties/gecko.mako.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index ac5acfd05dca..c91ef4d44766 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -5379,21 +5379,21 @@ clip-path #[allow(unused_unsafe)] 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}; + use gecko_bindings::structs::{nsStyleColumn_kColumnCountAuto, nsStyleColumn_kMaxColumnCount}; self.gecko.mColumnCount = match v { ColumnCount::Integer(integer) => { cmp::min(integer.0 as u32, unsafe { nsStyleColumn_kMaxColumnCount }) }, - ColumnCount::Auto => NS_STYLE_COLUMN_COUNT_AUTO + ColumnCount::Auto => nsStyleColumn_kColumnCountAuto }; } ${impl_simple_copy('column_count', 'mColumnCount')} pub fn clone_column_count(&self) -> longhands::column_count::computed_value::T { - use gecko_bindings::structs::{NS_STYLE_COLUMN_COUNT_AUTO, nsStyleColumn_kMaxColumnCount}; - if self.gecko.mColumnCount != NS_STYLE_COLUMN_COUNT_AUTO { + use gecko_bindings::structs::{nsStyleColumn_kColumnCountAuto, nsStyleColumn_kMaxColumnCount}; + if self.gecko.mColumnCount != nsStyleColumn_kColumnCountAuto { debug_assert!(self.gecko.mColumnCount >= 1 && self.gecko.mColumnCount <= nsStyleColumn_kMaxColumnCount); ColumnCount::Integer((self.gecko.mColumnCount as i32).into())