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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 m_title = canonicalizedTitle<UChar>(this, m_rawTitle); 1279 m_title = canonicalizedTitle<UChar>(this, m_rawTitle);
1280 1280
1281 if (!m_frame || oldTitle == m_title) 1281 if (!m_frame || oldTitle == m_title)
1282 return; 1282 return;
1283 m_frame->loader().client()->dispatchDidReceiveTitle(m_title); 1283 m_frame->loader().client()->dispatchDidReceiveTitle(m_title);
1284 } 1284 }
1285 1285
1286 void Document::setTitle(const String& title) 1286 void Document::setTitle(const String& title)
1287 { 1287 {
1288 // Title set by JavaScript -- overrides any title elements. 1288 // Title set by JavaScript -- overrides any title elements.
1289 if (!isHTMLDocument() && !isXHTMLDocument()) { 1289 if (!m_titleElement) {
1290 m_titleElement = nullptr; 1290 if (isHTMLDocument() || isXHTMLDocument()) {
1291 } else if (!m_titleElement) { 1291 HTMLElement* headElement = head();
1292 HTMLElement* headElement = head(); 1292 if (!headElement)
1293 if (!headElement) 1293 return;
1294 return; 1294 m_titleElement = HTMLTitleElement::create(*this);
1295 m_titleElement = HTMLTitleElement::create(*this); 1295 headElement->appendChild(m_titleElement.get());
1296 headElement->appendChild(m_titleElement.get()); 1296 } else if (isSVGDocument()) {
1297 Element* element = documentElement();
1298 if (!isSVGSVGElement(element))
1299 return;
1300 m_titleElement = SVGTitleElement::create(*this);
1301 element->insertBefore(m_titleElement.get(), element->firstChild());
1302 }
1303 } else {
1304 if (!isHTMLDocument() && !isXHTMLDocument() && !isSVGDocument())
1305 m_titleElement = nullptr;
1297 } 1306 }
1298 1307
1299 if (isHTMLTitleElement(m_titleElement)) 1308 if (isHTMLTitleElement(m_titleElement))
1300 toHTMLTitleElement(m_titleElement)->setText(title); 1309 toHTMLTitleElement(m_titleElement)->setText(title);
1310 else if (isSVGTitleElement(m_titleElement))
1311 toSVGTitleElement(m_titleElement)->setText(title);
1301 else 1312 else
1302 updateTitle(title); 1313 updateTitle(title);
1303 } 1314 }
1304 1315
1305 void Document::setTitleElement(Element* titleElement) 1316 void Document::setTitleElement(Element* titleElement)
1306 { 1317 {
1307 // Only allow the first title element to change the title -- others have no effect. 1318 // Only allow the first title element to change the title -- others have no effect.
1308 if (m_titleElement && m_titleElement != titleElement) { 1319 if (m_titleElement && m_titleElement != titleElement) {
1309 if (isHTMLDocument() || isXHTMLDocument()) { 1320 if (isHTMLDocument() || isXHTMLDocument()) {
1310 m_titleElement = Traversal<HTMLTitleElement>::firstWithin(*this); 1321 m_titleElement = Traversal<HTMLTitleElement>::firstWithin(*this);
1311 } else if (isSVGDocument()) { 1322 } else if (isSVGDocument()) {
1312 m_titleElement = Traversal<SVGTitleElement>::firstWithin(*this); 1323 m_titleElement = Traversal<SVGTitleElement>::firstWithin(*this);
1313 } 1324 }
1314 } else { 1325 } else {
1315 m_titleElement = titleElement; 1326 m_titleElement = titleElement;
1316 } 1327 }
1317 1328
1318 if (isHTMLTitleElement(m_titleElement)) 1329 String titleText;
fs 2016/03/04 11:47:06 This is not quite what I meant... (note that now y
hyunjunekim2 2016/03/04 12:58:09 Done.
1319 updateTitle(toHTMLTitleElement(m_titleElement)->text()); 1330 if (isHTMLTitleElement(m_titleElement)) {
1320 else if (isSVGTitleElement(m_titleElement)) 1331 if (isSVGDocument() && isSVGSVGElement(documentElement())) {
1321 updateTitle(toSVGTitleElement(m_titleElement)->textContent()); 1332 m_titleElement = nullptr;
1333 return;
1334 }
1335 titleText = toHTMLTitleElement(m_titleElement)->text();
1336 } else if (isSVGTitleElement(m_titleElement)) {
1337 if (!isSVGSVGElement(m_titleElement->parentNode())) {
1338 m_titleElement = nullptr;
1339 return;
1340 }
1341 titleText = toSVGTitleElement(m_titleElement)->textContent();
1342 }
1343
1344 updateTitle(titleText);
1322 } 1345 }
1323 1346
1324 void Document::removeTitle(Element* titleElement) 1347 void Document::removeTitle(Element* titleElement)
1325 { 1348 {
1326 if (m_titleElement != titleElement) 1349 if (m_titleElement != titleElement)
1327 return; 1350 return;
1328 1351
1329 m_titleElement = nullptr; 1352 m_titleElement = nullptr;
1330 1353
1331 // Update title based on first title element in the document, if one exists. 1354 // Update title based on first title element in the document, if one exists.
(...skipping 4663 matching lines...) Expand 10 before | Expand all | Expand 10 after
5995 #ifndef NDEBUG 6018 #ifndef NDEBUG
5996 using namespace blink; 6019 using namespace blink;
5997 void showLiveDocumentInstances() 6020 void showLiveDocumentInstances()
5998 { 6021 {
5999 Document::WeakDocumentSet& set = Document::liveDocumentSet(); 6022 Document::WeakDocumentSet& set = Document::liveDocumentSet();
6000 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6023 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6001 for (Document* document : set) 6024 for (Document* document : set)
6002 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 6025 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
6003 } 6026 }
6004 #endif 6027 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698