diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/html/HTMLScriptElement.cpp | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebCore/html/HTMLScriptElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLScriptElement.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/html/HTMLScriptElement.cpp b/WebCore/html/HTMLScriptElement.cpp index e229bb8..0ee93df 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 wasInsertedByParser, bool wasAlreadyStarted) +inline HTMLScriptElement::HTMLScriptElement(const QualifiedName& tagName, Document* document, bool createdByParser, bool isEvaluated) : HTMLElement(tagName, document) - , ScriptElement(this, wasInsertedByParser, wasAlreadyStarted) + , ScriptElement(this, createdByParser, isEvaluated) { ASSERT(hasTagName(scriptTag)); } -PassRefPtr<HTMLScriptElement> HTMLScriptElement::create(const QualifiedName& tagName, Document* document, bool wasInsertedByParser) +PassRefPtr<HTMLScriptElement> HTMLScriptElement::create(const QualifiedName& tagName, Document* document, bool createdByParser) { - return adoptRef(new HTMLScriptElement(tagName, document, wasInsertedByParser, false)); + return adoptRef(new HTMLScriptElement(tagName, document, createdByParser, false)); } bool HTMLScriptElement::isURLAttribute(Attribute* attr) const @@ -175,7 +175,7 @@ void HTMLScriptElement::dispatchErrorEvent() PassRefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren() const { - return adoptRef(new HTMLScriptElement(tagQName(), document(), false, wasAlreadyStarted())); + return adoptRef(new HTMLScriptElement(tagQName(), document(), false, isEvaluated())); } } |