[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:36:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 33e762c685a5adbd9dbc12d766402e11f46c4820
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 30 21:15:13 2010 +0000
2010-07-30 Yong Li <yoli at rim.com>
Reviewed by Darin Adler.
Implement SVGScriptElement::shouldExecuteAsJavaScript() otherwise
SVGScriptElement cannot run when XHTMLMP is enabled.
https://bugs.webkit.org/show_bug.cgi?id=43267
No test needed, because it fails all SVG <script> tests when XHTMLMP is on.
* svg/SVGScriptElement.cpp:
(WebCore::SVGScriptElement::shouldExecuteAsJavaScript):
* svg/SVGScriptElement.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64373 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2e05e5..23d6041 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-30 Yong Li <yoli at rim.com>
+
+ Reviewed by Darin Adler.
+
+ Implement SVGScriptElement::shouldExecuteAsJavaScript() otherwise
+ SVGScriptElement cannot run when XHTMLMP is enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=43267
+
+ No test needed, because it fails all SVG <script> tests when XHTMLMP is on.
+
+ * svg/SVGScriptElement.cpp:
+ (WebCore::SVGScriptElement::shouldExecuteAsJavaScript):
+ * svg/SVGScriptElement.h:
+
2010-07-30 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/svg/SVGScriptElement.cpp b/WebCore/svg/SVGScriptElement.cpp
index abe77a9..ea4ac1f 100644
--- a/WebCore/svg/SVGScriptElement.cpp
+++ b/WebCore/svg/SVGScriptElement.cpp
@@ -242,6 +242,11 @@ void SVGScriptElement::dispatchErrorEvent()
dispatchEvent(Event::create(eventNames().errorEvent, true, false));
}
+bool SVGScriptElement::shouldExecuteAsJavaScript() const
+{
+ return m_data.shouldExecuteAsJavaScript();
+}
+
}
#endif // ENABLE(SVG)
diff --git a/WebCore/svg/SVGScriptElement.h b/WebCore/svg/SVGScriptElement.h
index 770dc89..2d9cae8 100644
--- a/WebCore/svg/SVGScriptElement.h
+++ b/WebCore/svg/SVGScriptElement.h
@@ -56,7 +56,7 @@ namespace WebCore {
virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
- virtual bool shouldExecuteAsJavaScript() const { return false; }
+ virtual bool shouldExecuteAsJavaScript() const;
protected:
virtual bool haveLoadedRequiredResources();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list