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

Side by Side Diff: Source/core/rendering/RenderScrollbarTheme.cpp

Issue 613503002: Move paint code for RenderScrollbar and RenderScrollbarPart into ScrollbarPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderScrollbarPart.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 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 #include "config.h" 26 #include "config.h"
27 #include "core/rendering/RenderScrollbarTheme.h"
28
29 #include "core/paint/ScrollbarPainter.h"
27 #include "core/rendering/RenderScrollbar.h" 30 #include "core/rendering/RenderScrollbar.h"
28 #include "core/rendering/RenderScrollbarTheme.h"
29 #include "platform/graphics/GraphicsContext.h" 31 #include "platform/graphics/GraphicsContext.h"
30 #include "platform/scroll/ScrollbarThemeClient.h" 32 #include "platform/scroll/ScrollbarThemeClient.h"
31 #include "wtf/StdLibExtras.h" 33 #include "wtf/StdLibExtras.h"
32 34
33 namespace blink { 35 namespace blink {
34 36
35 RenderScrollbarTheme* RenderScrollbarTheme::renderScrollbarTheme() 37 RenderScrollbarTheme* RenderScrollbarTheme::renderScrollbarTheme()
36 { 38 {
37 DEFINE_STATIC_LOCAL(RenderScrollbarTheme, theme, ()); 39 DEFINE_STATIC_LOCAL(RenderScrollbarTheme, theme, ());
38 return &theme; 40 return &theme;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } 111 }
110 112
111 void RenderScrollbarTheme::paintScrollCorner(GraphicsContext* context, const Int Rect& cornerRect) 113 void RenderScrollbarTheme::paintScrollCorner(GraphicsContext* context, const Int Rect& cornerRect)
112 { 114 {
113 // FIXME: Implement. 115 // FIXME: Implement.
114 context->fillRect(cornerRect, Color::white); 116 context->fillRect(cornerRect, Color::white);
115 } 117 }
116 118
117 void RenderScrollbarTheme::paintScrollbarBackground(GraphicsContext* context, Sc rollbarThemeClient* scrollbar) 119 void RenderScrollbarTheme::paintScrollbarBackground(GraphicsContext* context, Sc rollbarThemeClient* scrollbar)
118 { 120 {
119 toRenderScrollbar(scrollbar)->paintPart(context, ScrollbarBGPart, scrollbar- >frameRect()); 121 ScrollbarPainter(*toRenderScrollbar(scrollbar)).paintPart(context, Scrollbar BGPart, scrollbar->frameRect());
120 } 122 }
121 123
122 void RenderScrollbarTheme::paintTrackBackground(GraphicsContext* context, Scroll barThemeClient* scrollbar, const IntRect& rect) 124 void RenderScrollbarTheme::paintTrackBackground(GraphicsContext* context, Scroll barThemeClient* scrollbar, const IntRect& rect)
123 { 125 {
124 toRenderScrollbar(scrollbar)->paintPart(context, TrackBGPart, rect); 126 ScrollbarPainter(*toRenderScrollbar(scrollbar)).paintPart(context, TrackBGPa rt, rect);
125 } 127 }
126 128
127 void RenderScrollbarTheme::paintTrackPiece(GraphicsContext* context, ScrollbarTh emeClient* scrollbar, const IntRect& rect, ScrollbarPart part) 129 void RenderScrollbarTheme::paintTrackPiece(GraphicsContext* context, ScrollbarTh emeClient* scrollbar, const IntRect& rect, ScrollbarPart part)
128 { 130 {
129 toRenderScrollbar(scrollbar)->paintPart(context, part, rect); 131 ScrollbarPainter(*toRenderScrollbar(scrollbar)).paintPart(context, part, rec t);
130 } 132 }
131 133
132 void RenderScrollbarTheme::paintButton(GraphicsContext* context, ScrollbarThemeC lient* scrollbar, const IntRect& rect, ScrollbarPart part) 134 void RenderScrollbarTheme::paintButton(GraphicsContext* context, ScrollbarThemeC lient* scrollbar, const IntRect& rect, ScrollbarPart part)
133 { 135 {
134 toRenderScrollbar(scrollbar)->paintPart(context, part, rect); 136 ScrollbarPainter(*toRenderScrollbar(scrollbar)).paintPart(context, part, rec t);
135 } 137 }
136 138
137 void RenderScrollbarTheme::paintThumb(GraphicsContext* context, ScrollbarThemeCl ient* scrollbar, const IntRect& rect) 139 void RenderScrollbarTheme::paintThumb(GraphicsContext* context, ScrollbarThemeCl ient* scrollbar, const IntRect& rect)
138 { 140 {
139 toRenderScrollbar(scrollbar)->paintPart(context, ThumbPart, rect); 141 ScrollbarPainter(*toRenderScrollbar(scrollbar)).paintPart(context, ThumbPart , rect);
140 } 142 }
141 143
142 void RenderScrollbarTheme::paintTickmarks(GraphicsContext* context, ScrollbarThe meClient* scrollbar, const IntRect& rect) 144 void RenderScrollbarTheme::paintTickmarks(GraphicsContext* context, ScrollbarThe meClient* scrollbar, const IntRect& rect)
143 { 145 {
144 ScrollbarTheme::theme()->paintTickmarks(context, scrollbar, rect); 146 ScrollbarTheme::theme()->paintTickmarks(context, scrollbar, rect);
145 } 147 }
146 148
147 } 149 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderScrollbarPart.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698