Merge 149966 "Fix multipart images, regressed in r148560".

LayoutTests/http/tests/multipart/invalid-image-data.html

Index: LayoutTests/http/tests/multipart/invalid-image-data.html
===================================================================
--- LayoutTests/http/tests/multipart/invalid-image-data.html	(revision 150342)
+++ LayoutTests/http/tests/multipart/invalid-image-data.html	(working copy)
@@ -7,7 +7,7 @@
         function loadedFirstPart()
         {
             if (window.testRunner)
-                setTimeout("testRunner.notifyDone()", 200);
+                testRunner.notifyDone();
         }
     </script>
 </head>
@@ -19,6 +19,6 @@
     <p>
         There should be a bright green square below.
     </p>
-    <img width="100" height="100" src="resources/multipart.php?interval=0&img1=2x2-green.png&img2=abe.png" onload="loadedFirstPart()">
+    <img width="100" height="100" src="resources/multipart.php?interval=1&img1=2x2-green.png&img2=abe.png" onload="loadedFirstPart()">
 </body>
 </html>
Property changes on: LayoutTests/http/tests/multipart/invalid-image-data.html
___________________________________________________________________
Added: svn:mime-type
   + text/html
Added: svn:eol-style
   + LF