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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp

Issue 2660393002: Use gfx::ColorSpace instead of SkColorSpace in Blink (Closed)
Patch Set: Rebase (again) 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/frame/ImageBitmap.cpp ('k') | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 SkImage* convertedImage = 294 SkImage* convertedImage =
295 imageBitmap->bitmapImage() 295 imageBitmap->bitmapImage()
296 ->imageForCurrentFrame(ColorBehavior::ignore()) 296 ->imageForCurrentFrame(ColorBehavior::ignore())
297 .get(); 297 .get();
298 298
299 switch (colorSpaceConversion) { 299 switch (colorSpaceConversion) {
300 case ColorSpaceConversion::NONE: 300 case ColorSpaceConversion::NONE:
301 NOTREACHED(); 301 NOTREACHED();
302 break; 302 break;
303 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED: 303 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
304 colorSpace = ColorBehavior::globalTargetColorSpace(); 304 colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
305 colorFormat = colorFormat32; 305 colorFormat = colorFormat32;
306 break; 306 break;
307 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED: 307 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
308 case ColorSpaceConversion::SRGB: 308 case ColorSpaceConversion::SRGB:
309 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); 309 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
310 colorFormat = colorFormat32; 310 colorFormat = colorFormat32;
311 break; 311 break;
312 case ColorSpaceConversion::LINEAR_RGB: 312 case ColorSpaceConversion::LINEAR_RGB:
313 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); 313 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
314 colorType = SkColorType::kRGBA_F16_SkColorType; 314 colorType = SkColorType::kRGBA_F16_SkColorType;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 SkImage* convertedImage = 394 SkImage* convertedImage =
395 imageBitmap->bitmapImage() 395 imageBitmap->bitmapImage()
396 ->imageForCurrentFrame(ColorBehavior::ignore()) 396 ->imageForCurrentFrame(ColorBehavior::ignore())
397 .get(); 397 .get();
398 398
399 switch (colorSpaceConversion) { 399 switch (colorSpaceConversion) {
400 case ColorSpaceConversion::NONE: 400 case ColorSpaceConversion::NONE:
401 NOTREACHED(); 401 NOTREACHED();
402 break; 402 break;
403 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED: 403 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
404 colorSpace = ColorBehavior::globalTargetColorSpace(); 404 colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
405 colorFormat = colorFormat32; 405 colorFormat = colorFormat32;
406 break; 406 break;
407 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED: 407 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
408 case ColorSpaceConversion::SRGB: 408 case ColorSpaceConversion::SRGB:
409 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); 409 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
410 colorFormat = colorFormat32; 410 colorFormat = colorFormat32;
411 break; 411 break;
412 case ColorSpaceConversion::LINEAR_RGB: 412 case ColorSpaceConversion::LINEAR_RGB:
413 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); 413 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
414 colorType = SkColorType::kRGBA_F16_SkColorType; 414 colorType = SkColorType::kRGBA_F16_SkColorType;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 SkImage* convertedImage = 485 SkImage* convertedImage =
486 imageBitmap->bitmapImage() 486 imageBitmap->bitmapImage()
487 ->imageForCurrentFrame(ColorBehavior::ignore()) 487 ->imageForCurrentFrame(ColorBehavior::ignore())
488 .get(); 488 .get();
489 489
490 switch (colorSpaceConversion) { 490 switch (colorSpaceConversion) {
491 case ColorSpaceConversion::NONE: 491 case ColorSpaceConversion::NONE:
492 NOTREACHED(); 492 NOTREACHED();
493 break; 493 break;
494 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED: 494 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
495 colorSpace = ColorBehavior::globalTargetColorSpace(); 495 colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
496 colorFormat = colorFormat32; 496 colorFormat = colorFormat32;
497 break; 497 break;
498 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED: 498 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
499 case ColorSpaceConversion::SRGB: 499 case ColorSpaceConversion::SRGB:
500 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named); 500 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
501 colorFormat = colorFormat32; 501 colorFormat = colorFormat32;
502 break; 502 break;
503 case ColorSpaceConversion::LINEAR_RGB: 503 case ColorSpaceConversion::LINEAR_RGB:
504 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named); 504 colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
505 colorType = SkColorType::kRGBA_F16_SkColorType; 505 colorType = SkColorType::kRGBA_F16_SkColorType;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 colorSpaceXform->apply(colorFormat, transformedPixel.get(), colorFormat32, 603 colorSpaceXform->apply(colorFormat, transformedPixel.get(), colorFormat32,
604 srcPixel.get(), 1, 604 srcPixel.get(), 1,
605 SkAlphaType::kUnpremul_SkAlphaType); 605 SkAlphaType::kUnpremul_SkAlphaType);
606 int compare = std::memcmp(convertedPixel.get(), transformedPixel.get(), 606 int compare = std::memcmp(convertedPixel.get(), transformedPixel.get(),
607 imageInfo.bytesPerPixel()); 607 imageInfo.bytesPerPixel());
608 ASSERT_EQ(compare, 0); 608 ASSERT_EQ(compare, 0);
609 } 609 }
610 } 610 }
611 611
612 } // namespace blink 612 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/ImageBitmap.cpp ('k') | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698