Title: [193033] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193033
- Author
- [email protected]
- Date
- 2015-12-03 10:33:47 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187528. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193032 => 193033)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:33:42 UTC (rev 193032)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:33:47 UTC (rev 193033)
@@ -1,5 +1,19 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187528. rdar://problem/23221163
+
+ 2015-07-28 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: console.groupEnd causes negative indent when no group is active
+ https://bugs.webkit.org/show_bug.cgi?id=147375
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype.didAppendConsoleMessageView):
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187519. rdar://problem/23221163
2015-07-28 Brian J. Burg <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (193032 => 193033)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 18:33:42 UTC (rev 193032)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-12-03 18:33:47 UTC (rev 193033)
@@ -172,7 +172,8 @@
++this._nestingLevel;
break;
case WebInspector.ConsoleMessage.MessageType.EndGroup:
- --this._nestingLevel;
+ if (this._nestingLevel > 0)
+ --this._nestingLevel;
break;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
