| 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 25 matching lines...) Expand all Loading... |
| 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/skia_utils_mac.h" | 42 #include "skia/ext/skia_utils_mac.h" |
| 43 #include "wtf/HashSet.h" | 43 #include "wtf/HashSet.h" |
| 44 #include "wtf/RetainPtr.h" | 44 #include "wtf/RetainPtr.h" |
| 45 #include "wtf/StdLibExtras.h" | 45 #include "wtf/StdLibExtras.h" |
| 46 #include "wtf/TemporaryChange.h" | |
| 47 | 46 |
| 48 // FIXME: There are repainting problems due to Aqua scroll bar buttons' visual o
verflow. | 47 // FIXME: There are repainting problems due to Aqua scroll bar buttons' visual o
verflow. |
| 49 | 48 |
| 50 using namespace blink; | 49 using namespace blink; |
| 51 | 50 |
| 52 @interface NSColor (WebNSColorDetails) | 51 @interface NSColor (WebNSColorDetails) |
| 53 + (NSImage *)_linenPatternImage; | 52 + (NSImage *)_linenPatternImage; |
| 54 @end | 53 @end |
| 55 | 54 |
| 56 @interface BlinkScrollbarObserver : NSObject { | 55 @interface BlinkScrollbarObserver : NSObject { |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 | 426 |
| 428 // static | 427 // static |
| 429 NSScrollerStyle ScrollbarThemeMac::recommendedScrollerStyle() | 428 NSScrollerStyle ScrollbarThemeMac::recommendedScrollerStyle() |
| 430 { | 429 { |
| 431 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) | 430 if (RuntimeEnabledFeatures::overlayScrollbarsEnabled()) |
| 432 return NSScrollerStyleOverlay; | 431 return NSScrollerStyleOverlay; |
| 433 return gPreferredScrollerStyle; | 432 return gPreferredScrollerStyle; |
| 434 } | 433 } |
| 435 | 434 |
| 436 } // namespace blink | 435 } // namespace blink |
| OLD | NEW |