| Index: third_party/WebKit/Source/platform/graphics/Color.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/Color.cpp b/third_party/WebKit/Source/platform/graphics/Color.cpp
|
| index 02a5238168247e9e756ff11a1a517cab006e85b2..14f8de3133716bb6cf00d3d96ed0b6d7105bc270 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/Color.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/Color.cpp
|
| @@ -37,7 +37,8 @@ namespace blink {
|
|
|
| // VS 2015 and above allow these definitions and in this case require them
|
| #if !COMPILER(MSVC) || _MSC_VER >= 1900
|
| -// FIXME: Use C++11 strong enums to avoid static data member with initializer definition problems.
|
| +// FIXME: Use C++11 enum classes to avoid static data member initializer
|
| +// definition problems.
|
| const RGBA32 Color::black;
|
| const RGBA32 Color::white;
|
| const RGBA32 Color::darkGray;
|
| @@ -362,8 +363,9 @@ Color Color::blendWithWhite() const {
|
|
|
| Color newColor;
|
| for (int alpha = cStartAlpha; alpha <= cEndAlpha; alpha += cAlphaIncrement) {
|
| - // We have a solid color. Convert to an equivalent color that looks the same when blended with white
|
| - // at the current alpha. Try using less transparency if the numbers end up being negative.
|
| + // We have a solid color. Convert to an equivalent color that looks the
|
| + // same when blended with white at the current alpha. Try using less
|
| + // transparency if the numbers end up being negative.
|
| int r = blendComponent(red(), alpha);
|
| int g = blendComponent(green(), alpha);
|
| int b = blendComponent(blue(), alpha);
|
|
|