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

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

Issue 2712083002: color: Remove blink pre-conversion code (Closed)
Patch Set: Rebase 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/Image.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Image.cpp b/third_party/WebKit/Source/platform/graphics/Image.cpp
index f9fc11f1a568b709d557e954a0940b7cd0e5ce73..01d4a4a2b92d6f0870df60beec258f59cd89e6af 100644
--- a/third_party/WebKit/Source/platform/graphics/Image.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Image.cpp
@@ -264,7 +264,8 @@ void Image::drawPattern(GraphicsContext& context,
const FloatSize& repeatSpacing) {
TRACE_EVENT0("skia", "Image::drawPattern");
- sk_sp<SkImage> image = imageForCurrentFrame(context.getColorBehavior());
+ sk_sp<SkImage> image =
+ imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
if (!image)
return;
@@ -332,12 +333,11 @@ PassRefPtr<Image> Image::imageForDefaultFrame() {
return image.release();
}
-bool Image::applyShader(PaintFlags& flags,
- const SkMatrix& localMatrix,
- const ColorBehavior& colorBehavior) {
+bool Image::applyShader(PaintFlags& flags, const SkMatrix& localMatrix) {
// Default shader impl: attempt to build a shader based on the current frame
// SkImage.
- sk_sp<SkImage> image = imageForCurrentFrame(colorBehavior);
+ sk_sp<SkImage> image =
+ imageForCurrentFrame(ColorBehavior::transformToGlobalTarget());
if (!image)
return false;

Powered by Google App Engine
This is Rietveld 408576698