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

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

Issue 23601011: Have StyleResolver / StyleResolverState deal with Document references, not pointers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update StyleResolverState as well Created 7 years, 4 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 | « Source/core/css/RuleSet.cpp ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/FilterOperationResolver.cpp
diff --git a/Source/core/css/resolver/FilterOperationResolver.cpp b/Source/core/css/resolver/FilterOperationResolver.cpp
index a4093948476a55c1d8838eeaa6d2ab64059daa96..9f01f0abf6e9123a1f6732916c152e982a23dd0e 100644
--- a/Source/core/css/resolver/FilterOperationResolver.cpp
+++ b/Source/core/css/resolver/FilterOperationResolver.cpp
@@ -233,7 +233,7 @@ static PassRefPtr<CustomFilterProgram> createCustomFilterProgram(CSSShaderValue*
CustomFilterProgramType programType, const CustomFilterProgramMixSettings& mixSettings, CustomFilterMeshType meshType,
StyleResolverState& state)
{
- ResourceFetcher* fetcher = state.document()->fetcher();
+ ResourceFetcher* fetcher = state.document().fetcher();
KURL vertexShaderURL = vertexShader ? vertexShader->completeURL(fetcher) : KURL();
KURL fragmentShaderURL = fragmentShader ? fragmentShader->completeURL(fetcher) : KURL();
RefPtr<StyleCustomFilterProgram> program = StyleCustomFilterProgram::create(vertexShaderURL, vertexShader ? styleShader(vertexShader, state) : 0,
@@ -402,10 +402,10 @@ bool FilterOperationResolver::createFilterOperations(CSSValue* inValue, const Re
continue;
CSSSVGDocumentValue* svgDocumentValue = static_cast<CSSSVGDocumentValue*>(argument);
- KURL url = state.document()->completeURL(svgDocumentValue->url());
+ KURL url = state.document().completeURL(svgDocumentValue->url());
RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(svgDocumentValue->url(), url.fragmentIdentifier(), operationType);
- if (SVGURIReference::isExternalURIReference(svgDocumentValue->url(), state.document())) {
+ if (SVGURIReference::isExternalURIReference(svgDocumentValue->url(), &state.document())) {
if (!svgDocumentValue->loadRequested())
state.elementStyleResources().addPendingSVGDocument(operation.get(), svgDocumentValue);
else if (svgDocumentValue->cachedSVGDocument())
@@ -489,7 +489,7 @@ bool FilterOperationResolver::createFilterOperations(CSSValue* inValue, const Re
int blur = item->blur ? item->blur->computeLength<int>(style, rootStyle, zoomFactor) : 0;
StyleColor shadowColor;
if (item->color)
- shadowColor = state.document()->textLinkColors().colorFromPrimitiveValue(item->color.get());
+ shadowColor = state.document().textLinkColors().colorFromPrimitiveValue(item->color.get());
operations.operations().append(DropShadowFilterOperation::create(location, blur, shadowColor.isValid() ? shadowColor.color() : Color::transparent, operationType));
break;
« no previous file with comments | « Source/core/css/RuleSet.cpp ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698