Title: [152127] branches/safari-537-branch/Source/WebInspectorUI
- Revision
- 152127
- Author
- lforsch...@apple.com
- Date
- 2013-06-27 15:17:58 -0700 (Thu, 27 Jun 2013)
Log Message
Merged r151991. <rdar://problem/14260788>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebInspectorUI/ChangeLog (152126 => 152127)
--- branches/safari-537-branch/Source/WebInspectorUI/ChangeLog 2013-06-27 22:17:12 UTC (rev 152126)
+++ branches/safari-537-branch/Source/WebInspectorUI/ChangeLog 2013-06-27 22:17:58 UTC (rev 152127)
@@ -1,3 +1,20 @@
+2013-06-27 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r151991
+
+ 2013-06-26 Antoine Quint <grao...@apple.com>
+
+ Web Inspector: stepping through while paused in debugger makes a popover appear
+ https://bugs.webkit.org/show_bug.cgi?id=117994
+
+ There is no obvious need to call tokenTrackingControllerNewHighlightCandidate when the
+ active call frame changes and it leads to an extraneous display of the popover.
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._activeCallFrameDidChange):
+
2013-06-26 Lucas Forschler <lforsch...@apple.com>
Merge r151918
Modified: branches/safari-537-branch/Source/WebInspectorUI/UserInterface/SourceCodeTextEditor.js (152126 => 152127)
--- branches/safari-537-branch/Source/WebInspectorUI/UserInterface/SourceCodeTextEditor.js 2013-06-27 22:17:12 UTC (rev 152126)
+++ branches/safari-537-branch/Source/WebInspectorUI/UserInterface/SourceCodeTextEditor.js 2013-06-27 22:17:58 UTC (rev 152127)
@@ -443,9 +443,6 @@
return;
}
- if (this.tokenTrackingController.tracking && this.tokenTrackingController.candidate)
- this.tokenTrackingControllerNewHighlightCandidate(this.tokenTrackingController, this.tokenTrackingController.candidate);
-
this._dismissPopover();
this._activeCallFrameSourceCodeLocation = activeCallFrame.sourceCodeLocation;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
