Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.h

Issue 1738503003: Fix overlay scroll bar color on elements with dark background (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test after rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ScrollableArea_h 26 #ifndef ScrollableArea_h
27 #define ScrollableArea_h 27 #define ScrollableArea_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/RuntimeEnabledFeatures.h" 30 #include "platform/RuntimeEnabledFeatures.h"
31 #include "platform/geometry/DoublePoint.h" 31 #include "platform/geometry/DoublePoint.h"
32 #include "platform/graphics/Color.h"
32 #include "platform/heap/Handle.h" 33 #include "platform/heap/Handle.h"
33 #include "platform/scroll/ScrollAnimatorBase.h" 34 #include "platform/scroll/ScrollAnimatorBase.h"
34 #include "platform/scroll/ScrollTypes.h" 35 #include "platform/scroll/ScrollTypes.h"
35 #include "platform/scroll/Scrollbar.h" 36 #include "platform/scroll/Scrollbar.h"
36 #include "wtf/MathExtras.h" 37 #include "wtf/MathExtras.h"
37 #include "wtf/Noncopyable.h" 38 #include "wtf/Noncopyable.h"
38 #include "wtf/Vector.h" 39 #include "wtf/Vector.h"
39 40
40 namespace blink { 41 namespace blink {
41 42
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 116
116 void finishCurrentScrollAnimations() const; 117 void finishCurrentScrollAnimations() const;
117 118
118 virtual void didAddScrollbar(Scrollbar&, ScrollbarOrientation); 119 virtual void didAddScrollbar(Scrollbar&, ScrollbarOrientation);
119 virtual void willRemoveScrollbar(Scrollbar&, ScrollbarOrientation); 120 virtual void willRemoveScrollbar(Scrollbar&, ScrollbarOrientation);
120 121
121 virtual void contentsResized(); 122 virtual void contentsResized();
122 123
123 bool hasOverlayScrollbars() const; 124 bool hasOverlayScrollbars() const;
124 void setScrollbarOverlayStyle(ScrollbarOverlayStyle); 125 void setScrollbarOverlayStyle(ScrollbarOverlayStyle);
126 void recalculateScrollbarOverlayStyle(Color);
125 ScrollbarOverlayStyle getScrollbarOverlayStyle() const { return static_cast< ScrollbarOverlayStyle>(m_scrollbarOverlayStyle); } 127 ScrollbarOverlayStyle getScrollbarOverlayStyle() const { return static_cast< ScrollbarOverlayStyle>(m_scrollbarOverlayStyle); }
126 128
127 // This getter will create a ScrollAnimatorBase if it doesn't already exist. 129 // This getter will create a ScrollAnimatorBase if it doesn't already exist.
128 ScrollAnimatorBase& scrollAnimator() const; 130 ScrollAnimatorBase& scrollAnimator() const;
129 131
130 // This getter will return null if the ScrollAnimatorBase hasn't been create d yet. 132 // This getter will return null if the ScrollAnimatorBase hasn't been create d yet.
131 ScrollAnimatorBase* existingScrollAnimator() const { return m_scrollAnimator .get(); } 133 ScrollAnimatorBase* existingScrollAnimator() const { return m_scrollAnimator .get(); }
132 134
133 ProgrammaticScrollAnimator& programmaticScrollAnimator() const; 135 ProgrammaticScrollAnimator& programmaticScrollAnimator() const;
134 ProgrammaticScrollAnimator* existingProgrammaticScrollAnimator() const { ret urn m_programmaticScrollAnimator.get(); } 136 ProgrammaticScrollAnimator* existingProgrammaticScrollAnimator() const { ret urn m_programmaticScrollAnimator.get(); }
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 // vertical-lr / ltr NO NO 347 // vertical-lr / ltr NO NO
346 // vertical-lr / rtl NO YES 348 // vertical-lr / rtl NO YES
347 // vertical-rl / ltr YES NO 349 // vertical-rl / ltr YES NO
348 // vertical-rl / rtl YES YES 350 // vertical-rl / rtl YES YES
349 IntPoint m_scrollOrigin; 351 IntPoint m_scrollOrigin;
350 }; 352 };
351 353
352 } // namespace blink 354 } // namespace blink
353 355
354 #endif // ScrollableArea_h 356 #endif // ScrollableArea_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698