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

Side by Side Diff: Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.mm

Issue 528413002: Revert 181330 "Revert 180822 "Specify clip rects when drawing Ma..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2145/
Patch Set: Created 6 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
« no previous file with comments | « Source/platform/mac/ThemeMac.mm ('k') | Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm » ('j') | 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "platform/scroll/ScrollbarThemeMacNonOverlayAPI.h" 32 #include "platform/scroll/ScrollbarThemeMacNonOverlayAPI.h"
33 33
34 #include "platform/graphics/GraphicsContext.h" 34 #include "platform/graphics/GraphicsContext.h"
35 #include "platform/graphics/ImageBuffer.h" 35 #include "platform/graphics/ImageBuffer.h"
36 #include "platform/mac/ThemeMac.h"
36 #include "platform/scroll/ScrollbarThemeClient.h" 37 #include "platform/scroll/ScrollbarThemeClient.h"
37 #include "public/platform/Platform.h" 38 #include "public/platform/Platform.h"
38 #include "public/platform/WebRect.h" 39 #include "public/platform/WebRect.h"
39 #include "public/platform/WebThemeEngine.h" 40 #include "public/platform/WebThemeEngine.h"
40 #include "skia/ext/skia_utils_mac.h" 41 #include "skia/ext/skia_utils_mac.h"
41 #include <Carbon/Carbon.h> 42 #include <Carbon/Carbon.h>
42 43
43 namespace blink { 44 namespace blink {
44 45
45 // FIXME: Get these numbers from CoreUI. 46 // FIXME: Get these numbers from CoreUI.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 bufferRect.move(-scrollbar->frameRect().x(), -scrollbar->frameRect().y() ); 129 bufferRect.move(-scrollbar->frameRect().x(), -scrollbar->frameRect().y() );
129 130
130 imageBuffer = ImageBuffer::create(bufferRect.size()); 131 imageBuffer = ImageBuffer::create(bufferRect.size());
131 if (!imageBuffer) 132 if (!imageBuffer)
132 return true; 133 return true;
133 134
134 drawingContext = imageBuffer->context(); 135 drawingContext = imageBuffer->context();
135 } 136 }
136 137
137 // Draw thumbless. 138 // Draw thumbless.
138 gfx::SkiaBitLocker bitLocker(drawingContext->canvas()); 139 gfx::SkiaBitLocker bitLocker(drawingContext->canvas(), ThemeMac::inflateRect ForAA(scrollbar->frameRect()));
139 CGContextRef cgContext = bitLocker.cgContext(); 140 CGContextRef cgContext = bitLocker.cgContext();
140 HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal); 141 HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
141 142
142 IntRect tickmarkTrackRect = trackRect(scrollbar, false); 143 IntRect tickmarkTrackRect = trackRect(scrollbar, false);
143 if (!canDrawDirectly) { 144 if (!canDrawDirectly) {
144 tickmarkTrackRect.setX(0); 145 tickmarkTrackRect.setX(0);
145 tickmarkTrackRect.setY(0); 146 tickmarkTrackRect.setY(0);
146 } 147 }
147 // The ends are rounded and the thumb doesn't go there. 148 // The ends are rounded and the thumb doesn't go there.
148 tickmarkTrackRect.inflateY(-tickmarkTrackRect.width()); 149 tickmarkTrackRect.inflateY(-tickmarkTrackRect.width());
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 return IntRect(scrollbar->x() + startWidth, scrollbar->y(), scrollbar->w idth() - totalWidth, thickness); 333 return IntRect(scrollbar->x() + startWidth, scrollbar->y(), scrollbar->w idth() - totalWidth, thickness);
333 return IntRect(scrollbar->x(), scrollbar->y() + startWidth, thickness, scrol lbar->height() - totalWidth); 334 return IntRect(scrollbar->x(), scrollbar->y() + startWidth, thickness, scrol lbar->height() - totalWidth);
334 } 335 }
335 336
336 int ScrollbarThemeMacNonOverlayAPI::minimumThumbLength(ScrollbarThemeClient* scr ollbar) 337 int ScrollbarThemeMacNonOverlayAPI::minimumThumbLength(ScrollbarThemeClient* scr ollbar)
337 { 338 {
338 return cThumbMinLength[scrollbar->controlSize()]; 339 return cThumbMinLength[scrollbar->controlSize()];
339 } 340 }
340 341
341 } 342 }
OLDNEW
« no previous file with comments | « Source/platform/mac/ThemeMac.mm ('k') | Source/platform/scroll/ScrollbarThemeMacOverlayAPI.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698