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

Unified Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 23685007: Have SVGURIReference API deal with Document references, not pointers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
Index: Source/core/css/resolver/StyleBuilderCustom.cpp
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
index 3bd5e6c8c6c54f24ccd26d8844436b35ac773d17..a791d57dbbe3a461983def5daf0accfe54a52284 100644
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -1159,7 +1159,7 @@ static bool percentageOrNumberToFloat(const CSSPrimitiveValue* primitiveValue, f
return numberToFloat(primitiveValue, out);
}
-static String fragmentIdentifier(const CSSPrimitiveValue* primitiveValue, Document* document)
+static String fragmentIdentifier(const CSSPrimitiveValue* primitiveValue, Document& document)
{
if (primitiveValue->primitiveType() != CSSPrimitiveValue::CSS_URI)
return String();
@@ -2278,21 +2278,21 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
{
HANDLE_SVG_INHERIT_AND_INITIAL(markerStartResource, MarkerStartResource)
if (primitiveValue)
- state.style()->accessSVGStyle()->setMarkerStartResource(fragmentIdentifier(primitiveValue, &state.document()));
+ state.style()->accessSVGStyle()->setMarkerStartResource(fragmentIdentifier(primitiveValue, state.document()));
break;
}
case CSSPropertyMarkerMid:
{
HANDLE_SVG_INHERIT_AND_INITIAL(markerMidResource, MarkerMidResource)
if (primitiveValue)
- state.style()->accessSVGStyle()->setMarkerMidResource(fragmentIdentifier(primitiveValue, &state.document()));
+ state.style()->accessSVGStyle()->setMarkerMidResource(fragmentIdentifier(primitiveValue, state.document()));
break;
}
case CSSPropertyMarkerEnd:
{
HANDLE_SVG_INHERIT_AND_INITIAL(markerEndResource, MarkerEndResource)
if (primitiveValue)
- state.style()->accessSVGStyle()->setMarkerEndResource(fragmentIdentifier(primitiveValue, &state.document()));
+ state.style()->accessSVGStyle()->setMarkerEndResource(fragmentIdentifier(primitiveValue, state.document()));
break;
}
case CSSPropertyStrokeMiterlimit:
@@ -2307,21 +2307,21 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
{
HANDLE_SVG_INHERIT_AND_INITIAL(filterResource, FilterResource)
if (primitiveValue)
- state.style()->accessSVGStyle()->setFilterResource(fragmentIdentifier(primitiveValue, &state.document()));
+ state.style()->accessSVGStyle()->setFilterResource(fragmentIdentifier(primitiveValue, state.document()));
break;
}
case CSSPropertyMask:
{
HANDLE_SVG_INHERIT_AND_INITIAL(maskerResource, MaskerResource)
if (primitiveValue)
- state.style()->accessSVGStyle()->setMaskerResource(fragmentIdentifier(primitiveValue, &state.document()));
+ state.style()->accessSVGStyle()->setMaskerResource(fragmentIdentifier(primitiveValue, state.document()));
break;
}
case CSSPropertyClipPath:
{
HANDLE_SVG_INHERIT_AND_INITIAL(clipperResource, ClipperResource)
if (primitiveValue)
- state.style()->accessSVGStyle()->setClipperResource(fragmentIdentifier(primitiveValue, &state.document()));
+ state.style()->accessSVGStyle()->setClipperResource(fragmentIdentifier(primitiveValue, state.document()));
break;
}
case CSSPropertyStopColor:
« no previous file with comments | « Source/core/css/resolver/FilterOperationResolver.cpp ('k') | Source/core/rendering/svg/RenderSVGResourceContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698