[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
rniwa at webkit.org
rniwa at webkit.org
Wed Dec 22 15:53:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1329a19d9b83fa0a5e4f9668ea1734729cb55dc3
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 05:23:34 2010 +0000
2010-11-12 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
ScriptElement rather than HTMLScriptElement and SVGScriptElement should have ScriptElementData
https://bugs.webkit.org/show_bug.cgi?id=49469
Moved m_data, scriptCharset, scriptContent, shouldExecuteAsJavaScript, and executeScript from
HTMLScriptElement and SVGScriptElement to ScriptElementData.
Also made insertedIntoDocument, removedFromDocument, childrenChanged, finishParsingChildren,
and handleSourceAttribute of ScriptElement non-static.
No new tests are added since this is a cleanup.
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::scriptCharset): Added.
(WebCore::ScriptElement::scriptContent): Added.
(WebCore::ScriptElement::shouldExecuteAsJavaScript): Added.
(WebCore::ScriptElement::executeScript): Added.
(WebCore::ScriptElement::insertedIntoDocument): Made non-static. Accesses m_data.
(WebCore::ScriptElement::removedFromDocument): Ditto.
(WebCore::ScriptElement::childrenChanged): Ditto.
(WebCore::ScriptElement::finishParsingChildren): Ditto.
(WebCore::ScriptElement::handleSourceAttribute): Ditto.
* dom/ScriptElement.h: Moved the declaration of ScriptElement after that of ScriptElementData
because ScriptElement has to instantiate ScriptElementData.
(WebCore::ScriptElement::ScriptElement): Initializes m_data.
* html/HTMLScriptElement.cpp: Removed scriptCharset, scriptContent, shouldExecuteAsJavaScript, and executeScript.
(WebCore::HTMLScriptElement::HTMLScriptElement): Initializes ScriptElement instead of ScriptElementData.
(WebCore::HTMLScriptElement::childrenChanged): Calls ScriptElement::childrenChanged.
(WebCore::HTMLScriptElement::parseMappedAttribute): Calls ScriptElement::handleSourceAttribute.
(WebCore::HTMLScriptElement::finishParsingChildren): Calls ScriptElement::finishParsingChildren.
(WebCore::HTMLScriptElement::insertedIntoDocument): Calls ScriptElement::insertedIntoDocument.
(WebCore::HTMLScriptElement::removedFromDocument): Calls ScriptElement::removedFromDocument.
* html/HTMLScriptElement.h:
* svg/SVGScriptElement.cpp: Removed scriptCharset, scriptContent, shouldExecuteAsJavaScript, and executeScript.
(WebCore::SVGScriptElement::SVGScriptElement): Initializes ScriptElement instead of ScriptElementData.
(WebCore::SVGScriptElement::svgAttributeChanged): Calls ScriptElement::handleSourceAttribute.
(WebCore::SVGScriptElement::insertedIntoDocument): Calls ScriptElement::insertedIntoDocument.
(WebCore::SVGScriptElement::removedFromDocument): Calls ScriptElement::removedFromDocument.
(WebCore::SVGScriptElement::childrenChanged): Calls ScriptElement::childrenChanged.
(WebCore::SVGScriptElement::finishParsingChildren): Calls ScriptElement::finishParsingChildren.
* svg/SVGScriptElement.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2dead1d..a434683 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,48 @@
+2010-11-12 Ryosuke Niwa <rniwa at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ ScriptElement rather than HTMLScriptElement and SVGScriptElement should have ScriptElementData
+ https://bugs.webkit.org/show_bug.cgi?id=49469
+
+ Moved m_data, scriptCharset, scriptContent, shouldExecuteAsJavaScript, and executeScript from
+ HTMLScriptElement and SVGScriptElement to ScriptElementData.
+
+ Also made insertedIntoDocument, removedFromDocument, childrenChanged, finishParsingChildren,
+ and handleSourceAttribute of ScriptElement non-static.
+
+ No new tests are added since this is a cleanup.
+
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::scriptCharset): Added.
+ (WebCore::ScriptElement::scriptContent): Added.
+ (WebCore::ScriptElement::shouldExecuteAsJavaScript): Added.
+ (WebCore::ScriptElement::executeScript): Added.
+ (WebCore::ScriptElement::insertedIntoDocument): Made non-static. Accesses m_data.
+ (WebCore::ScriptElement::removedFromDocument): Ditto.
+ (WebCore::ScriptElement::childrenChanged): Ditto.
+ (WebCore::ScriptElement::finishParsingChildren): Ditto.
+ (WebCore::ScriptElement::handleSourceAttribute): Ditto.
+ * dom/ScriptElement.h: Moved the declaration of ScriptElement after that of ScriptElementData
+ because ScriptElement has to instantiate ScriptElementData.
+ (WebCore::ScriptElement::ScriptElement): Initializes m_data.
+ * html/HTMLScriptElement.cpp: Removed scriptCharset, scriptContent, shouldExecuteAsJavaScript, and executeScript.
+ (WebCore::HTMLScriptElement::HTMLScriptElement): Initializes ScriptElement instead of ScriptElementData.
+ (WebCore::HTMLScriptElement::childrenChanged): Calls ScriptElement::childrenChanged.
+ (WebCore::HTMLScriptElement::parseMappedAttribute): Calls ScriptElement::handleSourceAttribute.
+ (WebCore::HTMLScriptElement::finishParsingChildren): Calls ScriptElement::finishParsingChildren.
+ (WebCore::HTMLScriptElement::insertedIntoDocument): Calls ScriptElement::insertedIntoDocument.
+ (WebCore::HTMLScriptElement::removedFromDocument): Calls ScriptElement::removedFromDocument.
+ * html/HTMLScriptElement.h:
+ * svg/SVGScriptElement.cpp: Removed scriptCharset, scriptContent, shouldExecuteAsJavaScript, and executeScript.
+ (WebCore::SVGScriptElement::SVGScriptElement): Initializes ScriptElement instead of ScriptElementData.
+ (WebCore::SVGScriptElement::svgAttributeChanged): Calls ScriptElement::handleSourceAttribute.
+ (WebCore::SVGScriptElement::insertedIntoDocument): Calls ScriptElement::insertedIntoDocument.
+ (WebCore::SVGScriptElement::removedFromDocument): Calls ScriptElement::removedFromDocument.
+ (WebCore::SVGScriptElement::childrenChanged): Calls ScriptElement::childrenChanged.
+ (WebCore::SVGScriptElement::finishParsingChildren): Calls ScriptElement::finishParsingChildren.
+ * svg/SVGScriptElement.h:
+
2010-11-15 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/dom/ScriptElement.cpp b/WebCore/dom/ScriptElement.cpp
index d7520cd..d544a09 100644
--- a/WebCore/dom/ScriptElement.cpp
+++ b/WebCore/dom/ScriptElement.cpp
@@ -51,58 +51,78 @@
namespace WebCore {
-void ScriptElement::insertedIntoDocument(ScriptElementData& data, const String& sourceUrl)
+String ScriptElement::scriptCharset() const
{
- if (data.createdByParser() && !data.isAsynchronous())
+ return m_data.scriptCharset();
+}
+
+String ScriptElement::scriptContent() const
+{
+ return m_data.scriptContent();
+}
+
+bool ScriptElement::shouldExecuteAsJavaScript() const
+{
+ return m_data.shouldExecuteAsJavaScript();
+}
+
+void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
+{
+ m_data.executeScript(sourceCode);
+}
+
+void ScriptElement::insertedIntoDocument(const String& sourceUrl)
+{
+ if (m_data.createdByParser() && !m_data.isAsynchronous())
return;
// http://www.whatwg.org/specs/web-apps/current-work/#script
if (!sourceUrl.isEmpty()) {
- data.requestScript(sourceUrl);
+ m_data.requestScript(sourceUrl);
return;
}
// If there's an empty script node, we shouldn't evaluate the script
// because if a script is inserted afterwards (by setting text or innerText)
// it should be evaluated, and evaluateScript only evaluates a script once.
- data.evaluateScript(ScriptSourceCode(data.scriptContent(), data.element()->document()->url())); // FIXME: Provide a real starting line number here.
+ m_data.evaluateScript(ScriptSourceCode(m_data.scriptContent(), m_data.element()->document()->url())); // FIXME: Provide a real starting line number here.
}
-void ScriptElement::removedFromDocument(ScriptElementData& data)
+void ScriptElement::removedFromDocument()
{
// Eventually stop loading any not-yet-finished content
- data.stopLoadRequest();
+ m_data.stopLoadRequest();
}
-void ScriptElement::childrenChanged(ScriptElementData& data)
+void ScriptElement::childrenChanged()
{
- if (data.createdByParser())
+ if (m_data.createdByParser())
return;
- Element* element = data.element();
+ Element* element = m_data.element();
// If a node is inserted as a child of the script element
// and the script element has been inserted in the document
// we evaluate the script.
if (element->inDocument() && element->firstChild())
- data.evaluateScript(ScriptSourceCode(data.scriptContent(), element->document()->url())); // FIXME: Provide a real starting line number here
+ m_data.evaluateScript(ScriptSourceCode(m_data.scriptContent(), element->document()->url())); // FIXME: Provide a real starting line number here
}
-void ScriptElement::finishParsingChildren(ScriptElementData& data, const String& sourceUrl)
+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() && data.scriptContent().isEmpty())
- data.setCreatedByParser(false);
+ if (sourceUrl.isEmpty() && m_data.scriptContent().isEmpty())
+ m_data.setCreatedByParser(false);
}
-void ScriptElement::handleSourceAttribute(ScriptElementData& data, const String& sourceUrl)
+void ScriptElement::handleSourceAttribute(const String& sourceUrl)
{
- if (data.ignoresLoadRequest() || sourceUrl.isEmpty())
+ if (m_data.ignoresLoadRequest() || sourceUrl.isEmpty())
return;
- data.requestScript(sourceUrl);
+ m_data.requestScript(sourceUrl);
}
// Helper function
diff --git a/WebCore/dom/ScriptElement.h b/WebCore/dom/ScriptElement.h
index b576468..79c4af9 100644
--- a/WebCore/dom/ScriptElement.h
+++ b/WebCore/dom/ScriptElement.h
@@ -28,43 +28,9 @@ namespace WebCore {
class CachedScript;
class Element;
-class ScriptElementData;
+class ScriptElement;
class ScriptSourceCode;
-class ScriptElement {
-public:
- ScriptElement() { }
- virtual ~ScriptElement() { }
-
- virtual String scriptContent() const = 0;
-
- virtual String sourceAttributeValue() const = 0;
- virtual String charsetAttributeValue() const = 0;
- virtual String typeAttributeValue() const = 0;
- virtual String languageAttributeValue() const = 0;
- virtual String forAttributeValue() const = 0;
- virtual String eventAttributeValue() const = 0;
- virtual bool asyncAttributeValue() const = 0;
- virtual bool deferAttributeValue() const = 0;
-
- virtual void dispatchLoadEvent() = 0;
- virtual void dispatchErrorEvent() = 0;
-
- // A charset for loading the script (may be overridden by HTTP headers or a BOM).
- virtual String scriptCharset() const = 0;
-
- virtual bool shouldExecuteAsJavaScript() const = 0;
- virtual void executeScript(const ScriptSourceCode&) = 0;
-
-protected:
- // Helper functions used by our parent classes.
- static void insertedIntoDocument(ScriptElementData&, const String& sourceUrl);
- static void removedFromDocument(ScriptElementData&);
- static void childrenChanged(ScriptElementData&);
- static void finishParsingChildren(ScriptElementData&, const String& sourceUrl);
- static void handleSourceAttribute(ScriptElementData&, const String& sourceUrl);
-};
-
// HTML/SVGScriptElement hold this struct as member variable
// and pass it to the static helper functions in ScriptElement
class ScriptElementData : private CachedResourceClient {
@@ -107,6 +73,44 @@ private:
bool m_firedLoad;
};
+class ScriptElement {
+public:
+ ScriptElement(Element* element, bool createdByParser, bool isEvaluated)
+ : m_data(this, element, isEvaluated)
+ {
+ m_data.setCreatedByParser(createdByParser);
+ }
+ virtual ~ScriptElement() { }
+
+ // A charset for loading the script (may be overridden by HTTP headers or a BOM).
+ String scriptCharset() const;
+ String scriptContent() const;
+ bool shouldExecuteAsJavaScript() const;
+ void executeScript(const ScriptSourceCode&);
+
+ virtual String sourceAttributeValue() const = 0;
+ virtual String charsetAttributeValue() const = 0;
+ virtual String typeAttributeValue() const = 0;
+ virtual String languageAttributeValue() const = 0;
+ virtual String forAttributeValue() const = 0;
+ virtual String eventAttributeValue() const = 0;
+ virtual bool asyncAttributeValue() const = 0;
+ virtual bool deferAttributeValue() const = 0;
+
+ virtual void dispatchLoadEvent() = 0;
+ virtual void dispatchErrorEvent() = 0;
+
+protected:
+ // Helper functions used by our parent classes.
+ void insertedIntoDocument(const String& sourceUrl);
+ void removedFromDocument();
+ void childrenChanged();
+ void finishParsingChildren(const String& sourceUrl);
+ void handleSourceAttribute(const String& sourceUrl);
+
+ ScriptElementData m_data;
+};
+
ScriptElement* toScriptElement(Element*);
}
diff --git a/WebCore/html/HTMLScriptElement.cpp b/WebCore/html/HTMLScriptElement.cpp
index 25c535d..91fa416 100644
--- a/WebCore/html/HTMLScriptElement.cpp
+++ b/WebCore/html/HTMLScriptElement.cpp
@@ -37,10 +37,9 @@ using namespace HTMLNames;
inline HTMLScriptElement::HTMLScriptElement(const QualifiedName& tagName, Document* document, bool createdByParser, bool isEvaluated)
: HTMLElement(tagName, document)
- , m_data(this, this, isEvaluated)
+ , ScriptElement(this, createdByParser, isEvaluated)
{
ASSERT(hasTagName(scriptTag));
- m_data.setCreatedByParser(createdByParser);
}
PassRefPtr<HTMLScriptElement> HTMLScriptElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
@@ -53,14 +52,9 @@ bool HTMLScriptElement::isURLAttribute(Attribute* attr) const
return attr->name() == srcAttr;
}
-bool HTMLScriptElement::shouldExecuteAsJavaScript() const
-{
- return m_data.shouldExecuteAsJavaScript();
-}
-
void HTMLScriptElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
{
- ScriptElement::childrenChanged(m_data);
+ ScriptElement::childrenChanged();
HTMLElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
}
@@ -69,7 +63,7 @@ void HTMLScriptElement::parseMappedAttribute(Attribute* attr)
const QualifiedName& attrName = attr->name();
if (attrName == srcAttr)
- handleSourceAttribute(m_data, attr->value());
+ handleSourceAttribute(attr->value());
else if (attrName == onloadAttr)
setAttributeEventListener(eventNames().loadEvent, createAttributeEventListener(this, attr));
else if (attrName == onbeforeloadAttr)
@@ -82,20 +76,20 @@ void HTMLScriptElement::parseMappedAttribute(Attribute* attr)
void HTMLScriptElement::finishParsingChildren()
{
- ScriptElement::finishParsingChildren(m_data, sourceAttributeValue());
+ ScriptElement::finishParsingChildren(sourceAttributeValue());
HTMLElement::finishParsingChildren();
}
void HTMLScriptElement::insertedIntoDocument()
{
HTMLElement::insertedIntoDocument();
- ScriptElement::insertedIntoDocument(m_data, sourceAttributeValue());
+ ScriptElement::insertedIntoDocument(sourceAttributeValue());
}
void HTMLScriptElement::removedFromDocument()
{
HTMLElement::removedFromDocument();
- ScriptElement::removedFromDocument(m_data);
+ ScriptElement::removedFromDocument();
}
String HTMLScriptElement::text() const
@@ -124,16 +118,6 @@ KURL HTMLScriptElement::src() const
return document()->completeURL(sourceAttributeValue());
}
-String HTMLScriptElement::scriptCharset() const
-{
- return m_data.scriptCharset();
-}
-
-String HTMLScriptElement::scriptContent() const
-{
- return m_data.scriptContent();
-}
-
void HTMLScriptElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
{
HTMLElement::addSubresourceAttributeURLs(urls);
@@ -199,9 +183,4 @@ PassRefPtr<Element> HTMLScriptElement::cloneElementWithoutAttributesAndChildren(
return adoptRef(new HTMLScriptElement(tagQName(), document(), false, m_data.isEvaluated()));
}
-void HTMLScriptElement::executeScript(const ScriptSourceCode& sourceCode)
-{
- return m_data.executeScript(sourceCode);
-}
-
}
diff --git a/WebCore/html/HTMLScriptElement.h b/WebCore/html/HTMLScriptElement.h
index fcf85a7..aae73a7 100644
--- a/WebCore/html/HTMLScriptElement.h
+++ b/WebCore/html/HTMLScriptElement.h
@@ -33,22 +33,16 @@ class HTMLScriptElement : public HTMLElement, public ScriptElement {
public:
static PassRefPtr<HTMLScriptElement> create(const QualifiedName&, Document*, bool createdByParser);
- virtual bool shouldExecuteAsJavaScript() const;
-
String text() const;
void setText(const String&);
KURL src() const;
- virtual String scriptCharset() const;
-
bool haveFiredLoadEvent() const { return m_data.haveFiredLoadEvent(); }
private:
HTMLScriptElement(const QualifiedName&, Document*, bool createdByParser, bool isEvaluated);
- virtual String scriptContent() const;
-
virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
@@ -72,9 +66,6 @@ private:
virtual void dispatchErrorEvent();
PassRefPtr<Element> cloneElementWithoutAttributesAndChildren() const;
- void executeScript(const ScriptSourceCode&);
-
- ScriptElementData m_data;
};
} //namespace
diff --git a/WebCore/svg/SVGScriptElement.cpp b/WebCore/svg/SVGScriptElement.cpp
index 737cb3a..18f9df3 100644
--- a/WebCore/svg/SVGScriptElement.cpp
+++ b/WebCore/svg/SVGScriptElement.cpp
@@ -33,9 +33,8 @@ namespace WebCore {
inline SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document* document, bool createdByParser, bool isEvaluated)
: SVGElement(tagName, document)
- , m_data(this, this, isEvaluated)
+ , ScriptElement(this, createdByParser, isEvaluated)
{
- m_data.setCreatedByParser(createdByParser);
}
PassRefPtr<SVGScriptElement> SVGScriptElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
@@ -43,11 +42,6 @@ PassRefPtr<SVGScriptElement> SVGScriptElement::create(const QualifiedName& tagNa
return adoptRef(new SVGScriptElement(tagName, document, createdByParser, false));
}
-String SVGScriptElement::scriptContent() const
-{
- return m_data.scriptContent();
-}
-
void SVGScriptElement::parseMappedAttribute(Attribute* attr)
{
const QualifiedName& attrName = attr->name();
@@ -69,7 +63,7 @@ void SVGScriptElement::svgAttributeChanged(const QualifiedName& attrName)
SVGElement::svgAttributeChanged(attrName);
if (SVGURIReference::isKnownAttribute(attrName))
- handleSourceAttribute(m_data, href());
+ handleSourceAttribute(href());
else if (SVGExternalResourcesRequired::isKnownAttribute(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
@@ -102,7 +96,7 @@ void SVGScriptElement::synchronizeProperty(const QualifiedName& attrName)
void SVGScriptElement::insertedIntoDocument()
{
SVGElement::insertedIntoDocument();
- ScriptElement::insertedIntoDocument(m_data, sourceAttributeValue());
+ ScriptElement::insertedIntoDocument(sourceAttributeValue());
if (m_data.createdByParser())
return;
@@ -117,12 +111,12 @@ void SVGScriptElement::insertedIntoDocument()
void SVGScriptElement::removedFromDocument()
{
SVGElement::removedFromDocument();
- ScriptElement::removedFromDocument(m_data);
+ ScriptElement::removedFromDocument();
}
void SVGScriptElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
{
- ScriptElement::childrenChanged(m_data);
+ ScriptElement::childrenChanged();
SVGElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
}
@@ -133,7 +127,7 @@ bool SVGScriptElement::isURLAttribute(Attribute* attr) const
void SVGScriptElement::finishParsingChildren()
{
- ScriptElement::finishParsingChildren(m_data, sourceAttributeValue());
+ ScriptElement::finishParsingChildren(sourceAttributeValue());
SVGElement::finishParsingChildren();
// A SVGLoad event has been fired by SVGElement::finishParsingChildren.
@@ -151,11 +145,6 @@ void SVGScriptElement::setType(const String& type)
m_type = type;
}
-String SVGScriptElement::scriptCharset() const
-{
- return m_data.scriptCharset();
-}
-
void SVGScriptElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
{
SVGElement::addSubresourceAttributeURLs(urls);
@@ -241,21 +230,11 @@ void SVGScriptElement::dispatchErrorEvent()
dispatchEvent(Event::create(eventNames().errorEvent, true, false));
}
-bool SVGScriptElement::shouldExecuteAsJavaScript() const
-{
- return m_data.shouldExecuteAsJavaScript();
-}
-
PassRefPtr<Element> SVGScriptElement::cloneElementWithoutAttributesAndChildren() const
{
return adoptRef(new SVGScriptElement(tagQName(), document(), false, m_data.isEvaluated()));
}
-void SVGScriptElement::executeScript(const ScriptSourceCode& sourceCode)
-{
- m_data.executeScript(sourceCode);
-}
-
}
#endif // ENABLE(SVG)
diff --git a/WebCore/svg/SVGScriptElement.h b/WebCore/svg/SVGScriptElement.h
index 1cca0f6..7532bf2 100644
--- a/WebCore/svg/SVGScriptElement.h
+++ b/WebCore/svg/SVGScriptElement.h
@@ -43,8 +43,6 @@ namespace WebCore {
private:
SVGScriptElement(const QualifiedName&, Document*, bool createdByParser, bool isEvaluated);
- virtual String scriptContent() const;
-
virtual void parseMappedAttribute(Attribute*);
virtual void insertedIntoDocument();
virtual void removedFromDocument();
@@ -55,12 +53,8 @@ namespace WebCore {
virtual bool isURLAttribute(Attribute*) const;
virtual void finishParsingChildren();
- virtual String scriptCharset() const;
-
virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
- virtual bool shouldExecuteAsJavaScript() const;
-
virtual bool haveLoadedRequiredResources();
virtual String sourceAttributeValue() const;
@@ -76,7 +70,6 @@ namespace WebCore {
virtual void dispatchErrorEvent();
PassRefPtr<Element> cloneElementWithoutAttributesAndChildren() const;
- void executeScript(const ScriptSourceCode& sourceCode);
// SVGURIReference
DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGScriptElement, XLinkNames::hrefAttr, String, Href, href)
@@ -84,7 +77,6 @@ namespace WebCore {
// SVGExternalResourcesRequired
DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGScriptElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
- ScriptElementData m_data;
String m_type;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list