Attachment 362071 Details for Bug 167035 – Patch

[patch] Patch

bug-167035-20190214153455.patch (text/plain), 9.66 KB, created by Devin Rousso on 2019-02-14 15:34:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-02-14 15:34:56 PST

Size: 9.66 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 0f674693d8e97a346bc7be1fce2a5748bc879b77..5685830784672ee726e2f81bf91ce34f3d4c170e 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,28 @@
>+2019-02-14  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: no way to filter out all console messages or all evaluations/results
>+        https://bugs.webkit.org/show_bug.cgi?id=167035
>+        <rdar://problem/30023523>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/LogContentView.js:
>+        (WI.LogContentView):
>+        (WI.LogContentView.prototype.didAppendConsoleMessageView):
>+        (WI.LogContentView.prototype._markScopeBarItemUnread):
>+        (WI.LogContentView.prototype._markScopeBarItemForMessageLevelUnread): Added.
>+        (WI.LogContentView.prototype._previousMessageRepeatCountUpdated):
>+        (WI.LogContentView.prototype._messageSourceBarSelectionDidChange):
>+        (WI.LogContentView.prototype._scopeBarSelectionDidChange):
>+        (WI.LogContentView.prototype._filterMessageElements):
>+        (WI.LogContentView.prototype.performSearch):
>+        * UserInterface/Views/LogContentView.css:
>+        (.log-scope-bar > li.unread.console::before): Added.
>+
>+        * UserInterface/Views/ConsoleCommandView.js:
>+        (WI.ConsoleCommandView):
>+        Drive-by: remove unnecessary super-class extends.
>+
> 2019-02-13  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Styles: valid values in style attributes are reported as unsupported property values
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js b/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js
>index 434c6aaee9cf306ef6ff9d1fa4498962a7b60364..32f3b87216bf7a093117233a2a5b06910038dd7a 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js
>@@ -27,12 +27,10 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-WI.ConsoleCommandView = class ConsoleCommandView extends WI.Object
>+WI.ConsoleCommandView = class ConsoleCommandView
> {
>     constructor(commandText, className)
>     {
>-        super();
>-
>         this._commandText = commandText;
>         this._className = className || "";
>     }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/LogContentView.css b/Source/WebInspectorUI/UserInterface/Views/LogContentView.css
>index ad96a3d5f744b3c79b65206df242d6716a675165..6c104ee6ea6f01b1a2f7eebc7ed526b797982767 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/LogContentView.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/LogContentView.css
>@@ -54,6 +54,10 @@ body[dir=rtl] .log-scope-bar > li.unread::before {
>     visibility: hidden;
> }
> 
>+.log-scope-bar > li.unread.console::before {
>+    background-color: darkgrey;
>+}
>+
> .log-scope-bar > li.unread.errors::before {
>     background-color: hsl(0, 95%, 72%);
> }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>index 1caca5c4d30bf9d153310511e3f56499503ace0a..a8fcc384e60b9d19643dd0ec018cb1c1c1496b64 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
>@@ -75,6 +75,7 @@ WI.LogContentView = class LogContentView extends WI.ContentView
> 
>         let scopeBarItems = [
>             new WI.ScopeBarItem(WI.LogContentView.Scopes.All, WI.UIString("All"), {exclusive: true}),
>+            new WI.ScopeBarItem(WI.LogContentView.Scopes.Console, WI.UIString("Console"), {className: "console"}),
>             new WI.ScopeBarItem(WI.LogContentView.Scopes.Errors, WI.UIString("Errors"), {className: "errors"}),
>             new WI.ScopeBarItem(WI.LogContentView.Scopes.Warnings, WI.UIString("Warnings"), {className: "warnings"}),
>             new WI.ScopeBarItem(WI.LogContentView.Scopes.Logs, WI.UIString("Logs"), {className: "logs"}),
>@@ -210,14 +211,13 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>         let target = messageView.message ? messageView.message.target : WI.runtimeManager.activeExecutionContext.target;
>         target.connection.runAfterPendingDispatches(this._clearFocusableChildren.bind(this));
> 
>-        if (type && type !== WI.ConsoleMessage.MessageType.EndGroup) {
>-            console.assert(messageView.message instanceof WI.ConsoleMessage);
>-            if (!(messageView.message instanceof WI.ConsoleCommandResultMessage))
>-                this._markScopeBarItemUnread(messageView.message.level);
>+        if (messageView instanceof WI.ConsoleCommandView || messageView.message instanceof WI.ConsoleCommandResultMessage)
>+            this._markScopeBarItemUnread(WI.LogContentView.Scopes.Console);
>+        else
>+            this._markScopeBarItemForMessageLevelUnread(messageView.message.level);
> 
>-            console.assert(messageView.element instanceof Element);
>-            this._filterMessageElements([messageView.element]);
>-        }
>+        console.assert(messageView.element instanceof Element);
>+        this._filterMessageElements([messageView.element]);
>     }
> 
>     get supportsSearch() { return true; }
>@@ -405,17 +405,22 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>         return undefined;
>     }
> 
>-    _markScopeBarItemUnread(level)
>+    _markScopeBarItemUnread(scope)
>     {
>-        let messageLevel = this._scopeFromMessageLevel(level);
>-        if (!messageLevel)
>-            return;
>-
>-        let item = this._scopeBar.item(messageLevel);
>+        let item = this._scopeBar.item(scope);
>         if (item && !item.selected && !this._scopeBar.item(WI.LogContentView.Scopes.All).selected)
>             item.element.classList.add("unread");
>     }
> 
>+    _markScopeBarItemForMessageLevelUnread(level)
>+    {
>+        let scope = this._scopeFromMessageLevel(level);
>+        if (!scope)
>+            return;
>+
>+        this._markScopeBarItemUnread(scope);
>+    }
>+
>     _messageAdded(event)
>     {
>         let message = event.data.message;
>@@ -435,7 +440,7 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>     _previousMessageRepeatCountUpdated(event)
>     {
>         if (this._logViewController.updatePreviousMessageRepeatCount(event.data.count) && this._lastMessageView)
>-            this._markScopeBarItemUnread(this._lastMessageView.message.level);
>+            this._markScopeBarItemForMessageLevelUnread(this._lastMessageView.message.level);
>     }
> 
>     _handleContextMenuEvent(event)
>@@ -801,25 +806,24 @@ WI.LogContentView = class LogContentView extends WI.ContentView
> 
>     _messageSourceBarSelectionDidChange(event)
>     {
>-        let selectedItem = this._messageSourceBar.selectedItems[0];
>-        if (selectedItem.id === WI.LogContentView.Scopes.AllChannels) {
>-            for (let item of this._messageSourceBar.items)
>-                item.element.classList.remove("unread");
>-        } else
>-            selectedItem.element.classList.remove("unread");
>+        let items = this._messageSourceBar.selectedItems;
>+        if (items.some((item) => item.id === WI.LogContentView.Scopes.AllChannels))
>+            items = this._messageSourceBar.items;
>+
>+        for (let item of items)
>+            item.element.classList.remove("unread");
> 
>         this._filterMessageElements(this._allMessageElements());
>     }
> 
>     _scopeBarSelectionDidChange(event)
>     {
>-        let selectedItem = this._scopeBar.selectedItems[0];
>+        let items = this._scopeBar.selectedItems;
>+        if (items.some((item) => item.id === WI.LogContentView.Scopes.All))
>+            items = this._scopeBar.items;
> 
>-        if (selectedItem.id === WI.LogContentView.Scopes.All) {
>-            for (let item of this._scopeBar.items)
>-                item.element.classList.remove("unread");
>-        } else
>-            selectedItem.element.classList.remove("unread");
>+        for (let item of items)
>+            item.element.classList.remove("unread");
> 
>         this._filterMessageElements(this._allMessageElements());
>     }
>@@ -827,8 +831,10 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>     _filterMessageElements(messageElements)
>     {
>         messageElements.forEach(function(messageElement) {
>-            let visible = messageElement.__commandView instanceof WI.ConsoleCommandView || messageElement.__message instanceof WI.ConsoleCommandResultMessage;
>-            if (!visible)
>+            let visible = false;
>+            if (messageElement.__commandView instanceof WI.ConsoleCommandView || messageElement.__message instanceof WI.ConsoleCommandResultMessage)
>+                visible = this._scopeBar.selectedItems.some((item) => item.id === WI.LogContentView.Scopes.Console || item.id === WI.LogContentView.Scopes.All);
>+            else
>                 visible = this._messageShouldBeVisible(messageElement.__message);
> 
>             let classList = messageElement.classList;
>@@ -1060,7 +1066,7 @@ WI.LogContentView = class LogContentView extends WI.ContentView
>                 this._highlightRanges(message, matchRanges);
> 
>             let classList = message.classList;
>-            if (!isEmptyObject(matchRanges) || message.__commandView instanceof WI.ConsoleCommandView || message.__message instanceof WI.ConsoleCommandResultMessage)
>+            if (!isEmptyObject(matchRanges))
>                 classList.remove(WI.LogContentView.FilteredOutBySearchStyleClassName);
>             else
>                 classList.add(WI.LogContentView.FilteredOutBySearchStyleClassName);
>@@ -1153,6 +1159,7 @@ WI.LogContentView = class LogContentView extends WI.ContentView
> 
> WI.LogContentView.Scopes = {
>     All: "log-all",
>+    Console: "log-console",
>     Errors: "log-errors",
>     Warnings: "log-warnings",
>     Logs: "log-logs",

Actions: View | Formatted Diff | Diff

Attachments on bug 167035: 362071 | 362876 | 365375 | 365412 | 365429 | 365431