Attachment 362050 Details for Bug 194662 – Patch

[patch] Patch

patch.txt (text/plain), 3.95 KB, created by Nikita Vasilyev on 2019-02-14 12:51:14 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Nikita Vasilyev

Created: 2019-02-14 12:51:14 PST

Size: 3.95 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 32bd451e1ce..e51a460127b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-02-14  Nikita Vasilyev  <nvasilyev@apple.com>
>+
>+        Web Inspector: inspector/css/modify-inline-style.html times out
>+        https://bugs.webkit.org/show_bug.cgi?id=194662
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fix the test timeout on Mac Release WK2.
>+
>+        * inspector/css/modify-inline-style-expected.txt:
>+        * inspector/css/modify-inline-style.html:
>+
> 2019-02-14  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC][MarginCollapse] Replaced boxes don't collapse through their margins
>diff --git a/LayoutTests/inspector/css/modify-inline-style-expected.txt b/LayoutTests/inspector/css/modify-inline-style-expected.txt
>index 397ca66305f..070016879ed 100644
>--- a/LayoutTests/inspector/css/modify-inline-style-expected.txt
>+++ b/LayoutTests/inspector/css/modify-inline-style-expected.txt
>@@ -3,16 +3,19 @@ Testing that adding and editing CSS properties of inline styles works.
> 
> == Running test suite: ModifyInlineStyle
> -- Running test case: ModifyInlineStyle.AddPropertyAndEdit
>-CSSProperty changed to "font: 12px normal sans-serif!important;".
>-font: 12px normal sans-serif!important;
>+CSSProperty changed to "font: 12px normal sans-serif;".
>+font: 12px normal sans-serif;outline: 2px solid green;
>+
>+CSSProperty changed to "outline: 2px solid green;".
>+font: 12px normal sans-serif;outline: 2px solid green;
> 
> CSSProperty changed to "color: red;".
>-font: 12px normal sans-serif!important;color: red;
>+color: red;font: 12px normal sans-serif;outline: 2px solid green;
> 
>-CSSProperty changed to "font: 12px sans-serif;".
>-font: 12px sans-serif;color: red;
>+CSSProperty changed to "font: 12px sans-serif!important;".
>+color: red;font: 12px sans-serif!important;outline: 2px solid green;
> 
> CSSProperty changed to "color: invalid_c010r;".
>-font: 12px sans-serif;color: invalid_c010r;
>+color: invalid_c010r;font: 12px sans-serif!important;outline: 2px solid green;
> 
> 
>diff --git a/LayoutTests/inspector/css/modify-inline-style.html b/LayoutTests/inspector/css/modify-inline-style.html
>index 1b35319edd3..62d24ad6aa6 100644
>--- a/LayoutTests/inspector/css/modify-inline-style.html
>+++ b/LayoutTests/inspector/css/modify-inline-style.html
>@@ -25,7 +25,12 @@ function test() {
>             const fontPropertyIndex = 0;
>             let fontProperty = style.newBlankProperty(fontPropertyIndex);
>             fontProperty.name = "font";
>-            fontProperty.rawValue = "12px normal sans-serif!important";
>+            fontProperty.rawValue = "12px normal sans-serif";
>+
>+            const outlinePropertyIndex = 1;
>+            let outlineProperty = style.newBlankProperty(outlinePropertyIndex);
>+            outlineProperty.name = "outline";
>+            outlineProperty.rawValue = "2px solid green";
> 
>             let colorProperty = null;
> 
>@@ -39,8 +44,9 @@ function test() {
> 
>             WI.CSSProperty.addEventListener(WI.CSSProperty.Event.Changed, cssPropertyChanged);
> 
>-            fontProperty.awaitEvent(WI.CSSProperty.Event.Changed).then((event) => {
>-                const colorPropertyIndex = 1;
>+            fontProperty.awaitEvent(WI.CSSProperty.Event.Changed)
>+            .then((event) => {
>+                const colorPropertyIndex = 0;
>                 colorProperty = style.newBlankProperty(colorPropertyIndex);
>                 let promise = colorProperty.awaitEvent(WI.CSSProperty.Event.Changed);
>                 colorProperty.name = "color";
>@@ -48,7 +54,7 @@ function test() {
>                 return promise;
>             }).then(() => {
>                 let promise = fontProperty.awaitEvent(WI.CSSProperty.Event.Changed);
>-                fontProperty.rawValue = "12px sans-serif";
>+                fontProperty.rawValue = "12px sans-serif!important";
>                 return promise;
>             }).then(() => {
>                 let promise = colorProperty.awaitEvent(WI.CSSProperty.Event.Changed);

Actions: View | Formatted Diff | Diff

Attachments on bug 194662: 362050