summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/ScriptElement.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-01-05 12:15:11 +0000
committerSteve Block <steveblock@google.com>2011-01-06 14:14:00 +0000
commitd06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch)
treee0af8413af65a8e30630563441af7bdb8478e513 /WebCore/dom/ScriptElement.h
parent419a5cf2f8db6ca014df624865197ffb82caad37 (diff)
downloadexternal_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/dom/ScriptElement.h')
-rw-r--r--WebCore/dom/ScriptElement.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/WebCore/dom/ScriptElement.h b/WebCore/dom/ScriptElement.h
index 07c59db..b6beb6e 100644
--- a/WebCore/dom/ScriptElement.h
+++ b/WebCore/dom/ScriptElement.h
@@ -51,12 +51,11 @@ public:
virtual void dispatchLoadEvent() = 0;
virtual void dispatchErrorEvent() = 0;
- bool haveFiredLoadEvent() const { return m_haveFiredLoad; }
-
protected:
- void setHaveFiredLoadEvent(bool haveFiredLoad) { m_haveFiredLoad = haveFiredLoad; }
- bool wasInsertedByParser() const { return m_wasInsertedByParser; }
- bool wasAlreadyStarted() const { return m_wasAlreadyStarted; }
+ bool haveFiredLoadEvent() const { return m_firedLoad; }
+ void setHaveFiredLoadEvent(bool firedLoad) { m_firedLoad = firedLoad; }
+ bool createdByParser() const { return m_createdByParser; }
+ bool isEvaluated() const { return m_isEvaluated; }
// Helper functions used by our parent classes.
void insertedIntoDocument(const String& sourceUrl);
@@ -86,10 +85,10 @@ private:
Element* m_element;
CachedResourceHandle<CachedScript> m_cachedScript;
- bool m_wasInsertedByParser;
- bool m_isExternalScript;
- bool m_wasAlreadyStarted;
- bool m_haveFiredLoad;
+ bool m_createdByParser; // HTML5: "parser-inserted"
+ bool m_requested;
+ bool m_isEvaluated; // HTML5: "already started"
+ bool m_firedLoad;
};
ScriptElement* toScriptElement(Element*);