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

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

Issue 1771703003: Revert of Fix SVGDocument return title that is not a child of the root element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGTitleElement.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
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/SVGTitleElement.h" 21 #include "core/svg/SVGTitleElement.h"
22 22
23 #include "core/SVGNames.h" 23 #include "core/SVGNames.h"
24 #include "core/dom/ChildListMutationScope.h"
25 #include "core/dom/Document.h" 24 #include "core/dom/Document.h"
26 #include "core/dom/Text.h"
27 25
28 namespace blink { 26 namespace blink {
29 27
30 inline SVGTitleElement::SVGTitleElement(Document& document) 28 inline SVGTitleElement::SVGTitleElement(Document& document)
31 : SVGElement(SVGNames::titleTag, document) 29 : SVGElement(SVGNames::titleTag, document)
32 , m_ignoreTitleUpdatesWhenChildrenChange(false)
33 { 30 {
34 } 31 }
35 32
36 DEFINE_NODE_FACTORY(SVGTitleElement) 33 DEFINE_NODE_FACTORY(SVGTitleElement)
37 34
38 Node::InsertionNotificationRequest SVGTitleElement::insertedInto(ContainerNode* rootParent) 35 Node::InsertionNotificationRequest SVGTitleElement::insertedInto(ContainerNode* rootParent)
39 { 36 {
40 SVGElement::insertedInto(rootParent); 37 SVGElement::insertedInto(rootParent);
41 if (!rootParent->inDocument()) 38 if (!rootParent->inDocument())
42 return InsertionDone; 39 return InsertionDone;
43 if (hasChildren() && document().isSVGDocument()) 40 if (hasChildren() && document().isSVGDocument())
44 document().setTitleElement(this); 41 document().setTitleElement(this);
45 return InsertionDone; 42 return InsertionDone;
46 } 43 }
47 44
48 void SVGTitleElement::removedFrom(ContainerNode* rootParent) 45 void SVGTitleElement::removedFrom(ContainerNode* rootParent)
49 { 46 {
50 SVGElement::removedFrom(rootParent); 47 SVGElement::removedFrom(rootParent);
51 if (rootParent->inDocument() && document().isSVGDocument()) 48 if (rootParent->inDocument() && document().isSVGDocument())
52 document().removeTitle(this); 49 document().removeTitle(this);
53 } 50 }
54 51
55 void SVGTitleElement::childrenChanged(const ChildrenChange& change) 52 void SVGTitleElement::childrenChanged(const ChildrenChange& change)
56 { 53 {
57 SVGElement::childrenChanged(change); 54 SVGElement::childrenChanged(change);
58 if (inDocument() && document().isSVGDocument() && !m_ignoreTitleUpdatesWhenC hildrenChange) 55 if (inDocument() && document().isSVGDocument())
59 document().setTitleElement(this); 56 document().setTitleElement(this);
60 } 57 }
61 58
62 void SVGTitleElement::setText(const String& value)
63 {
64 RefPtrWillBeRawPtr<Node> protectFromMutationEvents(this);
65 ChildListMutationScope mutation(*this);
66
67 {
68 // Avoid calling Document::setTitleElement() during intermediate steps.
69 TemporaryChange<bool> inhibitTitleUpdateScope(m_ignoreTitleUpdatesWhenCh ildrenChange, !value.isEmpty());
70 removeChildren(OmitSubtreeModifiedEvent);
71 }
72
73 if (!value.isEmpty())
74 appendChild(document().createTextNode(value.impl()), IGNORE_EXCEPTION);
75 }
76
77 } // namespace blink 59 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGTitleElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698