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

Side by Side Diff: sky/engine/platform/graphics/Color.cpp

Issue 719063002: Revert "Remove support for MSVC" (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
(...skipping 17 matching lines...) Expand all
28 28
29 #include "platform/Decimal.h" 29 #include "platform/Decimal.h"
30 #include "wtf/Assertions.h" 30 #include "wtf/Assertions.h"
31 #include "wtf/HexNumber.h" 31 #include "wtf/HexNumber.h"
32 #include "wtf/MathExtras.h" 32 #include "wtf/MathExtras.h"
33 #include "wtf/dtoa.h" 33 #include "wtf/dtoa.h"
34 #include "wtf/text/StringBuilder.h" 34 #include "wtf/text/StringBuilder.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 #if !COMPILER(MSVC)
38 // FIXME: Use C++11 strong enums to avoid static data member with initializer de finition problems. 39 // FIXME: Use C++11 strong enums to avoid static data member with initializer de finition problems.
39 const RGBA32 Color::black; 40 const RGBA32 Color::black;
40 const RGBA32 Color::white; 41 const RGBA32 Color::white;
41 const RGBA32 Color::darkGray; 42 const RGBA32 Color::darkGray;
42 const RGBA32 Color::gray; 43 const RGBA32 Color::gray;
43 const RGBA32 Color::lightGray; 44 const RGBA32 Color::lightGray;
44 const RGBA32 Color::transparent; 45 const RGBA32 Color::transparent;
46 #endif
45 47
46 static const RGBA32 lightenedBlack = 0xFF545454; 48 static const RGBA32 lightenedBlack = 0xFF545454;
47 static const RGBA32 darkenedWhite = 0xFFABABAB; 49 static const RGBA32 darkenedWhite = 0xFFABABAB;
48 50
49 RGBA32 makeRGB(int r, int g, int b) 51 RGBA32 makeRGB(int r, int g, int b)
50 { 52 {
51 return 0xFF000000 | std::max(0, std::min(r, 255)) << 16 | std::max(0, std::m in(g, 255)) << 8 | std::max(0, std::min(b, 255)); 53 return 0xFF000000 | std::max(0, std::min(r, 255)) << 16 | std::max(0, std::m in(g, 255)) << 8 | std::max(0, std::min(b, 255));
52 } 54 }
53 55
54 RGBA32 makeRGBA(int r, int g, int b, int a) 56 RGBA32 makeRGBA(int r, int g, int b, int a)
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 (color.green() * alpha + 254) / 255, 454 (color.green() * alpha + 254) / 255,
453 (color.blue() * alpha + 254) / 255, 455 (color.blue() * alpha + 254) / 255,
454 alpha).rgb(); 456 alpha).rgb();
455 } else 457 } else
456 pixelColor = color.rgb(); 458 pixelColor = color.rgb();
457 459
458 return pixelColor; 460 return pixelColor;
459 } 461 }
460 462
461 } // namespace blink 463 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698