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

Side by Side Diff: Source/core/platform/ScrollbarThemeOverlay.cpp

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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 if (scrollbar->orientation() == HorizontalScrollbar) 100 if (scrollbar->orientation() == HorizontalScrollbar)
101 rect.inflateX(-m_scrollbarMargin); 101 rect.inflateX(-m_scrollbarMargin);
102 else 102 else
103 rect.inflateY(-m_scrollbarMargin); 103 rect.inflateY(-m_scrollbarMargin);
104 return rect; 104 return rect;
105 } 105 }
106 106
107 void ScrollbarThemeOverlay::paintThumb(GraphicsContext* context, ScrollbarThemeC lient* scrollbar, const IntRect& rect) 107 void ScrollbarThemeOverlay::paintThumb(GraphicsContext* context, ScrollbarThemeC lient* scrollbar, const IntRect& rect)
108 { 108 {
109 IntRect thumbRect = rect; 109 IntRect thumbRect = rect;
110 if (scrollbar->orientation() == HorizontalScrollbar) 110 if (scrollbar->orientation() == HorizontalScrollbar) {
111 thumbRect.setHeight(thumbRect.height() - m_scrollbarMargin); 111 thumbRect.setHeight(thumbRect.height() - m_scrollbarMargin);
112 else 112 } else {
113 thumbRect.setWidth(thumbRect.width() - m_scrollbarMargin); 113 thumbRect.setWidth(thumbRect.width() - m_scrollbarMargin);
114 if (scrollbar->isLeftSideVerticalScrollbar())
115 thumbRect.setX(thumbRect.x() + m_scrollbarMargin);
116 }
114 context->fillRect(thumbRect, m_color); 117 context->fillRect(thumbRect, m_color);
115 } 118 }
116 119
117 ScrollbarPart ScrollbarThemeOverlay::hitTest(ScrollbarThemeClient* scrollbar, co nst IntPoint& position) 120 ScrollbarPart ScrollbarThemeOverlay::hitTest(ScrollbarThemeClient* scrollbar, co nst IntPoint& position)
118 { 121 {
119 if (m_allowHitTest == DisallowHitTest) 122 if (m_allowHitTest == DisallowHitTest)
120 return NoPart; 123 return NoPart;
121 124
122 return ScrollbarTheme::hitTest(scrollbar, position); 125 return ScrollbarTheme::hitTest(scrollbar, position);
123 } 126 }
124 127
125 } // namespace WebCore 128 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698