Remove uses of implicit conversion of ScopedTypeRef in /skia
Implicit unwrapping of a scoper to its underlying pointer is dangerous and that capability is being removed. This converts uses of implicit conversion to be explicit so that implicit unwrapping can be removed. This also may perform other cleanup and modernization. Bug: 1495439 Change-Id: I5706fe0cc06a15ec745fb2ced051f138651fde18 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4980630 Commit-Queue: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Michael Ludwig <michaelludwig@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com> Auto-Submit: Avi Drissman <avi@chromium.org> Cr-Commit-Position: refs/heads/main@{#1218246}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
d3b73be635
commit
07a32eff33
@ -55,7 +55,7 @@ SkBitmap NSImageOrNSImageRepToSkBitmapWithColorSpace(
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
|
||||
NSGraphicsContext* context_cocoa =
|
||||
[NSGraphicsContext graphicsContextWithCGContext:context flipped:NO];
|
||||
[NSGraphicsContext graphicsContextWithCGContext:context.get() flipped:NO];
|
||||
[NSGraphicsContext setCurrentContext:context_cocoa];
|
||||
|
||||
NSRect drawRect = NSMakeRect(0, 0, size.width, size.height);
|
||||
@ -155,7 +155,7 @@ SkColor CGColorRefToSkColor(CGColorRef color) {
|
||||
kCGRenderingIntentDefault, color,
|
||||
nullptr));
|
||||
DCHECK(CGColorGetNumberOfComponents(color) == 4);
|
||||
const CGFloat* components = CGColorGetComponents(cg_color);
|
||||
const CGFloat* components = CGColorGetComponents(cg_color.get());
|
||||
return SkColor4f{components[0], components[1], components[2], components[3]}
|
||||
.toSkColor();
|
||||
}
|
||||
@ -234,7 +234,7 @@ NSBitmapImageRep* SkBitmapToNSBitmapImageRepWithColorSpace(
|
||||
return nil;
|
||||
|
||||
// Now convert to NSBitmapImageRep.
|
||||
return [[NSBitmapImageRep alloc] initWithCGImage:cgimage];
|
||||
return [[NSBitmapImageRep alloc] initWithCGImage:cgimage.get()];
|
||||
}
|
||||
|
||||
NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap,
|
||||
|
Reference in New Issue
Block a user