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

Side by Side Diff: skia/ext/skia_utils_mac.mm

Issue 9203001: Implement input type=color UI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed issues Created 8 years, 10 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
« skia/ext/skia_utils_mac.h ('K') | « skia/ext/skia_utils_mac.h ('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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "skia/ext/skia_utils_mac.h" 5 #include "skia/ext/skia_utils_mac.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 } 179 }
180 180
181 // Converts ARGB to CGColorRef. 181 // Converts ARGB to CGColorRef.
182 CGColorRef SkColorToCGColorRef(SkColor color) { 182 CGColorRef SkColorToCGColorRef(SkColor color) {
183 return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0, 183 return CGColorCreateGenericRGB(SkColorGetR(color) / 255.0,
184 SkColorGetG(color) / 255.0, 184 SkColorGetG(color) / 255.0,
185 SkColorGetB(color) / 255.0, 185 SkColorGetB(color) / 255.0,
186 SkColorGetA(color) / 255.0); 186 SkColorGetA(color) / 255.0);
187 } 187 }
188 188
189 // Converts NSColor to ARGB
190 SkColor NSColorToSkColor(NSColor* color) {
191 CGFloat red, green, blue, alpha;
Nico 2012/02/21 19:40:17 DCHECK([color colorSpace] == NSCalibratedRGBColorS
keishi 2012/02/24 14:38:54 Done.
192 [color getRed:&red green:&green blue:&blue alpha:&alpha];
Nico 2012/02/21 19:40:17 Are you sure you don't want to call this NSDeviceC
keishi 2012/02/24 14:38:54 OK. Done. On 2012/02/21 19:40:17, Nico wrote:
193 return SkColorSetARGB(SkScalarRound(255.0 * alpha),
194 SkScalarRound(255.0 * red),
195 SkScalarRound(255.0 * green),
196 SkScalarRound(255.0 * blue));
197 }
198
189 // Converts ARGB to NSColor. 199 // Converts ARGB to NSColor.
190 NSColor* SkColorToCalibratedNSColor(SkColor color) { 200 NSColor* SkColorToCalibratedNSColor(SkColor color) {
191 return [NSColor colorWithCalibratedRed:SkColorGetR(color) / 255.0 201 return [NSColor colorWithCalibratedRed:SkColorGetR(color) / 255.0
192 green:SkColorGetG(color) / 255.0 202 green:SkColorGetG(color) / 255.0
193 blue:SkColorGetB(color) / 255.0 203 blue:SkColorGetB(color) / 255.0
194 alpha:SkColorGetA(color) / 255.0]; 204 alpha:SkColorGetA(color) / 255.0];
195 } 205 }
196 206
207 NSColor* SkColorToDeviceNSColor(SkColor color) {
208 return [NSColor colorWithDeviceRed:SkColorGetR(color) / 255.0
209 green:SkColorGetG(color) / 255.0
210 blue:SkColorGetB(color) / 255.0
211 alpha:SkColorGetA(color) / 255.0];
212 }
213
197 SkBitmap CGImageToSkBitmap(CGImageRef image) { 214 SkBitmap CGImageToSkBitmap(CGImageRef image) {
198 if (!image) 215 if (!image)
199 return SkBitmap(); 216 return SkBitmap();
200 217
201 int width = CGImageGetWidth(image); 218 int width = CGImageGetWidth(image);
202 int height = CGImageGetHeight(image); 219 int height = CGImageGetHeight(image);
203 220
204 scoped_ptr<SkDevice> device( 221 scoped_ptr<SkDevice> device(
205 skia::BitmapPlatformDevice::Create(NULL, width, height, false)); 222 skia::BitmapPlatformDevice::Create(NULL, width, height, false));
206 223
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 // Apply content matrix. 373 // Apply content matrix.
357 SkMatrix skMatrix = canvas_->getTotalMatrix(); 374 SkMatrix skMatrix = canvas_->getTotalMatrix();
358 skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY)); 375 skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
359 CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix); 376 CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
360 CGContextConcatCTM(cgContext_, affine); 377 CGContextConcatCTM(cgContext_, affine);
361 378
362 return cgContext_; 379 return cgContext_;
363 } 380 }
364 381
365 } // namespace gfx 382 } // namespace gfx
OLDNEW
« skia/ext/skia_utils_mac.h ('K') | « skia/ext/skia_utils_mac.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698