squash 'resources/unpacked/devtools' changes from 5708432..0f159bf

0f159bf DevTools: CSSSourceFrame -> CSSPlugin
ab85ac7 DevTools: Move default CodeMirror theme into cmdevtools.css
ea1ce3b DevTools: fix cursor style and disabled state for TextPrompt
e02f8e8 DevTools: do not group JS-source error messages
c1c155b DevTools: Show focus outline for checkboxes in devices screen
3f1d0b9 DevTools: Don't have hover state for non-highlightable nodes
aac1780 Add space before Milestone token in Console message
6032773 DevTools: align position of console level dropdown
5bc121b Reland "DevTools: Report column number for FunctionCall trace events."
2f03362 DevTools: Disable console context selector when it is empty
7c3ffee Revert "DevTools: automatically migrate http/tests/devtools/tracing/*.html"
d9d5f4b [DevTools] prepare frontend for numbers without description

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: 0f159bf

Author: darwin

BUILD.gn

@@ -614,15 +614,14 @@ all_devtools_files = [
   "front_end/source_frame/SourceCodeDiff.js",
   "front_end/source_frame/SourceFrame.js",
   "front_end/source_frame/SourcesTextEditor.js",
-  "front_end/source_frame/UISourceCodeFrame.js",
   "front_end/source_frame/xmlTree.css",
   "front_end/source_frame/xmlView.css",
   "front_end/source_frame/XMLView.js",
   "front_end/sources/AddSourceMapURLDialog.js",
   "front_end/sources/AdvancedSearchView.js",
   "front_end/sources/callStackSidebarPane.css",
   "front_end/sources/CallStackSidebarPane.js",
-  "front_end/sources/CSSSourceFrame.js",
+  "front_end/sources/CSSPlugin.js",
   "front_end/sources/dialog.css",
   "front_end/sources/EditingLocationHistoryManager.js",
   "front_end/sources/eventListenerBreakpoints.css",
@@ -660,6 +659,7 @@ all_devtools_files = [
   "front_end/sources/SourcesSearchScope.js",
   "front_end/sources/sourcesView.css",
   "front_end/sources/SourcesView.js",
+  "front_end/sources/UISourceCodeFrame.js",
   "front_end/sources/TabbedEditorContainer.js",
   "front_end/sources/threadsSidebarPane.css",
   "front_end/sources/ThreadsSidebarPane.js",

front_end/cm/PRESUBMIT.py

@@ -32,7 +32,7 @@ def _CheckCodeMirrorChanges(input_api, output_api):
                  "rolls from the upstream (http://codemirror.net). If this is a roll, "
                  "make sure you mention 'roll CodeMirror' (no quotes) in the change description.\n"
                  "CodeMirror rolling instructions:\n"
-                 "    https://sites.google.com/a/chromium.org/devtools-codemirror-rolling")
+                 "    src/third_party/WebKit/Source/devtools/front_end/cm/README.md")
     changeDescription = input_api.change.DescriptionText()
     errors = []
     if not "roll codemirror" in changeDescription.lower():

front_end/cm/README.md

@@ -0,0 +1,36 @@
+# Rolling CodeMirror
+
+## What's this about?
+CodeMirror is a third-party library, which supports editing experience in Chrome DevTools. DevTools does not fork CodeMirror, thus all CodeMirror patches should go upstream to http://codemirror.net.
+Every once in a while, the CodeMirror dependency (which is located in Source/devtools/front_end/cm/ folder) should be updated to a newer version.
+
+## Updating CodeMirror
+This requires the following steps to be done:
+1. File `headlesscodemirror.js` is a `runmode-standalone.js` file from CodeMirror distribution, but wrapped in `(function(window) { ... }(this))`
+construction. This is needed to support in web workers.
+2. File `markselection.js` is a `mark-selection.js` from CodeMirror distribution. The "dash" is removed due to the restriction on the chromium grd generator.
+4. File codemirror.css contains both the default theme of CodeMirror and structural css required for it to work. Discard everything in the file up to the word `/* STOP */`.
+3. All other files in front_end/cm/ folder should be substituted with their newer versions from the upstream.
+
+## Testing
+DevTools wrap CodeMirror via `CodeMirrorTextEditor.js` and `cmdevtools.css` files.
+Although there are a couple of automated tests (LayoutTests/inspector/editor/) to verify overall sanity of the setup, a manual testing is mandatory before
+landing a roll. Here is a rough testing scenario outline:
+1. Create a new snippet and type in a small function with a few nested for-loops. (The author suggests a bubble-sort). Make sure that:
+   * Words `function`, `for`, `var` are highlighted
+   * "Smart braces" behavior works
+   * "Enter" after opening curly brace adds correct indent
+   * Autocompletion works
+   * Multiple cursors functionality works as intended - Ctrl+D/Ctrl+U shortcuts
+   * Set a breakpoint inside a function, select some text and summon a context menu over it.
+2. Make sure there are items such as "Add to Watch", "Evaluate in Console" and "Copy/Paste"
+Make sure minified jquery opens nicely in the editor (minified jquery could be found as a resource on http://jquery.com)
+   * Verify `jquery.min.js` is formatted via "Pretty print" action
+3. Go to the Elements panel, select a node and verify the "Edit it as HTML" command works.
+
+## Committing
+The only changes allowed to front_end/cm/ folder are CodeMirror rolls. There's a presubmit check that enforces this, so make sure you include the phrase "roll CodeMirror" into
+your patch description.
+
+## Example
+Example CodeMirror roll patchset: https://codereview.chromium.org/273763003

front_end/cm/codemirror.css

@@ -1,149 +1,3 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 300px;
-  color: black;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-  white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror-cursor {
-  border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.cm-fat-cursor .CodeMirror-cursor {
-  width: auto;
-  border: 0 !important;
-  background: #7e7;
-}
-.cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
-}
-
-.cm-animate-fat-cursor {
-  width: auto;
-  border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-  background-color: #7e7;
-}
-@-moz-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@-webkit-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror-overwrite .CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-rulers {
-  position: absolute;
-  left: 0; right: 0; top: -50px; bottom: -20px;
-  overflow: hidden;
-}
-.CodeMirror-ruler {
-  border-left: 1px solid #ccc;
-  top: 0; bottom: 0;
-  position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
 /* STOP */
 
 /* The rest of this file contains styles related to the mechanics of

front_end/cm_modes/PRESUBMIT.py

@@ -8,7 +8,7 @@ def _CheckCodeMirrorChanges(input_api, output_api):
                  "rolls from the upstream (http://codemirror.net). If this is a roll, "
                  "make sure you mention 'roll CodeMirror' (no quotes) in the change description.\n"
                  "CodeMirror rolling instructions:\n"
-                 "    https://sites.google.com/a/chromium.org/devtools-codemirror-rolling")
+                 "    src/third_party/WebKit/Source/devtools/front_end/cm/README.md")
     changeDescription = input_api.change.DescriptionText()
     errors = []
     if "roll codemirror" not in changeDescription.lower():

front_end/console/ConsoleContextSelector.js

@@ -13,6 +13,9 @@ Console.ConsoleContextSelector = class {
     this._dropDown = new UI.SoftDropDown(this._items, this);
     this._dropDown.setRowHeight(36);
     this._toolbarItem = new UI.ToolbarItem(this._dropDown.element);
+    this._toolbarItem.setEnabled(false);
+    this._items.addEventListener(
+        UI.ListModel.Events.ItemsReplaced, () => this._toolbarItem.setEnabled(!!this._items.length));
 
     /** @type {!Map<!SDK.ExecutionContext, !ProductRegistry.BadgePool>} */
     this._badgePoolForExecutionContext = new Map();

front_end/console/ConsoleView.js

@@ -1240,7 +1240,9 @@ Console.ConsoleViewFilter = class {
     var setting = this._messageLevelFiltersSetting;
     var levels = setting.get();
 
-    var contextMenu = new UI.ContextMenu(mouseEvent, true);
+    var contextMenu = new UI.ContextMenu(
+        mouseEvent, true /* useSoftMenu */, this._levelMenuButton.element.totalOffsetLeft(),
+        this._levelMenuButton.element.totalOffsetTop() + this._levelMenuButton.element.offsetHeight);
     contextMenu.headerSection().appendItem(
         Common.UIString('Default'), () => setting.set(Console.ConsoleFilter.defaultLevelsFilterValue()));
     for (var level in this._levelLabels) {

front_end/console/ConsoleViewMessage.js

@@ -1385,7 +1385,7 @@ Console.ConsoleViewMessage = class {
       else if (token.type === 'event')
         text = Common.UIString('<some> event');
       else if (token.type === 'milestone')
-        text = Common.UIString('M<XX>');
+        text = Common.UIString(' M<XX>');
       else if (token.type === 'autofill')
         text = Common.UIString('<attribute>');
       return acc + text;

front_end/console_model/ConsoleModel.js

@@ -249,8 +249,10 @@ ConsoleModel.ConsoleModel = class extends Common.Object {
         call.type === ConsoleModel.ConsoleMessage.MessageType.Log)
       level = ConsoleModel.ConsoleMessage.MessageLevel.Info;
     var message = '';
-    if (call.args.length && typeof call.args[0].value === 'string')
-      message = call.args[0].value;
+    if (call.args.length && call.args[0].unserializableValue)
+      message = call.args[0].unserializableValue;
+    else if (call.args.length && (typeof call.args[0].value !== 'object' || call.args[0].value === null))
+      message = call.args[0].value + '';
     else if (call.args.length && call.args[0].description)
       message = call.args[0].description;
     var callFrame = call.stackTrace && call.stackTrace.callFrames.length ? call.stackTrace.callFrames[0] : null;
@@ -559,11 +561,13 @@ ConsoleModel.ConsoleMessage = class {
    * @return {boolean}
    */
   isGroupable() {
+    var isJSError = this.source === ConsoleModel.ConsoleMessage.MessageSource.JS &&
+        this.level === ConsoleModel.ConsoleMessage.MessageLevel.Error;
     return (
         this.source !== ConsoleModel.ConsoleMessage.MessageSource.ConsoleAPI &&
         this.type !== ConsoleModel.ConsoleMessage.MessageType.Command &&
         this.type !== ConsoleModel.ConsoleMessage.MessageType.Result &&
-        this.type !== ConsoleModel.ConsoleMessage.MessageType.System);
+        this.type !== ConsoleModel.ConsoleMessage.MessageType.System && !isJSError);
   }
 
   /**

front_end/coverage/CoverageDecorationManager.js

@@ -263,7 +263,7 @@ Coverage.CoverageDecorationManager = class {
 Coverage.CoverageDecorationManager._decoratorType = 'coverage';
 
 /**
- * @implements {SourceFrame.UISourceCodeFrame.LineDecorator}
+ * @implements {SourceFrame.LineDecorator}
  */
 Coverage.CoverageView.LineDecorator = class {
   /**