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

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

Issue 488353003: Specify clip rects when drawing Mac native widgets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Incorporate review feedbac Created 6 years, 4 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) 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 bufferRect.move(-scrollbar->frameRect().x(), -scrollbar->frameRect().y() ); 128 bufferRect.move(-scrollbar->frameRect().x(), -scrollbar->frameRect().y() );
129 129
130 imageBuffer = ImageBuffer::create(bufferRect.size()); 130 imageBuffer = ImageBuffer::create(bufferRect.size());
131 if (!imageBuffer) 131 if (!imageBuffer)
132 return true; 132 return true;
133 133
134 drawingContext = imageBuffer->context(); 134 drawingContext = imageBuffer->context();
135 } 135 }
136 136
137 // Draw thumbless. 137 // Draw thumbless.
138 gfx::SkiaBitLocker bitLocker(drawingContext->canvas()); 138 gfx::SkiaBitLocker bitLocker(drawingContext->canvas(), scrollbar->frameRect( ));
139 CGContextRef cgContext = bitLocker.cgContext(); 139 CGContextRef cgContext = bitLocker.cgContext();
140 HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal); 140 HIThemeDrawTrack(&trackInfo, 0, cgContext, kHIThemeOrientationNormal);
141 141
142 IntRect tickmarkTrackRect = trackRect(scrollbar, false); 142 IntRect tickmarkTrackRect = trackRect(scrollbar, false);
143 if (!canDrawDirectly) { 143 if (!canDrawDirectly) {
144 tickmarkTrackRect.setX(0); 144 tickmarkTrackRect.setX(0);
145 tickmarkTrackRect.setY(0); 145 tickmarkTrackRect.setY(0);
146 } 146 }
147 // The ends are rounded and the thumb doesn't go there. 147 // The ends are rounded and the thumb doesn't go there.
148 tickmarkTrackRect.inflateY(-tickmarkTrackRect.width()); 148 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); 332 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); 333 return IntRect(scrollbar->x(), scrollbar->y() + startWidth, thickness, scrol lbar->height() - totalWidth);
334 } 334 }
335 335
336 int ScrollbarThemeMacNonOverlayAPI::minimumThumbLength(ScrollbarThemeClient* scr ollbar) 336 int ScrollbarThemeMacNonOverlayAPI::minimumThumbLength(ScrollbarThemeClient* scr ollbar)
337 { 337 {
338 return cThumbMinLength[scrollbar->controlSize()]; 338 return cThumbMinLength[scrollbar->controlSize()];
339 } 339 }
340 340
341 } 341 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698