Chromium Code Reviews| Index: third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp |
| diff --git a/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp |
| index 041f1914cd3145754a62c46196089ce2942d2042..24537c445662939885a43e1d318015bb6dad4e53 100644 |
| --- a/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp |
| +++ b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp |
| @@ -36,8 +36,6 @@ |
| #include "core/css/CSSURIValue.h" |
| #include "core/css/resolver/StyleResolverState.h" |
| #include "core/frame/UseCounter.h" |
| -#include "core/layout/svg/ReferenceFilterBuilder.h" |
| -#include "core/svg/SVGURIReference.h" |
| namespace blink { |
| @@ -135,19 +133,10 @@ FilterOperations FilterOperationResolver::createFilterOperations( |
| countFilterUse(FilterOperation::REFERENCE, state.document()); |
| const CSSURIValue& urlValue = toCSSURIValue(*currValue); |
| - SVGURLReferenceResolver resolver(urlValue.value(), state.document()); |
| - ReferenceFilterOperation* operation = ReferenceFilterOperation::create( |
| - urlValue.value(), resolver.fragmentIdentifier()); |
| - if (!resolver.isLocal()) { |
| - if (!urlValue.loadRequested()) |
| - state.elementStyleResources().addPendingSVGDocument(operation, |
| - &urlValue); |
| - else if (urlValue.cachedDocument()) |
| - ReferenceFilterBuilder::setDocumentResourceReference( |
| - operation, |
| - new DocumentResourceReference(urlValue.cachedDocument())); |
| - } |
| - operations.operations().append(operation); |
| + SVGElementProxy* elementProxy = |
|
pdr.
2016/10/20 03:11:05
Is the CSSURIValue lifetime guaranteed to last as
fs
2016/10/20 11:28:00
Both have strong references, so technically speaki
|
| + state.elementStyleResources().cachedOrPendingFromValue(urlValue); |
| + operations.operations().append( |
| + ReferenceFilterOperation::create(urlValue.value(), *elementProxy)); |
| continue; |
| } |