| 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 195e7f60fab0292d6fc229eddfd8c4c27ff719bb..3bce2cc162277667e6bcfcad4fc817a5fa797488 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/Color.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/Color.cpp
|
| @@ -35,7 +35,8 @@
|
|
|
| namespace blink {
|
|
|
| -#if !COMPILER(MSVC)
|
| +// 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.
|
| const RGBA32 Color::black;
|
| const RGBA32 Color::white;
|
|
|