OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 29 matching lines...) Expand all Loading... |
40 | 40 |
41 namespace blink { | 41 namespace blink { |
42 | 42 |
43 static_assert(static_cast<NSScrollerStyle>(ScrollerStyleLegacy) == NSScrollerSty
leLegacy, "ScrollerStyleLegacy must match NSScrollerStyleLegacy"); | 43 static_assert(static_cast<NSScrollerStyle>(ScrollerStyleLegacy) == NSScrollerSty
leLegacy, "ScrollerStyleLegacy must match NSScrollerStyleLegacy"); |
44 static_assert(static_cast<NSScrollerStyle>(ScrollerStyleOverlay) == NSScrollerSt
yleOverlay, "ScrollerStyleOverlay must match NSScrollerStyleOverlay"); | 44 static_assert(static_cast<NSScrollerStyle>(ScrollerStyleOverlay) == NSScrollerSt
yleOverlay, "ScrollerStyleOverlay must match NSScrollerStyleOverlay"); |
45 | 45 |
46 void WebScrollbarTheme::updateScrollbarsWithNSDefaults( | 46 void WebScrollbarTheme::updateScrollbarsWithNSDefaults( |
47 float initialButtonDelay, float autoscrollButtonDelay, | 47 float initialButtonDelay, float autoscrollButtonDelay, |
48 ScrollerStyle preferredScrollerStyle, bool redraw, bool scrollAnimationEnabl
ed, ScrollbarButtonsPlacement buttonPlacement) | 48 ScrollerStyle preferredScrollerStyle, bool redraw, bool scrollAnimationEnabl
ed, ScrollbarButtonsPlacement buttonPlacement) |
49 { | 49 { |
50 ScrollbarTheme* theme = ScrollbarTheme::theme(); | 50 ScrollbarTheme& theme = ScrollbarTheme::theme(); |
51 if (theme->isMockTheme()) | 51 if (theme.isMockTheme()) |
52 return; | 52 return; |
53 | 53 |
54 static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesC
hanged( | 54 static_cast<ScrollbarThemeMacCommon&>(theme).preferencesChanged( |
55 initialButtonDelay, autoscrollButtonDelay, | 55 initialButtonDelay, autoscrollButtonDelay, |
56 static_cast<NSScrollerStyle>(preferredScrollerStyle), | 56 static_cast<NSScrollerStyle>(preferredScrollerStyle), |
57 redraw, scrollAnimationEnabled, buttonPlacement); | 57 redraw, scrollAnimationEnabled, buttonPlacement); |
58 } | 58 } |
59 | 59 |
60 } // namespace blink | 60 } // namespace blink |
OLD | NEW |