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 5f4d259..06c5903 100644 (file)
@@ -1,5 +1,25 @@
 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.
 
         <rdar://problem/5280532>
index b2a0a9f..aea0cb7 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 70b148a..a027dc0 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 3439613..6e05440 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 4296f28..7382788 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 8def5ff..0a71449 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 0f92604..e549148 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 667761b..1b90457 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 81c329c..235271b 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 ee1b3de..43d8cd4 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 7d30dc7..c6893b2 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 d1db287..c416cad 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 5fdc6f1..daecca2 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 39682bc..a13a2a2 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 e30a96b..53c8610 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 2ac350c..1168ce1 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)