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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGTextPathElement.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) 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com> 3 * Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #include "core/svg/SVGTextPathElement.h" 21 #include "core/svg/SVGTextPathElement.h"
22 22
23 #include "core/layout/svg/LayoutSVGTextPath.h" 23 #include "core/layout/svg/LayoutSVGTextPath.h"
24 #include "core/svg/SVGDocumentExtensions.h" 24 #include "core/svg/SVGTreeScopeResources.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 template <> 28 template <>
29 const SVGEnumerationStringEntries& 29 const SVGEnumerationStringEntries&
30 getStaticStringEntries<SVGTextPathMethodType>() { 30 getStaticStringEntries<SVGTextPathMethodType>() {
31 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); 31 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ());
32 if (entries.isEmpty()) { 32 if (entries.isEmpty()) {
33 entries.push_back(std::make_pair(SVGTextPathMethodAlign, "align")); 33 entries.push_back(std::make_pair(SVGTextPathMethodAlign, "align"));
34 entries.push_back(std::make_pair(SVGTextPathMethodStretch, "stretch")); 34 entries.push_back(std::make_pair(SVGTextPathMethodStretch, "stretch"));
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 void SVGTextPathElement::buildPendingResource() { 120 void SVGTextPathElement::buildPendingResource() {
121 clearResourceReferences(); 121 clearResourceReferences();
122 if (!isConnected()) 122 if (!isConnected())
123 return; 123 return;
124 124
125 AtomicString id; 125 AtomicString id;
126 Element* target = SVGURIReference::targetElementFromIRIString( 126 Element* target = SVGURIReference::targetElementFromIRIString(
127 hrefString(), treeScope(), &id); 127 hrefString(), treeScope(), &id);
128 if (!target) { 128 if (!target) {
129 // Do not register as pending if we are already pending this resource. 129 // Do not register as pending if we are already pending this resource.
130 if (document().accessSVGExtensions().isElementPendingResource(this, id)) 130 if (treeScope().ensureSVGTreeScopedResources().isElementPendingResource(
131 this, id))
131 return; 132 return;
132
133 if (!id.isEmpty()) { 133 if (!id.isEmpty()) {
134 document().accessSVGExtensions().addPendingResource(id, this); 134 treeScope().ensureSVGTreeScopedResources().addPendingResource(id, this);
135 ASSERT(hasPendingResources()); 135 DCHECK(hasPendingResources());
136 } 136 }
137 } else if (isSVGPathElement(*target)) { 137 } else if (isSVGPathElement(*target)) {
138 // Register us with the target in the dependencies map. Any change of 138 // Register us with the target in the dependencies map. Any change of
139 // hrefElement that leads to relayout/repainting now informs us, so we can 139 // hrefElement that leads to relayout/repainting now informs us, so we can
140 // react to it. 140 // react to it.
141 addReferenceTo(toSVGElement((target))); 141 addReferenceTo(toSVGElement((target)));
142 } 142 }
143 143
144 if (LayoutObject* layoutObject = this->layoutObject()) 144 if (LayoutObject* layoutObject = this->layoutObject())
145 markForLayoutAndParentResourceInvalidation(layoutObject); 145 markForLayoutAndParentResourceInvalidation(layoutObject);
(...skipping 11 matching lines...) Expand all
157 if (rootParent->isConnected()) 157 if (rootParent->isConnected())
158 clearResourceReferences(); 158 clearResourceReferences();
159 } 159 }
160 160
161 bool SVGTextPathElement::selfHasRelativeLengths() const { 161 bool SVGTextPathElement::selfHasRelativeLengths() const {
162 return m_startOffset->currentValue()->isRelative() || 162 return m_startOffset->currentValue()->isRelative() ||
163 SVGTextContentElement::selfHasRelativeLengths(); 163 SVGTextContentElement::selfHasRelativeLengths();
164 } 164 }
165 165
166 } // namespace blink 166 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGMPathElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGTreeScopeResources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698