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

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

Issue 2727133002: Remove ColorBehavior argument to Image::imageForCurrentFrame (Closed)
Patch Set: Rebase Created 3 years, 9 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "modules/canvas2d/CanvasRenderingContext2D.h" 5 #include "modules/canvas2d/CanvasRenderingContext2D.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include "bindings/core/v8/V8BindingForTesting.h" 8 #include "bindings/core/v8/V8BindingForTesting.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/frame/FrameView.h" 10 #include "core/frame/FrameView.h"
(...skipping 1289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 sk_sp<SkColorSpace> srcRGBColorSpace = SkColorSpace::MakeSRGB(); 1300 sk_sp<SkColorSpace> srcRGBColorSpace = SkColorSpace::MakeSRGB();
1301 1301
1302 for (uint8_t i = static_cast<uint8_t>( 1302 for (uint8_t i = static_cast<uint8_t>(
1303 ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED); 1303 ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED);
1304 i <= static_cast<uint8_t>(ColorSpaceConversion::LAST); i++) { 1304 i <= static_cast<uint8_t>(ColorSpaceConversion::LAST); i++) {
1305 ColorSpaceConversion colorSpaceConversion = 1305 ColorSpaceConversion colorSpaceConversion =
1306 static_cast<ColorSpaceConversion>(i); 1306 static_cast<ColorSpaceConversion>(i);
1307 ImageBitmapOptions options = 1307 ImageBitmapOptions options =
1308 prepareBitmapOptionsAndSetRuntimeFlags(colorSpaceConversion); 1308 prepareBitmapOptionsAndSetRuntimeFlags(colorSpaceConversion);
1309 ImageBitmap* imageBitmap = ImageBitmap::create(canvas, cropRect, options); 1309 ImageBitmap* imageBitmap = ImageBitmap::create(canvas, cropRect, options);
1310 // ColorBehavior::ignore() is used instead of
1311 // ColorBehavior::transformToTargetForTesting() to avoid color conversion to
1312 // display color profile, as we want to solely rely on the color correction
1313 // that happens in ImageBitmap create method.
1314 SkImage* convertedImage = 1310 SkImage* convertedImage =
1315 imageBitmap->bitmapImage() 1311 imageBitmap->bitmapImage()->imageForCurrentFrame().get();
1316 ->imageForCurrentFrame(ColorBehavior::ignore())
1317 .get();
1318 1312
1319 switch (colorSpaceConversion) { 1313 switch (colorSpaceConversion) {
1320 case ColorSpaceConversion::NONE: 1314 case ColorSpaceConversion::NONE:
1321 NOTREACHED(); 1315 NOTREACHED();
1322 break; 1316 break;
1323 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED: 1317 case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
1324 colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace(); 1318 colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
1325 colorFormat = colorFormat32; 1319 colorFormat = colorFormat32;
1326 break; 1320 break;
1327 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED: 1321 case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 1356
1363 RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled( 1357 RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(
1364 experimentalCanvasFeaturesRuntimeFlag); 1358 experimentalCanvasFeaturesRuntimeFlag);
1365 RuntimeEnabledFeatures::setColorCorrectRenderingEnabled( 1359 RuntimeEnabledFeatures::setColorCorrectRenderingEnabled(
1366 colorCorrectRenderingRuntimeFlag); 1360 colorCorrectRenderingRuntimeFlag);
1367 RuntimeEnabledFeatures::setColorCorrectRenderingDefaultModeEnabled( 1361 RuntimeEnabledFeatures::setColorCorrectRenderingDefaultModeEnabled(
1368 colorCorrectRenderingDefaultModeRuntimeFlag); 1362 colorCorrectRenderingDefaultModeRuntimeFlag);
1369 } 1363 }
1370 1364
1371 } // namespace blink 1365 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698