WebKit Bugzilla
Attachment 370538 Details for
Bug 198203
: REGRESSION(r245665): Inspector appears blank, again. (Requested by NVI on #webkit).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ROLLOUT of r245665
bug-198203-20190523181949.patch (text/plain), 42.07 KB, created by
WebKit Commit Bot
on 2019-05-23 18:19:50 PDT
(
hide
)
Description:
ROLLOUT of r245665
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2019-05-23 18:19:50 PDT
Size:
42.07 KB
patch
obsolete
>Subversion Revision: 245728 >diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog >index 8205b91b69492a9581fa52d2ad13c2b14a94c0c5..fa304862f58ef6fdd46b47af9cce9d7974ca8912 100644 >--- a/Source/WebInspectorUI/ChangeLog >+++ b/Source/WebInspectorUI/ChangeLog >@@ -1,3 +1,17 @@ >+2019-05-23 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r245665. >+ https://bugs.webkit.org/show_bug.cgi?id=198203 >+ >+ Inspector appears blank, again. (Requested by NVI on #webkit). >+ >+ Reverted changeset: >+ >+ "Web Inspector: Provide UIString descriptions to improve >+ localizations" >+ https://bugs.webkit.org/show_bug.cgi?id=195132 >+ https://trac.webkit.org/changeset/245665 >+ > 2019-05-23 Matt Baker <mattbaker@apple.com> > > Web Inspector: Remove unused CSS class "offset-sections" >diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >index f97c188cb31128dbbd5caf1e8c8afd6f44c4f53d..50466169e1fd1a8fa43a5db4547c24dd139c90f4 100644 >--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js >@@ -97,10 +97,8 @@ localizedStrings["Additions"] = "Additions"; > localizedStrings["Address"] = "Address"; > localizedStrings["All"] = "All"; > localizedStrings["All Changes"] = "All Changes"; >-/* Break (pause) on all exceptions */ > localizedStrings["All Exceptions"] = "All Exceptions"; > localizedStrings["All Layers"] = "All Layers"; >-/* A submenu item of 'Break on' that breaks (pauses) before all network requests */ > localizedStrings["All Requests"] = "All Requests"; > localizedStrings["All Resources"] = "All Resources"; > localizedStrings["All Storage"] = "All Storage"; >@@ -129,14 +127,12 @@ localizedStrings["Area"] = "Area"; > localizedStrings["Assertion"] = "Assertion"; > localizedStrings["Assertion Failed"] = "Assertion Failed"; > localizedStrings["Assertion Failed: %s"] = "Assertion Failed: %s"; >-/* Break (pause) when console.assert() fails */ > localizedStrings["Assertion Failures"] = "Assertion Failures"; > localizedStrings["Assertion with message: %s"] = "Assertion with message: %s"; > localizedStrings["Assertive"] = "Assertive"; > localizedStrings["Associated Data"] = "Associated Data"; > localizedStrings["Async audits are not supported."] = "Async audits are not supported."; > localizedStrings["Attribute"] = "Attribute"; >-/* A submenu item of 'Break On' that breaks (pauses) before DOM attribute is modified */ > localizedStrings["Attribute Modified"] = "Attribute Modified"; > localizedStrings["Attributes"] = "Attributes"; > localizedStrings["Audit"] = "Audit"; >@@ -200,7 +196,6 @@ localizedStrings["Canvas %d"] = "Canvas %d"; > localizedStrings["Canvas %s"] = "Canvas %s"; > localizedStrings["Canvas Element"] = "Canvas Element"; > localizedStrings["Canvases"] = "Canvases"; >-/* Capture screenshot of the selected DOM node */ > localizedStrings["Capture Screenshot"] = "Capture Screenshot"; > localizedStrings["Capturing"] = "Capturing"; > /* Context menu label for whether searches should be case sensitive. */ >@@ -214,7 +209,6 @@ localizedStrings["Changes"] = "Changes"; > localizedStrings["Character Data"] = "Character Data"; > localizedStrings["Charge \u201C%s\u201D to Callers"] = "Charge \u201C%s\u201D to Callers"; > localizedStrings["Checked"] = "Checked"; >-/* A submenu item of 'Add' to append DOM nodes to the selected DOM node */ > localizedStrings["Child"] = "Child"; > localizedStrings["Child Layers"] = "Child Layers"; > localizedStrings["Child added to "] = "Child added to "; >@@ -249,8 +243,7 @@ localizedStrings["Collect garbage"] = "Collect garbage"; > localizedStrings["Comment"] = "Comment"; > localizedStrings["Compare snapshots"] = "Compare snapshots"; > localizedStrings["Comparison of total memory size at the end of the selected time range to the maximum memory size in this recording"] = "Comparison of total memory size at the end of the selected time range to the maximum memory size in this recording"; >-/* Composite phase timeline records, where graphic layers are combined */ >-localizedStrings["Composite @ Timeline record"] = "Composite"; >+localizedStrings["Composite"] = "Composite"; > localizedStrings["Composited"] = "Composited"; > localizedStrings["Compressed"] = "Compressed"; > localizedStrings["Compression"] = "Compression"; >@@ -470,9 +463,7 @@ localizedStrings["Extra Scripts"] = "Extra Scripts"; > localizedStrings["Fade unexecuted code"] = "Fade unexecuted code"; > localizedStrings["Failed to upgrade"] = "Failed to upgrade"; > localizedStrings["Failure status code"] = "Failure status code"; >-/* Resource loaded via 'fetch' method */ > localizedStrings["Fetch"] = "Fetch"; >-/* Resources loaded via 'fetch' method */ > localizedStrings["Fetches"] = "Fetches"; > localizedStrings["File or Resource"] = "File or Resource"; > localizedStrings["Filename"] = "Filename"; >@@ -489,9 +480,7 @@ localizedStrings["Fonts"] = "Fonts"; > localizedStrings["Force Dark Appearance"] = "Force Dark Appearance"; > localizedStrings["Force Light Appearance"] = "Force Light Appearance"; > localizedStrings["Force Print Media Styles"] = "Force Print Media Styles"; >-/* Layout phase records that were imperative (forced) */ > localizedStrings["Forced Layout"] = "Forced Layout"; >-/* A context menu item to force (override) a DOM node's pseudo-classes */ > localizedStrings["Forced Pseudo-Classes"] = "Forced Pseudo-Classes"; > localizedStrings["Format: HSL"] = "Format: HSL"; > localizedStrings["Format: HSLA"] = "Format: HSLA"; >@@ -581,7 +570,6 @@ localizedStrings["Index Key \u2014 %s"] = "Index Key \u2014 %s"; > localizedStrings["Indexed Databases"] = "Indexed Databases"; > localizedStrings["Info: "] = "Info: "; > localizedStrings["Infos"] = "Infos"; >-/* A section of CSS rules matching an ancestor DOM node */ > localizedStrings["Inherited From"] = "Inherited From"; > localizedStrings["Initial State"] = "Initial State"; > localizedStrings["Initial Velocity"] = "Initial Velocity"; >@@ -610,9 +598,8 @@ localizedStrings["Layer Count: %d"] = "Layer Count: %d"; > localizedStrings["Layer Info"] = "Layer Info"; > localizedStrings["Layers"] = "Layers"; > localizedStrings["Layers:"] = "Layers:"; >+localizedStrings["Layout"] = "Layout"; > localizedStrings["Layout & Rendering"] = "Layout & Rendering"; >-/* Layout phase timeline records */ >-localizedStrings["Layout @ Timeline record"] = "Layout"; > localizedStrings["Layout Invalidated"] = "Layout Invalidated"; > localizedStrings["Line %d"] = "Line %d"; > localizedStrings["Line %d:%d"] = "Line %d:%d"; >@@ -630,12 +617,10 @@ localizedStrings["Local Variables"] = "Local Variables"; > localizedStrings["Located at %s"] = "Located at %s"; > localizedStrings["Location"] = "Location"; > localizedStrings["Log Canvas Context"] = "Log Canvas Context"; >-/* Log (print) DOM element to Console */ > localizedStrings["Log Element"] = "Log Element"; > localizedStrings["Log Frame Text"] = "Log Frame Text"; > localizedStrings["Log Frame Value"] = "Log Frame Value"; > localizedStrings["Log Message"] = "Log Message"; >-/* Log (print) DOM node to Console */ > localizedStrings["Log Node"] = "Log Node"; > localizedStrings["Log Symbol"] = "Log Symbol"; > localizedStrings["Log Value"] = "Log Value"; >@@ -679,7 +664,6 @@ localizedStrings["Network Issue"] = "Network Issue"; > localizedStrings["Network Requests"] = "Network Requests"; > localizedStrings["Network Requests:"] = "Network Requests:"; > localizedStrings["New Tab"] = "New Tab"; >-/* A submenu item of 'Add' to add DOM nodes after the selected DOM node */ > localizedStrings["Next Sibling"] = "Next Sibling"; > localizedStrings["No"] = "No"; > localizedStrings["No Accessibility Information"] = "No Accessibility Information"; >@@ -720,7 +704,6 @@ localizedStrings["No request, served from the memory cache."] = "No request, ser > localizedStrings["No response cookies."] = "No response cookies."; > localizedStrings["No response headers"] = "No response headers"; > localizedStrings["Node"] = "Node"; >-/* A submenu item of 'Break On' that breaks (pauses) before DOM node is removed */ > localizedStrings["Node Removed"] = "Node Removed"; > localizedStrings["Nodes"] = "Nodes"; > localizedStrings["None"] = "None"; >@@ -760,11 +743,8 @@ localizedStrings["Page"] = "Page"; > localizedStrings["Page Issue"] = "Page Issue"; > localizedStrings["Page navigated at %s"] = "Page navigated at %s"; > localizedStrings["Page reloaded at %s"] = "Page reloaded at %s"; >-/* Paint (render) phase timeline records */ >-localizedStrings["Paint @ Timeline record"] = "Paint"; >+localizedStrings["Paint"] = "Paint"; > localizedStrings["Paints"] = "Paints"; >-/* A count of how many times an element was painted (rendered) */ >-localizedStrings["Paints @ Column title"] = "Paints"; > localizedStrings["Parent"] = "Parent"; > localizedStrings["Partial Garbage Collection"] = "Partial Garbage Collection"; > localizedStrings["Passive"] = "Passive"; >@@ -794,7 +774,6 @@ localizedStrings["Press %s to stop editing"] = "Press %s to stop editing"; > localizedStrings["Pressed"] = "Pressed"; > localizedStrings["Pretty print"] = "Pretty print"; > localizedStrings["Preview"] = "Preview"; >-/* A submenu item of 'Add' to add DOM nodes before the selected DOM node */ > localizedStrings["Previous Sibling"] = "Previous Sibling"; > localizedStrings["Primary Key"] = "Primary Key"; > localizedStrings["Primary Key \u2014 %s"] = "Primary Key \u2014 %s"; >@@ -882,11 +861,9 @@ localizedStrings["Return type for anonymous function"] = "Return type for anonym > localizedStrings["Return type for function: %s"] = "Return type for function: %s"; > localizedStrings["Return value is not an object, string, or boolean"] = "Return value is not an object, string, or boolean"; > localizedStrings["Reveal Breakpoint"] = "Reveal Breakpoint"; >-/* Open Elements tab and select this node in DOM tree */ > localizedStrings["Reveal in DOM Tree"] = "Reveal in DOM Tree"; > localizedStrings["Reveal in Debugger Tab"] = "Reveal in Debugger Tab"; > localizedStrings["Reveal in Elements Tab"] = "Reveal in Elements Tab"; >-/* Open Layers tab and select the layer corresponding to this node */ > localizedStrings["Reveal in Layers Tab"] = "Reveal in Layers Tab"; > localizedStrings["Reveal in Network Tab"] = "Reveal in Network Tab"; > localizedStrings["Reveal in Original Resource"] = "Reveal in Original Resource"; >@@ -915,8 +892,7 @@ localizedStrings["Script Element %d"] = "Script Element %d"; > localizedStrings["Script Entries:"] = "Script Entries:"; > localizedStrings["Script Evaluated"] = "Script Evaluated"; > localizedStrings["Scripts"] = "Scripts"; >-/* Scroll selected DOM node into view on the inspected web page */ >-localizedStrings["Scroll into View"] = "Scroll into View"; >+localizedStrings["Scroll Into View"] = "Scroll Into View"; > localizedStrings["Search"] = "Search"; > localizedStrings["Search Again"] = "Search Again"; > localizedStrings["Search Resource Content"] = "Search Resource Content"; >@@ -931,12 +907,10 @@ localizedStrings["Select baseline snapshot"] = "Select baseline snapshot"; > localizedStrings["Select comparison snapshot"] = "Select comparison snapshot"; > localizedStrings["Selected"] = "Selected"; > localizedStrings["Selected Canvas Context"] = "Selected Canvas Context"; >-/* Selected DOM element */ > localizedStrings["Selected Element"] = "Selected Element"; > localizedStrings["Selected Frame"] = "Selected Frame"; > localizedStrings["Selected Item"] = "Selected Item"; > localizedStrings["Selected Items"] = "Selected Items"; >-/* Selected DOM node */ > localizedStrings["Selected Node"] = "Selected Node"; > localizedStrings["Selected Symbol"] = "Selected Symbol"; > localizedStrings["Selected Value"] = "Selected Value"; >@@ -1037,7 +1011,6 @@ localizedStrings["Stop recording canvas actions"] = "Stop recording canvas actio > localizedStrings["Stop recording once page loads"] = "Stop recording once page loads"; > localizedStrings["Stopping the \u201C%s\u201D audit"] = "Stopping the \u201C%s\u201D audit"; > localizedStrings["Storage"] = "Storage"; >-/* CSS properties defined via HTML style attribute */ > localizedStrings["Style Attribute"] = "Style Attribute"; > localizedStrings["Style Resolution"] = "Style Resolution"; > localizedStrings["Style rule"] = "Style rule"; >@@ -1050,14 +1023,12 @@ localizedStrings["Styles:"] = "Styles:"; > localizedStrings["Stylesheet"] = "Stylesheet"; > localizedStrings["Stylesheets"] = "Stylesheets"; > localizedStrings["Subject"] = "Subject"; >-/* A submenu item of 'Break On' that breaks (pauses) before child DOM node is modified */ > localizedStrings["Subtree Modified"] = "Subtree Modified"; > localizedStrings["Summary"] = "Summary"; > localizedStrings["TCP"] = "TCP"; > localizedStrings["TIFF"] = "TIFF"; > localizedStrings["Tab width:"] = "Tab width:"; > localizedStrings["Tabs"] = "Tabs"; >-/* A submenu item of 'Edit' to change DOM element's tag name */ > localizedStrings["Tag"] = "Tag"; > localizedStrings["Take snapshot"] = "Take snapshot"; > localizedStrings["Target"] = "Target"; >@@ -1120,7 +1091,6 @@ localizedStrings["Total: %s"] = "Total: %s"; > localizedStrings["Totals:"] = "Totals:"; > localizedStrings["Trace"] = "Trace"; > localizedStrings["Trace: %s"] = "Trace: %s"; >-/* Amount of data sent over the network for a single resource */ > localizedStrings["Transfer Size"] = "Transfer Size"; > localizedStrings["Transferred"] = "Transferred"; > localizedStrings["Triggered Breakpoint"] = "Triggered Breakpoint"; >@@ -1135,7 +1105,6 @@ localizedStrings["URL Breakpoint\u2026"] = "URL Breakpoint\u2026"; > localizedStrings["Unable to determine path to property from root"] = "Unable to determine path to property from root"; > localizedStrings["Unable to parse as JSON: %s"] = "Unable to parse as JSON: %s"; > localizedStrings["Unable to show certificate for \u201C%s\u201D"] = "Unable to show certificate for \u201C%s\u201D"; >-/* Break (pause) on uncaught (unhandled) exceptions */ > localizedStrings["Uncaught Exceptions"] = "Uncaught Exceptions"; > localizedStrings["Undefined custom element"] = "Undefined custom element"; > localizedStrings["Unique"] = "Unique"; >diff --git a/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js b/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js >index e20d506831b0e1a664c4ebe6aa2819b1f0b536cf..c0f5a375e33dd076ac70aa8901497dddeef4577f 100644 >--- a/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js >+++ b/Source/WebInspectorUI/UserInterface/Base/LoadLocalizedStrings.js >@@ -43,17 +43,9 @@ WI.unlocalizedString = function(string) > > WI.UIString = function(string, key, comment) > { >- "use strict"; >- > if (WI.dontLocalizeUserInterface) > return string; > >- // UIString(string, comment) >- if (arguments.length === 2) { >- comment = key; >- key = undefined; >- } >- > key = key || string; > > if (window.localizedStrings && key in window.localizedStrings) >@@ -72,41 +64,3 @@ WI.UIString = function(string, key, comment) > > return "LOCALIZED STRING NOT FOUND"; > }; >- >-WI.repeatedUIString = {}; >- >-WI.repeatedUIString.timelineRecordLayout = function() { >- return WI.UIString("Layout", "Layout @ Timeline record", "Layout phase timeline records"); >-}; >- >-WI.repeatedUIString.timelineRecordPaint = function() { >- return WI.UIString("Paint", "Paint @ Timeline record", "Paint (render) phase timeline records"); >-}; >- >-WI.repeatedUIString.timelineRecordComposite = function() { >- return WI.UIString("Composite", "Composite @ Timeline record", "Composite phase timeline records, where graphic layers are combined"); >-}; >- >-WI.repeatedUIString.allExceptions = function() { >- return WI.UIString("All Exceptions", "Break (pause) on all exceptions"); >-}; >- >-WI.repeatedUIString.uncaughtExceptions = function() { >- return WI.UIString("Uncaught Exceptions", "Break (pause) on uncaught (unhandled) exceptions"); >-}; >- >-WI.repeatedUIString.assertionFailures = function() { >- return WI.UIString("Assertion Failures", "Break (pause) when console.assert() fails"); >-}; >- >-WI.repeatedUIString.allRequests = function() { >- return WI.UIString("All Requests", "A submenu item of 'Break on' that breaks (pauses) before all network requests"); >-}; >- >-WI.repeatedUIString.fetch = function() { >- return WI.UIString("Fetch", "Resource loaded via 'fetch' method"); >-}; >- >-WI.repeatedUIString.revealInDOMTree = function() { >- return WI.UIString("Reveal in DOM Tree", "Open Elements tab and select this node in DOM tree"); >-}; >diff --git a/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js b/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js >index 4a831f126b09a80634b2c026eb50f2aabc59154d..faa4b6c2e52b84be86921afcae4ead4290687ff6 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js >+++ b/Source/WebInspectorUI/UserInterface/Models/LayoutTimelineRecord.js >@@ -51,13 +51,13 @@ WI.LayoutTimelineRecord = class LayoutTimelineRecord extends WI.TimelineRecord > case WI.LayoutTimelineRecord.EventType.InvalidateLayout: > return WI.UIString("Layout Invalidated"); > case WI.LayoutTimelineRecord.EventType.ForcedLayout: >- return WI.UIString("Forced Layout", "Layout phase records that were imperative (forced)"); >+ return WI.UIString("Forced Layout"); > case WI.LayoutTimelineRecord.EventType.Layout: >- return WI.repeatedUIString.timelineRecordLayout(); >+ return WI.UIString("Layout"); > case WI.LayoutTimelineRecord.EventType.Paint: >- return WI.repeatedUIString.timelineRecordPaint(); >+ return WI.UIString("Paint"); > case WI.LayoutTimelineRecord.EventType.Composite: >- return WI.repeatedUIString.timelineRecordComposite(); >+ return WI.UIString("Composite"); > } > } > >diff --git a/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js b/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js >index cc2e1b2467aed49cd58b2e851347fcde0991b30d..5fd81083f9e840f6e2291b99d4bdcc143be0957f 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js >+++ b/Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js >@@ -46,9 +46,9 @@ WI.RenderingFrameTimelineRecord = class RenderingFrameTimelineRecord extends WI. > case WI.RenderingFrameTimelineRecord.TaskType.Script: > return WI.UIString("Script"); > case WI.RenderingFrameTimelineRecord.TaskType.Layout: >- return WI.repeatedUIString.timelineRecordLayout(); >+ return WI.UIString("Layout"); > case WI.RenderingFrameTimelineRecord.TaskType.Paint: >- return WI.repeatedUIString.timelineRecordPaint(); >+ return WI.UIString("Paint"); > case WI.RenderingFrameTimelineRecord.TaskType.Other: > return WI.UIString("Other"); > } >diff --git a/Source/WebInspectorUI/UserInterface/Models/Resource.js b/Source/WebInspectorUI/UserInterface/Models/Resource.js >index e931c127481310c21fc941e945c8dd3cb55f3d3f..dc752086d611c3f89e677c9add1217494396846b 100644 >--- a/Source/WebInspectorUI/UserInterface/Models/Resource.js >+++ b/Source/WebInspectorUI/UserInterface/Models/Resource.js >@@ -156,8 +156,8 @@ WI.Resource = class Resource extends WI.SourceCode > return WI.UIString("XHR"); > case WI.Resource.Type.Fetch: > if (plural) >- return WI.UIString("Fetches", "Resources loaded via 'fetch' method"); >- return WI.repeatedUIString.fetch(); >+ return WI.UIString("Fetches"); >+ return WI.UIString("Fetch"); > case WI.Resource.Type.Ping: > if (plural) > return WI.UIString("Pings"); >diff --git a/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js b/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js >index be2eeba62ccb90c2005da5aa1394840dc3b81e68..8e40dd6d7d7d16cc1b7d7e9cb27346e065762684 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/AuditTestGroupContentView.js >@@ -125,11 +125,11 @@ WI.AuditTestGroupContentView = class AuditTestGroupContentView extends WI.AuditT > scopeBarItems.push(scopeBarItem); > }; > >- addScopeBarItem(WI.AuditTestCaseResult.Level.Pass, WI.UIString("%d Passed", "%d Passed (singular)", ""), WI.UIString("%d Passed", "%d Passed (plural)", "")); >+ addScopeBarItem(WI.AuditTestCaseResult.Level.Pass, WI.UIString("%d Passed", "%d Passed (singular)"), WI.UIString("%d Passed", "%d Passed (plural)")); > addScopeBarItem(WI.AuditTestCaseResult.Level.Warn, WI.UIString("%d Warning"), WI.UIString("%d Warnings")); >- addScopeBarItem(WI.AuditTestCaseResult.Level.Fail, WI.UIString("%d Failed", "%d Failed (singular)", ""), WI.UIString("%d Failed", "%d Failed (plural)", "")); >+ addScopeBarItem(WI.AuditTestCaseResult.Level.Fail, WI.UIString("%d Failed", "%d Failed (singular)"), WI.UIString("%d Failed", "%d Failed (plural)")); > addScopeBarItem(WI.AuditTestCaseResult.Level.Error, WI.UIString("%d Error"), WI.UIString("%d Errors")); >- addScopeBarItem(WI.AuditTestCaseResult.Level.Unsupported, WI.UIString("%d Unsupported", "%d Unsupported (singular)", ""), WI.UIString("%d Unsupported", "%d Unsupported (plural)", "")); >+ addScopeBarItem(WI.AuditTestCaseResult.Level.Unsupported, WI.UIString("%d Unsupported", "%d Unsupported (singular)"), WI.UIString("%d Unsupported", "%d Unsupported (plural)")); > > this._levelScopeBar = new WI.ScopeBar(null, scopeBarItems); > this._levelScopeBar.addEventListener(WI.ScopeBar.Event.SelectionChanged, this._handleLevelScopeBarSelectionChanged, this); >diff --git a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js >index 7864bb41b443f48ed20586f34f193ba511f32fac..365421dc1c7cb62228d9060ebf3312ba23f3e94c 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js >@@ -57,9 +57,9 @@ WI.CPUTimelineView = class CPUTimelineView extends WI.TimelineView > case WI.CPUTimelineView.SampleType.Script: > return WI.UIString("Script"); > case WI.CPUTimelineView.SampleType.Layout: >- return WI.repeatedUIString.timelineRecordLayout(); >+ return WI.UIString("Layout"); > case WI.CPUTimelineView.SampleType.Paint: >- return WI.repeatedUIString.timelineRecordPaint(); >+ return WI.UIString("Paint"); > case WI.CPUTimelineView.SampleType.Style: > return WI.UIString("Style Resolution"); > } >diff --git a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js >index da3dc633cdfcac6c0dcc703a867d4037156d6788..c435f7d4caf1a5e0f9149e0718a659a53faa64c0 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js >+++ b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js >@@ -210,7 +210,7 @@ WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = { > if (WI.cssManager.canForcePseudoClasses() && domNode.attached) { > contextMenu.appendSeparator(); > >- let pseudoSubMenu = contextMenu.appendSubMenuItem(WI.UIString("Forced Pseudo-Classes", "A context menu item to force (override) a DOM node's pseudo-classes")); >+ let pseudoSubMenu = contextMenu.appendSubMenuItem(WI.UIString("Forced Pseudo-Classes")); > > let enabledPseudoClasses = domNode.enabledPseudoClasses; > WI.CSSManager.ForceablePseudoClasses.forEach((pseudoClass) => { >@@ -230,10 +230,10 @@ WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = { > contextMenu.appendSeparator(); > > if (!options.excludeLogElement && !domNode.isInUserAgentShadowTree() && !domNode.isPseudoElement()) { >- let label = isElement ? WI.UIString("Log Element", "Log (print) DOM element to Console") : WI.UIString("Log Node", "Log (print) DOM node to Console"); >+ let label = isElement ? WI.UIString("Log Element") : WI.UIString("Log Node"); > contextMenu.appendItem(label, () => { > WI.RemoteObject.resolveNode(domNode, WI.RuntimeManager.ConsoleObjectGroup).then((remoteObject) => { >- let text = isElement ? WI.UIString("Selected Element", "Selected DOM element") : WI.UIString("Selected Node", "Selected DOM node"); >+ let text = isElement ? WI.UIString("Selected Element") : WI.UIString("Selected Node"); > const addSpecialUserLogClass = true; > WI.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, addSpecialUserLogClass); > }); >@@ -241,19 +241,19 @@ WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = { > } > > if (!options.excludeRevealElement && window.DOMAgent && attached) { >- contextMenu.appendItem(WI.repeatedUIString.revealInDOMTree(), () => { >+ contextMenu.appendItem(WI.UIString("Reveal in DOM Tree"), () => { > WI.domManager.inspectElement(domNode.id); > }); > } > > if (WI.settings.experimentalEnableLayersTab.value && window.LayerTreeAgent && attached) { >- contextMenu.appendItem(WI.UIString("Reveal in Layers Tab", "Open Layers tab and select the layer corresponding to this node"), () => { >+ contextMenu.appendItem(WI.UIString("Reveal in Layers Tab"), () => { > WI.showLayersTab({nodeToSelect: domNode}); > }); > } > > if (window.PageAgent && attached) { >- contextMenu.appendItem(WI.UIString("Capture Screenshot", "Capture screenshot of the selected DOM node"), () => { >+ contextMenu.appendItem(WI.UIString("Capture Screenshot"), () => { > PageAgent.snapshotNode(domNode.id, (error, dataURL) => { > if (error) { > const target = WI.mainTarget; >@@ -276,7 +276,7 @@ WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = { > } > > if (isElement && attached) { >- contextMenu.appendItem(WI.UIString("Scroll into View", "Scroll selected DOM node into view on the inspected web page"), () => { >+ contextMenu.appendItem(WI.UIString("Scroll Into View"), () => { > domNode.scrollIntoView(); > }); > } >diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMBreakpointTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMBreakpointTreeElement.js >index 991d716db5afaca58f3588348a58db83491fc946..667d557efc622287575be9fb30e5004429284701 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/DOMBreakpointTreeElement.js >+++ b/Source/WebInspectorUI/UserInterface/Views/DOMBreakpointTreeElement.js >@@ -50,11 +50,11 @@ WI.DOMBreakpointTreeElement = class DOMBreakpointTreeElement extends WI.GeneralT > { > switch (type) { > case WI.DOMBreakpoint.Type.SubtreeModified: >- return WI.UIString("Subtree Modified", "A submenu item of 'Break On' that breaks (pauses) before child DOM node is modified"); >+ return WI.UIString("Subtree Modified"); > case WI.DOMBreakpoint.Type.AttributeModified: >- return WI.UIString("Attribute Modified", "A submenu item of 'Break On' that breaks (pauses) before DOM attribute is modified"); >+ return WI.UIString("Attribute Modified"); > case WI.DOMBreakpoint.Type.NodeRemoved: >- return WI.UIString("Node Removed", "A submenu item of 'Break On' that breaks (pauses) before DOM node is removed"); >+ return WI.UIString("Node Removed"); > default: > console.error("Unexpected DOM breakpoint type: " + type); > return null; >diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMNodeTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMNodeTreeElement.js >index adaff3faae8f2b826912b19b19f1882e8c537de2..1f5d17183e453dc317b59ce70009e2fa205c4998 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/DOMNodeTreeElement.js >+++ b/Source/WebInspectorUI/UserInterface/Views/DOMNodeTreeElement.js >@@ -61,7 +61,7 @@ WI.DOMNodeTreeElement = class DOMNodeTreeElement extends WI.GeneralTreeElement > > contextMenu.appendSeparator(); > >- contextMenu.appendItem(WI.repeatedUIString.revealInDOMTree(), () => { >+ contextMenu.appendItem(WI.UIString("Reveal in DOM Tree"), () => { > WI.domManager.inspectElement(this.representedObject.id); > }); > } >diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js >index aebff03a1caa1eb5ae08276246b71502dbdcb215..e6f1ee887566feaed9ef19a9e8493111300ada03 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js >+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js >@@ -764,16 +764,16 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement > > if (isEditableNode) { > if (!forbiddenClosingTag) { >- subMenus.add.appendItem(WI.UIString("Child", "A submenu item of 'Add' to append DOM nodes to the selected DOM node"), () => { >+ subMenus.add.appendItem(WI.UIString("Child"), () => { > this._addHTML(); > }); > } > >- subMenus.add.appendItem(WI.UIString("Previous Sibling", "A submenu item of 'Add' to add DOM nodes before the selected DOM node"), () => { >+ subMenus.add.appendItem(WI.UIString("Previous Sibling"), () => { > this._addPreviousSibling(); > }); > >- subMenus.add.appendItem(WI.UIString("Next Sibling", "A submenu item of 'Add' to add DOM nodes after the selected DOM node"), () => { >+ subMenus.add.appendItem(WI.UIString("Next Sibling"), () => { > this._addNextSibling(); > }); > } >@@ -797,7 +797,7 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement > }); > } > >- subMenus.edit.appendItem(WI.UIString("Tag", "A submenu item of 'Edit' to change DOM element's tag name"), () => { >+ subMenus.edit.appendItem(WI.UIString("Tag"), () => { > this._startEditingTagName(); > }); > } >diff --git a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js >index 8dc21756503bd603f8e71f9992bbb49f3414167f..bd56b03b8df27d8a64cd1cc57d95b934ef137e15 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js >+++ b/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js >@@ -471,13 +471,13 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba > > if (breakpoint === WI.debuggerManager.allExceptionsBreakpoint) { > options.className = WI.DebuggerSidebarPanel.ExceptionIconStyleClassName; >- options.title = WI.repeatedUIString.allExceptions(); >+ options.title = WI.UIString("All Exceptions"); > } else if (breakpoint === WI.debuggerManager.uncaughtExceptionsBreakpoint) { > options.className = WI.DebuggerSidebarPanel.ExceptionIconStyleClassName; >- options.title = WI.repeatedUIString.uncaughtExceptions(); >+ options.title = WI.UIString("Uncaught Exceptions"); > } else if (breakpoint === WI.debuggerManager.assertionFailuresBreakpoint) { > options.className = WI.DebuggerSidebarPanel.AssertionIconStyleClassName; >- options.title = WI.repeatedUIString.assertionFailures(); >+ options.title = WI.UIString("Assertion Failures"); > } else if (breakpoint instanceof WI.DOMBreakpoint) { > if (!breakpoint.domNodeIdentifier) > return null; >@@ -511,7 +511,7 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba > > if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint) { > options.className = WI.DebuggerSidebarPanel.AssertionIconStyleClassName; >- options.title = WI.repeatedUIString.allRequests(); >+ options.title = WI.UIString("All Requests"); > } > } else { > let sourceCode = breakpoint.sourceCodeLocation && breakpoint.sourceCodeLocation.displaySourceCode; >@@ -1454,7 +1454,7 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba > if (InspectorBackend.domains.Debugger.setPauseOnAssertions) { > let assertionFailuresBreakpointShown = WI.settings.showAssertionFailuresBreakpoint.value; > >- contextMenu.appendCheckboxItem(WI.repeatedUIString.assertionFailures(), () => { >+ contextMenu.appendCheckboxItem(WI.UIString("Assertion Failures"), () => { > if (assertionFailuresBreakpointShown) > WI.debuggerManager.removeBreakpoint(WI.debuggerManager.assertionFailuresBreakpoint); > else { >@@ -1476,7 +1476,7 @@ WI.DebuggerSidebarPanel = class DebuggerSidebarPanel extends WI.NavigationSideba > > let allRequestsBreakpointShown = WI.settings.showAllRequestsBreakpoint.value; > >- contextMenu.appendCheckboxItem(WI.repeatedUIString.allRequests(), () => { >+ contextMenu.appendCheckboxItem(WI.UIString("All Requests"), () => { > if (allRequestsBreakpointShown) > WI.domDebuggerManager.removeURLBreakpoint(WI.domDebuggerManager.allRequestsBreakpoint); > else { >diff --git a/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js >index c1ad6faa4ceb28f3dd3f69bc334caad87eb25bcd..2b6513a7fd286357d2731ab73076f774001cc049 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js >+++ b/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js >@@ -136,7 +136,7 @@ WI.LayerTreeDetailsSidebarPanel = class LayerTreeDetailsSidebarPanel extends WI. > columns.name.title = WI.UIString("Node"); > columns.name.sortable = false; > >- columns.paintCount.title = WI.UIString("Paints", "Paints @ Column title", "A count of how many times an element was painted (rendered)"); >+ columns.paintCount.title = WI.UIString("Paints"); > columns.paintCount.sortable = true; > columns.paintCount.aligned = "right"; > columns.paintCount.width = "70px"; >diff --git a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >index cffd1cf284c59a1fcd70310836d5eda86fb3532a..33b9163c760a6079adf5b8e4c41c54ffc15e0fb2 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >+++ b/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js >@@ -211,7 +211,7 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > case WI.Resource.Type.XHR: > return "XHR"; > case WI.Resource.Type.Fetch: >- return WI.repeatedUIString.fetch(); >+ return WI.UIString("Fetch"); > case WI.Resource.Type.Ping: > return WI.UIString("Ping"); > case WI.Resource.Type.Beacon: >@@ -1172,7 +1172,7 @@ WI.NetworkTableContentView = class NetworkTableContentView extends WI.ContentVie > align: "right", > }); > >- this._transferSizeColumn = new WI.TableColumn("transferSize", WI.UIString("Transfer Size", "Amount of data sent over the network for a single resource"), { >+ this._transferSizeColumn = new WI.TableColumn("transferSize", WI.UIString("Transfer Size"), { > minWidth: 100, > maxWidth: 150, > initialWidth: 100, >diff --git a/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js >index c5a1bfe14eaeb5877adb5e47b2f657884a8ae6fc..a21bae8d0d87045491ad3d9057cce54326c4d5a2 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js >+++ b/Source/WebInspectorUI/UserInterface/Views/SourcesNavigationSidebarPanel.js >@@ -889,13 +889,13 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W > > if (breakpoint === WI.debuggerManager.allExceptionsBreakpoint) { > options.className = "breakpoint-exception-icon"; >- options.title = WI.repeatedUIString.allExceptions(); >+ options.title = WI.UIString("All Exceptions"); > } else if (breakpoint === WI.debuggerManager.uncaughtExceptionsBreakpoint) { > options.className = "breakpoint-exception-icon"; >- options.title = WI.repeatedUIString.uncaughtExceptions(); >+ options.title = WI.UIString("Uncaught Exceptions"); > } else if (breakpoint === WI.debuggerManager.assertionFailuresBreakpoint) { > options.className = "breakpoint-assertion-icon"; >- options.title = WI.repeatedUIString.assertionFailures(); >+ options.title = WI.UIString("Assertion Failures"); > } else if (breakpoint instanceof WI.DOMBreakpoint) { > if (!breakpoint.domNodeIdentifier) > return null; >@@ -929,7 +929,7 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W > > if (breakpoint === WI.domDebuggerManager.allRequestsBreakpoint) { > options.className = "breakpoint-assertion-icon"; >- options.title = WI.repeatedUIString.allRequests(); >+ options.title = WI.UIString("All Requests"); > } > } else { > let sourceCode = breakpoint.sourceCodeLocation && breakpoint.sourceCodeLocation.displaySourceCode; >@@ -1508,7 +1508,7 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W > if (InspectorBackend.domains.Debugger.setPauseOnAssertions) { > let assertionFailuresBreakpointShown = WI.settings.showAssertionFailuresBreakpoint.value; > >- contextMenu.appendCheckboxItem(WI.repeatedUIString.assertionFailures(), () => { >+ contextMenu.appendCheckboxItem(WI.UIString("Assertion Failures"), () => { > if (assertionFailuresBreakpointShown) > WI.debuggerManager.removeBreakpoint(WI.debuggerManager.assertionFailuresBreakpoint); > else { >@@ -1530,7 +1530,7 @@ WI.SourcesNavigationSidebarPanel = class SourcesNavigationSidebarPanel extends W > > let allRequestsBreakpointShown = WI.settings.showAllRequestsBreakpoint.value; > >- contextMenu.appendCheckboxItem(WI.repeatedUIString.allRequests(), () => { >+ contextMenu.appendCheckboxItem(WI.UIString("All Requests"), () => { > if (allRequestsBreakpointShown) > WI.domDebuggerManager.removeURLBreakpoint(WI.domDebuggerManager.allRequestsBreakpoint); > else { >diff --git a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js >index fecbe60c23ff329d20ffc4e674d929cdfecbcffb..bfce82282f00b3f56956189ce8057230a25c9f2c 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js >+++ b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetCSSStyleDeclarationSection.js >@@ -315,7 +315,7 @@ WI.SpreadsheetCSSStyleDeclarationSection = class SpreadsheetCSSStyleDeclarationS > break; > > case WI.CSSStyleDeclaration.Type.Inline: >- this._selectorElement.textContent = WI.UIString("Style Attribute", "CSS properties defined via HTML style attribute"); >+ this._selectorElement.textContent = WI.UIString("Style Attribute"); > this._selectorElement.classList.add("style-attribute"); > break; > >diff --git a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js >index dc84c05aeb463370728fcded39700e54111db470..e1d4ebed3124123f18fd08cb57cf3d24c214fec3 100644 >--- a/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js >+++ b/Source/WebInspectorUI/UserInterface/Views/SpreadsheetRulesStyleDetailsPanel.js >@@ -256,7 +256,7 @@ WI.SpreadsheetRulesStyleDetailsPanel = class SpreadsheetRulesStyleDetailsPanel e > > let addSection = (section) => { > if (section.style.inherited && (!previousStyle || previousStyle.node !== section.style.node)) >- addHeader(WI.UIString("Inherited From", "A section of CSS rules matching an ancestor DOM node"), section.style.node); >+ addHeader(WI.UIString("Inherited From"), section.style.node); > > if (!section.isDescendantOf(this)) { > let referenceView = this.subviews[this._sections.length]; >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 75c73bb0edc1e991fcd8c7bc7d07f014756dcb9a..415cd0c357188b982d5890ca5eecababb132e774 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,17 @@ >+2019-05-23 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r245665. >+ https://bugs.webkit.org/show_bug.cgi?id=198203 >+ >+ Inspector appears blank, again. (Requested by NVI on #webkit). >+ >+ Reverted changeset: >+ >+ "Web Inspector: Provide UIString descriptions to improve >+ localizations" >+ https://bugs.webkit.org/show_bug.cgi?id=195132 >+ https://trac.webkit.org/changeset/245665 >+ > 2019-05-23 Stephan Szabo <stephan.szabo@sony.com> > > [Win][CMake] Pass architecture to cmake via -A for both x64 and Win32 >diff --git a/Tools/Scripts/extract-localizable-js-strings b/Tools/Scripts/extract-localizable-js-strings >index 68c70bdec97b774b23a799d6c570e4eecac8d10e..34b5ac7793b3806eafa542348362ed1beef415ed 100755 >--- a/Tools/Scripts/extract-localizable-js-strings >+++ b/Tools/Scripts/extract-localizable-js-strings >@@ -74,15 +74,7 @@ for my $file (sort @files) { > chomp; > > # Handle WebInspector strings. Prints a warning if a non-string literal is passed to WI.UIString(). >- # Allow: WI.UIString(string, comment) >- # WI.UIString(string, key, comment) >- HandleUIString( >- $1, >- ($3 || (defined $3 and length $3 == 0)) ? $2 : $1, >- ($3 || (defined $3 and length $3 == 0)) ? $3 : $2 || "", >- $file, >- $. >- ) while s/WI\.UIString\("([^"]+)"(?:,\s*"([^"]*)"(?:,\s*"([^"]*)")?)?\)//; >+ HandleUIString($1, $2 || $1, $3 || "", $file, $.) while s/WI\.UIString\("([^"]+)"(?:,\s*"([^"]+)"(?:,\s*"([^"]+)")?)?\)//; > print "$file:$.:WARNING: $&\n" while s/WI\.UIString\(.*?\)//; > > # Handle strings for other projects that also use this script.
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=370538">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198203
: 370538