Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 7 insertions, 7 deletions

diff --git a/WebCore/html/HTMLScriptElement.cpp b/WebCore/html/HTMLScriptElement.cpp
index 0ee93df..603b2a8 100644
--- a/WebCore/html/HTMLScriptElement.cpp
+++ b/WebCore/html/HTMLScriptElement.cpp
@@ -35,16 +35,16 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-inline HTMLScriptElement::HTMLScriptElement(const QualifiedName& tagName, Document* document, bool createdByParser, bool isEvaluated)
+inline HTMLScriptElement::HTMLScriptElement(const QualifiedName& tagName, Document* document, bool wasInsertedByParser, bool wasAlreadyStarted)
     : HTMLElement(tagName, document)
-    , ScriptElement(this, createdByParser, isEvaluated)
+    , ScriptElement(this, wasInsertedByParser, wasAlreadyStarted)
 {
     ASSERT(hasTagName(scriptTag));
 }
 
-PassRefPtr<HTMLScriptElement> HTMLScriptElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
+PassRefPtr<HTMLScriptElement> HTMLScriptElement::create(const QualifiedName& tagName, Document* document, bool wasInsertedByParser)
 {
-    return adoptRef(new HTMLScriptElement(tagName, document, createdByParser, false));
+    return adoptRef(new HTMLScriptElement(tagName, document, wasInsertedByParser, false));
 }
 
 bool HTMLScriptElement::isURLAttribute(Attribute* attr) const
@@ -152,12 +152,12 @@ String HTMLScriptElement::eventAttributeValue() const
 
 bool HTMLScriptElement::asyncAttributeValue() const
 {
-    return !getAttribute(asyncAttr).isNull();
+    return fastHasAttribute(asyncAttr);
 }
 
 bool HTMLScriptElement::deferAttributeValue() const
 {
-    return !getAttribute(deferAttr).isNull();
+    return fastHasAttribute(deferAttr);
 }
 
 void HTMLScriptElement::dispatchLoadEvent()
@@ -175,7 +175,7 @@ void HTMLScriptElement::dispatchErrorEvent()
 
 PassRefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren() const
 {
-    return adoptRef(new HTMLScriptElement(tagQName(), document(), false, isEvaluated()));
+    return adoptRef(new HTMLScriptElement(tagQName(), document(), false, wasAlreadyStarted()));
 }
 
 }