<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[248274] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/248274">248274</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-08-05 15:44:10 -0700 (Mon, 05 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: rename "Stylesheet" to "Style Sheet" to match spec text
https://bugs.webkit.org/show_bug.cgi?id=200422

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

* inspector/protocol/Page.json:

Source/WebCore:

No observable change in functionality.

* inspector/agents/InspectorPageAgent.h:
* inspector/agents/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::resourceTypeJSON):
(WebCore::InspectorPageAgent::inspectorResourceType):

Source/WebInspectorUI:

* Localizations/en.lproj/localizedStrings.js:

* UserInterface/Controllers/CSSManager.js:
(WI.CSSManager.prototype._resourceAdded):
(WI.CSSManager.prototype._resourceTypeDidChange):
(WI.CSSManager.prototype._clearStyleSheetsForResource):
(WI.CSSManager.prototype._updateResourceContent.fetchedStyleSheetContent):
* UserInterface/Models/CSSStyleSheet.js:
(WI.CSSStyleSheet.prototype.get displayName):
* UserInterface/Models/CollectionTypes.js:
(WI.CSSStyleSheetCollection.prototype.get displayName):
* UserInterface/Models/Resource.js:
(WI.Resource.displayNameForType):
(WI.Resource.prototype.get syntheticMIMEType):
* UserInterface/Models/ResourceCollection.js:
(WI.ResourceCollection.prototype.objectIsRequiredType):
* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView):
(WI.NetworkTableContentView.shortDisplayNameForResourceType):
* UserInterface/Views/ResourceClusterContentView.js:
(WI.ResourceClusterContentView.prototype._contentViewForResourceType):
* UserInterface/Views/ResourceSidebarPanel.js:
(WI.ResourceSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
* UserInterface/Views/SourcesNavigationSidebarPanel.js:
(WI.SourcesNavigationSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
* UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js:
(WI.SpreadsheetCSSStyleDeclarationSection.prototype._save):
(WI.SpreadsheetCSSStyleDeclarationSection.prototype._populateIconElementContextMenu):
* UserInterface/Views/StyleOriginView.js:
(WI.StyleOriginView.prototype.update):
* UserInterface/Views/TextResourceContentView.js:
(WI.TextResourceContentView.prototype._shouldBeEditable):

* UserInterface/Views/CSSStyleSheetTreeElement.js:
(WI.CSSStyleSheetTreeElement):
* UserInterface/Views/ResourceIcons.css:
(:matches(.resource-icon.resource-type-style-sheet, .style-sheet-icon) .icon): Added.
(.source-map-resource.resource-icon.resource-type-style-sheet .icon): Added.
(.large :matches(.resource-icon.resource-type-style-sheet, .style-sheet-icon) .icon): Added.
(.large .source-map-resource.resource-icon.resource-type-style-sheet .icon): Added.
(:matches(.resource-icon.resource-type-stylesheet, .stylesheet-icon) .icon): Deleted.
(.source-map-resource.resource-icon.resource-type-stylesheet .icon): Deleted.
(.large :matches(.resource-icon.resource-type-stylesheet, .stylesheet-icon) .icon): Deleted.
(.large .source-map-resource.resource-icon.resource-type-stylesheet .icon): Deleted.

LayoutTests:

* inspector/unit-tests/resource-collection.html:
* http/tests/inspector/network/resource-mime-type.html:
* http/tests/inspector/network/resource-mime-type-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkresourcemimetypeexpectedtxt">trunk/LayoutTests/http/tests/inspector/network/resource-mime-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectornetworkresourcemimetypehtml">trunk/LayoutTests/http/tests/inspector/network/resource-mime-type.html</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsresourcecollectionhtml">trunk/LayoutTests/inspector/unit-tests/resource-collection.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolPagejson">trunk/Source/JavaScriptCore/inspector/protocol/Page.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsInspectorPageAgentcpp">trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectoragentsInspectorPageAgenth">trunk/Source/WebCore/inspector/agents/InspectorPageAgent.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersCSSManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSStyleSheetjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCollectionTypesjs">trunk/Source/WebInspectorUI/UserInterface/Models/CollectionTypes.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourceCollectionjs">trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleSheetTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleSheetTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTableContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceClusterContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceIconscss">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceIcons.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourcesNavigationSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSpreadsheetCSSStyleDeclarationSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsStyleOriginViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/StyleOriginView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/LayoutTests/ChangeLog 2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-08-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: rename "Stylesheet" to "Style Sheet" to match spec text
+        https://bugs.webkit.org/show_bug.cgi?id=200422
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/unit-tests/resource-collection.html:
+        * http/tests/inspector/network/resource-mime-type.html:
+        * http/tests/inspector/network/resource-mime-type-expected.txt:
+
</ins><span class="cx"> 2019-08-05  John Wilander  <wilander@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Resource Load Statistics: Re-introduce latch mode for subresource cookie blocking
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkresourcemimetypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/network/resource-mime-type-expected.txt (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/resource-mime-type-expected.txt   2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/LayoutTests/http/tests/inspector/network/resource-mime-type-expected.txt      2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -14,15 +14,15 @@
</span><span class="cx"> PASS: Resource mimeType should be 'text/plain'.
</span><span class="cx"> PASS: Resource syntheticMIMEType should be 'text/javascript'.
</span><span class="cx"> 
</span><del>--- Running test case: Resource.MIMEType.Stylesheet.css
</del><ins>+-- Running test case: Resource.MIMEType.StyleSheet.css
</ins><span class="cx"> PASS: Resource should be created.
</span><del>-PASS: Resource Type should be 'resource-type-stylesheet'.
</del><ins>+PASS: Resource Type should be 'resource-type-style-sheet'.
</ins><span class="cx"> PASS: Resource mimeType should be 'text/css'.
</span><span class="cx"> PASS: Resource syntheticMIMEType should be 'text/css'.
</span><span class="cx"> 
</span><del>--- Running test case: Resource.MIMEType.Stylesheet.txt
</del><ins>+-- Running test case: Resource.MIMEType.StyleSheet.txt
</ins><span class="cx"> PASS: Resource should be created.
</span><del>-PASS: Resource Type should be 'resource-type-stylesheet'.
</del><ins>+PASS: Resource Type should be 'resource-type-style-sheet'.
</ins><span class="cx"> PASS: Resource mimeType should be 'text/plain'.
</span><span class="cx"> PASS: Resource syntheticMIMEType should be 'text/css'.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectornetworkresourcemimetypehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/network/resource-mime-type.html (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/network/resource-mime-type.html   2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/LayoutTests/http/tests/inspector/network/resource-mime-type.html      2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -108,20 +108,20 @@
</span><span class="cx">         synthetic: "text/javascript",
</span><span class="cx">     });
</span><span class="cx"> 
</span><del>-    // Stylesheets.
</del><ins>+    // Style Sheets.
</ins><span class="cx"> 
</span><span class="cx">     addTestCase({
</span><del>-        name: "Resource.MIMEType.Stylesheet.css",
</del><ins>+        name: "Resource.MIMEType.StyleSheet.css",
</ins><span class="cx">         expression: `loadStyleSheetWithURL("resources/stylesheet.css")`,
</span><del>-        type: WI.Resource.Type.Stylesheet,
</del><ins>+        type: WI.Resource.Type.StyleSheet,
</ins><span class="cx">         mimeType: mimeTypeForExtension.css,
</span><span class="cx">         synthetic: mimeTypeForExtension.css,
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="cx">     addTestCase({
</span><del>-        name: "Resource.MIMEType.Stylesheet.txt",
</del><ins>+        name: "Resource.MIMEType.StyleSheet.txt",
</ins><span class="cx">         expression: `loadStyleSheetWithURL("resources/stylesheet.txt")`,
</span><del>-        type: WI.Resource.Type.Stylesheet,
</del><ins>+        type: WI.Resource.Type.StyleSheet,
</ins><span class="cx">         mimeType: mimeTypeForExtension.txt,
</span><span class="cx">         synthetic: "text/css",
</span><span class="cx">     });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsresourcecollectionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/unit-tests/resource-collection.html (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/resource-collection.html  2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/LayoutTests/inspector/unit-tests/resource-collection.html     2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -34,16 +34,16 @@
</span><span class="cx">         test(resolve, reject) {
</span><span class="cx">             let collection = new WI.ResourceCollection;
</span><span class="cx">             collection.add(createResource("one", WI.Resource.Type.Image));
</span><del>-            collection.add(createResource("two", WI.Resource.Type.Stylesheet));
</del><ins>+            collection.add(createResource("two", WI.Resource.Type.StyleSheet));
</ins><span class="cx">             collection.add(createResource("three", WI.Resource.Type.Image));
</span><span class="cx">             collection.add(createResource("four", WI.Resource.Type.Document));
</span><del>-            collection.add(createResource("five", WI.Resource.Type.Stylesheet));
</del><ins>+            collection.add(createResource("five", WI.Resource.Type.StyleSheet));
</ins><span class="cx"> 
</span><span class="cx">             logResourceNames(collection.resourceCollectionForType(WI.Resource.Type.Image));
</span><span class="cx"> 
</span><span class="cx">             let typedCollection = new WI.ResourceCollection(WI.Resource.Type.Image);
</span><span class="cx">             typedCollection.add(createResource("one", WI.Resource.Type.Image));
</span><del>-            typedCollection.add(createResource("two", WI.Resource.Type.Stylesheet));
</del><ins>+            typedCollection.add(createResource("two", WI.Resource.Type.StyleSheet));
</ins><span class="cx">             typedCollection.add(createResource("three", WI.Resource.Type.Image));
</span><span class="cx"> 
</span><span class="cx">             logResourceNames(typedCollection);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2019-08-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: rename "Stylesheet" to "Style Sheet" to match spec text
+        https://bugs.webkit.org/show_bug.cgi?id=200422
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/protocol/Page.json:
+
</ins><span class="cx"> 2019-08-05  Michael Saboff  <msaboff@apple.com>
</span><span class="cx"> 
</span><span class="cx">         JSC: assertion failure in SpeculativeJIT::compileGetByValOnIntTypedArray
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolPagejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Page.json (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Page.json 2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Page.json    2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">         {
</span><span class="cx">             "id": "ResourceType",
</span><span class="cx">             "type": "string",
</span><del>-            "enum": ["Document", "Stylesheet", "Image", "Font", "Script", "XHR", "Fetch", "Ping", "Beacon", "WebSocket", "Other"],
</del><ins>+            "enum": ["Document", "StyleSheet", "Image", "Font", "Script", "XHR", "Fetch", "Ping", "Beacon", "WebSocket", "Other"],
</ins><span class="cx">             "description": "Resource type as it was perceived by the rendering engine."
</span><span class="cx">         },
</span><span class="cx">         {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebCore/ChangeLog      2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-08-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: rename "Stylesheet" to "Style Sheet" to match spec text
+        https://bugs.webkit.org/show_bug.cgi?id=200422
+
+        Reviewed by Joseph Pecoraro.
+
+        No observable change in functionality.
+
+        * inspector/agents/InspectorPageAgent.h:
+        * inspector/agents/InspectorPageAgent.cpp:
+        (WebCore::InspectorPageAgent::resourceTypeJSON):
+        (WebCore::InspectorPageAgent::inspectorResourceType):
+
</ins><span class="cx"> 2019-08-05  Takashi Komori  <Takashi.Komori@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [Curl] implement CertificateInfo::summaryInfo
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp     2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebCore/inspector/agents/InspectorPageAgent.cpp        2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx">         return Inspector::Protocol::Page::ResourceType::Image;
</span><span class="cx">     case FontResource:
</span><span class="cx">         return Inspector::Protocol::Page::ResourceType::Font;
</span><del>-    case StylesheetResource:
-        return Inspector::Protocol::Page::ResourceType::Stylesheet;
</del><ins>+    case StyleSheetResource:
+        return Inspector::Protocol::Page::ResourceType::StyleSheet;
</ins><span class="cx">     case ScriptResource:
</span><span class="cx">         return Inspector::Protocol::Page::ResourceType::Script;
</span><span class="cx">     case XHRResource:
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">     case CachedResource::Type::XSLStyleSheet:
</span><span class="cx"> #endif
</span><span class="cx">     case CachedResource::Type::CSSStyleSheet:
</span><del>-        return InspectorPageAgent::StylesheetResource;
</del><ins>+        return InspectorPageAgent::StyleSheetResource;
</ins><span class="cx">     case CachedResource::Type::Script:
</span><span class="cx">         return InspectorPageAgent::ScriptResource;
</span><span class="cx">     case CachedResource::Type::MainResource:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectoragentsInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/agents/InspectorPageAgent.h (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/agents/InspectorPageAgent.h       2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebCore/inspector/agents/InspectorPageAgent.h  2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx">     enum ResourceType {
</span><span class="cx">         DocumentResource,
</span><del>-        StylesheetResource,
</del><ins>+        StyleSheetResource,
</ins><span class="cx">         ImageResource,
</span><span class="cx">         FontResource,
</span><span class="cx">         ScriptResource,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2019-08-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: rename "Stylesheet" to "Style Sheet" to match spec text
+        https://bugs.webkit.org/show_bug.cgi?id=200422
+
+        Reviewed by Joseph Pecoraro.
+
+        * Localizations/en.lproj/localizedStrings.js:
+
+        * UserInterface/Controllers/CSSManager.js:
+        (WI.CSSManager.prototype._resourceAdded):
+        (WI.CSSManager.prototype._resourceTypeDidChange):
+        (WI.CSSManager.prototype._clearStyleSheetsForResource):
+        (WI.CSSManager.prototype._updateResourceContent.fetchedStyleSheetContent):
+        * UserInterface/Models/CSSStyleSheet.js:
+        (WI.CSSStyleSheet.prototype.get displayName):
+        * UserInterface/Models/CollectionTypes.js:
+        (WI.CSSStyleSheetCollection.prototype.get displayName):
+        * UserInterface/Models/Resource.js:
+        (WI.Resource.displayNameForType):
+        (WI.Resource.prototype.get syntheticMIMEType):
+        * UserInterface/Models/ResourceCollection.js:
+        (WI.ResourceCollection.prototype.objectIsRequiredType):
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView):
+        (WI.NetworkTableContentView.shortDisplayNameForResourceType):
+        * UserInterface/Views/ResourceClusterContentView.js:
+        (WI.ResourceClusterContentView.prototype._contentViewForResourceType):
+        * UserInterface/Views/ResourceSidebarPanel.js:
+        (WI.ResourceSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+        (WI.SourcesNavigationSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
+        * UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js:
+        (WI.SpreadsheetCSSStyleDeclarationSection.prototype._save):
+        (WI.SpreadsheetCSSStyleDeclarationSection.prototype._populateIconElementContextMenu):
+        * UserInterface/Views/StyleOriginView.js:
+        (WI.StyleOriginView.prototype.update):
+        * UserInterface/Views/TextResourceContentView.js:
+        (WI.TextResourceContentView.prototype._shouldBeEditable):
+
+        * UserInterface/Views/CSSStyleSheetTreeElement.js:
+        (WI.CSSStyleSheetTreeElement):
+        * UserInterface/Views/ResourceIcons.css:
+        (:matches(.resource-icon.resource-type-style-sheet, .style-sheet-icon) .icon): Added.
+        (.source-map-resource.resource-icon.resource-type-style-sheet .icon): Added.
+        (.large :matches(.resource-icon.resource-type-style-sheet, .style-sheet-icon) .icon): Added.
+        (.large .source-map-resource.resource-icon.resource-type-style-sheet .icon): Added.
+        (:matches(.resource-icon.resource-type-stylesheet, .stylesheet-icon) .icon): Deleted.
+        (.source-map-resource.resource-icon.resource-type-stylesheet .icon): Deleted.
+        (.large :matches(.resource-icon.resource-type-stylesheet, .stylesheet-icon) .icon): Deleted.
+        (.large .source-map-resource.resource-icon.resource-type-stylesheet .icon): Deleted.
+
</ins><span class="cx"> 2019-08-03  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Elements: Styles: move psuedo-selector rules before inherited rules
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js   2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js      2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> localizedStrings["Animation Frame Requested"] = "Animation Frame Requested";
</span><span class="cx"> localizedStrings["Anonymous Script %d"] = "Anonymous Script %d";
</span><span class="cx"> localizedStrings["Anonymous Scripts"] = "Anonymous Scripts";
</span><del>-localizedStrings["Anonymous StyleSheet %d"] = "Anonymous StyleSheet %d";
</del><ins>+localizedStrings["Anonymous Style Sheet %d"] = "Anonymous Style Sheet %d";
</ins><span class="cx"> localizedStrings["Application Cache"] = "Application Cache";
</span><span class="cx"> /* Approximate count of events */
</span><span class="cx"> localizedStrings["Approximate Number"] = "~%s";
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> localizedStrings["Audit Warning: %s"] = "Audit Warning: %s";
</span><span class="cx"> localizedStrings["Audit version: %s"] = "Audit version: %s";
</span><span class="cx"> localizedStrings["Audits"] = "Audits";
</span><del>-localizedStrings["Author Stylesheet"] = "Author Stylesheet";
</del><ins>+localizedStrings["Author Style Sheet"] = "Author Style Sheet";
</ins><span class="cx"> localizedStrings["Auto"] = "Auto";
</span><span class="cx"> localizedStrings["Auto - %s"] = "Auto - %s";
</span><span class="cx"> localizedStrings["Auto Increment"] = "Auto Increment";
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> localizedStrings["Reveal in Original Resource"] = "Reveal in Original Resource";
</span><span class="cx"> localizedStrings["Reveal in Resources Tab"] = "Reveal in Resources Tab";
</span><span class="cx"> localizedStrings["Reveal in Sources Tab"] = "Reveal in Sources Tab";
</span><del>-localizedStrings["Reveal in Stylesheet"] = "Reveal in Stylesheet";
</del><ins>+localizedStrings["Reveal in Style Sheet"] = "Reveal in Style Sheet";
</ins><span class="cx"> localizedStrings["Role"] = "Role";
</span><span class="cx"> localizedStrings["Run %d"] = "Run %d";
</span><span class="cx"> localizedStrings["Run console commands as if inside a user gesture"] = "Run console commands as if inside a user gesture";
</span><span class="lines">@@ -1061,6 +1061,8 @@
</span><span class="cx"> localizedStrings["Storage"] = "Storage";
</span><span class="cx"> /* CSS properties defined via HTML style attribute */
</span><span class="cx"> localizedStrings["Style Attribute"] = "Style Attribute";
</span><ins>+localizedStrings["Style Sheet"] = "Style Sheet";
+localizedStrings["Style Sheets"] = "Style Sheets";
</ins><span class="cx"> localizedStrings["Style rule"] = "Style rule";
</span><span class="cx"> localizedStrings["Styles"] = "Styles";
</span><span class="cx"> localizedStrings["Styles Invalidated"] = "Styles Invalidated";
</span><span class="lines">@@ -1068,8 +1070,6 @@
</span><span class="cx"> localizedStrings["Styles \u2014 Computed"] = "Styles \u2014 Computed";
</span><span class="cx"> localizedStrings["Styles \u2014 Rules"] = "Styles \u2014 Rules";
</span><span class="cx"> localizedStrings["Styles:"] = "Styles:";
</span><del>-localizedStrings["Stylesheet"] = "Stylesheet";
-localizedStrings["Stylesheets"] = "Stylesheets";
</del><span class="cx"> localizedStrings["Subject"] = "Subject";
</span><span class="cx"> /* A submenu item of 'Break On' that breaks (pauses) before child DOM node is modified */
</span><span class="cx"> localizedStrings["Subtree Modified"] = "Subtree Modified";
</span><span class="lines">@@ -1192,10 +1192,10 @@
</span><span class="cx"> localizedStrings["Use default media styles"] = "Use default media styles";
</span><span class="cx"> localizedStrings["Use the resource cache when loading resources"] = "Use the resource cache when loading resources";
</span><span class="cx"> localizedStrings["User Agent"] = "User Agent";
</span><del>-localizedStrings["User Agent Stylesheet"] = "User Agent Stylesheet";
</del><ins>+localizedStrings["User Agent Style Sheet"] = "User Agent Style Sheet";
</ins><span class="cx"> localizedStrings["User Agent:"] = "User Agent:";
</span><span class="cx"> localizedStrings["User Interface:"] = "User Interface:";
</span><del>-localizedStrings["User Stylesheet"] = "User Stylesheet";
</del><ins>+localizedStrings["User Style Sheet"] = "User Style Sheet";
</ins><span class="cx"> localizedStrings["Valid From"] = "Valid From";
</span><span class="cx"> localizedStrings["Valid Until"] = "Valid Until";
</span><span class="cx"> localizedStrings["Value"] = "Value";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCSSManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js      2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CSSManager.js 2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx">         var resource = event.data.resource;
</span><span class="cx">         console.assert(resource);
</span><span class="cx"> 
</span><del>-        if (resource.type !== WI.Resource.Type.Stylesheet)
</del><ins>+        if (resource.type !== WI.Resource.Type.StyleSheet)
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         this._clearStyleSheetsForResource(resource);
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx">         console.assert(event.target instanceof WI.Resource);
</span><span class="cx"> 
</span><span class="cx">         var resource = event.target;
</span><del>-        if (resource.type !== WI.Resource.Type.Stylesheet)
</del><ins>+        if (resource.type !== WI.Resource.Type.StyleSheet)
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         this._clearStyleSheetsForResource(resource);
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx"> 
</span><span class="cx">     _clearStyleSheetsForResource(resource)
</span><span class="cx">     {
</span><del>-        // Clear known stylesheets for this URL and frame. This will cause the stylesheets to
</del><ins>+        // Clear known stylesheets for this URL and frame. This will cause the style sheets to
</ins><span class="cx">         // be updated next time _fetchInfoForAllStyleSheets is called.
</span><span class="cx">         this._styleSheetIdentifierMap.delete(this._frameURLMapKey(resource.parentFrame, resource.url));
</span><span class="cx">     }
</span><span class="lines">@@ -638,8 +638,8 @@
</span><span class="cx">         if (resource === this._ignoreResourceContentDidChangeEventForResource)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        // Ignore if it isn't a CSS stylesheet.
-        if (resource.type !== WI.Resource.Type.Stylesheet || resource.syntheticMIMEType !== "text/css")
</del><ins>+        // Ignore if it isn't a CSS style sheet.
+        if (resource.type !== WI.Resource.Type.StyleSheet || resource.syntheticMIMEType !== "text/css")
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><span class="cx">         function applyStyleSheetChanges()
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> 
</span><span class="cx">                 // Only try to update stylesheet resources. Other resources, like documents, can contain
</span><span class="cx">                 // multiple stylesheets and we don't have the source ranges to update those.
</span><del>-                if (representedObject.type !== WI.Resource.Type.Stylesheet)
</del><ins>+                if (representedObject.type !== WI.Resource.Type.StyleSheet)
</ins><span class="cx">                     return;
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="lines">@@ -758,4 +758,4 @@
</span><span class="cx"> 
</span><span class="cx"> WI.CSSManager.PseudoElementNames = ["before", "after"];
</span><span class="cx"> WI.CSSManager.ForceablePseudoClasses = ["active", "focus", "hover", "visited"];
</span><del>-WI.CSSManager.PreferredInspectorStyleSheetSymbol = Symbol("css-manager-preferred-inspector-stylesheet");
</del><ins>+WI.CSSManager.PreferredInspectorStyleSheetSymbol = Symbol("css-manager-preferred-inspector-style-sheet");
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSStyleSheetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js        2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSStyleSheet.js   2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">         if (!this._uniqueDisplayNameNumber)
</span><span class="cx">             this._uniqueDisplayNameNumber = this.constructor._nextUniqueDisplayNameNumber++;
</span><span class="cx"> 
</span><del>-        return WI.UIString("Anonymous StyleSheet %d").format(this._uniqueDisplayNameNumber);
</del><ins>+        return WI.UIString("Anonymous Style Sheet %d").format(this._uniqueDisplayNameNumber);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     get startLineNumber()
</span><span class="lines">@@ -219,12 +219,12 @@
</span><span class="cx"> WI.CSSStyleSheet._nextUniqueDisplayNameNumber = 1;
</span><span class="cx"> 
</span><span class="cx"> WI.CSSStyleSheet.Event = {
</span><del>-    ContentDidChange: "stylesheet-content-did-change"
</del><ins>+    ContentDidChange: "css-style-sheet-content-did-change"
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> WI.CSSStyleSheet.Type = {
</span><del>-    Author: "css-stylesheet-type-author",
-    User: "css-stylesheet-type-user",
-    UserAgent: "css-stylesheet-type-user-agent",
-    Inspector: "css-stylesheet-type-inspector"
</del><ins>+    Author: "css-style-sheet-type-author",
+    User: "css-style-sheet-type-user",
+    UserAgent: "css-style-sheet-type-user-agent",
+    Inspector: "css-style-sheet-type-inspector"
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCollectionTypesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CollectionTypes.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CollectionTypes.js      2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CollectionTypes.js 2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx">     get displayName()
</span><span class="cx">     {
</span><del>-        return WI.UIString("Stylesheets");
</del><ins>+        return WI.UIString("Style Sheets");
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     objectIsRequiredType(object)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js     2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js        2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx">             if (plural)
</span><span class="cx">                 return WI.UIString("Documents");
</span><span class="cx">             return WI.UIString("Document");
</span><del>-        case WI.Resource.Type.Stylesheet:
</del><ins>+        case WI.Resource.Type.StyleSheet:
</ins><span class="cx">             if (plural)
</span><del>-                return WI.UIString("Stylesheets");
-            return WI.UIString("Stylesheet");
</del><ins>+                return WI.UIString("Style Sheets");
+            return WI.UIString("Style Sheet");
</ins><span class="cx">         case WI.Resource.Type.Image:
</span><span class="cx">             if (plural)
</span><span class="cx">                 return WI.UIString("Images");
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx">         // Return the default MIME-types for the Resource.Type, since the current MIME-type
</span><span class="cx">         // does not match what is expected for the Resource.Type.
</span><span class="cx">         switch (this._type) {
</span><del>-        case WI.Resource.Type.Stylesheet:
</del><ins>+        case WI.Resource.Type.StyleSheet:
</ins><span class="cx">             return "text/css";
</span><span class="cx">         case WI.Resource.Type.Script:
</span><span class="cx">             return "text/javascript";
</span><span class="lines">@@ -1164,7 +1164,7 @@
</span><span class="cx"> // Keep these in sync with the "ResourceType" enum defined by the "Page" domain.
</span><span class="cx"> WI.Resource.Type = {
</span><span class="cx">     Document: "resource-type-document",
</span><del>-    Stylesheet: "resource-type-stylesheet",
</del><ins>+    StyleSheet: "resource-type-style-sheet",
</ins><span class="cx">     Image: "resource-type-image",
</span><span class="cx">     Font: "resource-type-font",
</span><span class="cx">     Script: "resource-type-script",
</span><span class="lines">@@ -1174,6 +1174,9 @@
</span><span class="cx">     Beacon: "resource-type-beacon",
</span><span class="cx">     WebSocket: "resource-type-websocket",
</span><span class="cx">     Other: "resource-type-other",
</span><ins>+
+    // COMPATIBILITY (iOS 13): Page.ResourceType.Stylesheet was renamed to Page.ResourceType.StyleSheet.
+    Stylesheet: "resource-type-style-sheet",
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> WI.Resource.ResponseSource = {
</span><span class="lines">@@ -1204,11 +1207,11 @@
</span><span class="cx">     "text/plain": WI.Resource.Type.Document,
</span><span class="cx">     "application/xhtml+xml": WI.Resource.Type.Document,
</span><span class="cx"> 
</span><del>-    "text/css": WI.Resource.Type.Stylesheet,
-    "text/xsl": WI.Resource.Type.Stylesheet,
-    "text/x-less": WI.Resource.Type.Stylesheet,
-    "text/x-sass": WI.Resource.Type.Stylesheet,
-    "text/x-scss": WI.Resource.Type.Stylesheet,
</del><ins>+    "text/css": WI.Resource.Type.StyleSheet,
+    "text/xsl": WI.Resource.Type.StyleSheet,
+    "text/x-less": WI.Resource.Type.StyleSheet,
+    "text/x-sass": WI.Resource.Type.StyleSheet,
+    "text/x-scss": WI.Resource.Type.StyleSheet,
</ins><span class="cx"> 
</span><span class="cx">     "application/pdf": WI.Resource.Type.Image,
</span><span class="cx">     "image/svg+xml": WI.Resource.Type.Image,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourceCollectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js   2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ResourceCollection.js      2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> 
</span><span class="cx">     objectIsRequiredType(object)
</span><span class="cx">     {
</span><del>-        if (this._resourceType === WI.Resource.Type.Stylesheet && object instanceof WI.CSSStyleSheet)
</del><ins>+        if (this._resourceType === WI.Resource.Type.StyleSheet && object instanceof WI.CSSStyleSheet)
</ins><span class="cx">             return true;
</span><span class="cx"> 
</span><span class="cx">         if (!(object instanceof WI.Resource))
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleSheetTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleSheetTreeElement.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleSheetTreeElement.js      2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleSheetTreeElement.js 2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -30,6 +30,6 @@
</span><span class="cx">         console.assert(styleSheet instanceof WI.CSSStyleSheet);
</span><span class="cx">         console.assert(styleSheet.isInspectorStyleSheet());
</span><span class="cx"> 
</span><del>-        super(styleSheet, ["stylesheet", "stylesheet-icon"], WI.UIString("Inspector Style Sheet"));
</del><ins>+        super(styleSheet, ["style-sheet", "style-sheet-icon"], WI.UIString("Inspector Style Sheet"));
</ins><span class="cx">     }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTableContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js       2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js  2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> 
</span><span class="cx">         let uniqueTypes = [
</span><span class="cx">             ["Document", (type) => type === WI.Resource.Type.Document],
</span><del>-            ["Stylesheet", (type) => type === WI.Resource.Type.Stylesheet],
</del><ins>+            ["StyleSheet", (type) => type === WI.Resource.Type.StyleSheet],
</ins><span class="cx">             ["Image", (type) => type === WI.Resource.Type.Image],
</span><span class="cx">             ["Font", (type) => type === WI.Resource.Type.Font],
</span><span class="cx">             ["Script", (type) => type === WI.Resource.Type.Script],
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">             ["XHR", (type) => type === WI.Resource.Type.XHR || type === WI.Resource.Type.Fetch],
</span><span class="cx">             ["Other", (type) => {
</span><span class="cx">                 return type !== WI.Resource.Type.Document
</span><del>-                    && type !== WI.Resource.Type.Stylesheet
</del><ins>+                    && type !== WI.Resource.Type.StyleSheet
</ins><span class="cx">                     && type !== WI.Resource.Type.Image
</span><span class="cx">                     && type !== WI.Resource.Type.Font
</span><span class="cx">                     && type !== WI.Resource.Type.Script
</span><span class="lines">@@ -199,16 +199,16 @@
</span><span class="cx">         switch (type) {
</span><span class="cx">         case WI.Resource.Type.Document:
</span><span class="cx">             return WI.UIString("Document");
</span><del>-        case WI.Resource.Type.Stylesheet:
-            return "CSS";
</del><ins>+        case WI.Resource.Type.StyleSheet:
+            return WI.unlocalizedString("CSS");
</ins><span class="cx">         case WI.Resource.Type.Image:
</span><span class="cx">             return WI.UIString("Image");
</span><span class="cx">         case WI.Resource.Type.Font:
</span><span class="cx">             return WI.UIString("Font");
</span><span class="cx">         case WI.Resource.Type.Script:
</span><del>-            return "JS";
</del><ins>+            return WI.unlocalizedString("JS");
</ins><span class="cx">         case WI.Resource.Type.XHR:
</span><del>-            return "XHR";
</del><ins>+            return WI.unlocalizedString("XHR");
</ins><span class="cx">         case WI.Resource.Type.Fetch:
</span><span class="cx">             return WI.repeatedUIString.fetch();
</span><span class="cx">         case WI.Resource.Type.Ping:
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceClusterContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js    2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js       2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">         switch (type) {
</span><span class="cx">         case WI.Resource.Type.Document:
</span><span class="cx">         case WI.Resource.Type.Script:
</span><del>-        case WI.Resource.Type.Stylesheet:
</del><ins>+        case WI.Resource.Type.StyleSheet:
</ins><span class="cx">             return new WI.TextResourceContentView(this._resource);
</span><span class="cx"> 
</span><span class="cx">         case WI.Resource.Type.Image:
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceIconscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceIcons.css (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceIcons.css        2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceIcons.css   2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">     content: image-set(url(../Images/DocumentFont.png) 1x, url(../Images/DocumentFont@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-:matches(.resource-icon.resource-type-stylesheet, .stylesheet-icon) .icon {
</del><ins>+:matches(.resource-icon.resource-type-style-sheet, .style-sheet-icon) .icon {
</ins><span class="cx">     content: image-set(url(../Images/DocumentCSS.png) 1x, url(../Images/DocumentCSS@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">     content: image-set(url(../Images/ClippingGeneric.png) 1x, url(../Images/ClippingGeneric@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.source-map-resource.resource-icon.resource-type-stylesheet .icon {
</del><ins>+.source-map-resource.resource-icon.resource-type-style-sheet .icon {
</ins><span class="cx">     content: image-set(url(../Images/ClippingCSS.png) 1x, url(../Images/ClippingCSS@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">     content: image-set(url(../Images/DocumentFontLarge.png) 1x, url(../Images/DocumentFontLarge@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.large :matches(.resource-icon.resource-type-stylesheet, .stylesheet-icon) .icon {
</del><ins>+.large :matches(.resource-icon.resource-type-style-sheet, .style-sheet-icon) .icon {
</ins><span class="cx">     content: image-set(url(../Images/DocumentCSSLarge.png) 1x, url(../Images/DocumentCSSLarge@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">     content: image-set(url(../Images/ClippingGenericLarge.png) 1x, url(../Images/ClippingGenericLarge@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.large .source-map-resource.resource-icon.resource-type-stylesheet .icon {
</del><ins>+.large .source-map-resource.resource-icon.resource-type-style-sheet .icon {
</ins><span class="cx">     content: image-set(url(../Images/ClippingCSSLarge.png) 1x, url(../Images/ClippingCSSLarge@2x.png) 2x);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js  2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js     2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx">                 return selectedScopeBarItem[WI.ResourceSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Script;
</span><span class="cx"> 
</span><span class="cx">             if (treeElement instanceof WI.CSSStyleSheetTreeElement)
</span><del>-                return selectedScopeBarItem[WI.ResourceSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Stylesheet;
</del><ins>+                return selectedScopeBarItem[WI.ResourceSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.StyleSheet;
</ins><span class="cx"> 
</span><span class="cx">             console.assert(treeElement instanceof WI.ResourceTreeElement, "Unknown treeElement", treeElement);
</span><span class="cx">             if (!(treeElement instanceof WI.ResourceTreeElement))
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourcesNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js 2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js    2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx">                 return selectedScopeBarItem[WI.SourcesNavigationSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Script;
</span><span class="cx"> 
</span><span class="cx">             if (treeElement instanceof WI.CSSStyleSheetTreeElement)
</span><del>-                return selectedScopeBarItem[WI.SourcesNavigationSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.Stylesheet;
</del><ins>+                return selectedScopeBarItem[WI.SourcesNavigationSidebarPanel.ResourceTypeSymbol] === WI.Resource.Type.StyleSheet;
</ins><span class="cx"> 
</span><span class="cx">             console.assert(treeElement instanceof WI.ResourceTreeElement, "Unknown treeElement", treeElement);
</span><span class="cx">             if (!(treeElement instanceof WI.ResourceTreeElement))
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSpreadsheetCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js 2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js    2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -421,7 +421,7 @@
</span><span class="cx">         console.assert(this._style.ownerRule.sourceCodeLocation instanceof WI.SourceCodeLocation);
</span><span class="cx"> 
</span><span class="cx">         let sourceCode = this._style.ownerRule.sourceCodeLocation.sourceCode;
</span><del>-        if (sourceCode.type !== WI.Resource.Type.Stylesheet) {
</del><ins>+        if (sourceCode.type !== WI.Resource.Type.StyleSheet) {
</ins><span class="cx">             // FIXME: Can't save CSS inside style="" <https://webkit.org/b/150357>
</span><span class="cx">             InspectorFrontendHost.beep();
</span><span class="cx">             return;
</span><span class="lines">@@ -561,8 +561,8 @@
</span><span class="cx"> 
</span><span class="cx">             let label = null;
</span><span class="cx">             let sourceCode = this._style.ownerRule.sourceCodeLocation.displaySourceCode;
</span><del>-            if (sourceCode instanceof WI.CSSStyleSheet || (sourceCode instanceof WI.Resource && sourceCode.type === WI.Resource.Type.Stylesheet))
-                label = WI.UIString("Reveal in Stylesheet");
</del><ins>+            if (sourceCode instanceof WI.CSSStyleSheet || (sourceCode instanceof WI.Resource && sourceCode.type === WI.Resource.Type.StyleSheet))
+                label = WI.UIString("Reveal in Style Sheet");
</ins><span class="cx">             else if (WI.settings.experimentalEnableSourcesTab.value)
</span><span class="cx">                 label = WI.UIString("Reveal in Sources Tab");
</span><span class="cx">             else
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsStyleOriginViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/StyleOriginView.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/StyleOriginView.js       2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/StyleOriginView.js  2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -61,15 +61,15 @@
</span><span class="cx"> 
</span><span class="cx">                 switch (style.ownerRule.type) {
</span><span class="cx">                 case WI.CSSStyleSheet.Type.Author:
</span><del>-                    originString = WI.UIString("Author Stylesheet");
</del><ins>+                    originString = WI.UIString("Author Style Sheet");
</ins><span class="cx">                     break;
</span><span class="cx"> 
</span><span class="cx">                 case WI.CSSStyleSheet.Type.User:
</span><del>-                    originString = WI.UIString("User Stylesheet");
</del><ins>+                    originString = WI.UIString("User Style Sheet");
</ins><span class="cx">                     break;
</span><span class="cx"> 
</span><span class="cx">                 case WI.CSSStyleSheet.Type.UserAgent:
</span><del>-                    originString = WI.UIString("User Agent Stylesheet");
</del><ins>+                    originString = WI.UIString("User Agent Style Sheet");
</ins><span class="cx">                     break;
</span><span class="cx"> 
</span><span class="cx">                 case WI.CSSStyleSheet.Type.Inspector:
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">                 if (!style.editable) {
</span><span class="cx">                     let styleTitle = "";
</span><span class="cx">                     if (style.ownerRule && style.ownerRule.type === WI.CSSStyleSheet.Type.UserAgent)
</span><del>-                        styleTitle = WI.UIString("User Agent Stylesheet");
</del><ins>+                        styleTitle = WI.UIString("User Agent Style Sheet");
</ins><span class="cx">                     else
</span><span class="cx">                         styleTitle = WI.UIString("Style rule");
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js (248273 => 248274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js       2019-08-05 21:33:51 UTC (rev 248273)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js  2019-08-05 22:44:10 UTC (rev 248274)
</span><span class="lines">@@ -295,8 +295,8 @@
</span><span class="cx">         if (this.resource instanceof WI.CSSStyleSheet)
</span><span class="cx">             return true;
</span><span class="cx"> 
</span><del>-        // Check the MIME-type for CSS since Resource.Type.Stylesheet also includes XSL, which we can't edit yet.
-        if (this.resource.type === WI.Resource.Type.Stylesheet && this.resource.syntheticMIMEType === "text/css")
</del><ins>+        // Check the MIME-type for CSS since Resource.Type.StyleSheet also includes XSL, which we can't edit yet.
+        if (this.resource.type === WI.Resource.Type.StyleSheet && this.resource.syntheticMIMEType === "text/css")
</ins><span class="cx">             return true;
</span><span class="cx"> 
</span><span class="cx">         // Allow editing any local file since edits can be saved and reloaded right from the Inspector.
</span></span></pre>
</div>
</div>

</body>
</html>