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

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

Issue 2165833006: Merge CSSSVGDocumentValue with CSSURIValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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: 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 d41a8cfe79af2de57cee6ad81d6c7a4ea327bfc7..ec78f73c8f7cff9e73d5aba938ea443c16611329 100644
--- a/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp
@@ -31,6 +31,7 @@
#include "core/css/CSSFunctionValue.h"
#include "core/css/CSSPrimitiveValueMappings.h"
#include "core/css/CSSShadowValue.h"
+#include "core/css/CSSURIValue.h"
#include "core/css/resolver/StyleResolverState.h"
#include "core/frame/UseCounter.h"
#include "core/layout/svg/ReferenceFilterBuilder.h"
@@ -133,15 +134,15 @@ FilterOperations FilterOperationResolver::createFilterOperations(StyleResolverSt
ASSERT(filterValue->length() <= 1);
if (operationType == FilterOperation::REFERENCE) {
- const CSSSVGDocumentValue& svgDocumentValue = toCSSSVGDocumentValue(filterValue->item(0));
- KURL url = state.document().completeURL(svgDocumentValue.url());
+ const CSSURIValue& urlValue = toCSSURIValue(filterValue->item(0));
+ KURL url = state.document().completeURL(urlValue.url());
- ReferenceFilterOperation* operation = ReferenceFilterOperation::create(svgDocumentValue.url(), AtomicString(url.fragmentIdentifier()));
+ ReferenceFilterOperation* operation = ReferenceFilterOperation::create(urlValue.url(), AtomicString(url.fragmentIdentifier()));
if (!equalIgnoringFragmentIdentifier(url, state.document().url())) {
- if (!svgDocumentValue.loadRequested())
- state.elementStyleResources().addPendingSVGDocument(operation, &svgDocumentValue);
- else if (svgDocumentValue.cachedSVGDocument())
- ReferenceFilterBuilder::setDocumentResourceReference(operation, new DocumentResourceReference(svgDocumentValue.cachedSVGDocument()));
+ if (!urlValue.loadRequested())
+ state.elementStyleResources().addPendingSVGDocument(operation, &urlValue);
+ else if (urlValue.cachedDocument())
+ ReferenceFilterBuilder::setDocumentResourceReference(operation, new DocumentResourceReference(urlValue.cachedDocument()));
}
operations.operations().append(operation);
continue;

Powered by Google App Engine
This is Rietveld 408576698