Log Message
Web Inspector: rename CSS.StyleSheetOrigin.Regular to CSS.StyleSheetOrigin.Author to match the spec https://bugs.webkit.org/show_bug.cgi?id=211827
Reviewed by Timothy Hatcher.
Source/_javascript_Core:
* inspector/protocol/CSS.json:
Source/WebCore:
Tests: inspector/css/add-rule.html
inspector/css/getMatchedStylesForNode.html
* inspector/agents/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::asInspectorStyleSheet):
(WebCore::InspectorCSSAgent::detectOrigin):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::buildObjectForRule):
Source/WebInspectorUI:
* UserInterface/Controllers/CSSManager.js:
(WI.CSSManager.protocolStyleSheetOriginToEnum):
LayoutTests:
* inspector/css/add-rule.html:
* inspector/css/add-rule-expected.txt:
* inspector/css/getMatchedStylesForNode-expected.txt:
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/LayoutTests/inspector/css/add-rule-expected.txt
- trunk/LayoutTests/inspector/css/add-rule.html
- trunk/LayoutTests/inspector/css/getMatchedStylesForNode-expected.txt
- trunk/Source/_javascript_Core/ChangeLog
- trunk/Source/_javascript_Core/inspector/protocol/CSS.json
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
- trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp
- trunk/Source/WebInspectorUI/ChangeLog
- trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js
Diff
Modified: trunk/LayoutTests/ChangeLog (261668 => 261669)
--- trunk/LayoutTests/ChangeLog 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/LayoutTests/ChangeLog 2020-05-14 02:34:39 UTC (rev 261669)
@@ -1,3 +1,14 @@
+2020-05-13 Devin Rousso <[email protected]>
+
+ Web Inspector: rename CSS.StyleSheetOrigin.Regular to CSS.StyleSheetOrigin.Author to match the spec
+ https://bugs.webkit.org/show_bug.cgi?id=211827
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/css/add-rule.html:
+ * inspector/css/add-rule-expected.txt:
+ * inspector/css/getMatchedStylesForNode-expected.txt:
+
2020-05-13 Jack Lee <[email protected]>
Nullptr crash in InsertParagraphSeparatorCommand::doApply when the canonical position is uneditable
Modified: trunk/LayoutTests/inspector/css/add-rule-expected.txt (261668 => 261669)
--- trunk/LayoutTests/inspector/css/add-rule-expected.txt 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/LayoutTests/inspector/css/add-rule-expected.txt 2020-05-14 02:34:39 UTC (rev 261669)
@@ -16,7 +16,7 @@
-- Running test case: CSS.addRule.ExternalStyleSheet
PASS: Rule selector should be "div"
PASS: Rule range should be [2:0,2:3]
-PASS: Rule origin should be "regular"
+PASS: Rule origin should be "author"
-- Running test case: CSS.addRule.BadStyleSheetId
PASS: Missing style sheet for given styleSheetId
Modified: trunk/LayoutTests/inspector/css/add-rule.html (261668 => 261669)
--- trunk/LayoutTests/inspector/css/add-rule.html 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/LayoutTests/inspector/css/add-rule.html 2020-05-14 02:34:39 UTC (rev 261669)
@@ -95,7 +95,7 @@
InspectorTest.expectEqual(rulePayload.selectorList.text, "div", `Rule selector should be "div"`);
InspectorTest.expectEqual(stringify(rulePayload.selectorList.range), "2:0,2:3", `Rule range should be [2:0,2:3]`);
- InspectorTest.expectEqual(rulePayload.origin, "regular", `Rule origin should be "regular"`);
+ InspectorTest.expectEqual(rulePayload.origin, "author", `Rule origin should be "author"`);
resolve();
}
Modified: trunk/LayoutTests/inspector/css/getMatchedStylesForNode-expected.txt (261668 => 261669)
--- trunk/LayoutTests/inspector/css/getMatchedStylesForNode-expected.txt 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/LayoutTests/inspector/css/getMatchedStylesForNode-expected.txt 2020-05-14 02:34:39 UTC (rev 261669)
@@ -24,7 +24,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -67,7 +67,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -110,7 +110,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -160,7 +160,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -208,7 +208,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -256,7 +256,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -304,7 +304,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -352,7 +352,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -400,7 +400,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -448,7 +448,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -496,7 +496,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -544,7 +544,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -592,7 +592,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -640,7 +640,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -688,7 +688,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -736,7 +736,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -787,7 +787,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -837,7 +837,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -880,7 +880,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -930,7 +930,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -985,7 +985,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
@@ -1035,7 +1035,7 @@
"range": "<filtered>"
},
"sourceLine": "<filtered>",
- "origin": "regular",
+ "origin": "author",
"style": {
"cssProperties": [
{
Modified: trunk/Source/_javascript_Core/ChangeLog (261668 => 261669)
--- trunk/Source/_javascript_Core/ChangeLog 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-05-14 02:34:39 UTC (rev 261669)
@@ -1,3 +1,12 @@
+2020-05-13 Devin Rousso <[email protected]>
+
+ Web Inspector: rename CSS.StyleSheetOrigin.Regular to CSS.StyleSheetOrigin.Author to match the spec
+ https://bugs.webkit.org/show_bug.cgi?id=211827
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/CSS.json:
+
2020-05-13 Yusuke Suzuki <[email protected]>
JSDOMWindowBase m_windowCloseWatchpoints must be Ref<>
Modified: trunk/Source/_javascript_Core/inspector/protocol/CSS.json (261668 => 261669)
--- trunk/Source/_javascript_Core/inspector/protocol/CSS.json 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/_javascript_Core/inspector/protocol/CSS.json 2020-05-14 02:34:39 UTC (rev 261669)
@@ -20,7 +20,7 @@
{
"id": "StyleSheetOrigin",
"type": "string",
- "enum": ["user", "user-agent", "inspector", "regular"],
+ "enum": ["user", "user-agent", "author", "inspector"],
"description": "Stylesheet type: \"user\" for user stylesheets, \"user-agent\" for user-agent stylesheets, \"inspector\" for stylesheets created by the inspector (i.e. those holding the \"via inspector\" rules), \"regular\" for regular stylesheets."
},
{
Modified: trunk/Source/WebCore/ChangeLog (261668 => 261669)
--- trunk/Source/WebCore/ChangeLog 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/WebCore/ChangeLog 2020-05-14 02:34:39 UTC (rev 261669)
@@ -1,3 +1,19 @@
+2020-05-13 Devin Rousso <[email protected]>
+
+ Web Inspector: rename CSS.StyleSheetOrigin.Regular to CSS.StyleSheetOrigin.Author to match the spec
+ https://bugs.webkit.org/show_bug.cgi?id=211827
+
+ Reviewed by Timothy Hatcher.
+
+ Tests: inspector/css/add-rule.html
+ inspector/css/getMatchedStylesForNode.html
+
+ * inspector/agents/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::asInspectorStyleSheet):
+ (WebCore::InspectorCSSAgent::detectOrigin):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::buildObjectForRule):
+
2020-05-13 Yusuke Suzuki <[email protected]>
JSDOMWindowBase m_windowCloseWatchpoints must be Ref<>
Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (261668 => 261669)
--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2020-05-14 02:34:39 UTC (rev 261669)
@@ -1135,7 +1135,7 @@
.setStyle(buildObjectForStyle(&rule->style()))
.release();
- if (m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::Regular || m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::User)
+ if (m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::Author || m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::User)
result->setSourceURL(finalURL());
if (canBind()) {
Modified: trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp (261668 => 261669)
--- trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp 2020-05-14 02:34:39 UTC (rev 261669)
@@ -870,7 +870,7 @@
{
return m_nodeToInspectorStyleSheet.ensure(&element, [this, &element] {
String newStyleSheetId = String::number(m_lastStyleSheetId++);
- auto inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_instrumentingAgents.inspectorPageAgent(), newStyleSheetId, element, Inspector::Protocol::CSS::StyleSheetOrigin::Regular, this);
+ auto inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_instrumentingAgents.inspectorPageAgent(), newStyleSheetId, element, Inspector::Protocol::CSS::StyleSheetOrigin::Author, this);
m_idToInspectorStyleSheet.set(newStyleSheetId, inspectorStyleSheet.copyRef());
return inspectorStyleSheet;
}).iterator->value;
@@ -942,7 +942,7 @@
}
}
- return Inspector::Protocol::CSS::StyleSheetOrigin::Regular;
+ return Inspector::Protocol::CSS::StyleSheetOrigin::Author;
}
RefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(const StyleRule* styleRule, Style::Resolver& styleResolver, Element& element)
Modified: trunk/Source/WebInspectorUI/ChangeLog (261668 => 261669)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-05-14 02:34:39 UTC (rev 261669)
@@ -1,3 +1,13 @@
+2020-05-13 Devin Rousso <[email protected]>
+
+ Web Inspector: rename CSS.StyleSheetOrigin.Regular to CSS.StyleSheetOrigin.Author to match the spec
+ https://bugs.webkit.org/show_bug.cgi?id=211827
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/CSSManager.js:
+ (WI.CSSManager.protocolStyleSheetOriginToEnum):
+
2020-05-11 Devin Rousso <[email protected]>
Web Inspector: Network: Timing: gaps around the "Resource does not have timing data" message
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js (261668 => 261669)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js 2020-05-14 02:15:33 UTC (rev 261668)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js 2020-05-14 02:34:39 UTC (rev 261669)
@@ -63,18 +63,20 @@
static protocolStyleSheetOriginToEnum(origin)
{
switch (origin) {
- case InspectorBackend.Enum.CSS.StyleSheetOrigin.Regular:
- return WI.CSSStyleSheet.Type.Author;
case InspectorBackend.Enum.CSS.StyleSheetOrigin.User:
return WI.CSSStyleSheet.Type.User;
+
case InspectorBackend.Enum.CSS.StyleSheetOrigin.UserAgent:
return WI.CSSStyleSheet.Type.UserAgent;
+
case InspectorBackend.Enum.CSS.StyleSheetOrigin.Inspector:
return WI.CSSStyleSheet.Type.Inspector;
- default:
- console.assert(false, "Unknown CSS.StyleSheetOrigin", origin);
- return InspectorBackend.Enum.CSS.StyleSheetOrigin.Regular;
}
+
+ // COMPATIBILITY (iOS 14): CSS.StyleSheetOrigin.Regular was replaced with CSS.StyleSheetOrigin.Author.
+ console.assert(!InspectorBackend.Enum.CSS.StyleSheetOrigin.Author || origin === InspectorBackend.Enum.CSS.StyleSheetOrigin.Author);
+ console.assert(!InspectorBackend.Enum.CSS.StyleSheetOrigin.Regular || origin === InspectorBackend.Enum.CSS.StyleSheetOrigin.Regular);
+ return WI.CSSStyleSheet.Type.Author;
}
static protocolGroupingTypeToEnum(type)
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
