Attachment 346798 Details for Bug 188420 – PATCH

[patch] PATCH

188420.diff (text/plain), 10.25 KB, created by Basuke Suzuki on 2018-08-08 14:39:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-08-08 14:39:16 PDT

Size: 10.25 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index dbdba41392b..19704804ea2 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-08  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Test gardening
>+        https://bugs.webkit.org/show_bug.cgi?id=188420
>+
>+        Unreviewed test gardening.
>+
>+        Fix test result after r234607 landed. Part 1 for http/tests
>+
>+        * platform/wincairo/TestExpectations:
>+        * platform/wincairo/http/tests/local/file-url-sent-as-referer-expected.txt:
>+        * platform/wincairo/http/tests/multipart/invalid-image-data-expected.txt:
>+        * platform/wincairo/http/tests/multipart/invalid-image-data-standalone-expected.txt:
>+        * platform/wincairo/http/tests/uri/css-href-expected.txt:
>+
> 2018-08-08  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Web Inspector: XHR content sometimes shows as error even though load succeeded
>diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations
>index 35c2541fe85..c8b02103a76 100644
>--- a/LayoutTests/platform/wincairo/TestExpectations
>+++ b/LayoutTests/platform/wincairo/TestExpectations
>@@ -879,7 +879,6 @@ http/tests/loading [ Skip ]
> http/tests/local/blob [ Skip ]
> http/tests/local/fileapi [ Skip ]
> http/tests/local/formdata [ Skip ]
>-http/tests/local/drag-over-remote-content.html [ Failure ]
> 
> http/tests/media [ Skip ]
> 
>@@ -907,8 +906,6 @@ http/tests/webauthn [ Skip ]
> http/tests/webgl [ Skip ]
> http/tests/webrtc [ Skip ]
> 
>-http/tests/websocket/tests/hybi/close-event.html [ Failure ]
>-http/tests/websocket/tests/hybi/close.html [ Failure ]
> http/tests/websocket/tests/hybi/contentextensions [ Failure ]
> http/tests/websocket/tests/hybi/contentextensions/block-cookies.php [ Pass ]
> http/tests/websocket/tests/hybi/contentextensions/block-cookies-worker.php [ Pass ]
>diff --git a/LayoutTests/platform/wincairo/http/tests/local/file-url-sent-as-referer-expected.txt b/LayoutTests/platform/wincairo/http/tests/local/file-url-sent-as-referer-expected.txt
>index 2be126d94a9..c17c362b9fd 100644
>--- a/LayoutTests/platform/wincairo/http/tests/local/file-url-sent-as-referer-expected.txt
>+++ b/LayoutTests/platform/wincairo/http/tests/local/file-url-sent-as-referer-expected.txt
>@@ -1,8 +1,8 @@
>-layer at (0,0) size 534x400
>-  RenderView at (0,0) size 534x400
>-layer at (0,0) size 534x400
>-  RenderBlock {HTML} at (0,0) size 534x400
>-    RenderBody {BODY} at (8,8) size 518x384
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>       RenderBR {BR} at (0,0) size 0x19
>       RenderText {#text} at (0,20) size 478x19
>         text run at (0,20) width 478: "This is a test to see if a file:// url is sent out as the referrer for a subresource load"
>diff --git a/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-expected.txt b/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-expected.txt
>index 9edf94911d2..fca8593a63c 100644
>--- a/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-expected.txt
>+++ b/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-expected.txt
>@@ -1,24 +1,24 @@
>-layer at (0,0) size 534x400
>-  RenderView at (0,0) size 534x400
>-layer at (0,0) size 534x400
>-  RenderBlock {HTML} at (0,0) size 534x400
>-    RenderBody {BODY} at (8,8) size 518x384
>-      RenderBlock {P} at (0,0) size 518x40
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>+      RenderBlock {P} at (0,0) size 784x40
>         RenderText {#text} at (0,0) size 51x19
>           text run at (0,0) width 51: "Test for "
>-        RenderInline {I} at (0,0) size 513x39
>+        RenderInline {I} at (0,0) size 779x39
>           RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
>             RenderText {#text} at (51,0) size 305x19
>               text run at (51,0) width 305: "http://bugs.webkit.org/show_bug.cgi?id=13759"
>-          RenderText {#text} at (356,0) size 513x39
>+          RenderText {#text} at (356,0) size 779x39
>             text run at (356,0) width 4: " "
>-            text run at (360,0) width 153: "REGRESSION (r20182-"
>-            text run at (0,20) width 315: "r20184): Incorrect rendering of multipart images"
>-        RenderText {#text} at (315,20) size 4x19
>-          text run at (315,20) width 4: "."
>-      RenderBlock {P} at (0,56) size 518x20
>+            text run at (360,0) width 419: "REGRESSION (r20182-r20184): Incorrect rendering of multipart"
>+            text run at (0,20) width 45: "images"
>+        RenderText {#text} at (45,20) size 4x19
>+          text run at (45,20) width 4: "."
>+      RenderBlock {P} at (0,56) size 784x20
>         RenderText {#text} at (0,0) size 272x19
>           text run at (0,0) width 272: "There should be a bright green square below."
>-      RenderBlock (anonymous) at (0,92) size 518x100
>+      RenderBlock (anonymous) at (0,92) size 784x100
>         RenderImage {IMG} at (0,0) size 100x100
>         RenderText {#text} at (0,0) size 0x0
>diff --git a/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-standalone-expected.txt b/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-standalone-expected.txt
>index dcf54b31889..6243e585266 100644
>--- a/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-standalone-expected.txt
>+++ b/LayoutTests/platform/wincairo/http/tests/multipart/invalid-image-data-standalone-expected.txt
>@@ -1,25 +1,25 @@
>-layer at (0,0) size 534x400
>-  RenderView at (0,0) size 534x400
>-layer at (0,0) size 534x400
>-  RenderBlock {HTML} at (0,0) size 534x400
>-    RenderBody {BODY} at (8,8) size 518x384
>-      RenderBlock {P} at (0,0) size 518x40
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>+      RenderBlock {P} at (0,0) size 784x40
>         RenderText {#text} at (0,0) size 51x19
>           text run at (0,0) width 51: "Test for "
>-        RenderInline {I} at (0,0) size 513x39
>+        RenderInline {I} at (0,0) size 779x39
>           RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
>             RenderText {#text} at (51,0) size 305x19
>               text run at (51,0) width 305: "http://bugs.webkit.org/show_bug.cgi?id=13759"
>-          RenderText {#text} at (356,0) size 513x39
>+          RenderText {#text} at (356,0) size 779x39
>             text run at (356,0) width 4: " "
>-            text run at (360,0) width 153: "REGRESSION (r20182-"
>-            text run at (0,20) width 315: "r20184): Incorrect rendering of multipart images"
>-        RenderText {#text} at (315,20) size 4x19
>-          text run at (315,20) width 4: "."
>-      RenderBlock {P} at (0,56) size 518x20
>+            text run at (360,0) width 419: "REGRESSION (r20182-r20184): Incorrect rendering of multipart"
>+            text run at (0,20) width 45: "images"
>+        RenderText {#text} at (45,20) size 4x19
>+          text run at (45,20) width 4: "."
>+      RenderBlock {P} at (0,56) size 784x20
>         RenderText {#text} at (0,0) size 234x19
>           text run at (0,0) width 234: "There should be a green square below."
>-      RenderBlock (anonymous) at (0,92) size 518x124
>+      RenderBlock (anonymous) at (0,92) size 784x124
>         RenderIFrame {IFRAME} at (0,0) size 124x124 [border: (2px inset #000000)]
>           layer at (0,0) size 120x120
>             RenderView at (0,0) size 120x120
>diff --git a/LayoutTests/platform/wincairo/http/tests/uri/css-href-expected.txt b/LayoutTests/platform/wincairo/http/tests/uri/css-href-expected.txt
>index 0053b9ca8c0..7306826cfc4 100644
>--- a/LayoutTests/platform/wincairo/http/tests/uri/css-href-expected.txt
>+++ b/LayoutTests/platform/wincairo/http/tests/uri/css-href-expected.txt
>@@ -1,9 +1,9 @@
>-layer at (0,0) size 534x400
>-  RenderView at (0,0) size 534x400
>-layer at (0,0) size 534x400
>-  RenderBlock {HTML} at (0,0) size 534x400
>-    RenderBody {BODY} at (8,8) size 518x376
>-      RenderBlock {P} at (0,0) size 518x20
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x576
>+      RenderBlock {P} at (0,0) size 784x20
>         RenderText {#text} at (0,0) size 51x19
>           text run at (0,0) width 51: "Test for "
>         RenderInline {A} at (0,0) size 66x19 [color=#0000EE]
>@@ -12,18 +12,15 @@ layer at (0,0) size 534x400
>         RenderText {#text} at (117,0) size 330x19
>           text run at (117,0) width 7: ": "
>           text run at (124,0) width 323: "CSS '@import' doesn't respect HTML Base element."
>-      RenderBlock {P} at (0,36) size 518x20 [color=#008000]
>+      RenderBlock {P} at (0,36) size 784x20 [color=#008000]
>         RenderText {#text} at (0,0) size 154x19
>           text run at (0,0) width 154: "This text should be green."
>-      RenderBlock {P} at (0,72) size 518x80
>-        RenderText {#text} at (0,0) size 510x79
>+      RenderBlock {P} at (0,72) size 784x40
>+        RenderText {#text} at (0,0) size 772x39
>           text run at (0,0) width 364: "If it is red, the css has been loaded relative to the document. "
>-          text run at (364,0) width 93: "If it is black, no"
>-          text run at (0,20) width 315: "stylesheet has been rendered, if it is rendered green, "
>-          text run at (315,20) width 195: "the stylesheet has been rendered"
>-          text run at (0,40) width 245: "correctly from the HREF attribute of the "
>-          text run at (245,40) width 248: "Base element in the HEAD section of this"
>-          text run at (0,60) width 63: "document."
>-      RenderBlock {P} at (0,168) size 518x20 [color=#008000]
>+          text run at (364,0) width 408: "If it is black, no stylesheet has been rendered, if it is rendered green,"
>+          text run at (0,20) width 444: "the stylesheet has been rendered correctly from the HREF attribute of the "
>+          text run at (444,20) width 315: "Base element in the HEAD section of this document."
>+      RenderBlock {P} at (0,128) size 784x20 [color=#008000]
>         RenderText {#text} at (0,0) size 182x19
>           text run at (0,0) width 182: "This text should also be green."

Actions: View | Formatted Diff | Diff

Attachments on bug 188420: 346798