| 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 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 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 "WebDOMProgressEvent.h" | 32 #include "WebScrollbarTheme.h" |
| 33 | 33 |
| 34 #include "core/events/ProgressEvent.h" | 34 #include "core/platform/ScrollbarThemeMacCommon.h" |
| 35 #include "public/platform/WebString.h" | |
| 36 | 35 |
| 37 using namespace WebCore; | 36 using namespace WebCore; |
| 38 | 37 |
| 39 namespace WebKit { | 38 namespace WebKit { |
| 40 | 39 |
| 41 WebDOMProgressEvent::WebDOMProgressEvent(const WebString& type, bool lengthIsCom
putable, unsigned long long loaded, unsigned long long total) | 40 #if OS(MACOSX) |
| 42 : WebDOMEvent(ProgressEvent::create(type, lengthIsComputable, loaded, total)
) | 41 void WebScrollbarTheme::updateScrollbars( |
| 42 float initialButtonDelay, float autoscrollButtonDelay, |
| 43 bool jumpOnTrackClick, bool redraw) |
| 43 { | 44 { |
| 44 ASSERT(m_private.get()); | 45 static_cast<ScrollbarThemeMacCommon*>(ScrollbarTheme::theme())->preferencesC
hanged( |
| 45 ASSERT(isProgressEvent()); | 46 initialButtonDelay, autoscrollButtonDelay, jumpOnTrackClick, redraw); |
| 46 } | 47 } |
| 48 #endif |
| 47 | 49 |
| 48 } // namespace WebKit | 50 } // namespace WebKit |
| OLD | NEW |