| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 CanvasStyle(CanvasGradient*); | 66 CanvasStyle(CanvasGradient*); |
| 67 CanvasStyle(CanvasPattern*); | 67 CanvasStyle(CanvasPattern*); |
| 68 | 68 |
| 69 Type m_type; | 69 Type m_type; |
| 70 RGBA32 m_rgba; | 70 RGBA32 m_rgba; |
| 71 | 71 |
| 72 Member<CanvasGradient> m_gradient; | 72 Member<CanvasGradient> m_gradient; |
| 73 Member<CanvasPattern> m_pattern; | 73 Member<CanvasPattern> m_pattern; |
| 74 }; | 74 }; |
| 75 | 75 |
| 76 bool parseColorOrCurrentColor(RGBA32& parsedColor, const String& colorString, HT
MLCanvasElement*); | 76 bool parseColorOrCurrentColor(Color& parsedColor, const String& colorString, HTM
LCanvasElement*); |
| 77 | 77 |
| 78 } // namespace blink | 78 } // namespace blink |
| 79 | 79 |
| 80 #endif | 80 #endif |
| OLD | NEW |