third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp - Issue 2165833006: Merge CSSSVGDocumentValue with CSSURIValue

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/resolver/ElementStyleResources.cpp

Issue 2165833006: Merge CSSSVGDocumentValue with CSSURIValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixup FilterInterpolationFunctions 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

« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/ElementStyleResources.h ('k') | third_party/WebKit/Source/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

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

index 99c5fe685bac047cb2d8f78ac15e03e415f73f87..7b9538beff9308514907cef00d5a2b51f6faab33 100644

--- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp

@@ -26,7 +26,7 @@

#include "core/css/CSSCursorImageValue.h"

#include "core/css/CSSGradientValue.h"

#include "core/css/CSSImageValue.h"

-#include "core/css/CSSSVGDocumentValue.h"

+#include "core/css/CSSURIValue.h"

#include "core/dom/Document.h"

#include "core/fetch/ResourceFetcher.h"

#include "core/layout/svg/ReferenceFilterBuilder.h"

@@ -104,9 +104,9 @@ StyleImage* ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID proper

return value.cachedImage(m_deviceScaleFactor);

}

-void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperation, const CSSSVGDocumentValue* cssSVGDocumentValue)

+void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperation, const CSSURIValue* cssUriValue)

{

- m_pendingSVGDocuments.set(filterOperation, cssSVGDocumentValue);

+ m_pendingSVGDocuments.set(filterOperation, cssUriValue);

}

void ElementStyleResources::loadPendingSVGDocuments(ComputedStyle* computedStyle)

@@ -120,10 +120,10 @@ void ElementStyleResources::loadPendingSVGDocuments(ComputedStyle* computedStyle

if (filterOperation->type() == FilterOperation::REFERENCE) {

ReferenceFilterOperation* referenceFilter = toReferenceFilterOperation(filterOperation);

- const CSSSVGDocumentValue* value = m_pendingSVGDocuments.get(referenceFilter);

+ const CSSURIValue* value = m_pendingSVGDocuments.get(referenceFilter);

if (!value)

continue;

- DocumentResource* resource = value->load(m_document);

+ DocumentResource* resource = value->load(*m_document);

if (!resource)

continue;