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

marco-c · marco-c · commit 141cfecbe39c · 2019-10-04T01:22:08.000Z
It warns on debug builds.

UltraBlame original commit: a96130bc4159d683e559b763d18d36bc5d4b2b44
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
@@ -1259,10 +1259,6 @@ mSendAfterPaintToContent
 (
 false
 )
-mUseFocusColors
-(
-false
-)
 mDrawImageBackground
 (
 true
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
@@ -7281,21 +7281,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
@@ -244,10 +244,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
@@ -3869,6 +3869,14 @@ browser_display_focus_ring_width
 uint32_t
 1
 )
+/
+/
+0
+=
+solid
+1
+=
+dotted
 VARCACHE_PREF
 (
 "
@@ -3879,8 +3887,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
`@@ -3869,6 +3869,14 @@ browser_display_focus_ring_width`
`3869`	`3869`	`uint32_t`
`3870`	`3870`	`1`
`3871`	`3871`	`)`
	`3872`	`+/`
	`3873`	`+/`
	`3874`	`+0`
	`3875`	`+=`
	`3876`	`+solid`
	`3877`	`+1`
	`3878`	`+=`
	`3879`	`+dotted`
`3872`	`3880`	`VARCACHE_PREF`
`3873`	`3881`	`(`
`3874`	`3882`	`"`
`@@ -3879,8 +3887,8 @@ display`
`3879`	`3887`	`focus_ring_style`
`3880`	`3888`	`"`
`3881`	`3889`	`browser_display_focus_ring_style`
`3882`		`-bool`
`3883`		`-false`
	`3890`	`+uint32_t`
	`3891`	`+1`
`3884`	`3892`	`)`
`3885`	`3893`	`VARCACHE_PREF`
`3886`	`3894`	`(`