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

Side by Side Diff: Source/core/html/HTMLScriptElement.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/HTMLPlugInElement.cpp ('k') | Source/core/html/HTMLTableElement.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, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 m_loader->handleAsyncAttribute(); 102 m_loader->handleAsyncAttribute();
103 } 103 }
104 104
105 bool HTMLScriptElement::async() const 105 bool HTMLScriptElement::async() const
106 { 106 {
107 return fastHasAttribute(asyncAttr) || (m_loader->forceAsync()); 107 return fastHasAttribute(asyncAttr) || (m_loader->forceAsync());
108 } 108 }
109 109
110 KURL HTMLScriptElement::src() const 110 KURL HTMLScriptElement::src() const
111 { 111 {
112 return document().completeURL(sourceAttributeValue()); 112 return treeScope().completeURL(sourceAttributeValue());
113 } 113 }
114 114
115 String HTMLScriptElement::sourceAttributeValue() const 115 String HTMLScriptElement::sourceAttributeValue() const
116 { 116 {
117 return getAttribute(srcAttr).string(); 117 return getAttribute(srcAttr).string();
118 } 118 }
119 119
120 String HTMLScriptElement::charsetAttributeValue() const 120 String HTMLScriptElement::charsetAttributeValue() const
121 { 121 {
122 return getAttribute(charsetAttr).string(); 122 return getAttribute(charsetAttr).string();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ASSERT(!m_loader->haveFiredLoadEvent()); 162 ASSERT(!m_loader->haveFiredLoadEvent());
163 dispatchEvent(Event::create(EventTypeNames::load)); 163 dispatchEvent(Event::create(EventTypeNames::load));
164 } 164 }
165 165
166 PassRefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren( ) 166 PassRefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren( )
167 { 167 {
168 return adoptRef(new HTMLScriptElement(document(), false, m_loader->alreadySt arted())); 168 return adoptRef(new HTMLScriptElement(document(), false, m_loader->alreadySt arted()));
169 } 169 }
170 170
171 } 171 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLPlugInElement.cpp ('k') | Source/core/html/HTMLTableElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698