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/SDL/BCColorSDL.h

    r243 r437  
    3939RGBA32 makeRGB(int r, int g, int b); 
    4040RGBA32 makeRGBA(int r, int g, int b, int a); 
     41 
     42RGBA32 colorWithOverrideAlpha(RGBA32 color, float overrideAlpha); 
     43RGBA32 makeRGBA32FromFloats(float r, float g, float b, float a); 
    4144RGBA32 makeRGBAFromHSLA(double h, double s, double l, double a); 
    4245 
     
    4952    Color(int r, int g, int b) : m_color(makeRGB(r, g, b)), m_valid(true) { } 
    5053    Color(int r, int g, int b, int a) : m_color(makeRGBA(r, g, b, a)), m_valid(true) { } 
     54    // Color is currently limited to 32bit RGBA, perhaps some day we'll support better colors 
     55    Color(float r, float g, float b, float a) : m_color(makeRGBA32FromFloats(r, g, b, a)), m_valid(true) { } 
    5156    explicit Color(const String&); 
    5257    explicit Color(const char*);