Rolling out http://bugzilla.opendarwin.org/show_bug.cgi?id=6010 because of failin...

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15669 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1128a46dbd1e7930e9cd627f5514b29faee2a198..6ae93e7184cce4f719d5f55dcc82412cadafb9e5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,32 @@
+2006-07-28  Alexey Proskuryakov  <ap@nypop.com>
+
+        Rolling out http://bugzilla.opendarwin.org/show_bug.cgi?id=6010 because of failing layout tests.
+        Add better SVGLoad event support.
+
+        * svg/W3C-SVG-1.1/extend-namespace-01-f-expected.checksum:
+        * svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png:
+        * svg/W3C-SVG-1.1/extend-namespace-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum:
+        * svg/W3C-SVG-1.1/interact-events-01-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-01-b-expected.checksum:
+        * svg/W3C-SVG-1.1/struct-dom-01-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-01-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-dom-02-b-expected.checksum:
+        * svg/W3C-SVG-1.1/struct-dom-02-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-02-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-dom-03-b-expected.checksum:
+        * svg/W3C-SVG-1.1/struct-dom-03-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-03-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-dom-04-b-expected.checksum:
+        * svg/W3C-SVG-1.1/struct-dom-04-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-04-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-dom-05-b-expected.checksum:
+        * svg/W3C-SVG-1.1/struct-dom-05-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-05-b-expected.txt:
+        * svg/W3C-SVG-1.1/struct-dom-06-b-expected.checksum:
+        * svg/W3C-SVG-1.1/struct-dom-06-b-expected.png:
+        * svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt:
+
 2006-07-27  Eric Seidel  <eric@eseidel.com>
 
         Reviewed by darin.

diff --git a/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.checksum
index 4d7f66191b39a04909d798742f3dbdcbf750b676..604f2b4b74c7a3480e4ab3e6413bbd0fad55613a 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.checksum
@@ -1 +1 @@
-40e2571f917ea604155cc19efaa67b48
\ No newline at end of file
+bf2a1657c3305f4818f274ffb5fad223
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png b/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
index 71385b154f9be0b8e7e26518109a3a8df043f0aa..c3134a2ae6e6ae6b9fe04eede0c124aa48043870 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.txt
index 990628554865ec0d10795060d1e64d747a0037ed..f970bcff67c5ad04ecae3e561e75cf914fd6faad 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.txt
@@ -1,32 +1,12 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (126.05,61.42) size 242.55x213.97
+      KCanvasContainer {g} at (0,0) size 0x0
         KCanvasContainer {g} at (0,0) size 0x0
           RenderSVGText {text} at (0,0) size 465x18
             RenderText {#text} at (0,0) size 349x17
               text run at (0,0) width 349: "Pie chart built from data in a different namespace."
-        KCanvasContainer {g} at (126.05,61.42) size 242.55x213.97
-          KCanvasItem {path} at (263.86,76.89) size 104.74x81.61 [transform={m=((1.00,0.00)(0.00,1.00)) t=(27.00,-13.00)}] [stroke={[type=SOLID] [color=#0000FF] [stroke width=3.00]}] [fill={[type=SOLID] [color=#FF8888]}] [data="M240.00,170.00L340.00,170.00C340.10,139.74,326.50,111.06,303.00,92.00"]
-          RenderSVGText {text} at (0,0) size 465x16
-            RenderText {#text} at (0,0) size 28x16
-              text run at (0,0) width 28: "East"
-          KCanvasItem {path} at (190.64,61.42) size 113.76x110.37 [stroke={[type=SOLID] [color=#000000] [stroke width=2.00]}] [fill={[type=SOLID] [color=#6D6D6D]}] [data="M240.00,170.00L303.00,92.00C271.46,66.45,227.60,62.50,192.00,82.00"]
-          RenderSVGText {text} at (0,0) size 465x16
-            RenderText {#text} at (0,0) size 35x16
-              text run at (0,0) width 35: "North"
-          KCanvasItem {path} at (126.05,80.65) size 115.35x130.67 [stroke={[type=SOLID] [color=#000000] [stroke width=2.00]}] [fill={[type=SOLID] [color=#929292]}] [data="M240.00,170.00L192.00,82.00C146.30,106.75,127.18,162.38,148.00,210.00"]
-          RenderSVGText {text} at (0,0) size 465x16
-            RenderText {#text} at (0,0) size 32x16
-              text run at (0,0) width 32: "West"
-          KCanvasItem {path} at (146.68,168.31) size 94.70x100.88 [stroke={[type=SOLID] [color=#000000] [stroke width=2.00]}] [fill={[type=SOLID] [color=#B6B6B6]}] [data="M240.00,170.00L148.00,210.00C160.89,239.68,187.34,261.29,219.00,268.00"]
-          RenderSVGText {text} at (0,0) size 465x16
-            RenderText {#text} at (0,0) size 46x16
-              text run at (0,0) width 46: "Central"
-          KCanvasItem {path} at (217.81,169) size 123.26x106.39 [stroke={[type=SOLID] [color=#000000] [stroke width=2.00]}] [fill={[type=SOLID] [color=#DBDBDB]}] [data="M240.00,170.00L219.00,268.00C248.57,274.35,279.43,266.98,302.94,247.94C326.44,228.90,340.07,200.25,340.00,170.00"]
-          RenderSVGText {text} at (0,0) size 465x16
-            RenderText {#text} at (0,0) size 37x16
-              text run at (0,0) width 37: "South"
+        KCanvasContainer {g} at (0,0) size 0x0
       RenderSVGText {text} at (0,0) size 465x46
         RenderText {#text} at (0,0) size 264x46
           text run at (0,0) width 264: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum
index 492f65e31beaf5bb17958a7c04bd82e67c38eac2..78a497fe60d4433e99ecf17979bea0b68d1909eb 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum
@@ -1 +1 @@
-a3116bfe576508c62ac7839701ddab5b
\ No newline at end of file
+85fc21b21c47910cdf1b7a4958189b51
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png
index 304dcb97646481bf298a42cd7f2ffce30e5031a0..ca9e980ba210a666ab7f6f7cf2897aa46a576f45 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.checksum
index e326d7cd0ffeb3db44b7b6600f9b5dd776945b29..cf679d5e30c5733bfc2e3936867fdcefa030155c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.checksum
@@ -1 +1 @@
-40a6bbba9a7b85b0d4c525998e31763a
\ No newline at end of file
+0763e33b8aad0b768fa66561d59cf282
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png
index 83b06e3fb111c561aafce0711571786995076fe3..d63693e6adaaf13de2e9ba44904e5bbc39bb7419 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.txt
index 95804393aa86cda3eecda1cb637158b5a4b17291..7a8aa84138f182e252c63ea7db25a5b462b4ad32 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-01-b-expected.txt
@@ -3,9 +3,6 @@ layer at (0,0) size 480x360
     KCanvasContainer {svg} at (0.50,0.50) size 479x359
       KCanvasContainer {g} at (40,150) size 50x50
         KCanvasItem {rect} at (40,150) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M40.00,150.00L90.00,150.00L90.00,200.00L40.00,200.00"]
-        RenderSVGText {text} at (0,0) size 465x18
-          RenderText {#text} at (0,0) size 266x18
-            text run at (0,0) width 266: "This document's root identifier is: svg-root"
       RenderSVGText {text} at (0,0) size 465x36
         RenderText {#text} at (0,0) size 198x36
           text run at (0,0) width 198: "$Revision: 1.1 $"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.checksum
index ab4b534a86fca5cdb1061f6be72021e58145f140..ccd33e4ae5828e05b230dab8347a5fa2c3127ed7 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.checksum
@@ -1 +1 @@
-eb57fcf5ec1c29efaf461f26d34bd57f
\ No newline at end of file
+990fae4e2eca24cf2f3fe0438a6eb8ca
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png
index 9776266952f4a2b459ef643fc33dcb1886ef02f5..28ddd69dcaf540b936f82948019d211af164cbd8 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.txt
index 2c67a216173e1cd2fd1871da061de65500e64eec..d41f6f91b0ad6115f0951d59b26134d940619814 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-02-b-expected.txt
@@ -6,33 +6,3 @@ layer at (0,0) size 480x360
         RenderText {#text} at (0,0) size 198x36
           text run at (0,0) width 198: "$Revision: 1.1 $"
       KCanvasItem {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "xml"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 129x36
-          text run at (0,0) width 129: "stylesheets"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 70x36
-          text run at (0,0) width 70: "views"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 52x36
-          text run at (0,0) width 52: "css2"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 76x36
-          text run at (0,0) width 76: "events"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.checksum
index 8c2851ee844062a53af790b0b59411287a5eefa9..ccd33e4ae5828e05b230dab8347a5fa2c3127ed7 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.checksum
@@ -1 +1 @@
-ebd638b5c2115f2143e86868c6c44d56
\ No newline at end of file
+990fae4e2eca24cf2f3fe0438a6eb8ca
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png
index 5af0de5c3c5373db6356bb1fc0142b07635509da..28ddd69dcaf540b936f82948019d211af164cbd8 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.txt
index e73de1c2539260b65ef75361b5f361d07c4973bf..d41f6f91b0ad6115f0951d59b26134d940619814 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-03-b-expected.txt
@@ -6,33 +6,3 @@ layer at (0,0) size 480x360
         RenderText {#text} at (0,0) size 198x36
           text run at (0,0) width 198: "$Revision: 1.1 $"
       KCanvasItem {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 99x36
-          text run at (0,0) width 99: "uievents"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 154x36
-          text run at (0,0) width 154: "mouseevents"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 181x36
-          text run at (0,0) width 181: "mutationevents"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 102x36
-          text run at (0,0) width 102: "traversal"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 46x36
-          text run at (0,0) width 46: "true"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 148x36
-          text run at (0,0) width 148: "org.w3c.svg"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.checksum
index 32097eff9878f6d9e15e8e116048a4284196237d..ccd33e4ae5828e05b230dab8347a5fa2c3127ed7 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.checksum
@@ -1 +1 @@
-aaf1fe3f6c5db04e7fd07b4830be3e5e
\ No newline at end of file
+990fae4e2eca24cf2f3fe0438a6eb8ca
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png
index 7817c00ccfcc75c16b7889d09b8881f427e8992c..28ddd69dcaf540b936f82948019d211af164cbd8 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.txt
index 66f21edb6cc300debe543e8ee472065dbc2242e2..d41f6f91b0ad6115f0951d59b26134d940619814 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-04-b-expected.txt
@@ -6,33 +6,3 @@ layer at (0,0) size 480x360
         RenderText {#text} at (0,0) size 198x36
           text run at (0,0) width 198: "$Revision: 1.1 $"
       KCanvasItem {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 207x36
-          text run at (0,0) width 207: "org.w3c.svg.lang"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 258x36
-          text run at (0,0) width 258: "org.w3c.svg.dynamic"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 218x36
-          text run at (0,0) width 218: "org.w3c.svg.static"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 209x36
-          text run at (0,0) width 209: "org.w3c.dom.svg"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 148x36
-          text run at (0,0) width 148: "org.w3c.svg"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.checksum
index 88b6adf790a0f9aabbb3786c0a7056d5f95c8e1c..ccd33e4ae5828e05b230dab8347a5fa2c3127ed7 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.checksum
@@ -1 +1 @@
-9058873570c32158449fa57b60caaa3b
\ No newline at end of file
+990fae4e2eca24cf2f3fe0438a6eb8ca
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png
index 620844e96334d10137647bb13153e36c412368f2..28ddd69dcaf540b936f82948019d211af164cbd8 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.txt
index 1dd0ebcd41dd6f08c37c33f8268ed4c05b620747..d41f6f91b0ad6115f0951d59b26134d940619814 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-05-b-expected.txt
@@ -6,33 +6,3 @@ layer at (0,0) size 480x360
         RenderText {#text} at (0,0) size 198x36
           text run at (0,0) width 198: "$Revision: 1.1 $"
       KCanvasItem {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00L479.00,1.00L479.00,359.00L1.00,359.00"]
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 279x36
-          text run at (0,0) width 279: "org.w3c.dom.svg.static"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 335x36
-          text run at (0,0) width 335: "org.w3c.dom.svg.animation"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 319x36
-          text run at (0,0) width 319: "org.w3c.dom.svg.dynamic"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 246x36
-          text run at (0,0) width 246: "org.w3c.dom.svg.all"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 185x36
-          text run at (0,0) width 185: "org.w3c.svg.all"
-      RenderSVGText {text} at (0,0) size 465x36
-        RenderText {#text} at (0,0) size 56x36
-          text run at (0,0) width 56: "false"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.checksum
index 44358a80bd805d24faab47fe2622f3fb690233b8..3a22af9af4f1380a9c43f4aea8733e8235e3330a 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.checksum
@@ -1 +1 @@
-667ede172909f628f8032933dde32df6
\ No newline at end of file
+b50397794a544a22aaf283804f83b426
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png
index 606283f2eea80dca56c896f4cdac294763c3e2ba..d08745c886b3d97f18b4db8c7a075a9036039559 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt
index 3fa691ce4f5f7eaca6fe31d0bd702f1e89ad1de9..7367820663667c594c0e70d77db33f21735d02a5 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-dom-06-b-expected.txt
@@ -1,11 +1,12 @@
 layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
-    KCanvasContainer {svg} at (0.50,0.50) size 479x359
-      KCanvasContainer {g} at (0,0) size 0x0
-        KCanvasItem {rect} at (inf,inf) size 0x0 [fill={[type=SOLID] [color=#FF0000]}] [data=""]
-        RenderSVGText {text} at (0,0) size 465x18
-          RenderText {#text} at (0,0) size 148x18
-            text run at (0,0) width 148: "DOM API is supported"
+    KCanvasContainer {svg} at (0,0) size 479.50x450
+      KCanvasContainer {g} at (0,0) size 450x450
+        KCanvasItem {rect} at (0,0) size 450x450 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L450.00,0.00L450.00,450.00L0.00,450.00"]
+        RenderSVGText {text} at (0,0) size 465x72
+          RenderText {#text} at (0,0) size 418x72
+            text run at (0,0) width 418: "Removing DOM Elements is"
+            text run at (0,36) width 213: "not supported"
       RenderSVGText {text} at (0,0) size 465x36
         RenderText {#text} at (0,0) size 198x36
           text run at (0,0) width 198: "$Revision: 1.1 $"

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7927a8506768886be37afc2f634474c93a87c5aa..ef56c7c99043dbe0045d59e56e5f7b931d1fdc36 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,41 @@
+2006-07-28  Alexey Proskuryakov  <ap@nypop.com>
+
+        Rolling out http://bugzilla.opendarwin.org/show_bug.cgi?id=6010 because of failing layout tests.
+        Add better SVGLoad event support.
+
+        * dom/EventTargetNode.cpp:
+        (WebCore::EventTargetNode::dispatchGenericEvent):
+        * html/HTMLImageLoader.cpp:
+        (WebCore::HTMLImageLoader::dispatchLoadEvent):
+        * html/HTMLImageLoader.h:
+        * ksvg2/misc/SVGImageLoader.cpp:
+        (WebCore::SVGImageLoader::SVGImageLoader):
+        * ksvg2/misc/SVGImageLoader.h:
+        * ksvg2/svg/SVGAElement.cpp:
+        (WebCore::SVGAElement::parseMappedAttribute):
+        * ksvg2/svg/SVGAnimatedBoolean.h:
+        * ksvg2/svg/SVGElement.cpp:
+        (WebCore::SVGElement::SVGElement):
+        (WebCore::SVGElement::parseMappedAttribute):
+        * ksvg2/svg/SVGElement.h:
+        (WebCore::SVGElement::adjustViewportClipping):
+        (WebCore::SVGElement::closeRenderer):
+        (WebCore::SVGElement::rendererIsNeeded):
+        (WebCore::SVGElement::isClosed):
+        (WebCore::svg_dynamic_cast):
+        * ksvg2/svg/SVGExternalResourcesRequired.h:
+        * ksvg2/svg/SVGImageElement.cpp:
+        (SVGImageElement::SVGImageElement):
+        * ksvg2/svg/SVGImageElement.h:
+        * ksvg2/svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::parseMappedAttribute):
+        * ksvg2/svg/SVGScriptElement.cpp:
+        (SVGScriptElement::SVGScriptElement):
+        (SVGScriptElement::parseMappedAttribute):
+        (SVGScriptElement::executeScript):
+        * xml/xmlhttprequest.cpp:
+        (WebCore::XMLHttpRequest::callReadyStateChangeListener):
+
 2006-07-28  Adele Peterson  <adele@apple.com>
 
         Rolling out http://bugzilla.opendarwin.org/show_bug.cgi?id=9753 because of failing layout tests.

diff --git a/WebCore/dom/EventTargetNode.cpp b/WebCore/dom/EventTargetNode.cpp
index ee1df9a1dd1fbd26b90b40d8e592858955c7fbe7..d0ffbca84b12c96fd0ad4602ab3392e894538441 100644 (file)
--- a/WebCore/dom/EventTargetNode.cpp
+++ b/WebCore/dom/EventTargetNode.cpp
@@ -169,7 +169,8 @@ bool EventTargetNode::dispatchGenericEvent(PassRefPtr<Event> e, ExceptionCode&,
     RefPtr<Event> evt(e);
     assert(!eventDispatchForbidden());
     assert(evt->target());
-    assert(!evt->type().isNull()); // JavaScript code could create an event with name
+    
+    // ### check that type specified
     
     // work out what nodes to send event to
     DeprecatedPtrList<Node> nodeChain;

diff --git a/WebCore/html/HTMLImageLoader.cpp b/WebCore/html/HTMLImageLoader.cpp
index a1419a00c929cb29b068d2402bda9a5bb943c88e..744498e80fee1bca7af79c1ab9e0658c672d2aa6 100644 (file)
--- a/WebCore/html/HTMLImageLoader.cpp
+++ b/WebCore/html/HTMLImageLoader.cpp
@@ -102,9 +102,9 @@ void HTMLImageLoader::updateFromElement()
 
 void HTMLImageLoader::dispatchLoadEvent()
 {
-    if (!haveFiredLoadEvent() && image()) {
-        setHaveFiredLoadEvent(true);
-        element()->dispatchHTMLEvent(image()->isErrorImage() ? errorEvent : loadEvent, false, false);
+    if (!m_firedLoad && m_image) {
+        m_firedLoad = true;
+        element()->dispatchHTMLEvent(m_image->isErrorImage() ? errorEvent : loadEvent, false, false);
     }
 }
 

diff --git a/WebCore/html/HTMLImageLoader.h b/WebCore/html/HTMLImageLoader.h
index 21811d0f47a54428b54bc1142848aa36b70e4d7a..cd4b9566e4e2888a32bb2560e19c5ba39cce2f35 100644 (file)
--- a/WebCore/html/HTMLImageLoader.h
+++ b/WebCore/html/HTMLImageLoader.h
@@ -38,7 +38,7 @@ public:
 
     virtual void updateFromElement();
 
-    virtual void dispatchLoadEvent();
+    void dispatchLoadEvent();
 
     Element* element() const { return m_element; }
     bool imageComplete() const { return m_imageComplete; }
@@ -51,9 +51,6 @@ public:
 
 protected:
     void setLoadingImage(CachedImage*);
-    
-    bool haveFiredLoadEvent() { return m_firedLoad; }
-    void setHaveFiredLoadEvent(bool firedLoad) { m_firedLoad = firedLoad; }
 
 private:
     Element* m_element;

diff --git a/WebCore/ksvg2/misc/SVGImageLoader.cpp b/WebCore/ksvg2/misc/SVGImageLoader.cpp
index 3252ae12fdb0e324a48598b735fddff7cd2250e3..50146d30dadd44ce01798de642e5c8686716846e 100644 (file)
--- a/WebCore/ksvg2/misc/SVGImageLoader.cpp
+++ b/WebCore/ksvg2/misc/SVGImageLoader.cpp
@@ -37,8 +37,7 @@
 
 namespace WebCore {
 
-SVGImageLoader::SVGImageLoader(SVGImageElement* node)
-    : HTMLImageLoader(node)
+SVGImageLoader::SVGImageLoader(SVGImageElement *node) : HTMLImageLoader(node)
 {
 }
 
@@ -69,17 +68,6 @@ void SVGImageLoader::updateFromElement()
         renderer->resetAnimation();
 }
 
-void SVGImageLoader::dispatchLoadEvent()
-{
-    if (!haveFiredLoadEvent() && image()) {
-        setHaveFiredLoadEvent(true);
-        if (image()->isErrorImage()) {
-            // FIXME: We're supposed to put the document in an "error state" per the spec.
-        } else
-            static_cast<SVGElement*>(element())->sendSVGLoadEventIfPossible(true);
-    }
-}
-
 }
 
 #endif // SVG_SUPPORT

diff --git a/WebCore/ksvg2/misc/SVGImageLoader.h b/WebCore/ksvg2/misc/SVGImageLoader.h
index bcf58f67b50017ddb2bd8210d1a1e8d0f5d2034f..985f89c1462da48cd919947c0ff27b4f38d61744 100644 (file)
--- a/WebCore/ksvg2/misc/SVGImageLoader.h
+++ b/WebCore/ksvg2/misc/SVGImageLoader.h
@@ -30,11 +30,10 @@ namespace WebCore
     class SVGImageElement;
     class SVGImageLoader : public HTMLImageLoader {
     public:
-        SVGImageLoader(SVGImageElement*);
+        SVGImageLoader(SVGImageElement *node);
         virtual ~SVGImageLoader();
         
         virtual void updateFromElement();
-        virtual void dispatchLoadEvent();
     };
 };
 

diff --git a/WebCore/ksvg2/svg/SVGAElement.cpp b/WebCore/ksvg2/svg/SVGAElement.cpp
index ee983916443cd5a64fc1279d0c6ff6e4e47305f6..b140a20b497a791837ef393508b50bd813f8f6cf 100644 (file)
--- a/WebCore/ksvg2/svg/SVGAElement.cpp
+++ b/WebCore/ksvg2/svg/SVGAElement.cpp
@@ -61,16 +61,14 @@ void SVGAElement::parseMappedAttribute(MappedAttribute *attr)
     if (attr->name() == SVGNames::targetAttr) {
         target()->setBaseVal(value.impl());
     } else {
-        if (SVGURIReference::parseMappedAttribute(attr)) {
+        if(SVGURIReference::parseMappedAttribute(attr))
+        {
             m_isLink = attr->value() != 0;
             return;
         }
-        if (SVGTests::parseMappedAttribute(attr))
-            return;
-        if (SVGLangSpace::parseMappedAttribute(attr))
-            return;
-        if (SVGExternalResourcesRequired::parseMappedAttribute(attr))
-            return;
+        if(SVGTests::parseMappedAttribute(attr)) return;
+        if(SVGLangSpace::parseMappedAttribute(attr)) return;
+        if(SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;        
         SVGStyledTransformableElement::parseMappedAttribute(attr);
     }
 }

diff --git a/WebCore/ksvg2/svg/SVGAnimatedBoolean.h b/WebCore/ksvg2/svg/SVGAnimatedBoolean.h
index 79b9f88d63d60671226ccdbd22a54a7887b28387..72b33d051fcc1b12b0f73ede8b53d127b0e7d3fe 100644 (file)
--- a/WebCore/ksvg2/svg/SVGAnimatedBoolean.h
+++ b/WebCore/ksvg2/svg/SVGAnimatedBoolean.h
@@ -20,8 +20,8 @@
     Boston, MA 02111-1307, USA.
 */
 
-#ifndef SVGAnimatedBooleanImpl_H
-#define SVGAnimatedBooleanImpl_H
+#ifndef KSVG_SVGAnimatedBooleanImpl_H
+#define KSVG_SVGAnimatedBooleanImpl_H
 #if SVG_SUPPORT
 
 #include "Shared.h"

diff --git a/WebCore/ksvg2/svg/SVGElement.cpp b/WebCore/ksvg2/svg/SVGElement.cpp
index c809994840c6b1620a918dd4865891c608f491d4..59ca43952d9730b4088c4f2d53dcaf584bfeab97 100644 (file)
--- a/WebCore/ksvg2/svg/SVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGElement.cpp
@@ -26,7 +26,6 @@
 
 #include "Attr.h"
 #include "Document.h"
-#include "Event.h"
 #include "EventListener.h"
 #include "EventNames.h"
 #include "HTMLNames.h"
@@ -45,6 +44,7 @@ using namespace EventNames;
 
 SVGElement::SVGElement(const QualifiedName& tagName, Document* doc)
     : StyledElement(tagName, doc)
+    , m_closed(false)
 {
 }
 
@@ -132,9 +132,7 @@ void SVGElement::addSVGEventListener(const AtomicString& eventType, const Attrib
 void SVGElement::parseMappedAttribute(MappedAttribute *attr)
 {
     // standard events
-    if (attr->name() == onloadAttr)
-        addSVGEventListener(loadEvent, attr);
-    else if (attr->name() == onclickAttr)
+    if (attr->name() == onclickAttr)
         addSVGEventListener(clickEvent, attr);
     else if (attr->name() == onmousedownAttr)
         addSVGEventListener(mousedownEvent, attr);
@@ -154,39 +152,6 @@ void SVGElement::parseMappedAttribute(MappedAttribute *attr)
         StyledElement::parseMappedAttribute(attr);
 }
 
-bool SVGElement::haveLoadedRequiredResources()
-{
-    Node* child = fastFirstChild();
-    while (child) {
-        if (child->isSVGElement() && !static_cast<SVGElement*>(child)->haveLoadedRequiredResources())
-            return false;
-        child = child->nextSibling();
-    }
-    return true;
-}
-
-void SVGElement::sendSVGLoadEventIfPossible(bool sendParentLoadEvents)
-{
-    RefPtr<SVGElement> currentTarget = this;
-    while (currentTarget && currentTarget->haveLoadedRequiredResources()) {
-        RefPtr<Node> parent;
-        if (sendParentLoadEvents)
-            parent = parentNode(); // save the next parent to dispatch too incase dispatching the event changes the tree
-        
-        RefPtr<Event> event = new Event(loadEvent, false, false);
-        event->setTarget(currentTarget.get());
-        handleLocalEvents(event.get(), false);
-        currentTarget = (parent && parent->isSVGElement()) ? static_pointer_cast<SVGElement>(parent) : 0;
-    }
-}
-
-void SVGElement::closeRenderer()
-{
-    // closeRenderer() is called when the close tag is reached for an element (e.g. </svg>)
-    // we send SVGLoad events here if we can, otherwise they'll be sent when any required loads finish
-    sendSVGLoadEventIfPossible();
-}
-
 bool SVGElement::childShouldCreateRenderer(Node *child) const
 {
     if (child->isSVGElement())

diff --git a/WebCore/ksvg2/svg/SVGElement.h b/WebCore/ksvg2/svg/SVGElement.h
index ec73391932361d58b1c222a707439aeb80e6465e..ae452c802d38bd597ddfc8c49dfb2f47400daa8d 100644 (file)
--- a/WebCore/ksvg2/svg/SVGElement.h
+++ b/WebCore/ksvg2/svg/SVGElement.h
@@ -57,6 +57,9 @@ namespace WebCore {
 
         // Internal
         virtual void parseMappedAttribute(MappedAttribute*);
+
+        // To be implemented by any element which can establish new viewports...
+        virtual DeprecatedString adjustViewportClipping() const { return DeprecatedString::null; }
         
         virtual bool isStyled() const { return false; }
         virtual bool isStyledTransformable() const { return false; }
@@ -68,21 +71,24 @@ namespace WebCore {
         // For SVGTests
         virtual bool isValid() const { return true; }
         
-        virtual void closeRenderer();
-        virtual bool rendererIsNeeded(RenderStyle*) { return false; }
-        virtual bool childShouldCreateRenderer(Node*) const;
-        
-        void sendSVGLoadEventIfPossible(bool sendParentLoadEvents = false);
+        virtual void closeRenderer() { m_closed = true; }
+        virtual bool rendererIsNeeded(RenderStyle *) { return false; }
+        virtual bool childShouldCreateRenderer(Node *) const;
         
-    protected:
-        void addSVGEventListener(const AtomicString& eventType, const Attribute*);
-        virtual bool haveLoadedRequiredResources();
+        // helper:
+        bool isClosed() const { return m_closed; }
+
+    private:
+        bool m_closed;
+        void addSVGEventListener(const AtomicString& eventType, const Attribute* attr);
     };
+};
 
-    static inline SVGElement* svg_dynamic_cast(Node* node) {
-        SVGElement* svgElement = 0;
+namespace WebCore {
+    static inline SVGElement *svg_dynamic_cast(Node *node) {
+        SVGElement *svgElement = NULL;
         if (node && node->isSVGElement())
-            svgElement = static_cast<SVGElement*>(node);
+            svgElement = static_cast<SVGElement *>(node);
         return svgElement;
     }
 };

diff --git a/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h b/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h
index 53c60a84022ed5758a001257b7e4585c6cad1102..6631e8641227a691550ff55a7ac5907eb99133f1 100644 (file)
--- a/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h
+++ b/WebCore/ksvg2/svg/SVGExternalResourcesRequired.h
@@ -20,8 +20,8 @@
     Boston, MA 02111-1307, USA.
 */
 
-#ifndef SVGExternalResourcesRequiredImpl_H
-#define SVGExternalResourcesRequiredImpl_H
+#ifndef KSVG_SVGExternalResourcesRequiredImpl_H
+#define KSVG_SVGExternalResourcesRequiredImpl_H
 #if SVG_SUPPORT
 
 #include <wtf/RefPtr.h>
@@ -30,16 +30,6 @@ namespace WebCore {
     class MappedAttribute;
     class SVGAnimatedBoolean;
 
-    // FIXME: This is wrong for several reasons:
-    // 1. externalResourcesRequired is not animateable according to SVG 1.1 section 5.9
-    // 2. externalResourcesRequired should just be part of SVGElement, and default to "false" for all elements
-    /*
-     SPEC: Note that the SVG DOM 
-     defines the attribute externalResourcesRequired as being of type SVGAnimatedBoolean, whereas the 
-     SVG language definition says that externalResourcesRequired is not animated. Because the SVG 
-     language definition states that externalResourcesRequired cannot be animated, the animVal will 
-     always be the same as the baseVal.
-     */
     class SVGExternalResourcesRequired {
     public:
         SVGExternalResourcesRequired();

diff --git a/WebCore/ksvg2/svg/SVGImageElement.cpp b/WebCore/ksvg2/svg/SVGImageElement.cpp
index 0962743a1757e5d1a6264557c48fc4b5c48abf38..7f40c5e7d9f725425a2491484c1d682613b90baf 100644 (file)
--- a/WebCore/ksvg2/svg/SVGImageElement.cpp
+++ b/WebCore/ksvg2/svg/SVGImageElement.cpp
@@ -29,7 +29,6 @@
 #include "CSSPropertyNames.h"
 #include "KCanvasRenderingStyle.h"
 #include "RenderSVGImage.h"
-#include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "SVGAnimatedString.h"
@@ -47,12 +46,7 @@
 using namespace WebCore;
 
 SVGImageElement::SVGImageElement(const QualifiedName& tagName, Document *doc)
-    : SVGStyledTransformableElement(tagName, doc)
-    , SVGTests()
-    , SVGLangSpace()
-    , SVGExternalResourcesRequired()
-    , SVGURIReference()
-    , m_imageLoader(this)
+: SVGStyledTransformableElement(tagName, doc), SVGTests(), SVGLangSpace(), SVGExternalResourcesRequired(), SVGURIReference(), m_imageLoader(this)
 {
 }
 
@@ -121,11 +115,6 @@ RenderObject *SVGImageElement::createRenderer(RenderArena *arena, RenderStyle *s
     return new (arena) RenderSVGImage(this);
 }
 
-bool SVGImageElement::haveLoadedRequiredResources()
-{
-    return (!externalResourcesRequired()->baseVal() || m_imageLoader.imageComplete());
-}
-
 void SVGImageElement::attach()
 {
     SVGStyledTransformableElement::attach();

diff --git a/WebCore/ksvg2/svg/SVGImageElement.h b/WebCore/ksvg2/svg/SVGImageElement.h
index 15d3b22697a9ecad75af3bf2d28916cb9461fde1..687d68bd70d22a736b4a5f7dedb88f6a3330b80a 100644 (file)
--- a/WebCore/ksvg2/svg/SVGImageElement.h
+++ b/WebCore/ksvg2/svg/SVGImageElement.h
@@ -63,9 +63,6 @@ namespace WebCore
 
         virtual bool rendererIsNeeded(RenderStyle *style) { return StyledElement::rendererIsNeeded(style); }
         virtual RenderObject *createRenderer(RenderArena *arena, RenderStyle *style);
-        
-    protected:
-        virtual bool haveLoadedRequiredResources();
 
     private:
         mutable RefPtr<SVGAnimatedLength> m_x;

diff --git a/WebCore/ksvg2/svg/SVGSVGElement.cpp b/WebCore/ksvg2/svg/SVGSVGElement.cpp
index a433e30e50502548ba02b21c8bd111bc40698319..c42f962fd7d9b23622e5db2db5935b49560aa073 100644 (file)
--- a/WebCore/ksvg2/svg/SVGSVGElement.cpp
+++ b/WebCore/ksvg2/svg/SVGSVGElement.cpp
@@ -222,7 +222,9 @@ void SVGSVGElement::parseMappedAttribute(MappedAttribute *attr)
     const AtomicString& value = attr->value();
     if (!nearestViewportElement()) {
         // Only handle events if we're the outermost <svg> element
-        if (attr->name() == onunloadAttr)
+        if (attr->name() == onloadAttr)
+            addSVGWindowEventListner(loadEvent, attr);
+        else if (attr->name() == onunloadAttr)
             addSVGWindowEventListner(unloadEvent, attr);
         else if (attr->name() == onabortAttr)
             addSVGWindowEventListner(abortEvent, attr);

diff --git a/WebCore/ksvg2/svg/SVGScriptElement.cpp b/WebCore/ksvg2/svg/SVGScriptElement.cpp
index 5b11feb484ce70c47bc44d676f683c5b671c4dce..020f01482e29dbbee801173b0565aab5a2f70c2e 100644 (file)
--- a/WebCore/ksvg2/svg/SVGScriptElement.cpp
+++ b/WebCore/ksvg2/svg/SVGScriptElement.cpp
@@ -23,6 +23,7 @@
 #include "config.h"
 #if SVG_SUPPORT
 #include "PlatformString.h"
+//#include <kdom/ecma/Ecma.h>
 #include "Attr.h"
 #include "StringImpl.h"
 
@@ -30,12 +31,9 @@
 #include "SVGNames.h"
 #include "SVGScriptElement.h"
 
-namespace WebCore {
+using namespace WebCore;
 
-SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document* doc)
-    : SVGElement(tagName, doc)
-    , SVGURIReference()
-    , SVGExternalResourcesRequired()
+SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document *doc) : SVGElement(tagName, doc), SVGURIReference(), SVGExternalResourcesRequired()
 {
 }
 
@@ -57,11 +55,10 @@ void SVGScriptElement::parseMappedAttribute(MappedAttribute *attr)
 {
     if (attr->name() == SVGNames::typeAttr)
             setType(attr->value().impl());
-    else {
-        if(SVGURIReference::parseMappedAttribute(attr))
-            return;
-        if(SVGExternalResourcesRequired::parseMappedAttribute(attr))
-            return;
+    else
+    {
+        if(SVGURIReference::parseMappedAttribute(attr)) return;
+        if(SVGExternalResourcesRequired::parseMappedAttribute(attr)) return;
 
         SVGElement::parseMappedAttribute(attr);
     }
@@ -80,12 +77,14 @@ void SVGScriptElement::executeScript(Document *document, StringImpl *jsCode)
 
     // Run script
     KJS::Completion comp = ecmaEngine->evaluate(jsCode.deprecatedString(), ecmaEngine->globalObject());
-    if (comp.complType() == KJS::Throw) {
+    if(comp.complType() == KJS::Throw)
+    {
         KJS::ExecState *exec = ecmaEngine->globalExec();
         KJS::JSValue *exVal = comp.value();
 
         int lineno = -1;
-        if (exVal->isObject()) {
+        if(exVal->isObject())
+        {
             KJS::JSValue *lineVal = static_cast<KJS::JSObject *>(exVal)->get(exec, "line");
             if(lineVal->type() == KJS::NumberType)
                 lineno = int(lineVal->toNumber(exec));
@@ -93,7 +92,8 @@ void SVGScriptElement::executeScript(Document *document, StringImpl *jsCode)
 
         // Fire ERROR_EVENT upon errors...
         SVGDocument *svgDocument = static_cast<SVGDocument *>(document);
-        if (svgDocument && document->hasListenerType(ERROR_EVENT)) {
+        if(svgDocument && document->hasListenerType(ERROR_EVENT))
+        {
             RefPtr<Event> event = svgDocument->createEvent("SVGEvents");
             event->initEvent(EventNames::errorEvent, false, false);
             svgDocument->dispatchRecursiveEvent(event.get(), svgDocument->lastChild());
@@ -114,8 +114,6 @@ void SVGScriptElement::executeScript(Document *document, StringImpl *jsCode)
 #endif
 }
 
-}
-
 // vim:ts=4:noet
 #endif // SVG_SUPPORT
 

diff --git a/WebCore/xml/xmlhttprequest.cpp b/WebCore/xml/xmlhttprequest.cpp
index 2a307f6d0270771f48e0c5eb1b21e5b4ee3bc43a..b848bfaee25a79101c1a544be12219ba459d06f2 100644 (file)
--- a/WebCore/xml/xmlhttprequest.cpp
+++ b/WebCore/xml/xmlhttprequest.cpp
@@ -213,12 +213,16 @@ void XMLHttpRequest::changeState(XMLHttpRequestState newState)
 void XMLHttpRequest::callReadyStateChangeListener()
 {
     if (m_doc && m_doc->frame() && m_onReadyStateChangeListener) {
-        RefPtr<Event> ev = new Event(readystatechangeEvent, true, true);
+        ExceptionCode ec;
+        RefPtr<Event> ev = m_doc->createEvent("HTMLEvents", ec);
+        ev->initEvent(readystatechangeEvent, true, true);
         m_onReadyStateChangeListener->handleEvent(ev.get(), true);
     }
     
     if (m_doc && m_doc->frame() && m_state == Completed && m_onLoadListener) {
-        RefPtr<Event> ev = new Event(loadEvent, true, true);
+        ExceptionCode ec;
+        RefPtr<Event> ev = m_doc->createEvent("HTMLEvents", ec);
+        ev->initEvent(loadEvent, true, true);
         m_onLoadListener->handleEvent(ev.get(), true);
     }
 }