Title: [193051] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193051
- Author
- [email protected]
- Date
- 2015-12-03 10:35:37 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187775. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193050 => 193051)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:32 UTC (rev 193050)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:37 UTC (rev 193051)
@@ -1,5 +1,29 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187775. rdar://problem/23221163
+
+ 2015-08-03 Matt Baker <[email protected]>
+
+ Web Inspector: REGRESSION (r187708): Breakpoint dialog script action editing broken
+ https://bugs.webkit.org/show_bug.cgi?id=147553
+
+ Reviewed by Joseph Pecoraro.
+
+ Passing a widget to CodeMirror.setBookmark generates a viewportChange event, causing the
+ BreakpointActionView to update the popup for the breakpoint. The spurious update dismisses
+ the suggestion list, removes the CodeMirror completion hint, and causes other problems.
+
+ Now we ignore viewportChange events unless the viewport size changes. We still want to update
+ the popup when a carriage return or text wrap modifies the viewport.
+
+ * UserInterface/Views/BreakpointActionView.js:
+ (WebInspector.BreakpointActionView.prototype._updateBody):
+ Evaluate and Probe actions store the current viewport size.
+ (WebInspector.BreakpointActionView.prototype._codeMirrorViewportChanged):
+ Check if viewport size has changed since last event.
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187773. rdar://problem/23221163
2015-08-03 Brian J. Burg <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js (193050 => 193051)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js 2015-12-03 18:35:32 UTC (rev 193050)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js 2015-12-03 18:35:37 UTC (rev 193051)
@@ -161,6 +161,8 @@
this._codeMirror.on("viewportChange", this._codeMirrorViewportChanged.bind(this));
this._codeMirror.on("blur", this._codeMirrorBlurred.bind(this));
+ this._codeMirrorViewport = {from: null, to: null};
+
var completionController = new WebInspector.CodeMirrorCompletionController(this._codeMirror);
completionController.addExtendedCompletionProvider("_javascript_", WebInspector._javascript_RuntimeCompletionProvider);
@@ -195,8 +197,13 @@
this._action.data = "" || "").trim();
}
- _codeMirrorViewportChanged(event)
+ _codeMirrorViewportChanged(event, from, to)
{
+ if (this._codeMirrorViewport.from === from && this._codeMirrorViewport.to === to)
+ return;
+
+ this._codeMirrorViewport.from = from;
+ this._codeMirrorViewport.to = to;
this._delegate.breakpointActionViewResized(this);
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
