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 20 matching lines...) Expand all Loading... | |
31 #include "config.h" | 31 #include "config.h" |
32 #include "WebScrollbarTheme.h" | 32 #include "WebScrollbarTheme.h" |
33 | 33 |
34 #include "platform/scroll/ScrollbarThemeMacCommon.h" | 34 #include "platform/scroll/ScrollbarThemeMacCommon.h" |
35 | 35 |
36 using namespace WebCore; | 36 using namespace WebCore; |
37 | 37 |
38 namespace blink { | 38 namespace blink { |
39 | 39 |
40 #if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_V ERSION_10_7 | 40 #if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_V ERSION_10_7 |
41 COMPILE_ASSERT(ScrollerStyleLegacy == NSScrollerStyleLegacy, ScrollerStyle_Legac y_must_be_equal); | 41 // TODO(rsesek): Reenable this after making sure it actually builds. |
42 COMPILE_ASSERT(ScrollerStyleOverlay == NSScrollerStyleOverlay, ScrollerStyle_Ove rlay_must_be_equal); | 42 //COMPILE_ASSERT(ScrollerStyleLegacy == NSScrollerStyleLegacy, ScrollerStyle_Leg acy_must_be_equal); |
43 C//OMPILE_ASSERT(ScrollerStyleOverlay == NSScrollerStyleOverlay, ScrollerStyle_O verlay_must_be_equal); | |
Robert Sesek
2014/01/23 18:07:22
Off by one char
| |
43 #endif | 44 #endif |
44 | 45 |
45 void WebScrollbarTheme::updateScrollbars( | 46 void WebScrollbarTheme::updateScrollbars( |
46 float initialButtonDelay, float autoscrollButtonDelay, | 47 float initialButtonDelay, float autoscrollButtonDelay, |
47 bool jumpOnTrackClick, bool redraw) | 48 bool jumpOnTrackClick, bool redraw) |
48 { | 49 { |
49 ScrollbarTheme* theme = ScrollbarTheme::theme(); | 50 ScrollbarTheme* theme = ScrollbarTheme::theme(); |
50 if (theme->isMockTheme()) | 51 if (theme->isMockTheme()) |
51 return; | 52 return; |
52 | 53 |
53 static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesC hanged( | 54 static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesC hanged( |
54 initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick, redraw); | 55 initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick, redraw); |
55 } | 56 } |
56 | 57 |
57 void WebScrollbarTheme::updateScrollbars( | 58 void WebScrollbarTheme::updateScrollbars( |
58 float initialButtonDelay, float autoscrollButtonDelay, | 59 float initialButtonDelay, float autoscrollButtonDelay, |
59 bool jumpOnTrackClick, ScrollerStyle preferredScrollerStyle, bool redraw) | 60 bool jumpOnTrackClick, ScrollerStyle preferredScrollerStyle, bool redraw) |
60 { | 61 { |
61 updateScrollbars(initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick , redraw); | 62 updateScrollbars(initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick , redraw); |
62 } | 63 } |
63 | 64 |
64 } // namespace blink | 65 } // namespace blink |
OLD | NEW |