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

Unified Diff: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

Issue 2679323005: Update callsites to new SkColorSpace API, delete legacy flag (Closed)
Patch Set: Formatting Created 3 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
index cb1147440415c981ca3f0a00d8c0adff5da80aaa..fa041cb5911cff63d06650ef30ff2b5ca73536fa 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
@@ -81,10 +81,8 @@ std::unique_ptr<ImageBuffer> ImageBuffer::create(
ImageInitializationMode initializationMode,
sk_sp<SkColorSpace> colorSpace) {
SkColorType colorType = kN32_SkColorType;
- if (colorSpace &&
- SkColorSpace::Equals(
- colorSpace.get(),
- SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named).get()))
+ if (colorSpace && SkColorSpace::Equals(colorSpace.get(),
+ SkColorSpace::MakeSRGBLinear().get()))
colorType = kRGBA_F16_SkColorType;
std::unique_ptr<ImageBufferSurface> surface(WTF::wrapUnique(
@@ -409,7 +407,7 @@ bool ImageBuffer::getImageData(Multiply multiplied,
// pixels to a particular color space is not well-defined in Skia.
sk_sp<SkColorSpace> colorSpace = nullptr;
if (m_surface->colorSpace()) {
- colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+ colorSpace = SkColorSpace::MakeSRGB();
}
SkImageInfo info = SkImageInfo::Make(rect.width(), rect.height(), colorType,
@@ -494,9 +492,9 @@ void ImageBuffer::putByteArray(Multiply multiplied,
m_surface->colorType(), alphaType,
m_surface->colorSpace());
} else {
- info = SkImageInfo::Make(
- sourceRect.width(), sourceRect.height(), kRGBA_8888_SkColorType,
- alphaType, SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named));
+ info = SkImageInfo::Make(sourceRect.width(), sourceRect.height(),
+ kRGBA_8888_SkColorType, alphaType,
+ SkColorSpace::MakeSRGB());
}
m_surface->writePixels(info, srcAddr, srcBytesPerRow, destX, destY);
}

Powered by Google App Engine
This is Rietveld 408576698