12825 "Need new 'overflow' values to control scrollbar visibility". Added -moz-scrollbars-none, -moz-scrollbars-horizontal and -moz-scrollbars-vertical.

content/html/style/src/nsCSSKeywordList.h

@@ -44,6 +44,9 @@ CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
+CSS_KEY(_moz_scrollbars_none)
+CSS_KEY(_moz_scrollbars_horizontal)
+CSS_KEY(_moz_scrollbars_vertical)
 CSS_KEY(above)
 CSS_KEY(absolute)
 CSS_KEY(activeborder)

content/shared/public/nsCSSKeywordList.h

@@ -44,6 +44,9 @@ CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
+CSS_KEY(_moz_scrollbars_none)
+CSS_KEY(_moz_scrollbars_horizontal)
+CSS_KEY(_moz_scrollbars_vertical)
 CSS_KEY(above)
 CSS_KEY(absolute)
 CSS_KEY(activeborder)

content/shared/src/nsCSSProps.cpp

@@ -454,6 +454,9 @@ const PRInt32 nsCSSProps::kOverflowKTable[] = {
   eCSSKeyword_visible, NS_STYLE_OVERFLOW_VISIBLE,
   eCSSKeyword_hidden, NS_STYLE_OVERFLOW_HIDDEN,
   eCSSKeyword_scroll, NS_STYLE_OVERFLOW_SCROLL,
+  eCSSKeyword__moz_scrollbars_none, NS_STYLE_OVERFLOW_SCROLLBARS_NONE,
+  eCSSKeyword__moz_scrollbars_horizontal, NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL,
+  eCSSKeyword__moz_scrollbars_vertical, NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL,
   -1,-1
 };
 

layout/base/nsCSSFrameConstructor.cpp

@@ -5051,11 +5051,14 @@ nsCSSFrameConstructor::IsScrollable(nsIPresContext*       aPresContext,
 {
   // For the time being it's scrollable if the overflow property is auto or
   // scroll, regardless of whether the width or height is fixed in size
-  if ((NS_STYLE_OVERFLOW_SCROLL == aDisplay->mOverflow) ||
-      (NS_STYLE_OVERFLOW_AUTO == aDisplay->mOverflow)) {
-    return PR_TRUE;
+  switch (aDisplay->mOverflow) {
+  	case NS_STYLE_OVERFLOW_SCROLL:
+  	case NS_STYLE_OVERFLOW_AUTO:
+  	case NS_STYLE_OVERFLOW_SCROLLBARS_NONE:
+  	case NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL:
+  	case NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL:
+	    return PR_TRUE;
   }
-
   return PR_FALSE;
 }
 

layout/base/nsStyleConsts.h

@@ -366,6 +366,9 @@
 #define NS_STYLE_OVERFLOW_HIDDEN                1
 #define NS_STYLE_OVERFLOW_SCROLL                2
 #define NS_STYLE_OVERFLOW_AUTO                  3
+#define NS_STYLE_OVERFLOW_SCROLLBARS_NONE				4
+#define NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL	5
+#define NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL		6
 
 // See nsStyleList
 #define NS_STYLE_LIST_STYLE_NONE                  0

layout/base/public/nsStyleConsts.h

@@ -366,6 +366,9 @@
 #define NS_STYLE_OVERFLOW_HIDDEN                1
 #define NS_STYLE_OVERFLOW_SCROLL                2
 #define NS_STYLE_OVERFLOW_AUTO                  3
+#define NS_STYLE_OVERFLOW_SCROLLBARS_NONE				4
+#define NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL	5
+#define NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL		6
 
 // See nsStyleList
 #define NS_STYLE_LIST_STYLE_NONE                  0

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -5051,11 +5051,14 @@ nsCSSFrameConstructor::IsScrollable(nsIPresContext*       aPresContext,
 {
   // For the time being it's scrollable if the overflow property is auto or
   // scroll, regardless of whether the width or height is fixed in size
-  if ((NS_STYLE_OVERFLOW_SCROLL == aDisplay->mOverflow) ||
-      (NS_STYLE_OVERFLOW_AUTO == aDisplay->mOverflow)) {
-    return PR_TRUE;
+  switch (aDisplay->mOverflow) {
+  	case NS_STYLE_OVERFLOW_SCROLL:
+  	case NS_STYLE_OVERFLOW_AUTO:
+  	case NS_STYLE_OVERFLOW_SCROLLBARS_NONE:
+  	case NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL:
+  	case NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL:
+	    return PR_TRUE;
   }
-
   return PR_FALSE;
 }
 

layout/html/style/src/nsCSSKeywordList.h

@@ -44,6 +44,9 @@ CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
+CSS_KEY(_moz_scrollbars_none)
+CSS_KEY(_moz_scrollbars_horizontal)
+CSS_KEY(_moz_scrollbars_vertical)
 CSS_KEY(above)
 CSS_KEY(absolute)
 CSS_KEY(activeborder)

layout/html/style/src/nsCSSProps.cpp

@@ -454,6 +454,9 @@ const PRInt32 nsCSSProps::kOverflowKTable[] = {
   eCSSKeyword_visible, NS_STYLE_OVERFLOW_VISIBLE,
   eCSSKeyword_hidden, NS_STYLE_OVERFLOW_HIDDEN,
   eCSSKeyword_scroll, NS_STYLE_OVERFLOW_SCROLL,
+  eCSSKeyword__moz_scrollbars_none, NS_STYLE_OVERFLOW_SCROLLBARS_NONE,
+  eCSSKeyword__moz_scrollbars_horizontal, NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL,
+  eCSSKeyword__moz_scrollbars_vertical, NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL,
   -1,-1
 };
 

layout/style/nsCSSKeywordList.h

@@ -44,6 +44,9 @@ CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
+CSS_KEY(_moz_scrollbars_none)
+CSS_KEY(_moz_scrollbars_horizontal)
+CSS_KEY(_moz_scrollbars_vertical)
 CSS_KEY(above)
 CSS_KEY(absolute)
 CSS_KEY(activeborder)

layout/style/nsCSSProps.cpp

@@ -454,6 +454,9 @@ const PRInt32 nsCSSProps::kOverflowKTable[] = {
   eCSSKeyword_visible, NS_STYLE_OVERFLOW_VISIBLE,
   eCSSKeyword_hidden, NS_STYLE_OVERFLOW_HIDDEN,
   eCSSKeyword_scroll, NS_STYLE_OVERFLOW_SCROLL,
+  eCSSKeyword__moz_scrollbars_none, NS_STYLE_OVERFLOW_SCROLLBARS_NONE,
+  eCSSKeyword__moz_scrollbars_horizontal, NS_STYLE_OVERFLOW_SCROLLBARS_HORIZONTAL,
+  eCSSKeyword__moz_scrollbars_vertical, NS_STYLE_OVERFLOW_SCROLLBARS_VERTICAL,
   -1,-1
 };