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

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

Issue 1752713002: 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
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"
24 #include "core/dom/Document.h" 25 #include "core/dom/Document.h"
26 #include "core/dom/Text.h"
25 27
26 namespace blink { 28 namespace blink {
27 29
28 inline SVGTitleElement::SVGTitleElement(Document& document) 30 inline SVGTitleElement::SVGTitleElement(Document& document)
29 : SVGElement(SVGNames::titleTag, document) 31 : SVGElement(SVGNames::titleTag, document)
32 , m_ignoreTitleUpdatesWhenChildrenChange(false)
30 { 33 {
31 } 34 }
32 35
33 DEFINE_NODE_FACTORY(SVGTitleElement) 36 DEFINE_NODE_FACTORY(SVGTitleElement)
34 37
35 Node::InsertionNotificationRequest SVGTitleElement::insertedInto(ContainerNode* rootParent) 38 Node::InsertionNotificationRequest SVGTitleElement::insertedInto(ContainerNode* rootParent)
36 { 39 {
37 SVGElement::insertedInto(rootParent); 40 SVGElement::insertedInto(rootParent);
38 if (!rootParent->inDocument()) 41 if (!rootParent->inDocument())
39 return InsertionDone; 42 return InsertionDone;
40 if (hasChildren() && document().isSVGDocument()) 43 if (hasChildren() && document().isSVGDocument())
41 document().setTitleElement(this); 44 document().setTitleElement(this);
42 return InsertionDone; 45 return InsertionDone;
43 } 46 }
44 47
45 void SVGTitleElement::removedFrom(ContainerNode* rootParent) 48 void SVGTitleElement::removedFrom(ContainerNode* rootParent)
46 { 49 {
47 SVGElement::removedFrom(rootParent); 50 SVGElement::removedFrom(rootParent);
48 if (rootParent->inDocument() && document().isSVGDocument()) 51 if (rootParent->inDocument() && document().isSVGDocument())
49 document().removeTitle(this); 52 document().removeTitle(this);
50 } 53 }
51 54
52 void SVGTitleElement::childrenChanged(const ChildrenChange& change) 55 void SVGTitleElement::childrenChanged(const ChildrenChange& change)
53 { 56 {
54 SVGElement::childrenChanged(change); 57 SVGElement::childrenChanged(change);
55 if (inDocument() && document().isSVGDocument()) 58 if (inDocument() && document().isSVGDocument() && !m_ignoreTitleUpdatesWhenC hildrenChange)
56 document().setTitleElement(this); 59 document().setTitleElement(this);
57 } 60 }
58 61
62 void SVGTitleElement::setText(const String &value)
fs 2016/03/03 15:49:44 String& (not String &)
hyunjunekim2 2016/03/04 11:29:32 Done.
63 {
64 RefPtrWillBeRawPtr<Node> protectFromMutationEvents(this);
65 ChildListMutationScope mutation(*this);
66
67 // Avoid calling Document::setTitleElement() during intermediate steps.
68 m_ignoreTitleUpdatesWhenChildrenChange = !value.isEmpty();
fs 2016/03/03 15:49:45 Could also do this as: { // ... Temporary
hyunjunekim2 2016/03/04 11:29:32 Done.
69 removeChildren(OmitSubtreeModifiedEvent);
70 m_ignoreTitleUpdatesWhenChildrenChange = false;
71
72 if (!value.isEmpty())
73 appendChild(document().createTextNode(value.impl()), IGNORE_EXCEPTION);
74 }
75
59 } // namespace blink 76 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698