Title: [156358] trunk/Source/WebInspectorUI
- Revision
- 156358
- Author
- commit-qu...@webkit.org
- Date
- 2013-09-24 14:23:33 -0700 (Tue, 24 Sep 2013)
Log Message
Web Inspector: Using Breakpoint Actions Breaks iOS inspection
https://bugs.webkit.org/show_bug.cgi?id=121862
Patch by Joseph Pecoraro <pecor...@apple.com> on 2013-09-24
Reviewed by Timothy Hatcher.
Only use DebuggerAgent.BreakpointActionType if it is available.
Otherwise leave options undefined for breakpoints since the backend
does not support it.
* UserInterface/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype._setBreakpoint):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (156357 => 156358)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-09-24 21:19:23 UTC (rev 156357)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-09-24 21:23:33 UTC (rev 156358)
@@ -1,5 +1,19 @@
2013-09-24 Joseph Pecoraro <pecor...@apple.com>
+ Web Inspector: Using Breakpoint Actions Breaks iOS inspection
+ https://bugs.webkit.org/show_bug.cgi?id=121862
+
+ Reviewed by Timothy Hatcher.
+
+ Only use DebuggerAgent.BreakpointActionType if it is available.
+ Otherwise leave options undefined for breakpoints since the backend
+ does not support it.
+
+ * UserInterface/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype._setBreakpoint):
+
+2013-09-24 Joseph Pecoraro <pecor...@apple.com>
+
Web Inspector: Include iOS 7 Inspector.json Version
https://bugs.webkit.org/show_bug.cgi?id=121852
Modified: trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js (156357 => 156358)
--- trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js 2013-09-24 21:19:23 UTC (rev 156357)
+++ trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js 2013-09-24 21:23:33 UTC (rev 156358)
@@ -514,10 +514,13 @@
// Convert BreakpointAction types to DebuggerAgent protocol types.
// NOTE: Breakpoint.options returns new objects each time, so it is safe to modify.
- var options = breakpoint.options;
- if (options.actions.length) {
- for (var i = 0; i < options.actions.length; ++i)
- options.actions[i].type = this._debuggerBreakpointActionType(options.actions[i].type);
+ var options;
+ if (DebuggerAgent.BreakpointActionType) {
+ options = breakpoint.options;
+ if (options.actions.length) {
+ for (var i = 0; i < options.actions.length; ++i)
+ options.actions[i].type = this._debuggerBreakpointActionType(options.actions[i].type);
+ }
}
// COMPATIBILITY (iOS 7): iOS 7 and earlier, DebuggerAgent.setBreakpoint* took a "condition" string argument.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
