Diff
Modified: trunk/LayoutTests/ChangeLog (189031 => 189032)
--- trunk/LayoutTests/ChangeLog 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/LayoutTests/ChangeLog 2015-08-27 17:37:22 UTC (rev 189032)
@@ -1,3 +1,16 @@
+2015-08-27 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Standardize on CSSStyleSheet.Type enum and move more protocol enum conversion to the manager
+ https://bugs.webkit.org/show_bug.cgi?id=148515
+
+ Reviewed by Brian Burg.
+
+ * inspector/css/matched-style-properties.html:
+ * inspector/css/pseudo-element-matches.html:
+ * inspector/css/selector-dynamic-specificity.html:
+ * inspector/css/selector-specificity.html:
+ * inspector/css/stylesheet-with-mutations.html:
+
2015-08-27 Eric Carlson <[email protected]>
Media Session: MediaSession constructor 'kind' argument optional
Modified: trunk/LayoutTests/inspector/css/matched-style-properties.html (189031 => 189032)
--- trunk/LayoutTests/inspector/css/matched-style-properties.html 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/LayoutTests/inspector/css/matched-style-properties.html 2015-08-27 17:37:22 UTC (rev 189032)
@@ -35,7 +35,7 @@
{
for (var i = 0; i < nodeStyles.matchedRules.length; ++i) {
var rule = nodeStyles.matchedRules[i];
- if (rule.type !== WebInspector.CSSRule.Type.Author)
+ if (rule.type !== WebInspector.CSSStyleSheet.Type.Author)
continue;
for (var j = 0; j < rule.style.properties.length; ++j) {
Modified: trunk/LayoutTests/inspector/css/pseudo-element-matches.html (189031 => 189032)
--- trunk/LayoutTests/inspector/css/pseudo-element-matches.html 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/LayoutTests/inspector/css/pseudo-element-matches.html 2015-08-27 17:37:22 UTC (rev 189032)
@@ -12,7 +12,7 @@
for (var i = 0; i < nodeStyles.matchedRules.length; ++i) {
var rule = nodeStyles.matchedRules[i];
- if (rule.type !== WebInspector.CSSRule.Type.UserAgent)
+ if (rule.type !== WebInspector.CSSStyleSheet.Type.UserAgent)
continue;
if (rule.selectorText.indexOf("::-webkit-media-text-track-container") === -1)
continue;
Modified: trunk/LayoutTests/inspector/css/selector-dynamic-specificity.html (189031 => 189032)
--- trunk/LayoutTests/inspector/css/selector-dynamic-specificity.html 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/LayoutTests/inspector/css/selector-dynamic-specificity.html 2015-08-27 17:37:22 UTC (rev 189032)
@@ -33,7 +33,7 @@
for (var i = 0; i < nodeStyles.matchedRules.length; ++i) {
var rule = nodeStyles.matchedRules[i];
- if (rule.type !== WebInspector.CSSRule.Type.Author)
+ if (rule.type !== WebInspector.CSSStyleSheet.Type.Author)
continue;
if (seenRules.some(function(r) { return r.isEqualTo(rule); }))
Modified: trunk/LayoutTests/inspector/css/selector-specificity.html (189031 => 189032)
--- trunk/LayoutTests/inspector/css/selector-specificity.html 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/LayoutTests/inspector/css/selector-specificity.html 2015-08-27 17:37:22 UTC (rev 189032)
@@ -25,7 +25,7 @@
{
for (var i = 0; i < nodeStyles.matchedRules.length; ++i) {
var rule = nodeStyles.matchedRules[i];
- if (rule.type !== WebInspector.CSSRule.Type.Author)
+ if (rule.type !== WebInspector.CSSStyleSheet.Type.Author)
continue;
for (var selector of rule.selectors)
Modified: trunk/LayoutTests/inspector/css/stylesheet-with-mutations.html (189031 => 189032)
--- trunk/LayoutTests/inspector/css/stylesheet-with-mutations.html 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/LayoutTests/inspector/css/stylesheet-with-mutations.html 2015-08-27 17:37:22 UTC (rev 189032)
@@ -16,7 +16,7 @@
{
for (var i = 0; i < nodeStyles.matchedRules.length; ++i) {
var rule = nodeStyles.matchedRules[i];
- if (rule.type !== WebInspector.CSSRule.Type.Author)
+ if (rule.type !== WebInspector.CSSStyleSheet.Type.Author)
continue;
for (var selector of rule.selectors)
Modified: trunk/Source/WebInspectorUI/ChangeLog (189031 => 189032)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-27 17:37:22 UTC (rev 189032)
@@ -1,3 +1,39 @@
+2015-08-27 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Standardize on CSSStyleSheet.Type enum and move more protocol enum conversion to the manager
+ https://bugs.webkit.org/show_bug.cgi?id=148515
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Controllers/CSSStyleManager.js:
+ (WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum):
+ (WebInspector.CSSStyleManager.protocolMediaSourceToEnum):
+ Protocol enum to frontend enum conversion.
+
+ * UserInterface/Models/DOMNodeStyles.js:
+ (WebInspector.DOMNodeStyles.prototype.refresh.fetchedComputedStyle):
+ (WebInspector.DOMNodeStyles.prototype.refresh):
+ (WebInspector.DOMNodeStyles.prototype._parseRulePayload):
+ (WebInspector.DOMNodeStyles.prototype._collectStylesInCascadeOrder):
+ Use the manager to convert from a protocol payload enum to frontend num for css types.
+
+ * UserInterface/Models/CSSRule.js:
+ (WebInspector.CSSRule.prototype.get editable):
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection):
+ (WebInspector.CSSStyleDeclarationSection.prototype.refresh):
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh.appendStyleSection):
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh):
+ * UserInterface/Views/VisualStyleSelectorSection.js:
+ (WebInspector.VisualStyleSelectorSection.prototype.update.createSelectorItem):
+ (WebInspector.VisualStyleSelectorSection.prototype.update.uniqueOrderedRules.set return):
+ (WebInspector.VisualStyleSelectorSection.prototype.update.uniqueOrderedRules):
+ (WebInspector.VisualStyleSelectorSection.prototype.update):
+ * UserInterface/Views/VisualStyleSelectorTreeItem.js:
+ (WebInspector.VisualStyleSelectorTreeItem):
+ Update enum use.
+
2015-08-26 Nikita Vasilyev <[email protected]>
Web Inspector: [Regression] [Mavericks]: Undocked Web Inspector toolbar is two different colors and has extra space
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSStyleManager.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -56,7 +56,6 @@
static protocolStyleSheetOriginToEnum(origin)
{
- // FIXME: Switch from CSSRule.Type to CSSStyleSheet.Type everywhere.
switch (origin) {
case CSSAgent.StyleSheetOrigin.Regular:
return WebInspector.CSSStyleSheet.Type.Author;
@@ -67,11 +66,28 @@
case CSSAgent.StyleSheetOrigin.Inspector:
return WebInspector.CSSStyleSheet.Type.Inspector;
default:
- console.assert(false, "Unknown StyleSheetOrigin", origin);
+ console.assert(false, "Unknown CSS.StyleSheetOrigin", origin);
return CSSAgent.StyleSheetOrigin.Regular;
}
}
+ static protocolMediaSourceToEnum(source)
+ {
+ switch (source) {
+ case CSSAgent.CSSMediaSource.MediaRule:
+ return WebInspector.CSSMedia.Type.MediaRule;
+ case CSSAgent.CSSMediaSource.ImportRule:
+ return WebInspector.CSSMedia.Type.ImportRule;
+ case CSSAgent.CSSMediaSource.LinkedSheet:
+ return WebInspector.CSSMedia.Type.LinkedStyleSheet;
+ case CSSAgent.CSSMediaSource.InlineSheet:
+ return WebInspector.CSSMedia.Type.InlineStyleSheet;
+ default:
+ console.assert(false, "Unknown CSS.CSSMediaSource", origin);
+ return WebInspector.CSSMedia.Type.MediaRule;
+ }
+ }
+
// Public
get preferredColorFormat()
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -53,7 +53,7 @@
get editable()
{
- return !!this._id && (this._type === WebInspector.CSSRule.Type.Author || this._type === WebInspector.CSSRule.Type.Inspector);
+ return !!this._id && (this._type === WebInspector.CSSStyleSheet.Type.Author || this._type === WebInspector.CSSStyleSheet.Type.Inspector);
}
update(sourceCodeLocation, selectorText, selectors, matchedSelectorIndices, style, mediaList, dontFireEvents)
@@ -247,10 +247,3 @@
Changed: "css-rule-changed",
SelectorChanged: "css-rule-invalid-selector"
};
-
-WebInspector.CSSRule.Type = {
- Author: "css-rule-type-author",
- User: "css-rule-type-user",
- UserAgent: "css-rule-type-user-agent",
- Inspector: "css-rule-type-inspector"
-};
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNodeStyles.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -170,7 +170,7 @@
if (!this._includeUserAgentRulesOnNextRefresh) {
// We can assume all the styles with the same key are from the same stylesheet and rule, so we only check the first.
var firstStyle = this._styleDeclarationsMap[key][0];
- if (firstStyle && firstStyle.ownerRule && firstStyle.ownerRule.type === WebInspector.CSSRule.Type.UserAgent) {
+ if (firstStyle && firstStyle.ownerRule && firstStyle.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent) {
// User Agent styles get different identifiers after some edits. This would cause us to fire a significant refreshed
// event more than it is helpful. And since the user agent stylesheet is static it shouldn't match differently
// between refreshes for the same node. This issue is tracked by: https://webkit.org/b/110055
@@ -193,7 +193,7 @@
if (!this._includeUserAgentRulesOnNextRefresh) {
// See above for why we skip user agent style rules.
var firstStyle = this._previousStyleDeclarationsMap[key][0];
- if (firstStyle && firstStyle.ownerRule && firstStyle.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)
+ if (firstStyle && firstStyle.ownerRule && firstStyle.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent)
continue;
}
@@ -684,6 +684,7 @@
var selectorText = payload.selectorList.text;
var selectors = this._parseSelectorListPayload(payload.selectorList);
+ var type = WebInspector.CSSStyleManager.protocolStyleSheetOriginToEnum(payload.origin);
var sourceCodeLocation = null;
var sourceRange = payload.selectorList.range;
@@ -697,42 +698,10 @@
if (styleSheet)
sourceCodeLocation = styleSheet.offsetSourceCodeLocation(sourceCodeLocation);
- var type;
- switch (payload.origin) {
- case "regular":
- type = WebInspector.CSSRule.Type.Author;
- break;
- case "user":
- type = WebInspector.CSSRule.Type.User;
- break;
- case "user-agent":
- type = WebInspector.CSSRule.Type.UserAgent;
- break;
- case "inspector":
- type = WebInspector.CSSRule.Type.Inspector;
- break;
- }
-
var mediaList = [];
for (var i = 0; payload.media && i < payload.media.length; ++i) {
var mediaItem = payload.media[i];
-
- var mediaType;
- switch (mediaItem.source) {
- case "mediaRule":
- mediaType = WebInspector.CSSMedia.Type.MediaRule;
- break;
- case "importRule":
- mediaType = WebInspector.CSSMedia.Type.ImportRule;
- break;
- case "linkedSheet":
- mediaType = WebInspector.CSSMedia.Type.LinkedStyleSheet;
- break;
- case "inlineSheet":
- mediaType = WebInspector.CSSMedia.Type.InlineStyleSheet;
- break;
- }
-
+ var mediaType = WebInspector.CSSStyleManager.protocolMediaSourceToEnum(mediaItem.source);
var mediaText = mediaItem.text;
var mediaSourceCodeLocation = this._createSourceCodeLocation(mediaItem.sourceURL, mediaItem.sourceLine);
if (styleSheet)
@@ -820,13 +789,13 @@
// Only append to the result array here for author and inspector rules since attribute
// styles come between author rules and user/user agent rules.
switch (rule.type) {
- case WebInspector.CSSRule.Type.Inspector:
- case WebInspector.CSSRule.Type.Author:
+ case WebInspector.CSSStyleSheet.Type.Inspector:
+ case WebInspector.CSSStyleSheet.Type.Author:
result.push(rule.style);
break;
- case WebInspector.CSSRule.Type.User:
- case WebInspector.CSSRule.Type.UserAgent:
+ case WebInspector.CSSStyleSheet.Type.User:
+ case WebInspector.CSSStyleSheet.Type.UserAgent:
userAndUserAgentStyles.push(rule.style);
break;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -80,13 +80,13 @@
if (style.inherited)
iconClassName = WebInspector.CSSStyleDeclarationSection.InheritedStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.Author)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.Author)
iconClassName = WebInspector.CSSStyleDeclarationSection.AuthorStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.User)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.User)
iconClassName = WebInspector.CSSStyleDeclarationSection.UserStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent)
iconClassName = WebInspector.CSSStyleDeclarationSection.UserAgentStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.Inspector)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.Inspector)
iconClassName = WebInspector.CSSStyleDeclarationSection.InspectorStyleRuleIconStyleClassName;
break;
@@ -234,19 +234,19 @@
} else {
var originString;
switch (this._style.ownerRule.type) {
- case WebInspector.CSSRule.Type.Author:
+ case WebInspector.CSSStyleSheet.Type.Author:
originString = WebInspector.UIString("Author Stylesheet");
break;
- case WebInspector.CSSRule.Type.User:
+ case WebInspector.CSSStyleSheet.Type.User:
originString = WebInspector.UIString("User Stylesheet");
break;
- case WebInspector.CSSRule.Type.UserAgent:
+ case WebInspector.CSSStyleSheet.Type.UserAgent:
originString = WebInspector.UIString("User Agent Stylesheet");
break;
- case WebInspector.CSSRule.Type.Inspector:
+ case WebInspector.CSSStyleSheet.Type.Inspector:
originString = WebInspector.UIString("Web Inspector");
break;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -164,7 +164,7 @@
} else
section.refresh();
- if (this._focusNextNewInspectorRule && style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.Inspector) {
+ if (this._focusNextNewInspectorRule && style.ownerRule && style.ownerRule.type === WebInspector.CSSStyleSheet.Type.Inspector) {
this._previousFocusedSection = section;
delete this._focusNextNewInspectorRule;
}
@@ -282,7 +282,7 @@
this._ruleMediaAndInherticanceList = [];
var orderedStyles = uniqueOrderedStyles(this.nodeStyles.orderedStyles);
for (var style of orderedStyles) {
- var isUserAgentStyle = style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent;
+ var isUserAgentStyle = style.ownerRule && style.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent;
insertAllMatchingPseudoStyles.call(this, isUserAgentStyle || style.inerhited);
insertMediaOrInheritanceLabel.call(this, style);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -101,7 +101,7 @@
selector.addEventListener(WebInspector.VisualStyleSelectorTreeItem.Event.CheckboxChanged, this._treeElementCheckboxToggled, this);
this._selectors.appendChild(selector);
- if (this._focusNextNewInspectorRule && style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.Inspector) {
+ if (this._focusNextNewInspectorRule && style.ownerRule && style.ownerRule.type === WebInspector.CSSStyleSheet.Type.Inspector) {
selector.select(true);
selector.element.scrollIntoView();
this._nodeStyles[WebInspector.VisualStyleSelectorSection.LastSelectedRuleSymbol] = style;
@@ -166,7 +166,7 @@
// Matched Rules
for (let rule of uniqueOrderedRules(this._nodeStyles.matchedRules)) {
- if (rule.type === WebInspector.CSSRule.Type.UserAgent) {
+ if (rule.type === WebInspector.CSSStyleSheet.Type.UserAgent) {
insertAllMatchingPseudoRules.call(this, true);
continue;
}
@@ -190,7 +190,7 @@
this._selectors.appendChild(divider);
for (let rule of uniqueOrderedRules(inherited.matchedRules)) {
- if (rule.type === WebInspector.CSSRule.Type.UserAgent)
+ if (rule.type === WebInspector.CSSStyleSheet.Type.UserAgent)
continue;
createSelectorItem.call(this, rule.style, rule.selectorText, rule.mediaText);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js (189031 => 189032)
--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js 2015-08-27 17:33:48 UTC (rev 189031)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js 2015-08-27 17:37:22 UTC (rev 189032)
@@ -34,13 +34,13 @@
if (style.inherited)
iconClassName = WebInspector.CSSStyleDeclarationSection.InheritedStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.Author)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.Author)
iconClassName = WebInspector.CSSStyleDeclarationSection.AuthorStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.User)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.User)
iconClassName = WebInspector.CSSStyleDeclarationSection.UserStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.UserAgent)
iconClassName = WebInspector.CSSStyleDeclarationSection.UserAgentStyleRuleIconStyleClassName;
- else if (style.ownerRule.type === WebInspector.CSSRule.Type.Inspector)
+ else if (style.ownerRule.type === WebInspector.CSSStyleSheet.Type.Inspector)
iconClassName = WebInspector.CSSStyleDeclarationSection.InspectorStyleRuleIconStyleClassName;
break;
