<!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>[186466] 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/186466">186466</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-07 10:25:48 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Option+Click not jumping to resource
https://bugs.webkit.org/show_bug.cgi?id=146498
Reviewed by Timothy Hatcher.
* UserInterface/Base/Main.js: Always show the tab which contains the represented object.
(WebInspector._domNodeWasInspected):
(WebInspector._frameWasAdded):
(WebInspector.showConsoleTab):
(WebInspector.showRepresentedObject): Removed forceShowTab parameter.
(WebInspector.showMainFrameDOMTree):
(WebInspector.showContentFlowDOMTree):
(WebInspector.showSourceCodeForFrame):
(WebInspector.showSourceCode):
(WebInspector.showSourceCodeLocation):
(WebInspector.showOriginalUnformattedSourceCodeLocation):
(WebInspector.showOriginalOrFormattedSourceCodeLocation):
(WebInspector.showOriginalOrFormattedSourceCodeTextRange):
(WebInspector.showResourceRequest):
* UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
(WebInspector.CodeMirrorTokenTrackingController.prototype._mouseButtonWasReleasedOverEditor):
* UserInterface/Protocol/InspectorFrontendAPI.js:
(InspectorFrontendAPI.showMainResourceForFrame):
* UserInterface/Views/ComputedStyleDetailsPanel.js:
(WebInspector.ComputedStyleDetailsPanel.prototype._goToContentFlowArrowWasClicked):
(WebInspector.ComputedStyleDetailsPanel):
* UserInterface/Views/ObjectTreeBaseTreeElement.js:
(WebInspector.ObjectTreeBaseTreeElement.prototype._appendMenusItemsForObject):
(WebInspector.ObjectTreeBaseTreeElement):</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="#trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorTokenTrackingControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsComputedStyleDetailsPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeBaseTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186465 => 186466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-07 17:22:28 UTC (rev 186465)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-07 17:25:48 UTC (rev 186466)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-07-07 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Option+Click not jumping to resource
+ https://bugs.webkit.org/show_bug.cgi?id=146498
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js: Always show the tab which contains the represented object.
+ (WebInspector._domNodeWasInspected):
+ (WebInspector._frameWasAdded):
+ (WebInspector.showConsoleTab):
+ (WebInspector.showRepresentedObject): Removed forceShowTab parameter.
+ (WebInspector.showMainFrameDOMTree):
+ (WebInspector.showContentFlowDOMTree):
+ (WebInspector.showSourceCodeForFrame):
+ (WebInspector.showSourceCode):
+ (WebInspector.showSourceCodeLocation):
+ (WebInspector.showOriginalUnformattedSourceCodeLocation):
+ (WebInspector.showOriginalOrFormattedSourceCodeLocation):
+ (WebInspector.showOriginalOrFormattedSourceCodeTextRange):
+ (WebInspector.showResourceRequest):
+ * UserInterface/Controllers/CodeMirrorTokenTrackingController.js:
+ (WebInspector.CodeMirrorTokenTrackingController.prototype._mouseButtonWasReleasedOverEditor):
+ * UserInterface/Protocol/InspectorFrontendAPI.js:
+ (InspectorFrontendAPI.showMainResourceForFrame):
+ * UserInterface/Views/ComputedStyleDetailsPanel.js:
+ (WebInspector.ComputedStyleDetailsPanel.prototype._goToContentFlowArrowWasClicked):
+ (WebInspector.ComputedStyleDetailsPanel):
+ * UserInterface/Views/ObjectTreeBaseTreeElement.js:
+ (WebInspector.ObjectTreeBaseTreeElement.prototype._appendMenusItemsForObject):
+ (WebInspector.ObjectTreeBaseTreeElement):
+
+2015-07-07 Devin Rousso <drousso@apple.com>
+
</ins><span class="cx"> Web Inspector: Regression: CSS autocompletion suggestion applies on pressing delete
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146672
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (186465 => 186466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-07-07 17:22:28 UTC (rev 186465)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-07-07 17:25:48 UTC (rev 186466)
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx"> if (requestedScope || !this.consoleContentView.scopeBar.selectedItems.length)
</span><span class="cx"> this.consoleContentView.scopeBar.item(scope).selected = true;
</span><span class="cx">
</span><del>- this.showRepresentedObject(this._consoleRepresentedObject, null, true);
</del><ins>+ this.showRepresentedObject(this._consoleRepresentedObject);
</ins><span class="cx">
</span><span class="cx"> console.assert(this.isShowingConsoleTab());
</span><span class="cx"> };
</span><span class="lines">@@ -923,33 +923,31 @@
</span><span class="cx"> return tabContentView;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showRepresentedObject = function(representedObject, cookie, forceShowTab)
</del><ins>+WebInspector.showRepresentedObject = function(representedObject, cookie)
</ins><span class="cx"> {
</span><span class="cx"> var tabContentView = this.tabContentViewForRepresentedObject(representedObject);
</span><span class="cx"> console.assert(tabContentView);
</span><span class="cx"> if (!tabContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (window.event || forceShowTab)
- this.tabBrowser.showTabForContentView(tabContentView);
-
</del><ins>+ this.tabBrowser.showTabForContentView(tabContentView);
</ins><span class="cx"> tabContentView.showRepresentedObject(representedObject, cookie);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showMainFrameDOMTree = function(nodeToSelect, forceShowTab)
</del><ins>+WebInspector.showMainFrameDOMTree = function(nodeToSelect)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(WebInspector.frameResourceManager.mainFrame);
</span><span class="cx"> if (!WebInspector.frameResourceManager.mainFrame)
</span><span class="cx"> return;
</span><del>- this.showRepresentedObject(WebInspector.frameResourceManager.mainFrame.domTree, {nodeToSelect}, forceShowTab);
</del><ins>+ this.showRepresentedObject(WebInspector.frameResourceManager.mainFrame.domTree, {nodeToSelect});
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showContentFlowDOMTree = function(contentFlow, nodeToSelect, forceShowTab)
</del><ins>+WebInspector.showContentFlowDOMTree = function(contentFlow, nodeToSelect)
</ins><span class="cx"> {
</span><del>- this.showRepresentedObject(contentFlow, {nodeToSelect}, forceShowTab);
</del><ins>+ this.showRepresentedObject(contentFlow, {nodeToSelect});
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showSourceCodeForFrame = function(frameIdentifier, forceShowTab)
</del><ins>+WebInspector.showSourceCodeForFrame = function(frameIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> var frame = WebInspector.frameResourceManager.frameForIdentifier(frameIdentifier);
</span><span class="cx"> if (!frame) {
</span><span class="lines">@@ -959,10 +957,10 @@
</span><span class="cx">
</span><span class="cx"> this._frameIdentifierToShowSourceCodeWhenAvailable = undefined;
</span><span class="cx">
</span><del>- this.showRepresentedObject(frame, null, forceShowTab);
</del><ins>+ this.showRepresentedObject(frame);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showSourceCode = function(sourceCode, positionToReveal, textRangeToSelect, forceUnformatted, forceShowTab)
</del><ins>+WebInspector.showSourceCode = function(sourceCode, positionToReveal, textRangeToSelect, forceUnformatted)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!positionToReveal || positionToReveal instanceof WebInspector.SourceCodePosition, positionToReveal);
</span><span class="cx"> var representedObject = sourceCode;
</span><span class="lines">@@ -973,33 +971,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var cookie = positionToReveal ? {lineNumber: positionToReveal.lineNumber, columnNumber: positionToReveal.columnNumber} : {};
</span><del>- this.showRepresentedObject(representedObject, cookie, forceShowTab);
</del><ins>+ this.showRepresentedObject(representedObject, cookie);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showSourceCodeLocation = function(sourceCodeLocation, forceShowTab)
</del><ins>+WebInspector.showSourceCodeLocation = function(sourceCodeLocation)
</ins><span class="cx"> {
</span><del>- this.showSourceCode(sourceCodeLocation.displaySourceCode, sourceCodeLocation.displayPosition(), null, false, forceShowTab);
</del><ins>+ this.showSourceCode(sourceCodeLocation.displaySourceCode, sourceCodeLocation.displayPosition());
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showOriginalUnformattedSourceCodeLocation = function(sourceCodeLocation, forceShowTab)
</del><ins>+WebInspector.showOriginalUnformattedSourceCodeLocation = function(sourceCodeLocation)
</ins><span class="cx"> {
</span><span class="cx"> this.showSourceCode(sourceCodeLocation.sourceCode, sourceCodeLocation.position(), null, true);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showOriginalOrFormattedSourceCodeLocation = function(sourceCodeLocation, forceShowTab)
</del><ins>+WebInspector.showOriginalOrFormattedSourceCodeLocation = function(sourceCodeLocation)
</ins><span class="cx"> {
</span><del>- this.showSourceCode(sourceCodeLocation.sourceCode, sourceCodeLocation.formattedPosition(), null, false, forceShowTab);
</del><ins>+ this.showSourceCode(sourceCodeLocation.sourceCode, sourceCodeLocation.formattedPosition());
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showOriginalOrFormattedSourceCodeTextRange = function(sourceCodeTextRange, forceShowTab)
</del><ins>+WebInspector.showOriginalOrFormattedSourceCodeTextRange = function(sourceCodeTextRange)
</ins><span class="cx"> {
</span><span class="cx"> var textRangeToSelect = sourceCodeTextRange.formattedTextRange;
</span><del>- this.showSourceCode(sourceCodeTextRange.sourceCode, textRangeToSelect.startPosition(), textRangeToSelect, false, forceShowTab);
</del><ins>+ this.showSourceCode(sourceCodeTextRange.sourceCode, textRangeToSelect.startPosition(), textRangeToSelect);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showResourceRequest = function(resource, forceShowTab)
</del><ins>+WebInspector.showResourceRequest = function(resource)
</ins><span class="cx"> {
</span><del>- this.showRepresentedObject(resource, {[WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey]: WebInspector.ResourceClusterContentView.RequestIdentifier}, forceShowTab);
</del><ins>+ this.showRepresentedObject(resource, {[WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey]: WebInspector.ResourceClusterContentView.RequestIdentifier});
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.debuggerToggleBreakpoints = function(event)
</span><span class="lines">@@ -1135,7 +1133,7 @@
</span><span class="cx">
</span><span class="cx"> function delayedWork()
</span><span class="cx"> {
</span><del>- this.showSourceCodeForFrame(frame.id, true);
</del><ins>+ this.showSourceCodeForFrame(frame.id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Delay showing the frame since FrameWasAdded is called before MainFrameChanged.
</span><span class="lines">@@ -1532,7 +1530,7 @@
</span><span class="cx"> InspectorFrontendHost.bringToFront();
</span><span class="cx">
</span><span class="cx"> this.showElementsTab();
</span><del>- this.showMainFrameDOMTree(event.data.node, true);
</del><ins>+ this.showMainFrameDOMTree(event.data.node);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._inspectModeStateChanged = function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersCodeMirrorTokenTrackingControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js (186465 => 186466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2015-07-07 17:22:28 UTC (rev 186465)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js 2015-07-07 17:25:48 UTC (rev 186466)
</span><span class="lines">@@ -351,10 +351,9 @@
</span><span class="cx"> var marks = this._codeMirror.findMarksAt(position);
</span><span class="cx"> for (var i = 0; i < marks.length; ++i) {
</span><span class="cx"> if (marks[i] === this._codeMirrorMarkedText) {
</span><del>- if (this._delegate && typeof this._delegate.tokenTrackingControllerHighlightedRangeWasClicked === "function") {
- // Trigger the clicked delegate asynchronously, letting the editor complete handling of the click.
- setTimeout(function() { this._delegate.tokenTrackingControllerHighlightedRangeWasClicked(this); }.bind(this), 0);
- }
</del><ins>+ if (this._delegate && typeof this._delegate.tokenTrackingControllerHighlightedRangeWasClicked === "function")
+ this._delegate.tokenTrackingControllerHighlightedRangeWasClicked(this);
+
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (186465 => 186466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-07-07 17:22:28 UTC (rev 186465)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2015-07-07 17:25:48 UTC (rev 186466)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> showMainResourceForFrame: function(frameIdentifier)
</span><span class="cx"> {
</span><del>- WebInspector.showSourceCodeForFrame(frameIdentifier, true);
</del><ins>+ WebInspector.showSourceCodeForFrame(frameIdentifier);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> contextMenuItemSelected: function(id)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsComputedStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js (186465 => 186466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js 2015-07-07 17:22:28 UTC (rev 186465)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js 2015-07-07 17:25:48 UTC (rev 186466)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">
</span><span class="cx"> _goToContentFlowArrowWasClicked()
</span><span class="cx"> {
</span><del>- WebInspector.showContentFlowDOMTree(this._contentFlow, this.nodeStyles.node, true);
</del><ins>+ WebInspector.showContentFlowDOMTree(this._contentFlow, this.nodeStyles.node);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectTreeBaseTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js (186465 => 186466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2015-07-07 17:22:28 UTC (rev 186465)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2015-07-07 17:25:48 UTC (rev 186466)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var sourceCodeLocation = sourceCode.createSourceCodeLocation(location.lineNumber, location.columnNumber || 0);
</span><del>- WebInspector.showSourceCodeLocation(sourceCodeLocation, true);
</del><ins>+ WebInspector.showSourceCodeLocation(sourceCodeLocation);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>