<!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>[192351] trunk/Source/WebInspectorUI</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/192351">192351</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-11 22:33:53 -0800 (Wed, 11 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add Debug toolbar button to toggle InspectorBackend.dumpInspectorProtocolMessages
https://bugs.webkit.org/show_bug.cgi?id=151175
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-11-11
Reviewed by Brian Burg.
Add debug UI and a way to toggle it on and off in non-production builds.
To enable the debug UI use a keyboard shortcut in Inspector:
Option+Shift+Command+D (Mac) or Option+Shift+Ctrl+D (Windows / Linux)
The debug UI setting is a persistent setting, so those of use developing
Web Inspector will turn it on and leave it on.
Currently the only debug UI is a new toolbar button to toggle
the frontend logging on or off.
* Scripts/combine-resources.pl:
(concatenateFiles):
Exclude "Debug" files when combining resources for minification.
* UserInterface/Main.html:
Rename "Base/Bootstrap.js" to "Debug/Bootstrap" so that we can easily exclude it.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
Only evaluate bootstrap functions if they exist.
* UserInterface/Debug/Bootstrap.js: Renamed from Source/WebInspectorUI/UserInterface/Base/Bootstrap.js.
(WebInspector.runBootstrapOperations):
Add a debug setting, toolbar button, and keyboard shortcut.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIScriptscombineresourcespl">trunk/Source/WebInspectorUI/Scripts/combine-resources.pl</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebInspectorUI/UserInterface/Debug/</li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebugBootstrapjs">trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseBootstrapjs">trunk/Source/WebInspectorUI/UserInterface/Base/Bootstrap.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (192350 => 192351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-11-12 06:09:40 UTC (rev 192350)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-11-12 06:33:53 UTC (rev 192351)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-11-11 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Debug toolbar button to toggle InspectorBackend.dumpInspectorProtocolMessages
+ https://bugs.webkit.org/show_bug.cgi?id=151175
+
+ Reviewed by Brian Burg.
+
+ Add debug UI and a way to toggle it on and off in non-production builds.
+ To enable the debug UI use a keyboard shortcut in Inspector:
+ Option+Shift+Command+D (Mac) or Option+Shift+Ctrl+D (Windows / Linux)
+
+ The debug UI setting is a persistent setting, so those of use developing
+ Web Inspector will turn it on and leave it on.
+
+ Currently the only debug UI is a new toolbar button to toggle
+ the frontend logging on or off.
+
+ * Scripts/combine-resources.pl:
+ (concatenateFiles):
+ Exclude "Debug" files when combining resources for minification.
+
+ * UserInterface/Main.html:
+ Rename "Base/Bootstrap.js" to "Debug/Bootstrap" so that we can easily exclude it.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ Only evaluate bootstrap functions if they exist.
+
+ * UserInterface/Debug/Bootstrap.js: Renamed from Source/WebInspectorUI/UserInterface/Base/Bootstrap.js.
+ (WebInspector.runBootstrapOperations):
+ Add a debug setting, toolbar button, and keyboard shortcut.
+
</ins><span class="cx"> 2015-11-11 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: blank debugger tab when opening inspector on unvisited website
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIScriptscombineresourcespl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Scripts/combine-resources.pl (192350 => 192351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Scripts/combine-resources.pl 2015-11-12 06:09:40 UTC (rev 192350)
+++ trunk/Source/WebInspectorUI/Scripts/combine-resources.pl 2015-11-12 06:33:53 UTC (rev 192351)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> while ($headContents =~ m/$tagExpression/gi) {
</span><span class="cx"> local $/;
</span><ins>+ next if $1 =~ /^Debug\//;
</ins><span class="cx"> open IN, "$htmlDirectory/$1" or open IN, "$derivedSourcesDirectory/$1" or die "Can't open $htmlDirectory/$1: $!";
</span><span class="cx"> print OUT "\n" if $fileCount++;
</span><span class="cx"> print OUT "/* $1 */\n\n";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseBootstrapjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Base/Bootstrap.js (192350 => 192351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Bootstrap.js 2015-11-12 06:09:40 UTC (rev 192350)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Bootstrap.js 2015-11-12 06:33:53 UTC (rev 192351)
</span><span class="lines">@@ -1,32 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 University of Washington.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.runBootstrapOperations = function() {
- // This function is invoked after the inspector has loaded.
- // Modify it during development to hard-wire setup operations,
- // rather than manually clicking through the user interface.
-
- // If a model object or UI component is not easy to script, then file a bug!
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (192350 => 192351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-11-12 06:09:40 UTC (rev 192350)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-11-12 06:33:53 UTC (rev 192351)
</span><span class="lines">@@ -403,7 +403,8 @@
</span><span class="cx">
</span><span class="cx"> this._contentLoaded = true;
</span><span class="cx">
</span><del>- this.runBootstrapOperations();
</del><ins>+ if (this.runBootstrapOperations)
+ this.runBootstrapOperations();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.isTabTypeAllowed = function(tabType)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebugBootstrapjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js (0 => 192351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js 2015-11-12 06:33:53 UTC (rev 192351)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2015 University of Washington.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// This function is invoked after the inspector has loaded.
+WebInspector.runBootstrapOperations = function() {
+ WebInspector.showDebugUISetting = new WebInspector.Setting("show-debug-ui", false);
+ new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Option | WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "D", () => {
+ WebInspector.showDebugUISetting.value = !WebInspector.showDebugUISetting.value;
+ });
+
+ let toolTip = "Enable dump inspector messages to console";
+ let activatedToolTip = "Disable dump inspector messages to console";
+ let debugInspectorToolbarButton = new WebInspector.ActivateButtonToolbarItem("debug-inspector", toolTip, activatedToolTip, null, "Images/Console.svg");
+ debugInspectorToolbarButton.activated = InspectorBackend.dumpInspectorProtocolMessages;
+ WebInspector.toolbar.addToolbarItem(debugInspectorToolbarButton, WebInspector.Toolbar.Section.CenterRight);
+ debugInspectorToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, () => {
+ InspectorBackend.dumpInspectorProtocolMessages = !InspectorBackend.dumpInspectorProtocolMessages;
+ debugInspectorToolbarButton.activated = InspectorBackend.dumpInspectorProtocolMessages;
+ });
+
+ function updateDebugUI()
+ {
+ debugInspectorToolbarButton.hidden = !WebInspector.showDebugUISetting.value;
+ }
+
+ WebInspector.showDebugUISetting.addEventListener(WebInspector.Setting.Event.Changed, updateDebugUI);
+ updateDebugUI();
+}
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (192350 => 192351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-11-12 06:09:40 UTC (rev 192350)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2015-11-12 06:33:53 UTC (rev 192351)
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx">
</span><span class="cx"> <script src="Base/Main.js"></script>
</span><span class="cx">
</span><del>- <script src="Base/Bootstrap.js"></script>
</del><ins>+ <script src="Debug/Bootstrap.js"></script>
</ins><span class="cx">
</span><span class="cx"> <script>
</span><span class="cx"> WebInspector.loaded();
</span></span></pre>
</div>
</div>
</body>
</html>