| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008, 2011 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "platform/graphics/GraphicsContextStateSaver.h" | 32 #include "platform/graphics/GraphicsContextStateSaver.h" |
| 33 #include "platform/graphics/paint/DrawingRecorder.h" | 33 #include "platform/graphics/paint/DrawingRecorder.h" |
| 34 #include "platform/mac/ColorMac.h" | 34 #include "platform/mac/ColorMac.h" |
| 35 #include "platform/mac/LocalCurrentGraphicsContext.h" | 35 #include "platform/mac/LocalCurrentGraphicsContext.h" |
| 36 #include "platform/mac/NSScrollerImpDetails.h" | 36 #include "platform/mac/NSScrollerImpDetails.h" |
| 37 #include "platform/mac/ScrollAnimatorMac.h" | 37 #include "platform/mac/ScrollAnimatorMac.h" |
| 38 #include "platform/scroll/ScrollbarThemeClient.h" | 38 #include "platform/scroll/ScrollbarThemeClient.h" |
| 39 #include "public/platform/WebThemeEngine.h" | 39 #include "public/platform/WebThemeEngine.h" |
| 40 #include "public/platform/Platform.h" | 40 #include "public/platform/Platform.h" |
| 41 #include "public/platform/WebRect.h" | 41 #include "public/platform/WebRect.h" |
| 42 #include "skia/ext/cdl_canvas.h" |
| 42 #include "skia/ext/skia_utils_mac.h" | 43 #include "skia/ext/skia_utils_mac.h" |
| 43 #include "wtf/HashSet.h" | 44 #include "wtf/HashSet.h" |
| 44 #include "wtf/RetainPtr.h" | 45 #include "wtf/RetainPtr.h" |
| 45 #include "wtf/StdLibExtras.h" | 46 #include "wtf/StdLibExtras.h" |
| 46 | 47 |
| 47 // FIXME: There are repainting problems due to Aqua scroll bar buttons' visual | 48 // FIXME: There are repainting problems due to Aqua scroll bar buttons' visual |
| 48 // overflow. | 49 // overflow. |
| 49 | 50 |
| 50 using namespace blink; | 51 using namespace blink; |
| 51 | 52 |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 } | 410 } |
| 410 | 411 |
| 411 // static | 412 // static |
| 412 NSScrollerStyle ScrollbarThemeMac::recommendedScrollerStyle() { | 413 NSScrollerStyle ScrollbarThemeMac::recommendedScrollerStyle() { |
| 413 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) | 414 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) |
| 414 return NSScrollerStyleOverlay; | 415 return NSScrollerStyleOverlay; |
| 415 return gPreferredScrollerStyle; | 416 return gPreferredScrollerStyle; |
| 416 } | 417 } |
| 417 | 418 |
| 418 } // namespace blink | 419 } // namespace blink |
| OLD | NEW |