third_party/WebKit/Source/core/html/HTMLElement.cpp - Issue 1936913002: [CSS] Accept 8 (#RRGGBBAA) and 4 (#RGBA) value hex colors

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/HTMLElement.cpp

Issue 1936913002: [CSS] Accept 8 (#RRGGBBAA) and 4 (#RGBA) value hex colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add legacy color support. Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/svg/dom/rgb-color-parser-expected.txt ('k') | third_party/WebKit/Source/platform/graphics/Color.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLElement.cpp b/third_party/WebKit/Source/core/html/HTMLElement.cpp

index fd68fa31ba72fa0ed183a71a9b33b27b5f67b11e..90d3c5e13b1abf65938e9ffcfc00f6adf1d924a3 100644

--- a/third_party/WebKit/Source/core/html/HTMLElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLElement.cpp

@@ -927,9 +927,14 @@ void HTMLElement::addHTMLColorToStyle(MutableStylePropertySet* style, CSSPropert

if (equalIgnoringCase(colorString, "transparent"))

return;

+ // Only allow 3/6-digit hex color parsing during legacy color processing.

+ bool allowCSSColorParsing = !colorString.isEmpty();

+ if (allowCSSColorParsing && colorString[0] == '#')

+ allowCSSColorParsing = (colorString.length() == 4) || (colorString.length() == 7);

// If the string is a named CSS color or a 3/6-digit hex color, use that.

Color parsedColor;

- if (!parsedColor.setFromString(colorString))

+ if (!allowCSSColorParsing || !parsedColor.setFromString(colorString))

parsedColor.setRGB(parseColorStringWithCrazyLegacyRules(colorString));

style->setProperty(propertyID, cssValuePool().createColorValue(parsedColor.rgb()));