Attachment 362065 Details for Bug 194676 – ROLLOUT of r241497

[patch] ROLLOUT of r241497

bug-194676-20190214145039.patch (text/plain), 7.88 KB, created by WebKit Commit Bot on 2019-02-14 14:50:40 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-02-14 14:50:40 PST

Size: 7.88 KB

patch

obsolete

>Subversion Revision: 241564
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 0f674693d8e97a346bc7be1fce2a5748bc879b77..b83b1ec2c2ac4a06e916f9ec40fdab297c826fa8 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-14  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241497.
>+        https://bugs.webkit.org/show_bug.cgi?id=194676
>+
>+        New test times out (Requested by NVI on #webkit).
>+
>+        Reverted changeset:
>+
>+        "Web Inspector: Styles: valid values in style attributes are
>+        reported as unsupported property values"
>+        https://bugs.webkit.org/show_bug.cgi?id=194619
>+        https://trac.webkit.org/changeset/241497
>+
> 2019-02-13  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Styles: valid values in style attributes are reported as unsupported property values
>diff --git a/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js b/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js
>index a199be0310bc4af69da06a108857028b5a73a579..c7845078fbc399e50a127c880c0a20fd10546518 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js
>@@ -512,7 +512,6 @@ WI.DOMNodeStyles = class DOMNodeStyles extends WI.Object
>         var name = payload.name;
>         var value = payload.value || "";
>         var priority = payload.priority || "";
>-        let range = payload.range || null;
> 
>         var enabled = true;
>         var overridden = false;
>@@ -537,19 +536,6 @@ WI.DOMNodeStyles = class DOMNodeStyles extends WI.Object
>             break;
>         }
> 
>-        if (range) {
>-            // Last property of inline style has mismatching range.
>-            // The actual text has one line, but the range spans two lines.
>-            let rangeLineCount = 1 + range.endLine - range.startLine;
>-            if (rangeLineCount > 1) {
>-                let textLineCount = text.lineCount;
>-                if (textLineCount === rangeLineCount - 1) {
>-                    range.endLine = range.startLine + (textLineCount - 1);
>-                    range.endColumn = range.startColumn + text.lastLine.length;
>-                }
>-            }
>-        }
>-
>         var styleSheetTextRange = this._parseSourceRangePayload(payload.range);
> 
>         if (styleDeclaration) {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 32bd451e1ce8ad432dea54bd49ed6d80cc7d6550..1af7989c41f7d17cd88860056567e07ede7e4178 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-14  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241497.
>+        https://bugs.webkit.org/show_bug.cgi?id=194676
>+
>+        New test times out (Requested by NVI on #webkit).
>+
>+        Reverted changeset:
>+
>+        "Web Inspector: Styles: valid values in style attributes are
>+        reported as unsupported property values"
>+        https://bugs.webkit.org/show_bug.cgi?id=194619
>+        https://trac.webkit.org/changeset/241497
>+
> 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
>deleted file mode 100644
>index 397ca66305f72571a21da2df72c7125195b49386..0000000000000000000000000000000000000000
>--- a/LayoutTests/inspector/css/modify-inline-style-expected.txt
>+++ /dev/null
>@@ -1,18 +0,0 @@
>-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 "color: red;".
>-font: 12px normal sans-serif!important;color: red;
>-
>-CSSProperty changed to "font: 12px sans-serif;".
>-font: 12px sans-serif;color: red;
>-
>-CSSProperty changed to "color: invalid_c010r;".
>-font: 12px sans-serif;color: invalid_c010r;
>-
>-
>diff --git a/LayoutTests/inspector/css/modify-inline-style.html b/LayoutTests/inspector/css/modify-inline-style.html
>deleted file mode 100644
>index 1b35319edd3941b638f4d851191ae941ffc6d2b3..0000000000000000000000000000000000000000
>--- a/LayoutTests/inspector/css/modify-inline-style.html
>+++ /dev/null
>@@ -1,90 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
>-<script>
>-function test() {
>-    let nodeStyles = null;
>-
>-    let suite = InspectorTest.createAsyncSuite("ModifyInlineStyle");
>-
>-    suite.addTestCase({
>-        name: "ModifyInlineStyle.AddPropertyAndEdit",
>-        test(resolve, reject) {
>-            let getInlineStyleDeclaration = () => {
>-                for (let styleDeclaration of nodeStyles.orderedStyles) {
>-                    if (styleDeclaration.type === styleDeclaration.constructor.Type.Inline)
>-                        return styleDeclaration;
>-                }
>-                InspectorTest.fail("No declaration found.");
>-                resolve();
>-            };
>-
>-            let style = getInlineStyleDeclaration();
>-
>-            const fontPropertyIndex = 0;
>-            let fontProperty = style.newBlankProperty(fontPropertyIndex);
>-            fontProperty.name = "font";
>-            fontProperty.rawValue = "12px normal sans-serif!important";
>-
>-            let colorProperty = null;
>-
>-            let cssPropertyChanged = (event) => {
>-                if (event.target.ownerStyle && event.target.ownerStyle.type === WI.CSSStyleDeclaration.Type.Computed)
>-                    return;
>-
>-                InspectorTest.log(`CSSProperty changed to "${event.target.text}".`);
>-                InspectorTest.log(style.text + "\n");
>-            };
>-
>-            WI.CSSProperty.addEventListener(WI.CSSProperty.Event.Changed, cssPropertyChanged);
>-
>-            fontProperty.awaitEvent(WI.CSSProperty.Event.Changed).then((event) => {
>-                const colorPropertyIndex = 1;
>-                colorProperty = style.newBlankProperty(colorPropertyIndex);
>-                let promise = colorProperty.awaitEvent(WI.CSSProperty.Event.Changed);
>-                colorProperty.name = "color";
>-                colorProperty.rawValue = "red";
>-                return promise;
>-            }).then(() => {
>-                let promise = fontProperty.awaitEvent(WI.CSSProperty.Event.Changed);
>-                fontProperty.rawValue = "12px sans-serif";
>-                return promise;
>-            }).then(() => {
>-                let promise = colorProperty.awaitEvent(WI.CSSProperty.Event.Changed);
>-                colorProperty.rawValue = "invalid_c010r";
>-                return promise;
>-            }).then(() => {
>-                WI.CSSProperty.removeEventListener(WI.CSSProperty.Event.Changed, cssPropertyChanged);
>-                resolve();
>-                return true;
>-            });
>-        }
>-    });
>-
>-    WI.domManager.requestDocument((documentNode) => {
>-        WI.domManager.querySelector(documentNode.id, "#x", (contentNodeId) => {
>-            if (contentNodeId) {
>-                let domNode = WI.domManager.nodeForId(contentNodeId);
>-                nodeStyles = WI.cssManager.stylesForNode(domNode);
>-
>-                if (nodeStyles.needsRefresh) {
>-                    nodeStyles.singleFireEventListener(WI.DOMNodeStyles.Event.Refreshed, (event) => {
>-                        suite.runTestCasesAndFinish()
>-                    });
>-                } else
>-                    suite.runTestCasesAndFinish();
>-            } else {
>-                InspectorTest.fail("DOM node not found.");
>-                InspectorTest.completeTest();
>-            }
>-        });
>-    });
>-}
>-</script>
>-</head>
>-<body onload="runTest()">
>-    <p>Testing that adding and editing CSS properties of inline styles works.</p>
>-    <div id="x"></div>
>-</body>
>-</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 194676: 362065