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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 1137753004: Remove xml:base support (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rm tests Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Element.h ('k') | Source/core/frame/UseCounter.h » ('j') | 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) 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 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1347 if (attr.prefix() == xmlnsAtom && attr.value() == namespaceToLocate) 1347 if (attr.prefix() == xmlnsAtom && attr.value() == namespaceToLocate)
1348 return attr.localName(); 1348 return attr.localName();
1349 } 1349 }
1350 1350
1351 if (Element* parent = parentElement()) 1351 if (Element* parent = parentElement())
1352 return parent->locateNamespacePrefix(namespaceToLocate); 1352 return parent->locateNamespacePrefix(namespaceToLocate);
1353 1353
1354 return nullAtom; 1354 return nullAtom;
1355 } 1355 }
1356 1356
1357 KURL Element::baseURI() const
1358 {
1359 const AtomicString& baseAttribute = fastGetAttribute(baseAttr);
1360 if (!baseAttribute.isEmpty())
1361 UseCounter::count(document(), UseCounter::ElementBaseURIFromXMLBase);
1362
1363 KURL base(KURL(), baseAttribute);
1364 if (!base.protocol().isEmpty())
1365 return base;
1366
1367 ContainerNode* parent = parentNode();
1368 if (!parent)
1369 return base;
1370
1371 const KURL& parentBase = parent->baseURI();
1372 if (parentBase.isNull())
1373 return base;
1374
1375 return KURL(parentBase, baseAttribute);
1376 }
1377
1378 const AtomicString Element::imageSourceURL() const 1357 const AtomicString Element::imageSourceURL() const
1379 { 1358 {
1380 return getAttribute(srcAttr); 1359 return getAttribute(srcAttr);
1381 } 1360 }
1382 1361
1383 bool Element::layoutObjectIsNeeded(const ComputedStyle& style) 1362 bool Element::layoutObjectIsNeeded(const ComputedStyle& style)
1384 { 1363 {
1385 return style.display() != NONE; 1364 return style.display() != NONE;
1386 } 1365 }
1387 1366
(...skipping 2109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3497 { 3476 {
3498 #if ENABLE(OILPAN) 3477 #if ENABLE(OILPAN)
3499 if (hasRareData()) 3478 if (hasRareData())
3500 visitor->trace(elementRareData()); 3479 visitor->trace(elementRareData());
3501 visitor->trace(m_elementData); 3480 visitor->trace(m_elementData);
3502 #endif 3481 #endif
3503 ContainerNode::trace(visitor); 3482 ContainerNode::trace(visitor);
3504 } 3483 }
3505 3484
3506 } // namespace blink 3485 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/Element.h ('k') | Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698