Changeset 31722 in webkit
- Timestamp:
- Apr 8, 2008 10:29:32 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r31713 r31722 1 2008-04-08 Brady Eidson <beidson@apple.com> 2 3 Reviewed by Mitzpettel 4 5 Fixed http://bugs.webkit.org/show_bug.cgi?id=18302 6 -WebArchive subresources dump in random order, intermittent failures 7 8 Now that a DRT fix has set the order, these 3 tests needed new results 9 10 * webarchive/test-css-import-expected.txt: 11 * webarchive/test-duplicate-resources-expected.txt: 12 * webarchive/test-frameset-expected.txt: 13 1 14 2008-04-07 Brady Eidson <beidson@apple.com> 2 15 -
trunk/LayoutTests/webarchive/test-css-import-expected.txt
r31592 r31722 34 34 <key>WebSubresources</key> 35 35 <array> 36 <dict>37 <key>WebResourceData</key>38 <string>@import url('test-css-link-recurse.css');39 .red { color: red; }40 </string>41 <key>WebResourceMIMEType</key>42 <string>text/css</string>43 <key>WebResourceResponse</key>44 <dict>45 <key>MIMEType</key>46 <string>text/css</string>47 <key>URL</key>48 <string>file:///LayoutTests/webarchive/resources/test-css-link.css</string>49 <key>expectedContentLength</key>50 <integer>63</integer>51 </dict>52 <key>WebResourceURL</key>53 <string>file:///LayoutTests/webarchive/resources/test-css-link.css</string>54 </dict>55 <dict>56 <key>WebResourceData</key>57 <string>@import url('test-css-link-recurse.css');58 .purple { color: purple; }59 </string>60 <key>WebResourceMIMEType</key>61 <string>text/css</string>62 <key>WebResourceResponse</key>63 <dict>64 <key>MIMEType</key>65 <string>text/css</string>66 <key>URL</key>67 <string>file:///LayoutTests/webarchive/resources/test-css-link-recurse.css</string>68 <key>expectedContentLength</key>69 <integer>69</integer>70 </dict>71 <key>WebResourceURL</key>72 <string>file:///LayoutTests/webarchive/resources/test-css-link-recurse.css</string>73 </dict>74 36 <dict> 75 37 <key>WebResourceData</key> … … 110 72 <string>file:///LayoutTests/webarchive/resources/test-css-import.css</string> 111 73 </dict> 74 <dict> 75 <key>WebResourceData</key> 76 <string>@import url('test-css-link-recurse.css'); 77 .purple { color: purple; } 78 </string> 79 <key>WebResourceMIMEType</key> 80 <string>text/css</string> 81 <key>WebResourceResponse</key> 82 <dict> 83 <key>MIMEType</key> 84 <string>text/css</string> 85 <key>URL</key> 86 <string>file:///LayoutTests/webarchive/resources/test-css-link-recurse.css</string> 87 <key>expectedContentLength</key> 88 <integer>69</integer> 89 </dict> 90 <key>WebResourceURL</key> 91 <string>file:///LayoutTests/webarchive/resources/test-css-link-recurse.css</string> 92 </dict> 93 <dict> 94 <key>WebResourceData</key> 95 <string>@import url('test-css-link-recurse.css'); 96 .red { color: red; } 97 </string> 98 <key>WebResourceMIMEType</key> 99 <string>text/css</string> 100 <key>WebResourceResponse</key> 101 <dict> 102 <key>MIMEType</key> 103 <string>text/css</string> 104 <key>URL</key> 105 <string>file:///LayoutTests/webarchive/resources/test-css-link.css</string> 106 <key>expectedContentLength</key> 107 <integer>63</integer> 108 </dict> 109 <key>WebResourceURL</key> 110 <string>file:///LayoutTests/webarchive/resources/test-css-link.css</string> 111 </dict> 112 112 </array> 113 113 </dict> -
trunk/LayoutTests/webarchive/test-duplicate-resources-expected.txt
r30635 r31722 66 66 <key>WebSubresources</key> 67 67 <array> 68 <dict>69 <key>WebResourceData</key>70 <string>div { font-family: Arial, Helvetica, sans-serif; color: red; }71 </string>72 <key>WebResourceMIMEType</key>73 <string>text/css</string>74 <key>WebResourceResponse</key>75 <dict>76 <key>MIMEType</key>77 <string>text/css</string>78 <key>URL</key>79 <string>file:///LayoutTests/webarchive/resources/test-style.css</string>80 <key>expectedContentLength</key>81 <integer>63</integer>82 </dict>83 <key>WebResourceURL</key>84 <string>file:///LayoutTests/webarchive/resources/test-style.css</string>85 </dict>86 68 <dict> 87 69 <key>WebResourceData</key> … … 157 139 <string>file:///LayoutTests/webarchive/resources/apple.gif</string> 158 140 </dict> 141 <dict> 142 <key>WebResourceData</key> 143 <string>div { font-family: Arial, Helvetica, sans-serif; color: red; } 144 </string> 145 <key>WebResourceMIMEType</key> 146 <string>text/css</string> 147 <key>WebResourceResponse</key> 148 <dict> 149 <key>MIMEType</key> 150 <string>text/css</string> 151 <key>URL</key> 152 <string>file:///LayoutTests/webarchive/resources/test-style.css</string> 153 <key>expectedContentLength</key> 154 <integer>63</integer> 155 </dict> 156 <key>WebResourceURL</key> 157 <string>file:///LayoutTests/webarchive/resources/test-style.css</string> 158 </dict> 159 159 </array> 160 160 </dict> … … 162 162 <key>WebSubresources</key> 163 163 <array> 164 <dict>165 <key>WebResourceData</key>166 <string>if (window.layoutTestController)167 layoutTestController.dumpDOMAsWebArchive();168 </string>169 <key>WebResourceMIMEType</key>170 <string>text/javascript</string>171 <key>WebResourceResponse</key>172 <dict>173 <key>MIMEType</key>174 <string>text/javascript</string>175 <key>URL</key>176 <string>file:///LayoutTests/webarchive/resources/dump-webarchive.js</string>177 <key>expectedContentLength</key>178 <integer>81</integer>179 </dict>180 <key>WebResourceURL</key>181 <string>file:///LayoutTests/webarchive/resources/dump-webarchive.js</string>182 </dict>183 <dict>184 <key>WebResourceData</key>185 <string>div { font-family: Arial, Helvetica, sans-serif; color: red; }186 </string>187 <key>WebResourceMIMEType</key>188 <string>text/css</string>189 <key>WebResourceResponse</key>190 <dict>191 <key>MIMEType</key>192 <string>text/css</string>193 <key>URL</key>194 <string>file:///LayoutTests/webarchive/resources/test-style.css</string>195 <key>expectedContentLength</key>196 <integer>63</integer>197 </dict>198 <key>WebResourceURL</key>199 <string>file:///LayoutTests/webarchive/resources/test-style.css</string>200 </dict>201 164 <dict> 202 165 <key>WebResourceData</key> … … 255 218 <string>file:///LayoutTests/webarchive/resources/apple.gif</string> 256 219 </dict> 220 <dict> 221 <key>WebResourceData</key> 222 <string>if (window.layoutTestController) 223 layoutTestController.dumpDOMAsWebArchive(); 224 </string> 225 <key>WebResourceMIMEType</key> 226 <string>text/javascript</string> 227 <key>WebResourceResponse</key> 228 <dict> 229 <key>MIMEType</key> 230 <string>text/javascript</string> 231 <key>URL</key> 232 <string>file:///LayoutTests/webarchive/resources/dump-webarchive.js</string> 233 <key>expectedContentLength</key> 234 <integer>81</integer> 235 </dict> 236 <key>WebResourceURL</key> 237 <string>file:///LayoutTests/webarchive/resources/dump-webarchive.js</string> 238 </dict> 239 <dict> 240 <key>WebResourceData</key> 241 <string>div { font-family: Arial, Helvetica, sans-serif; color: red; } 242 </string> 243 <key>WebResourceMIMEType</key> 244 <string>text/css</string> 245 <key>WebResourceResponse</key> 246 <dict> 247 <key>MIMEType</key> 248 <string>text/css</string> 249 <key>URL</key> 250 <string>file:///LayoutTests/webarchive/resources/test-style.css</string> 251 <key>expectedContentLength</key> 252 <integer>63</integer> 253 </dict> 254 <key>WebResourceURL</key> 255 <string>file:///LayoutTests/webarchive/resources/test-style.css</string> 256 </dict> 257 257 </array> 258 258 </dict> -
trunk/LayoutTests/webarchive/test-frameset-expected.txt
r30635 r31722 55 55 <key>WebSubresources</key> 56 56 <array> 57 <dict>58 <key>WebResourceData</key>59 <string>div { font-family: Arial, Helvetica, sans-serif; color: red; }60 </string>61 <key>WebResourceMIMEType</key>62 <string>text/css</string>63 <key>WebResourceResponse</key>64 <dict>65 <key>MIMEType</key>66 <string>text/css</string>67 <key>URL</key>68 <string>file:///LayoutTests/webarchive/resources/test-style.css</string>69 <key>expectedContentLength</key>70 <integer>63</integer>71 </dict>72 <key>WebResourceURL</key>73 <string>file:///LayoutTests/webarchive/resources/test-style.css</string>74 </dict>75 57 <dict> 76 58 <key>WebResourceData</key> … … 146 128 <string>file:///LayoutTests/webarchive/resources/apple.gif</string> 147 129 </dict> 130 <dict> 131 <key>WebResourceData</key> 132 <string>div { font-family: Arial, Helvetica, sans-serif; color: red; } 133 </string> 134 <key>WebResourceMIMEType</key> 135 <string>text/css</string> 136 <key>WebResourceResponse</key> 137 <dict> 138 <key>MIMEType</key> 139 <string>text/css</string> 140 <key>URL</key> 141 <string>file:///LayoutTests/webarchive/resources/test-style.css</string> 142 <key>expectedContentLength</key> 143 <integer>63</integer> 144 </dict> 145 <key>WebResourceURL</key> 146 <string>file:///LayoutTests/webarchive/resources/test-style.css</string> 147 </dict> 148 148 </array> 149 149 </dict> -
trunk/WebKitTools/ChangeLog
r31708 r31722 1 2008-04-08 Brady Eidson <beidson@apple.com> 2 3 Reviewed by Mitzpettel 4 5 Fixed http://bugs.webkit.org/show_bug.cgi?id=18302 6 -WebArchive subresources dump in random order, intermittent failures 7 8 * DumpRenderTree/mac/DumpRenderTree.mm: 9 (compareResourceURLs): Sorting function based on the resource URLs 10 (serializeWebArchiveToXML): Sort the subresource array 11 1 12 2008-04-07 Brady Eidson <beidson@apple.com> 2 13 -
trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
r31271 r31722 609 609 } 610 610 611 static NSInteger compareResourceURLs(id resource1, id resource2, void *context) 612 { 613 NSString *url1 = [resource1 objectForKey:@"WebResourceURL"]; 614 NSString *url2 = [resource2 objectForKey:@"WebResourceURL"]; 615 616 return [url1 compare:url2]; 617 } 618 611 619 static NSString *serializeWebArchiveToXML(WebArchive *webArchive) 612 620 { … … 643 651 convertWebResourceDataToString(subresourcePropertyList); 644 652 } 653 654 // Sort the subresources so they're always in a predictable order for the dump 655 if (NSArray *sortedSubresources = [subresources sortedArrayUsingFunction:compareResourceURLs context:nil]) 656 [resourcePropertyList setObject:sortedSubresources forKey:@"WebSubresources"]; 645 657 } 646 658
Note: See TracChangeset
for help on using the changeset viewer.