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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/filters/SpotLightSource.h

Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...)) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More rebase Created 5 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) 2008 Alex Mathews <possessedpenguinbob@gmail.com> 2 * Copyright (C) 2008 Alex Mathews <possessedpenguinbob@gmail.com>
3 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 4 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
5 * Copyright (C) 2005 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #ifndef SpotLightSource_h 23 #ifndef SpotLightSource_h
24 #define SpotLightSource_h 24 #define SpotLightSource_h
25 25
26 #include "platform/graphics/filters/LightSource.h" 26 #include "platform/graphics/filters/LightSource.h"
27 #include <algorithm> 27 #include "wtf/MathExtras.h"
28 28
29 namespace blink { 29 namespace blink {
30 30
31 class PLATFORM_EXPORT SpotLightSource final : public LightSource { 31 class PLATFORM_EXPORT SpotLightSource final : public LightSource {
32 public: 32 public:
33 static PassRefPtr<SpotLightSource> create(const FloatPoint3D& position, 33 static PassRefPtr<SpotLightSource> create(const FloatPoint3D& position,
34 const FloatPoint3D& direction, float specularExponent, float limitingCon eAngle) 34 const FloatPoint3D& direction, float specularExponent, float limitingCon eAngle)
35 { 35 {
36 return adoptRef(new SpotLightSource(position, direction, specularExponen t, limitingConeAngle)); 36 return adoptRef(new SpotLightSource(position, direction, specularExponen t, limitingConeAngle));
37 } 37 }
(...skipping 10 matching lines...) Expand all
48 bool setLimitingConeAngle(float) override; 48 bool setLimitingConeAngle(float) override;
49 49
50 TextStream& externalRepresentation(TextStream&) const override; 50 TextStream& externalRepresentation(TextStream&) const override;
51 51
52 private: 52 private:
53 SpotLightSource(const FloatPoint3D& position, const FloatPoint3D& direction, 53 SpotLightSource(const FloatPoint3D& position, const FloatPoint3D& direction,
54 float specularExponent, float limitingConeAngle) 54 float specularExponent, float limitingConeAngle)
55 : LightSource(LS_SPOT) 55 : LightSource(LS_SPOT)
56 , m_position(position) 56 , m_position(position)
57 , m_direction(direction) 57 , m_direction(direction)
58 , m_specularExponent(std::min(std::max(specularExponent, 1.0f), 128.0f)) 58 , m_specularExponent(clampTo(specularExponent, 1.0f, 128.0f))
59 , m_limitingConeAngle(limitingConeAngle) 59 , m_limitingConeAngle(limitingConeAngle)
60 { 60 {
61 } 61 }
62 62
63 FloatPoint3D m_position; 63 FloatPoint3D m_position;
64 FloatPoint3D m_direction; 64 FloatPoint3D m_direction;
65 65
66 float m_specularExponent; 66 float m_specularExponent;
67 float m_limitingConeAngle; 67 float m_limitingConeAngle;
68 }; 68 };
69 69
70 } // namespace blink 70 } // namespace blink
71 71
72 #endif // SpotLightSource_h 72 #endif // SpotLightSource_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698