Title: [241572] trunk
- Revision
- 241572
- Author
- commit-qu...@webkit.org
- Date
- 2019-02-14 16:19:22 -0800 (Thu, 14 Feb 2019)
Log Message
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
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (241571 => 241572)
--- trunk/LayoutTests/ChangeLog 2019-02-15 00:06:30 UTC (rev 241571)
+++ trunk/LayoutTests/ChangeLog 2019-02-15 00:19:22 UTC (rev 241572)
@@ -1,3 +1,17 @@
+2019-02-14 Commit Queue <commit-qu...@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 <za...@apple.com>
[LFC][BFC][MarginCollapse] Replaced boxes don't collapse through their margins
Deleted: trunk/LayoutTests/inspector/css/modify-inline-style-expected.txt (241571 => 241572)
--- trunk/LayoutTests/inspector/css/modify-inline-style-expected.txt 2019-02-15 00:06:30 UTC (rev 241571)
+++ trunk/LayoutTests/inspector/css/modify-inline-style-expected.txt 2019-02-15 00:19:22 UTC (rev 241572)
@@ -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;
-
-
Deleted: trunk/LayoutTests/inspector/css/modify-inline-style.html (241571 => 241572)
--- trunk/LayoutTests/inspector/css/modify-inline-style.html 2019-02-15 00:06:30 UTC (rev 241571)
+++ trunk/LayoutTests/inspector/css/modify-inline-style.html 2019-02-15 00:19:22 UTC (rev 241572)
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-<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>
Modified: trunk/Source/WebInspectorUI/ChangeLog (241571 => 241572)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-02-15 00:06:30 UTC (rev 241571)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-02-15 00:19:22 UTC (rev 241572)
@@ -1,3 +1,17 @@
+2019-02-14 Commit Queue <commit-qu...@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 <nvasil...@apple.com>
Web Inspector: Styles: valid values in style attributes are reported as unsupported property values
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (241571 => 241572)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2019-02-15 00:06:30 UTC (rev 241571)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2019-02-15 00:19:22 UTC (rev 241572)
@@ -512,7 +512,6 @@
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 @@
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) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
