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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebImage.cpp

Issue 2559013002: Add ColorBehavior to blink::Image draw methods (Closed)
Patch Set: Rebase Created 4 years 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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 126
127 WebSize WebImage::size() const { 127 WebSize WebImage::size() const {
128 return WebSize(m_bitmap.width(), m_bitmap.height()); 128 return WebSize(m_bitmap.width(), m_bitmap.height());
129 } 129 }
130 130
131 WebImage::WebImage(PassRefPtr<Image> image) { 131 WebImage::WebImage(PassRefPtr<Image> image) {
132 if (!image) 132 if (!image)
133 return; 133 return;
134 134
135 if (sk_sp<SkImage> skImage = image->imageForCurrentFrame()) 135 // TODO(ccameron): WebImage needs to be consistent about color spaces.
136 // https://crbug.com/672315
137 if (sk_sp<SkImage> skImage =
138 image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget()))
136 skImage->asLegacyBitmap(&m_bitmap, SkImage::kRO_LegacyBitmapMode); 139 skImage->asLegacyBitmap(&m_bitmap, SkImage::kRO_LegacyBitmapMode);
137 } 140 }
138 141
139 } // namespace blink 142 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698