[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
rniwa at webkit.org
rniwa at webkit.org
Wed Dec 22 17:50:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit eb0ec5e71ba04bd5c7cedff165155565d172b51e
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 02:09:33 2010 +0000
2010-11-30 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
[HTML5] Rename member variables of HTMLScriptElement
https://bugs.webkit.org/show_bug.cgi?id=49705
Renamed m_wasCreatedByParser to m_wasInsertedByParser, m_requested to m_isExternalScript,
m_isEvaluated to m_wasAlreadyStarted, and m_firedLoad to m_haveFiredLoad.
Also made ScriptElement's haveFiredLoadEvent and removed HTMLScriptElement's haveFiredLoadEvent.
This effectively adds the same function to SVGScriptElement, which isn't currently used anywhere.
No new tests are added since this is a refactoring.
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::ScriptElement):
(WebCore::ScriptElement::insertedIntoDocument):
(WebCore::ScriptElement::childrenChanged):
(WebCore::ScriptElement::finishParsingChildren):
(WebCore::ScriptElement::requestScript):
(WebCore::ScriptElement::evaluateScript):
(WebCore::ScriptElement::executeScript):
(WebCore::ScriptElement::ignoresLoadRequest):
* dom/ScriptElement.h:
(WebCore::ScriptElement::haveFiredLoadEvent):
(WebCore::ScriptElement::setHaveFiredLoadEvent):
(WebCore::ScriptElement::wasInsertedByParser):
(WebCore::ScriptElement::wasAlreadyStarted):
* html/HTMLScriptElement.cpp:
(WebCore::HTMLScriptElement::HTMLScriptElement):
(WebCore::HTMLScriptElement::create):
(WebCore::HTMLScriptElement::cloneElementWithoutAttributesAndChildren):
* html/HTMLScriptElement.h:
* svg/SVGScriptElement.cpp:
(WebCore::SVGScriptElement::SVGScriptElement):
(WebCore::SVGScriptElement::create):
(WebCore::SVGScriptElement::svgAttributeChanged):
(WebCore::SVGScriptElement::insertedIntoDocument):
(WebCore::SVGScriptElement::dispatchLoadEvent):
(WebCore::SVGScriptElement::cloneElementWithoutAttributesAndChildren):
* svg/SVGScriptElement.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72995 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0e0b926..7742bf7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,46 @@
+2010-11-30 Ryosuke Niwa <rniwa at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ [HTML5] Rename member variables of HTMLScriptElement
+ https://bugs.webkit.org/show_bug.cgi?id=49705
+
+ Renamed m_wasCreatedByParser to m_wasInsertedByParser, m_requested to m_isExternalScript,
+ m_isEvaluated to m_wasAlreadyStarted, and m_firedLoad to m_haveFiredLoad.
+
+ Also made ScriptElement's haveFiredLoadEvent and removed HTMLScriptElement's haveFiredLoadEvent.
+ This effectively adds the same function to SVGScriptElement, which isn't currently used anywhere.
+
+ No new tests are added since this is a refactoring.
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::ScriptElement):
+ (WebCore::ScriptElement::insertedIntoDocument):
+ (WebCore::ScriptElement::childrenChanged):
+ (WebCore::ScriptElement::finishParsingChildren):
+ (WebCore::ScriptElement::requestScript):
+ (WebCore::ScriptElement::evaluateScript):
+ (WebCore::ScriptElement::executeScript):
+ (WebCore::ScriptElement::ignoresLoadRequest):
+ * dom/ScriptElement.h:
+ (WebCore::ScriptElement::haveFiredLoadEvent):
+ (WebCore::ScriptElement::setHaveFiredLoadEvent):
+ (WebCore::ScriptElement::wasInsertedByParser):
+ (WebCore::ScriptElement::wasAlreadyStarted):
+ * html/HTMLScriptElement.cpp:
+ (WebCore::HTMLScriptElement::HTMLScriptElement):
+ (WebCore::HTMLScriptElement::create):
+ (WebCore::HTMLScriptElement::cloneElementWithoutAttributesAndChildren):
+ * html/HTMLScriptElement.h:
+ * svg/SVGScriptElement.cpp:
+ (WebCore::SVGScriptElement::SVGScriptElement):
+ (WebCore::SVGScriptElement::create):
+ (WebCore::SVGScriptElement::svgAttributeChanged):
+ (WebCore::SVGScriptElement::insertedIntoDocument):
+ (WebCore::SVGScriptElement::dispatchLoadEvent):
+ (WebCore::SVGScriptElement::cloneElementWithoutAttributesAndChildren):
+ * svg/SVGScriptElement.h:
+
2010-11-30 Darin Adler <darin at apple.com>
Rolled back most of the FileReaderLoader changes to fix 32-bit builds.
diff --git a/WebCore/dom/ScriptElement.cpp b/WebCore/dom/ScriptElement.cpp
index 6c8441d..74f2580 100644
--- a/WebCore/dom/ScriptElement.cpp
+++ b/WebCore/dom/ScriptElement.cpp
@@ -51,13 +51,13 @@
namespace WebCore {
-ScriptElement::ScriptElement(Element* element, bool createdByParser, bool isEvaluated)
+ScriptElement::ScriptElement(Element* element, bool wasInsertedByParser, bool wasAlreadyStarted)
: m_element(element)
, m_cachedScript(0)
- , m_createdByParser(createdByParser)
- , m_requested(false)
- , m_isEvaluated(isEvaluated)
- , m_firedLoad(false)
+ , m_wasInsertedByParser(wasInsertedByParser)
+ , m_isExternalScript(false)
+ , m_wasAlreadyStarted(wasAlreadyStarted)
+ , m_haveFiredLoad(false)
{
ASSERT(m_element);
}
@@ -69,7 +69,7 @@ ScriptElement::~ScriptElement()
void ScriptElement::insertedIntoDocument(const String& sourceUrl)
{
- if (createdByParser() && !isAsynchronous())
+ if (wasInsertedByParser() && !isAsynchronous())
return;
// http://www.whatwg.org/specs/web-apps/current-work/#script
@@ -93,7 +93,7 @@ void ScriptElement::removedFromDocument()
void ScriptElement::childrenChanged()
{
- if (createdByParser())
+ if (wasInsertedByParser())
return;
// If a node is inserted as a child of the script element
@@ -108,7 +108,7 @@ void ScriptElement::finishParsingChildren(const String& sourceUrl)
// The parser just reached </script>. If we have no src and no text,
// allow dynamic loading later.
if (sourceUrl.isEmpty() && scriptContent().isEmpty())
- m_createdByParser = false;
+ m_wasInsertedByParser = false;
}
void ScriptElement::handleSourceAttribute(const String& sourceUrl)
@@ -158,12 +158,12 @@ void ScriptElement::requestScript(const String& sourceUrl)
ASSERT(!m_cachedScript);
m_cachedScript = document->cachedResourceLoader()->requestScript(sourceUrl, scriptCharset());
- m_requested = true;
+ m_isExternalScript = true;
- // m_createdByParser is never reset - always resied at the initial value set while parsing.
- // m_evaluated is left untouched as well to avoid script reexecution, if a <script> element
+ // m_wasInsertedByParser is never reset - always resied at the initial value set while parsing.
+ // m_wasAlreadyStarted is left untouched as well to avoid script reexecution, if a <script> element
// is removed and reappended to the document.
- m_firedLoad = false;
+ m_haveFiredLoad = false;
if (m_cachedScript) {
m_cachedScript->addClient(this);
@@ -175,7 +175,7 @@ void ScriptElement::requestScript(const String& sourceUrl)
void ScriptElement::evaluateScript(const ScriptSourceCode& sourceCode)
{
- if (m_isEvaluated || sourceCode.isEmpty() || !shouldExecuteAsJavaScript())
+ if (wasAlreadyStarted() || sourceCode.isEmpty() || !shouldExecuteAsJavaScript())
return;
RefPtr<Document> document = m_element->document();
@@ -184,12 +184,12 @@ void ScriptElement::evaluateScript(const ScriptSourceCode& sourceCode)
if (!frame->script()->canExecuteScripts(AboutToExecuteScript))
return;
- m_isEvaluated = true;
+ m_wasAlreadyStarted = true;
// http://www.whatwg.org/specs/web-apps/current-work/#script
{
- IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_requested ? document.get() : 0);
+ IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_isExternalScript ? document.get() : 0);
// Create a script from the script element node, using the script
// block's source and the script block's type.
// Note: This is where the script is compiled and actually executed.
@@ -202,7 +202,7 @@ void ScriptElement::evaluateScript(const ScriptSourceCode& sourceCode)
void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
{
- if (m_isEvaluated || sourceCode.isEmpty())
+ if (wasAlreadyStarted() || sourceCode.isEmpty())
return;
RefPtr<Document> document = m_element->document();
ASSERT(document);
@@ -210,7 +210,7 @@ void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
if (!frame)
return;
- m_isEvaluated = true;
+ m_wasAlreadyStarted = true;
frame->script()->executeScript(sourceCode);
}
@@ -244,7 +244,7 @@ void ScriptElement::notifyFinished(CachedResource* o)
bool ScriptElement::ignoresLoadRequest() const
{
- return m_isEvaluated || m_requested || m_createdByParser || !m_element->inDocument();
+ return wasAlreadyStarted() || m_isExternalScript || wasInsertedByParser() || !m_element->inDocument();
}
bool ScriptElement::shouldExecuteAsJavaScript() const
diff --git a/WebCore/dom/ScriptElement.h b/WebCore/dom/ScriptElement.h
index b6beb6e..07c59db 100644
--- a/WebCore/dom/ScriptElement.h
+++ b/WebCore/dom/ScriptElement.h
@@ -51,11 +51,12 @@ public:
virtual void dispatchLoadEvent() = 0;
virtual void dispatchErrorEvent() = 0;
+ bool haveFiredLoadEvent() const { return m_haveFiredLoad; }
+
protected:
- 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; }
+ void setHaveFiredLoadEvent(bool haveFiredLoad) { m_haveFiredLoad = haveFiredLoad; }
+ bool wasInsertedByParser() const { return m_wasInsertedByParser; }
+ bool wasAlreadyStarted() const { return m_wasAlreadyStarted; }
// Helper functions used by our parent classes.
void insertedIntoDocument(const String& sourceUrl);
@@ -85,10 +86,10 @@ private:
Element* m_element;
CachedResourceHandle<CachedScript> m_cachedScript;
- bool m_createdByParser; // HTML5: "parser-inserted"
- bool m_requested;
- bool m_isEvaluated; // HTML5: "already started"
- bool m_firedLoad;
+ bool m_wasInsertedByParser;
+ bool m_isExternalScript;
+ bool m_wasAlreadyStarted;
+ bool m_haveFiredLoad;
};
ScriptElement* toScriptElement(Element*);
diff --git a/WebCore/html/HTMLScriptElement.cpp b/WebCore/html/HTMLScriptElement.cpp
index 0ee93df..e229bb8 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
@@ -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()));
}
}
diff --git a/WebCore/html/HTMLScriptElement.h b/WebCore/html/HTMLScriptElement.h
index 5b91ecc..09773c5 100644
--- a/WebCore/html/HTMLScriptElement.h
+++ b/WebCore/html/HTMLScriptElement.h
@@ -31,17 +31,15 @@ namespace WebCore {
class HTMLScriptElement : public HTMLElement, public ScriptElement {
public:
- static PassRefPtr<HTMLScriptElement> create(const QualifiedName&, Document*, bool createdByParser);
+ static PassRefPtr<HTMLScriptElement> create(const QualifiedName&, Document*, bool wasInsertedByParser);
String text() const { return scriptContent(); }
void setText(const String&);
KURL src() const;
- bool haveFiredLoadEvent() const { return ScriptElement::haveFiredLoadEvent(); }
-
private:
- HTMLScriptElement(const QualifiedName&, Document*, bool createdByParser, bool isEvaluated);
+ HTMLScriptElement(const QualifiedName&, Document*, bool wasInsertedByParser, bool wasAlreadyStarted);
virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
diff --git a/WebCore/svg/SVGScriptElement.cpp b/WebCore/svg/SVGScriptElement.cpp
index 9146ddc..af5bd5f 100644
--- a/WebCore/svg/SVGScriptElement.cpp
+++ b/WebCore/svg/SVGScriptElement.cpp
@@ -31,15 +31,15 @@
namespace WebCore {
-inline SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document* document, bool createdByParser, bool isEvaluated)
+inline SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document* document, bool wasInsertedByParser, bool wasAlreadyStarted)
: SVGElement(tagName, document)
- , ScriptElement(this, createdByParser, isEvaluated)
+ , ScriptElement(this, wasInsertedByParser, wasAlreadyStarted)
{
}
-PassRefPtr<SVGScriptElement> SVGScriptElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
+PassRefPtr<SVGScriptElement> SVGScriptElement::create(const QualifiedName& tagName, Document* document, bool insertedByParser)
{
- return adoptRef(new SVGScriptElement(tagName, document, createdByParser, false));
+ return adoptRef(new SVGScriptElement(tagName, document, insertedByParser, false));
}
void SVGScriptElement::parseMappedAttribute(Attribute* attr)
@@ -68,7 +68,7 @@ void SVGScriptElement::svgAttributeChanged(const QualifiedName& attrName)
// Handle dynamic updates of the 'externalResourcesRequired' attribute. Only possible case: changing from 'true' to 'false'
// causes an immediate dispatch of the SVGLoad event. If the attribute value was 'false' before inserting the script element
// in the document, the SVGLoad event has already been dispatched.
- if (!externalResourcesRequiredBaseValue() && !haveFiredLoadEvent() && !createdByParser()) {
+ if (!externalResourcesRequiredBaseValue() && !haveFiredLoadEvent() && !wasInsertedByParser()) {
setHaveFiredLoadEvent(true);
ASSERT(haveLoadedRequiredResources());
@@ -98,7 +98,7 @@ void SVGScriptElement::insertedIntoDocument()
SVGElement::insertedIntoDocument();
ScriptElement::insertedIntoDocument(sourceAttributeValue());
- if (createdByParser())
+ if (wasInsertedByParser())
return;
// Eventually send SVGLoad event now for the dynamically inserted script element
@@ -201,7 +201,7 @@ void SVGScriptElement::dispatchLoadEvent()
{
bool externalResourcesRequired = externalResourcesRequiredBaseValue();
- if (createdByParser())
+ if (wasInsertedByParser())
ASSERT(externalResourcesRequired != haveFiredLoadEvent());
else if (haveFiredLoadEvent()) {
// If we've already fired an load event and externalResourcesRequired is set to 'true'
@@ -232,7 +232,7 @@ void SVGScriptElement::dispatchErrorEvent()
PassRefPtr<Element> SVGScriptElement::cloneElementWithoutAttributesAndChildren() const
{
- return adoptRef(new SVGScriptElement(tagQName(), document(), false, isEvaluated()));
+ return adoptRef(new SVGScriptElement(tagQName(), document(), false, wasAlreadyStarted()));
}
}
diff --git a/WebCore/svg/SVGScriptElement.h b/WebCore/svg/SVGScriptElement.h
index 7532bf2..84615d3 100644
--- a/WebCore/svg/SVGScriptElement.h
+++ b/WebCore/svg/SVGScriptElement.h
@@ -35,13 +35,13 @@ namespace WebCore {
, public SVGExternalResourcesRequired
, public ScriptElement {
public:
- static PassRefPtr<SVGScriptElement> create(const QualifiedName&, Document*, bool createdByParser);
+ static PassRefPtr<SVGScriptElement> create(const QualifiedName&, Document*, bool wasInsertedByParser);
String type() const;
void setType(const String&);
private:
- SVGScriptElement(const QualifiedName&, Document*, bool createdByParser, bool isEvaluated);
+ SVGScriptElement(const QualifiedName&, Document*, bool wasInsertedByParser, bool wasAlreadyStarted);
virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list