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

Side by Side Diff: Source/platform/graphics/Color.cpp

Issue 134733016: Add support for converting Colors to linear RGB; Fix relevant filters (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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 /* 1 /*
2 * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "platform/graphics/Color.h" 27 #include "platform/graphics/Color.h"
28 28
29 #include "platform/graphics/ColorSpace.h"
29 #include "wtf/Assertions.h" 30 #include "wtf/Assertions.h"
30 #include "wtf/DecimalNumber.h" 31 #include "wtf/DecimalNumber.h"
31 #include "wtf/HexNumber.h" 32 #include "wtf/HexNumber.h"
32 #include "wtf/MathExtras.h" 33 #include "wtf/MathExtras.h"
33 #include "wtf/text/StringBuilder.h" 34 #include "wtf/text/StringBuilder.h"
34 35
35 using namespace std; 36 using namespace std;
36 37
37 namespace WebCore { 38 namespace WebCore {
38 39
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 static_cast<int>(multiplier * g * scaleFactor), 326 static_cast<int>(multiplier * g * scaleFactor),
326 static_cast<int>(multiplier * b * scaleFactor), 327 static_cast<int>(multiplier * b * scaleFactor),
327 alpha()); 328 alpha());
328 } 329 }
329 330
330 Color Color::combineWithAlpha(float otherAlpha) const 331 Color Color::combineWithAlpha(float otherAlpha) const
331 { 332 {
332 return colorWithOverrideAlpha(rgb(), (alpha() / 255.f) * otherAlpha); 333 return colorWithOverrideAlpha(rgb(), (alpha() / 255.f) * otherAlpha);
333 } 334 }
334 335
336 Color Color::convertToLinear() const
337 {
338 const Vector<uint8_t>& lookUpTable = getLinearRgbLUT();
339 return Color(lookUpTable[red()], lookUpTable[green()], lookUpTable[blue()], alpha());
340 }
341
335 static int blendComponent(int c, int a) 342 static int blendComponent(int c, int a)
336 { 343 {
337 // We use white. 344 // We use white.
338 float alpha = a / 255.0f; 345 float alpha = a / 255.0f;
339 int whiteBlend = 255 - a; 346 int whiteBlend = 255 - a;
340 c -= whiteBlend; 347 c -= whiteBlend;
341 return static_cast<int>(c / alpha); 348 return static_cast<int>(c / alpha);
342 } 349 }
343 350
344 const int cStartAlpha = 153; // 60% 351 const int cStartAlpha = 153; // 60%
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 (color.green() * alpha + 254) / 255, 465 (color.green() * alpha + 254) / 255,
459 (color.blue() * alpha + 254) / 255, 466 (color.blue() * alpha + 254) / 255,
460 alpha).rgb(); 467 alpha).rgb();
461 } else 468 } else
462 pixelColor = color.rgb(); 469 pixelColor = color.rgb();
463 470
464 return pixelColor; 471 return pixelColor;
465 } 472 }
466 473
467 } // namespace WebCore 474 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698