[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:47:17 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4d2ca8c776107193d2a8d93d3c968e942f2dbe88
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 09:26:56 2010 +0000

    2010-11-12  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [qt] script-clone tests added in r71895 fails on qt platform
            https://bugs.webkit.org/show_bug.cgi?id=49429
    
            Enabled fast/dom/script-clone-rerun-self.html and fast/dom/script-clone-rerun.html
    
            * platform/qt/Skipped:
    2010-11-12  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [qt] script-clone tests added in r71895 fails on qt platform
            https://bugs.webkit.org/show_bug.cgi?id=49429
    
            Fixed parseEndElement to call ScriptElement's executeScript as supposed to that of ScriptController.
    
            * dom/XMLDocumentParserQt.cpp:
            (WebCore::XMLDocumentParser::parseEndElement):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f54dc6e..3f13a01 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-12  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [qt] script-clone tests added in r71895 fails on qt platform
+        https://bugs.webkit.org/show_bug.cgi?id=49429
+
+        Enabled fast/dom/script-clone-rerun-self.html and fast/dom/script-clone-rerun.html
+
+        * platform/qt/Skipped:
+
 2010-11-11  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed. Disable SVG tests added by r71895 because Qt has its own XML parser,
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 9433de2..f951b30 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -1508,10 +1508,6 @@ svg/dom/SVGRectElement/rect-modify-rx.svg
 svg/hixie/dynamic/002.xml
 svg/hixie/mixed/007.xml
 
-# https://bugs.webkit.org/show_bug.cgi?id=48966
-svg/dom/SVGScriptElement/script-clone-rerun-self.svg
-svg/dom/SVGScriptElement/script-clone-rerun.svg
-
 # ============================================================================= #
 # failing animations tests
 # ============================================================================= #
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d42b9e6..6efa9fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-12  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [qt] script-clone tests added in r71895 fails on qt platform
+        https://bugs.webkit.org/show_bug.cgi?id=49429
+
+        Fixed parseEndElement to call ScriptElement's executeScript as supposed to that of ScriptController.
+
+        * dom/XMLDocumentParserQt.cpp:
+        (WebCore::XMLDocumentParser::parseEndElement):
+
 2010-11-05  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/dom/XMLDocumentParserQt.cpp b/WebCore/dom/XMLDocumentParserQt.cpp
index 48cf5de..e905e31 100644
--- a/WebCore/dom/XMLDocumentParserQt.cpp
+++ b/WebCore/dom/XMLDocumentParserQt.cpp
@@ -611,7 +611,7 @@ void XMLDocumentParser::parseEndElement()
             } else
                 m_scriptElement = 0;
         } else
-            m_view->frame()->script()->executeScript(ScriptSourceCode(scriptElement->scriptContent(), document()->url(), m_scriptStartPosition));
+            scriptElement->executeScript(ScriptSourceCode(scriptElement->scriptContent(), document()->url(), m_scriptStartPosition));
     }
     m_requestingScript = false;
     popCurrentNode();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list