Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Side by Side Diff: Source/core/html/canvas/CanvasStyle.cpp

Issue 237743009: Don't parse colors for <canvas> in quirks mode (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix style issue. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/canvas/canvas-fillStyle-no-quirks-parsing.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 const bool useStrictParsing = true;
50 if (BisonCSSParser::parseColor(parsedColor, colorString, useStrictParsing))
50 return ParsedRGBA; 51 return ParsedRGBA;
51 if (BisonCSSParser::parseSystemColor(parsedColor, colorString)) 52 if (BisonCSSParser::parseSystemColor(parsedColor, colorString))
52 return ParsedSystemColor; 53 return ParsedSystemColor;
53 return ParseFailed; 54 return ParseFailed;
54 } 55 }
55 56
56 RGBA32 currentColor(HTMLCanvasElement* canvas) 57 RGBA32 currentColor(HTMLCanvasElement* canvas)
57 { 58 {
58 if (!canvas || !canvas->inDocument() || !canvas->inlineStyle()) 59 if (!canvas || !canvas->inDocument() || !canvas->inlineStyle())
59 return Color::black; 60 return Color::black;
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 context->setFillPattern(canvasPattern()->pattern()); 266 context->setFillPattern(canvasPattern()->pattern());
266 break; 267 break;
267 case CurrentColor: 268 case CurrentColor:
268 case CurrentColorWithOverrideAlpha: 269 case CurrentColorWithOverrideAlpha:
269 ASSERT_NOT_REACHED(); 270 ASSERT_NOT_REACHED();
270 break; 271 break;
271 } 272 }
272 } 273 }
273 274
274 } 275 }
OLDNEW
« no previous file with comments | « LayoutTests/fast/canvas/canvas-fillStyle-no-quirks-parsing.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698