<!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>[213617] 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/213617">213617</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-08 18:13:31 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: add a "create breakpoint" context menu item for linkified source locations
https://bugs.webkit.org/show_bug.cgi?id=47442
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2017-03-08
Reviewed by Brian Burg.
* UserInterface/Base/Main.js:
(WebInspector.isShowingResourcesTab): Added.
(WebInspector.linkifyElement):
Now calls WebInspector.appendContextMenuItemsForSourceCode on "contextmenu" events for the
created element.
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype.breakpointForSourceCodeLocation):
Returns the first breakpoint (since there should only be one) that matches the given location.
* UserInterface/Views/ContextMenuUtilities.js:
(WebInspector.appendContextMenuItemsForSourceCode):
Rework parameters to also accept a WebInspector.SourceCodeLocation, thereby allowing the
setting of breakpoints so long as the associated WebInspector.SourceCode is a script.
* UserInterface/Views/Main.css:
(.resource-link, .go-to-link):
Prevent link from being selected.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContextMenuUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsMaincss">trunk/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (213616 => 213617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-09 02:06:24 UTC (rev 213616)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-09 02:13:31 UTC (rev 213617)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2017-03-08 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: add a "create breakpoint" context menu item for linkified source locations
+ https://bugs.webkit.org/show_bug.cgi?id=47442
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.isShowingResourcesTab): Added.
+ (WebInspector.linkifyElement):
+ Now calls WebInspector.appendContextMenuItemsForSourceCode on "contextmenu" events for the
+ created element.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype.breakpointForSourceCodeLocation):
+ Returns the first breakpoint (since there should only be one) that matches the given location.
+
+ * UserInterface/Views/ContextMenuUtilities.js:
+ (WebInspector.appendContextMenuItemsForSourceCode):
+ Rework parameters to also accept a WebInspector.SourceCodeLocation, thereby allowing the
+ setting of breakpoints so long as the associated WebInspector.SourceCode is a script.
+
+ * UserInterface/Views/Main.css:
+ (.resource-link, .go-to-link):
+ Prevent link from being selected.
+
+2017-03-08 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: RTL: Switching back to System Direction doesn't change the dock side
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169323
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (213616 => 213617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-03-09 02:06:24 UTC (rev 213616)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-03-09 02:13:31 UTC (rev 213617)
</span><span class="lines">@@ -1027,6 +1027,11 @@
</span><span class="cx"> this.tabBrowser.showTabForContentView(tabContentView);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.isShowingResourcesTab = function()
+{
+ return this.tabBrowser.selectedTabContentView instanceof WebInspector.ResourcesTabContentView;
+};
+
</ins><span class="cx"> WebInspector.showStorageTab = function()
</span><span class="cx"> {
</span><span class="cx"> var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.StorageTabContentView);
</span><span class="lines">@@ -2353,6 +2358,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> linkElement.addEventListener("click", showSourceCodeLocation.bind(this));
</span><ins>+ linkElement.addEventListener("contextmenu", (event) => {
+ let contextMenu = WebInspector.ContextMenu.createFromEvent(event);
+ WebInspector.appendContextMenuItemsForSourceCode(contextMenu, sourceCodeLocation);
+ });
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.sourceCodeForURL = function(url)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (213616 => 213617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2017-03-09 02:06:24 UTC (rev 213616)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2017-03-09 02:13:31 UTC (rev 213617)
</span><span class="lines">@@ -204,6 +204,18 @@
</span><span class="cx"> return [];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ breakpointForSourceCodeLocation(sourceCodeLocation)
+ {
+ console.assert(sourceCodeLocation instanceof WebInspector.SourceCodeLocation);
+
+ for (let breakpoint of this.breakpointsForSourceCode(sourceCodeLocation.sourceCode)) {
+ if (breakpoint.sourceCodeLocation.isEqual(sourceCodeLocation))
+ return breakpoint;
+ }
+
+ return null;
+ }
+
</ins><span class="cx"> isBreakpointRemovable(breakpoint)
</span><span class="cx"> {
</span><span class="cx"> return breakpoint !== this._allExceptionsBreakpoint
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContextMenuUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js (213616 => 213617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js 2017-03-09 02:06:24 UTC (rev 213616)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js 2017-03-09 02:13:31 UTC (rev 213617)
</span><span class="lines">@@ -23,12 +23,19 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.appendContextMenuItemsForSourceCode = function(contextMenu, sourceCode)
</del><ins>+WebInspector.appendContextMenuItemsForSourceCode = function(contextMenu, sourceCodeOrLocation)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(contextMenu instanceof WebInspector.ContextMenu);
</span><span class="cx"> if (!(contextMenu instanceof WebInspector.ContextMenu))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ let sourceCode = sourceCodeOrLocation;
+ let location = null;
+ if (sourceCodeOrLocation instanceof WebInspector.SourceCodeLocation) {
+ sourceCode = sourceCodeOrLocation.sourceCode;
+ location = sourceCodeOrLocation;
+ }
+
</ins><span class="cx"> console.assert(sourceCode instanceof WebInspector.SourceCode);
</span><span class="cx"> if (!(sourceCode instanceof WebInspector.SourceCode))
</span><span class="cx"> return;
</span><span class="lines">@@ -41,6 +48,16 @@
</span><span class="cx"> WebInspector.openURL(sourceCode.url, frame, {alwaysOpenExternally: true});
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ if (WebInspector.frameResourceManager.resourceForURL(sourceCode.url) && !WebInspector.isShowingResourcesTab()) {
+ contextMenu.appendItem(WebInspector.UIString("Reveal in Resources Tab"), () => {
+ const options = {ignoreNetworkTab: true};
+ if (location)
+ WebInspector.showSourceCodeLocation(location, options);
+ else
+ WebInspector.showSourceCode(sourceCode, options);
+ });
+ }
+
</ins><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Copy Link Address"), () => {
</span><span class="cx"> InspectorFrontendHost.copyText(sourceCode.url);
</span><span class="cx"> });
</span><span class="lines">@@ -62,4 +79,21 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+
+ contextMenu.appendSeparator();
+
+ if (location && (sourceCode instanceof WebInspector.Script || (sourceCode instanceof WebInspector.Resource && sourceCode.type === WebInspector.Resource.Type.Script))) {
+ let existingBreakpoint = WebInspector.debuggerManager.breakpointForSourceCodeLocation(location);
+ if (existingBreakpoint) {
+ contextMenu.appendItem(WebInspector.UIString("Delete Breakpoint"), () => {
+ WebInspector.debuggerManager.removeBreakpoint(existingBreakpoint);
+ });
+ } else {
+ contextMenu.appendItem(WebInspector.UIString("Add Breakpoint"), () => {
+ WebInspector.debuggerManager.addBreakpoint(new WebInspector.Breakpoint(location));
+ });
+ }
+
+ contextMenu.appendSeparator();
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (213616 => 213617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2017-03-09 02:06:24 UTC (rev 213616)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2017-03-09 02:13:31 UTC (rev 213617)
</span><span class="lines">@@ -265,6 +265,7 @@
</span><span class="cx"> color: hsl(0, 0%, 33%);
</span><span class="cx"> text-decoration: underline;
</span><span class="cx"> cursor: pointer;
</span><ins>+ -webkit-user-select: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .go-to-link:not(.dont-float) {
</span></span></pre>
</div>
</div>
</body>
</html>