LayoutTests:
authorandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 21:37:56 +0000 (21:37 +0000)
committerandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2007 21:37:56 +0000 (21:37 +0000)
        Reviewed by David Kilzer.

        Update tests.

        * webarchive/archive-empty-frame-dom-expected.txt:
        * webarchive/archive-empty-frame-source-expected.txt:
        * webarchive/archive-with-unencoded-url-expected.txt:
        * webarchive/test-body-background-expected.txt:
        * webarchive/test-duplicate-resources-expected.txt:
        * webarchive/test-frameset-expected.txt:
        * webarchive/test-img-src-expected.txt:
        * webarchive/test-input-src-expected.txt:
        * webarchive/test-link-href-expected.txt:
        * webarchive/test-object-data-expected.txt:
        * webarchive/test-script-src-expected.txt:
        * webarchive/test-table-background-expected.txt:
        * webarchive/test-td-background-expected.txt:

WebKitTools:

        Reviewed by David Kilzer.

        Replace "Apple Computer" with "Apple" in the DTD declaration.

        * DumpRenderTree/DumpRenderTree.m:
        (serializeWebArchiveToXML):

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

16 files changed:
LayoutTests/ChangeLog
LayoutTests/webarchive/archive-empty-frame-dom-expected.txt
LayoutTests/webarchive/archive-empty-frame-source-expected.txt
LayoutTests/webarchive/archive-with-unencoded-url-expected.txt
LayoutTests/webarchive/test-body-background-expected.txt
LayoutTests/webarchive/test-duplicate-resources-expected.txt
LayoutTests/webarchive/test-frameset-expected.txt
LayoutTests/webarchive/test-img-src-expected.txt
LayoutTests/webarchive/test-input-src-expected.txt
LayoutTests/webarchive/test-link-href-expected.txt
LayoutTests/webarchive/test-object-data-expected.txt
LayoutTests/webarchive/test-script-src-expected.txt
LayoutTests/webarchive/test-table-background-expected.txt
LayoutTests/webarchive/test-td-background-expected.txt
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.m

index 5f4d2594b5022c65a7c0501cc71bf1dfab989d84..06c59030adfa4176653cee9b2b49ffd2754abec7 100644 (file)
@@ -1,3 +1,23 @@
+2007-07-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by David Kilzer.
+
+        Update tests.
+        
+        * webarchive/archive-empty-frame-dom-expected.txt:
+        * webarchive/archive-empty-frame-source-expected.txt:
+        * webarchive/archive-with-unencoded-url-expected.txt:
+        * webarchive/test-body-background-expected.txt:
+        * webarchive/test-duplicate-resources-expected.txt:
+        * webarchive/test-frameset-expected.txt:
+        * webarchive/test-img-src-expected.txt:
+        * webarchive/test-input-src-expected.txt:
+        * webarchive/test-link-href-expected.txt:
+        * webarchive/test-object-data-expected.txt:
+        * webarchive/test-script-src-expected.txt:
+        * webarchive/test-table-background-expected.txt:
+        * webarchive/test-td-background-expected.txt:
+
 2007-07-06  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Mitz.
index b2a0a9febd0b1ca851fa6c5862b920de35babace..aea0cb78cc0e2ae4062f8a02c8716a0dfd4d888f 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 70b148aea522722186660df375eaf84f1d0fb773..a027dc0de7c2b68e101a2d628fc1c935848defe2 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 3439613639ac5876830ffc42a895f2e958e54cc8..6e05440895b4f15c140d6637b4cca54d8741a18e 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 4296f289d02373976045972af055d09b12ee47ac..7382788fb1a0527a065b7efb5a95b255516dd49d 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 8def5ff43b94aa09bf129a4771d17dbbd2a366f2..0a714492e8e13f2bb7077f550a647fff51ec82f6 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 0f9260437ba0ce8b69cccfb99e8d5c99bfaa6f87..e549148a683037c96c01697e5d866bac16df210f 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 667761b04ba917d51e0c87c234ed5841174660c8..1b904572ba1b36363975377f200f9aef6b4683da 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 81c329cfad08587ff7acd9e8c75165e1f84c57f6..235271b7704380da65cc8683e52f90b4afceae47 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index ee1b3de643457a44e5ee77327015789fe73cfa9c..43d8cd4caf52b8af6ec56ae1b3f67096ef615d85 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 7d30dc7c54099502fc8f90db468f2740b2b8ee2b..c6893b21c919a8820f042b14fadb5e0cf5fca9d9 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index d1db287a1ca39d00db0af6b7f8ef3bbc957e4a22..c416cad549269d30804f1efc7bc319f7f904b2fc 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 5fdc6f1145d577d50c9930a5357b44c6a05fb8e8..daecca2136827ff94806fe0f973b0b77f0b1abed 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index 39682bc4de8806e846f063e50684c4c8d9d4b442..a13a2a2b09e2d8f7f3a5e11e170fb7de22d69f94 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
        <key>WebMainResource</key>
index e30a96bd6ab8a0105ddbe2e622a52c10f12fe153..53c86103e12af49ec521301367bd0a39437a25ac 100644 (file)
@@ -1,3 +1,12 @@
+2007-07-06  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by David Kilzer.
+
+        Replace "Apple Computer" with "Apple" in the DTD declaration.
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (serializeWebArchiveToXML):
+
 2007-07-06  Adam Treat  <adam@staikos.net>
 
         Reviewed by George Staikos.
index 2ac350cc05dc56ff71b5d3d8d76f9b9da9d3848a..1168ce15cb521499464617b6bf0687f17be4533e 100644 (file)
@@ -747,7 +747,14 @@ static NSString *serializeWebArchiveToXML(WebArchive *webArchive)
     if (!xmlData)
         return errorString;
 
-    return [[[NSMutableString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding] autorelease];
+    NSMutableString *string = [[[NSMutableString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding] autorelease];
+
+    // Replace "Apple Computer" with "Apple" in the DTD declaration.
+    NSRange range = [string rangeOfString:@"-//Apple Computer//"];
+    if (range.location != NSNotFound)
+        [string replaceCharactersInRange:range withString:@"-//Apple//"];
+    
+    return string;
 }
 
 static void dumpBackForwardListForWebView(WebView *view)