Changeset 261910 in webkit


Ignore:
Timestamp:
May 20, 2020 4:17:06 AM (4 years ago)
Author:
weinig@apple.com
Message:

Remove unused Color::getHSV function
https://bugs.webkit.org/show_bug.cgi?id=212119

Reviewed by Simon Fraser.

Source/WebCore:

  • platform/graphics/Color.cpp:

(WebCore::Color::getHSV const): Deleted.

  • platform/graphics/Color.h:

Remove Color::getHSV(). It was unused outside of the API test for it.

Tools:

  • TestWebKitAPI/Tests/WebCore/ColorTests.cpp:

Remove tests for Color::getHSV().

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r261908 r261910  
     12020-05-20  Sam Weinig  <weinig@apple.com>
     2
     3        Remove unused Color::getHSV function
     4        https://bugs.webkit.org/show_bug.cgi?id=212119
     5
     6        Reviewed by Simon Fraser.
     7
     8        * platform/graphics/Color.cpp:
     9        (WebCore::Color::getHSV const): Deleted.
     10        * platform/graphics/Color.h:
     11        Remove Color::getHSV(). It was unused outside of the API test for it.   
     12
    1132020-05-20  Youenn Fablet  <youenn@apple.com>
    214
  • trunk/Source/WebCore/platform/graphics/Color.cpp

    r261901 r261910  
    505505}
    506506
    507 void Color::getHSV(double& hue, double& saturation, double& value) const
    508 {
    509     double r = static_cast<double>(red()) / 255.0;
    510     double g = static_cast<double>(green()) / 255.0;
    511     double b = static_cast<double>(blue()) / 255.0;
    512     double max = std::max(std::max(r, g), b);
    513     double min = std::min(std::min(r, g), b);
    514     double chroma = max - min;
    515 
    516     if (!chroma)
    517         hue = 0.0;
    518     else if (max == r)
    519         hue = (60.0 * ((g - b) / chroma)) + 360.0;
    520     else if (max == g)
    521         hue = (60.0 * ((b - r) / chroma)) + 120.0;
    522     else
    523         hue = (60.0 * ((r - g) / chroma)) + 240.0;
    524 
    525     if (hue >= 360.0)
    526         hue -= 360.0;
    527 
    528     hue /= 360.0;
    529 
    530     if (!max)
    531         saturation = 0;
    532     else
    533         saturation = chroma / max;
    534 
    535     value = max;
    536 }
    537 
    538507std::pair<ColorSpace, FloatComponents> Color::colorSpaceAndComponents() const
    539508{
  • trunk/Source/WebCore/platform/graphics/Color.h

    r261901 r261910  
    212212
    213213    WEBCORE_EXPORT void getHSL(double& h, double& s, double& l) const;
    214     WEBCORE_EXPORT void getHSV(double& h, double& s, double& v) const;
    215214
    216215    WEBCORE_EXPORT std::pair<ColorSpace, FloatComponents> colorSpaceAndComponents() const;
  • trunk/Tools/ChangeLog

    r261909 r261910  
     12020-05-20  Sam Weinig  <weinig@apple.com>
     2
     3        Remove unused Color::getHSV function
     4        https://bugs.webkit.org/show_bug.cgi?id=212119
     5
     6        Reviewed by Simon Fraser.
     7
     8        * TestWebKitAPI/Tests/WebCore/ColorTests.cpp:
     9        Remove tests for Color::getHSV().
     10
    1112020-05-20  Philippe Normand  <pnormand@igalia.com>
    212
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/ColorTests.cpp

    r261790 r261910  
    3232
    3333namespace TestWebKitAPI {
    34 
    35 TEST(Color, RGBToHSV_White)
    36 {
    37     Color color = Color::white;
    38    
    39     double h = 0;
    40     double s = 0;
    41     double v = 0;
    42     color.getHSV(h, s, v);
    43 
    44     EXPECT_DOUBLE_EQ(0, h);
    45     EXPECT_DOUBLE_EQ(0, s);
    46     EXPECT_DOUBLE_EQ(1, v);
    47 }
    48 
    49 TEST(Color, RGBToHSV_Black)
    50 {
    51     Color color = Color::black;
    52    
    53     double h = 0;
    54     double s = 0;
    55     double v = 0;
    56     color.getHSV(h, s, v);
    57 
    58     EXPECT_DOUBLE_EQ(0, h);
    59     EXPECT_DOUBLE_EQ(0, s);
    60     EXPECT_DOUBLE_EQ(0, v);
    61 }
    62 
    63 TEST(Color, RGBToHSV_Red)
    64 {
    65     Color color(255, 0, 0);
    66    
    67     double h = 0;
    68     double s = 0;
    69     double v = 0;
    70     color.getHSV(h, s, v);
    71 
    72     EXPECT_DOUBLE_EQ(0, h);
    73     EXPECT_DOUBLE_EQ(1, s);
    74     EXPECT_DOUBLE_EQ(1, v);
    75 }
    76 
    77 TEST(Color, RGBToHSV_Green)
    78 {
    79     Color color(0, 255, 0);
    80    
    81     double h = 0;
    82     double s = 0;
    83     double v = 0;
    84     color.getHSV(h, s, v);
    85 
    86     EXPECT_DOUBLE_EQ(0.33333333333333331, h);
    87     EXPECT_DOUBLE_EQ(1, s);
    88     EXPECT_DOUBLE_EQ(1, v);
    89 }
    90 
    91 TEST(Color, RGBToHSV_Blue)
    92 {
    93     Color color(0, 0, 255);
    94    
    95     double h = 0;
    96     double s = 0;
    97     double v = 0;
    98     color.getHSV(h, s, v);
    99 
    100     EXPECT_DOUBLE_EQ(0.66666666666666663, h);
    101     EXPECT_DOUBLE_EQ(1, s);
    102     EXPECT_DOUBLE_EQ(1, v);
    103 }
    104 
    105 TEST(Color, RGBToHSV_DarkGray)
    106 {
    107     Color color = Color::darkGray;
    108    
    109     double h = 0;
    110     double s = 0;
    111     double v = 0;
    112     color.getHSV(h, s, v);
    113 
    114     EXPECT_DOUBLE_EQ(0, h);
    115     EXPECT_DOUBLE_EQ(0, s);
    116     EXPECT_DOUBLE_EQ(0.50196078431372548, v);
    117 }
    118 
    119 TEST(Color, RGBToHSV_Gray)
    120 {
    121     Color color = Color::gray;
    122    
    123     double h = 0;
    124     double s = 0;
    125     double v = 0;
    126     color.getHSV(h, s, v);
    127 
    128     EXPECT_DOUBLE_EQ(0, h);
    129     EXPECT_DOUBLE_EQ(0, s);
    130     EXPECT_DOUBLE_EQ(0.62745098039215685, v);
    131 }
    132 
    133 TEST(Color, RGBToHSV_LightGray)
    134 {
    135     Color color = Color::lightGray;
    136    
    137     double h = 0;
    138     double s = 0;
    139     double v = 0;
    140     color.getHSV(h, s, v);
    141 
    142     EXPECT_DOUBLE_EQ(0, h);
    143     EXPECT_DOUBLE_EQ(0, s);
    144     EXPECT_DOUBLE_EQ(0.75294117647058822, v);
    145 }
    14634
    14735TEST(Color, RGBToHSL_White)
Note: See TracChangeset for help on using the changeset viewer.