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 28 matching lines...) Expand all Loading... | |
39 #include "wtf/PassRefPtr.h" | 39 #include "wtf/PassRefPtr.h" |
40 | 40 |
41 namespace WebCore { | 41 namespace WebCore { |
42 | 42 |
43 enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, Parse Failed }; | 43 enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, Parse Failed }; |
44 | 44 |
45 static ColorParseResult parseColor(RGBA32& parsedColor, const String& colorStrin g) | 45 static ColorParseResult parseColor(RGBA32& parsedColor, const String& colorStrin g) |
46 { | 46 { |
47 if (equalIgnoringCase(colorString, "currentcolor")) | 47 if (equalIgnoringCase(colorString, "currentcolor")) |
48 return ParsedCurrentColor; | 48 return ParsedCurrentColor; |
49 if (BisonCSSParser::parseColor(parsedColor, colorString)) | 49 if (BisonCSSParser::parseColor(parsedColor, colorString, true /* strict */)) |
Justin Novosad
2014/04/16 16:26:49
The Blinky way of documenting the meaning of 'true
fs
2014/04/16 16:34:10
Ah, yes... I keep forgetting that rule (which thin
| |
50 return ParsedRGBA; | 50 return ParsedRGBA; |
51 if (BisonCSSParser::parseSystemColor(parsedColor, colorString)) | 51 if (BisonCSSParser::parseSystemColor(parsedColor, colorString)) |
52 return ParsedSystemColor; | 52 return ParsedSystemColor; |
53 return ParseFailed; | 53 return ParseFailed; |
54 } | 54 } |
55 | 55 |
56 RGBA32 currentColor(HTMLCanvasElement* canvas) | 56 RGBA32 currentColor(HTMLCanvasElement* canvas) |
57 { | 57 { |
58 if (!canvas || !canvas->inDocument() || !canvas->inlineStyle()) | 58 if (!canvas || !canvas->inDocument() || !canvas->inlineStyle()) |
59 return Color::black; | 59 return Color::black; |
(...skipping 205 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 |