Title: [172779] branches/safari-600.1-branch/Source/WebInspectorUI
- Revision
- 172779
- Author
- [email protected]
- Date
- 2014-08-19 16:29:15 -0700 (Tue, 19 Aug 2014)
Log Message
Merge r172662. <rdar://problem/17971908>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog (172778 => 172779)
--- branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:26:50 UTC (rev 172778)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/ChangeLog 2014-08-19 23:29:15 UTC (rev 172779)
@@ -1,5 +1,26 @@
2014-08-19 Dana Burkart <[email protected]>
+ Merge r172662. <rdar://problem/17971908>
+
+ 2014-08-15 Jono Wells <[email protected]>
+
+ Web Inspector: Inspect Element doesn't always highlight the correct element when inspector is closed before inspecting
+ https://bugs.webkit.org/show_bug.cgi?id=135995
+
+ Reviewed by Joseph Pecoraro.
+
+ Change so if an element is inspected via the Inspect Element context menu, selected
+ node restoration is disallowed until the main resource in the main frame changes.
+ This way an attempt by a sub-frame will not change the highlighted element in the
+ Main Frame's DOM tree unexpectedly.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager):
+ (WebInspector.DOMTreeManager.prototype._mainResourceDidChange):
+ (WebInspector.DOMTreeManager.prototype.inspectElement):
+
+2014-08-19 Dana Burkart <[email protected]>
+
Merge r172650. <rdar://problem/18034356>
2014-08-15 Timothy Hatcher <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (172778 => 172779)
--- branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2014-08-19 23:26:50 UTC (rev 172778)
+++ branches/safari-600.1-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2014-08-19 23:29:15 UTC (rev 172779)
@@ -37,6 +37,8 @@
this._flows = new Map;
this._contentNodesToFlowsMap = new Map;
this._restoreSelectedNodeIsAllowed = true;
+
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
};
WebInspector.Object.addConstructorFunctions(WebInspector.DOMTreeManager);
@@ -271,8 +273,6 @@
inspectElement: function(nodeId)
{
- this._restoreSelectedNodeIsAllowed = true;
-
var node = this._idToDOMNode[nodeId];
if (node)
this.dispatchEventToListeners(WebInspector.DOMTreeManager.Event.DOMNodeWasInspected, {node: node});
@@ -711,6 +711,14 @@
return result;
}
+ },
+
+ // Private
+
+ _mainResourceDidChange: function(event)
+ {
+ if (event.target.isMainFrame())
+ this._restoreSelectedNodeIsAllowed = true;
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
