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

Side by Side Diff: third_party/WebKit/Source/core/dom/ScriptLoader.cpp

Issue 1365923002: Make Document.charset an alias of characterSet, as per spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 * 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 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 6 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 222
223 if (!contextDocument || !contextDocument->allowExecutingScripts(m_element)) 223 if (!contextDocument || !contextDocument->allowExecutingScripts(m_element))
224 return false; 224 return false;
225 225
226 if (!isScriptForEventSupported()) 226 if (!isScriptForEventSupported())
227 return false; 227 return false;
228 228
229 if (!client->charsetAttributeValue().isEmpty()) 229 if (!client->charsetAttributeValue().isEmpty())
230 m_characterEncoding = client->charsetAttributeValue(); 230 m_characterEncoding = client->charsetAttributeValue();
231 else 231 else
232 m_characterEncoding = elementDocument.charset(); 232 m_characterEncoding = elementDocument.characterSet();
233 233
234 if (client->hasSourceAttribute()) { 234 if (client->hasSourceAttribute()) {
235 FetchRequest::DeferOption defer = FetchRequest::NoDefer; 235 FetchRequest::DeferOption defer = FetchRequest::NoDefer;
236 if (!m_parserInserted || client->asyncAttributeValue() || client->deferA ttributeValue()) 236 if (!m_parserInserted || client->asyncAttributeValue() || client->deferA ttributeValue())
237 defer = FetchRequest::LazyLoad; 237 defer = FetchRequest::LazyLoad;
238 if (!fetchScript(client->sourceAttributeValue(), defer)) 238 if (!fetchScript(client->sourceAttributeValue(), defer))
239 return false; 239 return false;
240 } 240 }
241 241
242 if (client->hasSourceAttribute() && client->deferAttributeValue() && m_parse rInserted && !client->asyncAttributeValue()) { 242 if (client->hasSourceAttribute() && client->deferAttributeValue() && m_parse rInserted && !client->asyncAttributeValue()) {
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 if (isHTMLScriptLoader(element)) 514 if (isHTMLScriptLoader(element))
515 return toHTMLScriptElement(element)->loader(); 515 return toHTMLScriptElement(element)->loader();
516 516
517 if (isSVGScriptLoader(element)) 517 if (isSVGScriptLoader(element))
518 return toSVGScriptElement(element)->loader(); 518 return toSVGScriptElement(element)->loader();
519 519
520 return 0; 520 return 0;
521 } 521 }
522 522
523 } // namespace blink 523 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp ('k') | third_party/WebKit/Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698