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

Side by Side Diff: Source/core/html/HTMLLinkElement.cpp

Issue 126443005: Use TreeScope::completeURL and baseURL instead of the Document versions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased again, passes tests Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLKeygenElement.cpp ('k') | Source/core/html/HTMLObjectElement.cpp » ('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 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com) 6 * Copyright (C) 2009 Rob Buis (rwlbuis@gmail.com)
7 * Copyright (C) 2011 Google Inc. All rights reserved. 7 * Copyright (C) 2011 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 linkStyle()->startLoadingDynamicSheet(); 304 linkStyle()->startLoadingDynamicSheet();
305 } 305 }
306 306
307 bool HTMLLinkElement::isURLAttribute(const Attribute& attribute) const 307 bool HTMLLinkElement::isURLAttribute(const Attribute& attribute) const
308 { 308 {
309 return attribute.name().localName() == hrefAttr || HTMLElement::isURLAttribu te(attribute); 309 return attribute.name().localName() == hrefAttr || HTMLElement::isURLAttribu te(attribute);
310 } 310 }
311 311
312 KURL HTMLLinkElement::href() const 312 KURL HTMLLinkElement::href() const
313 { 313 {
314 return document().completeURL(getAttribute(hrefAttr)); 314 return treeScope().completeURL(getAttribute(hrefAttr));
315 } 315 }
316 316
317 const AtomicString& HTMLLinkElement::rel() const 317 const AtomicString& HTMLLinkElement::rel() const
318 { 318 {
319 return getAttribute(relAttr); 319 return getAttribute(relAttr);
320 } 320 }
321 321
322 AtomicString HTMLLinkElement::target() const 322 AtomicString HTMLLinkElement::target() const
323 { 323 {
324 return getAttribute(targetAttr); 324 return getAttribute(targetAttr);
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 void LinkStyle::ownerRemoved() 607 void LinkStyle::ownerRemoved()
608 { 608 {
609 if (m_sheet) 609 if (m_sheet)
610 clearSheet(); 610 clearSheet();
611 611
612 if (styleSheetIsLoading()) 612 if (styleSheetIsLoading())
613 removePendingSheet(RemovePendingSheetNotifyLater); 613 removePendingSheet(RemovePendingSheetNotifyLater);
614 } 614 }
615 615
616 } // namespace WebCore 616 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/HTMLKeygenElement.cpp ('k') | Source/core/html/HTMLObjectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698