Show
Ignore:
Timestamp:
08/15/08 13:25:16 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35774

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/BAL/WKAL/Concretizations/Graphics/WK/BCColorWK.h

    r248 r437  
    5757RGBA32 makeRGB(int r, int g, int b); 
    5858RGBA32 makeRGBA(int r, int g, int b, int a); 
     59 
     60RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha); 
     61RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a); 
    5962RGBA32 makeRGBAFromHSLA(double h, double s, double l, double a); 
    6063 
     
    6770    Color(int r, int g, int b) : m_color(makeRGB(r, g, b)), m_valid(true) { } 
    6871    Color(int r, int g, int b, int a) : m_color(makeRGBA(r, g, b, a)), m_valid(true) { } 
     72    // Color is currently limited to 32bit RGBA, perhaps some day we'll support better colors 
     73    Color(float r, float g, float b, float a) : m_color(makeRGBA32FromFloats(r, g, b, a)), m_valid(true) { } 
    6974    explicit Color(const String&); 
    7075    explicit Color(const char*);