Defer late and async scripts

Source/core/dom/ScriptLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 47 matching lines @@
     , m_resource(0)
     , m_startLineNumber(WTF::OrdinalNumber::beforeFirst())
     , m_parserInserted(parserInserted)
     , m_isExternalScript(false)
     , m_alreadyStarted(alreadyStarted)
     , m_haveFiredLoad(false)
     , m_willBeParserExecuted(false)
     , m_readyToBeParserExecuted(false)
     , m_willExecuteWhenDocumentFinishedParsing(false)
     , m_forceAsync(!parserInserted)
+    , m_hasAsyncAttribute(false)
+    , m_hasDeferAttribute(false)
     , m_willExecuteInOrder(false)
 {
     ASSERT(m_element);
     if (parserInserted && element->document().scriptableDocumentParser() && !element->document().isInDocumentWrite())
         m_startLineNumber = element->document().scriptableDocumentParser()->lineNumber();
 }
 
 ScriptLoader::~ScriptLoader()
 {
     stopLoadRequest();
@@ skipping 15 matching lines @@
 {
     if (ignoresLoadRequest() || sourceUrl.isEmpty())
         return;
 
     prepareScript(); // FIXME: Provide a real starting line number here.
 }
 
 void ScriptLoader::handleAsyncAttribute()
 {
     m_forceAsync = false;
+    m_hasAsyncAttribute = true;
 }
 
 // Helper function
 static bool isLegacySupportedJavaScriptLanguage(const String& language)
 {
     // Mozilla 1.8 accepts javascript1.0 - javascript1.7, but WinIE 7 accepts only javascript1.1 - javascript1.3.
     // Mozilla 1.8 and WinIE 7 both accept javascript and livescript.
     // WinIE 7 accepts ecmascript and jscript, but Mozilla 1.8 doesn't.
     // Neither Mozilla 1.8 nor WinIE 7 accept leading or trailing whitespace.
     // We want to accept all the values that either of these browsers accept, but not other values.
@@ skipping 64 matching lines @@
     if (m_parserInserted) {
         wasParserInserted = true;
         m_parserInserted = false;
     } else {
         wasParserInserted = false;
     }
 
     if (wasParserInserted && !client->asyncAttributeValue())
         m_forceAsync = true;
 
+    if (client->deferAttributeValue())
+        m_hasDeferAttribute = true;
+
     // FIXME: HTML5 spec says we should check that all children are either comments or empty text nodes.
     if (!client->hasSourceAttribute() && !m_element->hasChildren())
         return false;
 
     if (!m_element->inDocument())
         return false;
 
     if (!isScriptTypeSupported(supportLegacyTypes))
         return false;
 
@@ skipping 63 matching lines @@
 
         AtomicString crossOriginMode = m_element->fastGetAttribute(HTMLNames::crossoriginAttr);
         if (!crossOriginMode.isNull())
             request.setCrossOriginAccessControl(elementDocument->securityOrigin(), crossOriginMode);
         request.setCharset(scriptCharset());
 
         bool scriptPassesCSP = elementDocument->contentSecurityPolicy()->allowScriptWithNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr));
         if (scriptPassesCSP)
             request.setContentSecurityCheck(DoNotCheckContentSecurityPolicy);
 
+        if (!m_parserInserted || m_hasAsyncAttribute || m_hasDeferAttribute)
+            request.setExecAsync(true);
+
         m_resource = elementDocument->fetcher()->fetchScript(request);
         m_isExternalScript = true;
     }
 
     if (m_resource)
         return true;
 
     dispatchErrorEvent();
     return false;
 }
@@ skipping 162 matching lines @@
     if (isHTMLScriptLoader(element))
         return toHTMLScriptElement(element)->loader();
 
     if (isSVGScriptLoader(element))
         return toSVGScriptElement(element)->loader();
 
     return 0;
 }
 
 }