Bug 1530193 - followup: Fix default type and value of browser.display.focus_ring_style.

marco-c · marco-c · commit 16b67c098ea1 · 2019-10-04T09:38:41.000Z
It warns on debug builds.

UltraBlame original commit: a96130bc4159d683e559b763d18d36bc5d4b2b44
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
@@ -996,10 +996,6 @@ mSendAfterPaintToContent
 (
 false
 )
-mUseFocusColors
-(
-false
-)
 mDrawImageBackground
 (
 true
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
@@ -3657,21 +3657,6 @@ mSendAfterPaintToContent
 1
 ;
 unsigned
-mUseFocusColors
-:
-1
-;
-unsigned
-mFocusRingOnAnything
-:
-1
-;
-unsigned
-mFocusRingStyle
-:
-1
-;
-unsigned
 mDrawImageBackground
 :
 1
diff --git a/layout/style/PreferenceSheet.h b/layout/style/PreferenceSheet.h
@@ -117,10 +117,10 @@ mFocusRingWidth
 =
 1
 ;
-bool
+uint8_t
 mFocusRingStyle
 =
-false
+1
 ;
 bool
 mFocusRingOnAnything
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
@@ -1071,8 +1071,8 @@ display
 focus_ring_style
 "
 browser_display_focus_ring_style
-bool
-false
+uint32_t
+1
 )
 VARCACHE_PREF
 (

Original file line number	Diff line number	Diff line change
`@@ -1071,8 +1071,8 @@ display`
`1071`	`1071`	`focus_ring_style`
`1072`	`1072`	`"`
`1073`	`1073`	`browser_display_focus_ring_style`
`1074`		`-bool`
`1075`		`-false`
	`1074`	`+uint32_t`
	`1075`	`+1`
`1076`	`1076`	`)`
`1077`	`1077`	`VARCACHE_PREF`
`1078`	`1078`	`(`