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 13 matching lines...) Expand all Loading... |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "WebScrollbarTheme.h" | 32 #include "WebScrollbarTheme.h" |
33 | 33 |
| 34 #import <AppKit/AppKit.h> |
| 35 |
34 #include "platform/scroll/ScrollbarThemeMacCommon.h" | 36 #include "platform/scroll/ScrollbarThemeMacCommon.h" |
| 37 #include "platform/mac/NSScrollerImpDetails.h" |
35 | 38 |
36 using namespace WebCore; | 39 using namespace WebCore; |
37 | 40 |
38 namespace blink { | 41 namespace blink { |
39 | 42 |
40 #if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_V
ERSION_10_7 | 43 COMPILE_ASSERT(ScrollerStyleLegacy == NSScrollerStyleLegacy, ScrollerStyle_Legac
y_must_be_equal); |
41 // TODO(rsesek): Reenable this after making sure it actually builds. | 44 COMPILE_ASSERT(ScrollerStyleOverlay == NSScrollerStyleOverlay, ScrollerStyle_Ove
rlay_must_be_equal); |
42 //COMPILE_ASSERT(ScrollerStyleLegacy == NSScrollerStyleLegacy, ScrollerStyle_Leg
acy_must_be_equal); | |
43 //COMPILE_ASSERT(ScrollerStyleOverlay == NSScrollerStyleOverlay, ScrollerStyle_O
verlay_must_be_equal); | |
44 #endif | |
45 | 45 |
46 void WebScrollbarTheme::updateScrollbars( | 46 void WebScrollbarTheme::updateScrollbars( |
47 float initialButtonDelay, float autoscrollButtonDelay, | 47 float initialButtonDelay, float autoscrollButtonDelay, |
48 bool jumpOnTrackClick, bool redraw) | 48 bool jumpOnTrackClick, ScrollerStyle preferredScrollerStyle, bool redraw) |
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*>(ScrollbarTheme::theme())->preferencesC
hanged( |
55 initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick, redraw); | 55 initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick, preferredSc
rollerStyle, redraw); |
56 } | |
57 | |
58 void WebScrollbarTheme::updateScrollbars( | |
59 float initialButtonDelay, float autoscrollButtonDelay, | |
60 bool jumpOnTrackClick, ScrollerStyle preferredScrollerStyle, bool redraw) | |
61 { | |
62 updateScrollbars(initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick
, redraw); | |
63 } | 56 } |
64 | 57 |
65 } // namespace blink | 58 } // namespace blink |
OLD | NEW |