| Index: Source/core/platform/ScrollbarThemeMacCommon.mm
|
| diff --git a/Source/core/platform/ScrollbarThemeMacCommon.mm b/Source/core/platform/ScrollbarThemeMacCommon.mm
|
| index 4417890ce0f48ccae0d77524f2db47eb4807f968..f37fb4475729d146058d0e21f4e2cc8f23f5c0d6 100644
|
| --- a/Source/core/platform/ScrollbarThemeMacCommon.mm
|
| +++ b/Source/core/platform/ScrollbarThemeMacCommon.mm
|
| @@ -70,56 +70,6 @@ static ScrollbarSet& scrollbarSet()
|
|
|
| }
|
|
|
| -@interface WebScrollbarPrefsObserver : NSObject
|
| -{
|
| -}
|
| -
|
| -+ (void)registerAsObserver;
|
| -+ (void)appearancePrefsChanged:(NSNotification*)theNotification;
|
| -+ (void)behaviorPrefsChanged:(NSNotification*)theNotification;
|
| -
|
| -@end
|
| -
|
| -@implementation WebScrollbarPrefsObserver
|
| -
|
| -+ (void)appearancePrefsChanged:(NSNotification*)unusedNotification
|
| -{
|
| - UNUSED_PARAM(unusedNotification);
|
| -
|
| - ScrollbarTheme* theme = ScrollbarTheme::theme();
|
| - if (theme->isMockTheme())
|
| - return;
|
| -
|
| - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
| - [defaults synchronize];
|
| - static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesChanged(
|
| - [defaults floatForKey:@"NSScrollerButtonDelay"], [defaults floatForKey:@"NSScrollerButtonPeriod"],
|
| - [defaults boolForKey:@"AppleScrollerPagingBehavior"], true);
|
| -}
|
| -
|
| -+ (void)behaviorPrefsChanged:(NSNotification*)unusedNotification
|
| -{
|
| - UNUSED_PARAM(unusedNotification);
|
| -
|
| - ScrollbarTheme* theme = ScrollbarTheme::theme();
|
| - if (theme->isMockTheme())
|
| - return;
|
| -
|
| - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
| - [defaults synchronize];
|
| - static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesChanged(
|
| - [defaults floatForKey:@"NSScrollerButtonDelay"], [defaults floatForKey:@"NSScrollerButtonPeriod"],
|
| - [defaults boolForKey:@"AppleScrollerPagingBehavior"], false);
|
| -}
|
| -
|
| -+ (void)registerAsObserver
|
| -{
|
| - [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(appearancePrefsChanged:) name:@"AppleAquaScrollBarVariantChanged" object:nil suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
|
| - [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(behaviorPrefsChanged:) name:@"AppleNoRedisplayAppearancePreferenceChanged" object:nil suspensionBehavior:NSNotificationSuspensionBehaviorCoalesce];
|
| -}
|
| -
|
| -@end
|
| -
|
| namespace WebCore {
|
|
|
| static float gInitialButtonDelay = 0.5f;
|
| @@ -138,7 +88,6 @@ ScrollbarTheme* ScrollbarTheme::nativeTheme()
|
| DEFINE_STATIC_LOCAL(ScrollbarThemeMacNonOverlayAPI, nonOverlayTheme, ());
|
| theme = &nonOverlayTheme;
|
| }
|
| - theme->Initialize();
|
| return theme;
|
| }
|
|
|
| @@ -339,16 +288,6 @@ void ScrollbarThemeMacCommon::paintTickmarks(GraphicsContext* context, Scrollbar
|
| paintGivenTickmarks(context, scrollbar, tickmarkTrackRect, tickmarks);
|
| }
|
|
|
| -void ScrollbarThemeMacCommon::Initialize()
|
| -{
|
| - [WebScrollbarPrefsObserver registerAsObserver];
|
| - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
| - [defaults synchronize];
|
| - preferencesChanged(
|
| - [defaults floatForKey:@"NSScrollerButtonDelay"], [defaults floatForKey:@"NSScrollerButtonPeriod"],
|
| - [defaults boolForKey:@"AppleScrollerPagingBehavior"], false);
|
| -}
|
| -
|
| ScrollbarThemeMacCommon::~ScrollbarThemeMacCommon()
|
| {
|
| }
|
|
|