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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGFEImageElement.cpp

Issue 2633143002: SVG objects with same idrefs conflict when under different shadow root (Closed)
Patch Set: ensureSVGTreeScopedResources(); add comment Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org> 4 * Copyright (C) 2010 Dirk Schulze <krit@webkit.org>
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 */ 20 */
21 21
22 #include "core/svg/SVGFEImageElement.h" 22 #include "core/svg/SVGFEImageElement.h"
23 23
24 #include "core/dom/Document.h" 24 #include "core/dom/Document.h"
25 #include "core/fetch/FetchRequest.h" 25 #include "core/fetch/FetchRequest.h"
26 #include "core/fetch/ResourceFetcher.h" 26 #include "core/fetch/ResourceFetcher.h"
27 #include "core/svg/SVGDocumentExtensions.h"
28 #include "core/svg/SVGPreserveAspectRatio.h" 27 #include "core/svg/SVGPreserveAspectRatio.h"
28 #include "core/svg/SVGTreeScopeResources.h"
29 #include "core/svg/graphics/filters/SVGFEImage.h" 29 #include "core/svg/graphics/filters/SVGFEImage.h"
30 #include "platform/graphics/Image.h" 30 #include "platform/graphics/Image.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 inline SVGFEImageElement::SVGFEImageElement(Document& document) 34 inline SVGFEImageElement::SVGFEImageElement(Document& document)
35 : SVGFilterPrimitiveStandardAttributes(SVGNames::feImageTag, document), 35 : SVGFilterPrimitiveStandardAttributes(SVGNames::feImageTag, document),
36 SVGURIReference(this), 36 SVGURIReference(this),
37 m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create( 37 m_preserveAspectRatio(SVGAnimatedPreserveAspectRatio::create(
38 this, 38 this,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 if (!isConnected()) 86 if (!isConnected())
87 return; 87 return;
88 88
89 AtomicString id; 89 AtomicString id;
90 Element* target = SVGURIReference::targetElementFromIRIString( 90 Element* target = SVGURIReference::targetElementFromIRIString(
91 hrefString(), treeScope(), &id); 91 hrefString(), treeScope(), &id);
92 if (!target) { 92 if (!target) {
93 if (id.isEmpty()) { 93 if (id.isEmpty()) {
94 fetchImageResource(); 94 fetchImageResource();
95 } else { 95 } else {
96 document().accessSVGExtensions().addPendingResource(id, this); 96 treeScope().ensureSVGTreeScopedResources().addPendingResource(id, this);
97 ASSERT(hasPendingResources()); 97 DCHECK(hasPendingResources());
98 } 98 }
99 } else if (target->isSVGElement()) { 99 } else if (target->isSVGElement()) {
100 // Register us with the target in the dependencies map. Any change of 100 // Register us with the target in the dependencies map. Any change of
101 // hrefElement that leads to relayout/repainting now informs us, so we can 101 // hrefElement that leads to relayout/repainting now informs us, so we can
102 // react to it. 102 // react to it.
103 addReferenceTo(toSVGElement(target)); 103 addReferenceTo(toSVGElement(target));
104 } 104 }
105 105
106 invalidate(); 106 invalidate();
107 } 107 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 m_cachedImage->errorOccurred() ? nullptr : m_cachedImage->getImage(); 154 m_cachedImage->errorOccurred() ? nullptr : m_cachedImage->getImage();
155 return FEImage::createWithImage(filter, image, 155 return FEImage::createWithImage(filter, image,
156 m_preserveAspectRatio->currentValue()); 156 m_preserveAspectRatio->currentValue());
157 } 157 }
158 158
159 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(), 159 return FEImage::createWithIRIReference(filter, treeScope(), hrefString(),
160 m_preserveAspectRatio->currentValue()); 160 m_preserveAspectRatio->currentValue());
161 } 161 }
162 162
163 } // namespace blink 163 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGMPathElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698