| 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) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> | 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> |
| 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "config.h" | 29 #include "config.h" |
| 30 #include "core/html/canvas/CanvasStyle.h" | 30 #include "core/html/canvas/CanvasStyle.h" |
| 31 | 31 |
| 32 #include "CSSPropertyNames.h" | 32 #include "CSSPropertyNames.h" |
| 33 #include "core/css/CSSParser.h" | 33 #include "core/css/CSSParser.h" |
| 34 #include "core/css/StylePropertySet.h" | 34 #include "core/css/StylePropertySet.h" |
| 35 #include "core/html/HTMLCanvasElement.h" | 35 #include "core/html/HTMLCanvasElement.h" |
| 36 #include "core/html/canvas/CanvasGradient.h" | 36 #include "core/html/canvas/CanvasGradient.h" |
| 37 #include "core/html/canvas/CanvasPattern.h" | 37 #include "core/html/canvas/CanvasPattern.h" |
| 38 #include "core/platform/graphics/GraphicsContext.h" | 38 #include "core/platform/graphics/GraphicsContext.h" |
| 39 #include <wtf/Assertions.h> | 39 #include "wtf/Assertions.h" |
| 40 #include <wtf/PassRefPtr.h> | 40 #include "wtf/PassRefPtr.h" |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace WebCore { |
| 43 | 43 |
| 44 enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, Parse
Failed }; | 44 enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, Parse
Failed }; |
| 45 | 45 |
| 46 static ColorParseResult parseColor(RGBA32& parsedColor, const String& colorStrin
g, Document* document = 0) | 46 static ColorParseResult parseColor(RGBA32& parsedColor, const String& colorStrin
g, Document* document = 0) |
| 47 { | 47 { |
| 48 if (equalIgnoringCase(colorString, "currentcolor")) | 48 if (equalIgnoringCase(colorString, "currentcolor")) |
| 49 return ParsedCurrentColor; | 49 return ParsedCurrentColor; |
| 50 if (CSSParser::parseColor(parsedColor, colorString)) | 50 if (CSSParser::parseColor(parsedColor, colorString)) |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 context->setFillPattern(canvasPattern()->pattern()); | 265 context->setFillPattern(canvasPattern()->pattern()); |
| 266 break; | 266 break; |
| 267 case CurrentColor: | 267 case CurrentColor: |
| 268 case CurrentColorWithOverrideAlpha: | 268 case CurrentColorWithOverrideAlpha: |
| 269 ASSERT_NOT_REACHED(); | 269 ASSERT_NOT_REACHED(); |
| 270 break; | 270 break; |
| 271 } | 271 } |
| 272 } | 272 } |
| 273 | 273 |
| 274 } | 274 } |
| OLD | NEW |