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

Side by Side Diff: Source/core/platform/ScrollableArea.h

Issue 23480037: Fix RTL scroll bars being misrendered on Android. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: isLeftSideVerticalScrollbar Created 7 years, 3 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 | Annotate | Revision Log
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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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 "core/platform/Scrollbar.h" 29 #include "core/platform/Scrollbar.h"
30 #include "core/platform/text/TextDirection.h"
31 #include "wtf/Vector.h" 30 #include "wtf/Vector.h"
32 31
33 namespace WebCore { 32 namespace WebCore {
34 33
35 class FloatPoint; 34 class FloatPoint;
36 class GraphicsContext; 35 class GraphicsContext;
37 class GraphicsLayer; 36 class GraphicsLayer;
38 class PlatformGestureEvent; 37 class PlatformGestureEvent;
39 class PlatformWheelEvent; 38 class PlatformWheelEvent;
40 class ScrollAnimator; 39 class ScrollAnimator;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 172
174 // Let subclasses provide a way of asking for and servicing scroll 173 // Let subclasses provide a way of asking for and servicing scroll
175 // animations. 174 // animations.
176 virtual bool scheduleAnimation() { return false; } 175 virtual bool scheduleAnimation() { return false; }
177 void serviceScrollAnimations(); 176 void serviceScrollAnimations();
178 177
179 virtual bool usesCompositedScrolling() const { return false; } 178 virtual bool usesCompositedScrolling() const { return false; }
180 virtual void updateNeedsCompositedScrolling() { } 179 virtual void updateNeedsCompositedScrolling() { }
181 180
182 virtual bool userInputScrollable(ScrollbarOrientation) const = 0; 181 virtual bool userInputScrollable(ScrollbarOrientation) const = 0;
182 virtual bool shouldPlaceVerticalScrollbarOnLeft() const = 0;
183 183
184 // Convenience functions 184 // Convenience functions
185 int scrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? scrollPosition().x() : scrollPosition().y(); } 185 int scrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? scrollPosition().x() : scrollPosition().y(); }
186 int minimumScrollPosition(ScrollbarOrientation orientation) { return orienta tion == HorizontalScrollbar ? minimumScrollPosition().x() : minimumScrollPositio n().y(); } 186 int minimumScrollPosition(ScrollbarOrientation orientation) { return orienta tion == HorizontalScrollbar ? minimumScrollPosition().x() : minimumScrollPositio n().y(); }
187 int maximumScrollPosition(ScrollbarOrientation orientation) { return orienta tion == HorizontalScrollbar ? maximumScrollPosition().x() : maximumScrollPositio n().y(); } 187 int maximumScrollPosition(ScrollbarOrientation orientation) { return orienta tion == HorizontalScrollbar ? maximumScrollPosition().x() : maximumScrollPositio n().y(); }
188 int clampScrollPosition(ScrollbarOrientation orientation, int pos) { return std::max(std::min(pos, maximumScrollPosition(orientation)), minimumScrollPositi on(orientation)); } 188 int clampScrollPosition(ScrollbarOrientation orientation, int pos) { return std::max(std::min(pos, maximumScrollPosition(orientation)), minimumScrollPositi on(orientation)); }
189 189
190 TextDirection textDirection() const;
191
192 protected: 190 protected:
193 ScrollableArea(); 191 ScrollableArea();
194 virtual ~ScrollableArea(); 192 virtual ~ScrollableArea();
195 193
196 void setScrollOrigin(const IntPoint&); 194 void setScrollOrigin(const IntPoint&);
197 void resetScrollOriginChanged() { m_scrollOriginChanged = false; } 195 void resetScrollOriginChanged() { m_scrollOriginChanged = false; }
198 196
199 virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0; 197 virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
200 virtual void invalidateScrollCornerRect(const IntRect&) = 0; 198 virtual void invalidateScrollCornerRect(const IntRect&) = 0;
201 199
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // vertical-lr / ltr NO NO 247 // vertical-lr / ltr NO NO
250 // vertical-lr / rtl NO YES 248 // vertical-lr / rtl NO YES
251 // vertical-rl / ltr YES NO 249 // vertical-rl / ltr YES NO
252 // vertical-rl / rtl YES YES 250 // vertical-rl / rtl YES YES
253 IntPoint m_scrollOrigin; 251 IntPoint m_scrollOrigin;
254 }; 252 };
255 253
256 } // namespace WebCore 254 } // namespace WebCore
257 255
258 #endif // ScrollableArea_h 256 #endif // ScrollableArea_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698