third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 2625873010: Resolve CSS url(...) non-<image> values against the correct base

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/css/ComputedStyleCSSValueMapping.cpp

Issue 2625873010: Resolve CSS url(...) non-<image> values against the correct base (Closed)

Patch Set: Rebase Created 3 years, 11 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/Source/core/css/CSSValueList.cpp ('k') | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

index 7a2f5486be031b2c5a5c377398182889b920dd08..fa97e72be9e99d80b400815e444635c87e2b3cd9 100644

--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

@@ -1691,7 +1691,7 @@ static CSSValue* adjustSVGPaintForCurrentColor(SVGPaintType paintType,

const Color& currentColor) {

if (paintType >= SVG_PAINTTYPE_URI_NONE) {

CSSValueList* values = CSSValueList::createSpaceSeparated();

- values->append(*CSSURIValue::create(url));

+ values->append(*CSSURIValue::create(AtomicString(url)));

if (paintType == SVG_PAINTTYPE_URI_NONE)

values->append(*CSSIdentifierValue::create(CSSValueNone));

else if (paintType == SVG_PAINTTYPE_URI_CURRENTCOLOR)

@@ -1708,7 +1708,7 @@ static CSSValue* adjustSVGPaintForCurrentColor(SVGPaintType paintType,

return CSSColorValue::create(color.rgb());

}

-static inline String serializeAsFragmentIdentifier(

+static inline AtomicString serializeAsFragmentIdentifier(

const AtomicString& resource) {

return "#" + resource;

}

@@ -3196,9 +3196,10 @@ const CSSValue* ComputedStyleCSSValueMapping::get(

if (operation->type() == ClipPathOperation::SHAPE)

return valueForBasicShape(

style, toShapeClipPathOperation(operation)->basicShape());

- if (operation->type() == ClipPathOperation::REFERENCE)

+ if (operation->type() == ClipPathOperation::REFERENCE) {

return CSSURIValue::create(

- toReferenceClipPathOperation(operation)->url());

+ AtomicString(toReferenceClipPathOperation(operation)->url()));

+ }

}

return CSSIdentifierValue::create(CSSValueNone);

case CSSPropertyShapeMargin: