DevTools: introduce API for the Common.FormatterWorkerPool.

third_party/WebKit/Source/devtools/front_end/sources/ScriptFormatter.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 67 matching lines @@
   /**
    * @param {string} mimeType
    * @param {string} content
    * @param {function(string, !Sources.FormatterSourceMapping)} callback
    */
   constructor(mimeType, content, callback) {
     content = content.replace(/\r\n?|[\n\u2028\u2029]/g, '\n').replace(/^\uFEFF/, '');
     this._callback = callback;
     this._originalContent = content;
 
-    var parameters = {
-      mimeType: mimeType,
-      content: content,
-      indentString: Common.moduleSetting('textEditorIndent').get()
-    };
-    Common.formatterWorkerPool.runTask('format', parameters).then(this._didFormatContent.bind(this));
+    Common.formatterWorkerPool.format(mimeType, content, Common.moduleSetting('textEditorIndent').get())
+        .then(this._didFormatContent.bind(this));
   }
 
   /**
-   * @param {?MessageEvent} event
+   * @param {?{content: string, mapping: !{original: !Array<number>, formatted: !Array<number>}}} data

[dgozman, 2016/12/14 19:33:00]

FormatResult?

[lushnikov, 2016/12/14 23:36:56]

Done.

    */
-  _didFormatContent(event) {
-    var formattedContent = '';
-    var mapping = [];
-    if (event) {
-      formattedContent = event.data.content;
-      mapping = event.data['mapping'];
-    }
+  _didFormatContent(data) {
+    if (!data)
+      data = {content: '', mapping: {original: [], formatted: []}};
+
     var sourceMapping = new Sources.FormatterSourceMappingImpl(
-        this._originalContent.computeLineEndings(), formattedContent.computeLineEndings(), mapping);
-    this._callback(formattedContent, sourceMapping);
+        this._originalContent.computeLineEndings(), data.content.computeLineEndings(), data.mapping);
+    this._callback(data.content, sourceMapping);
   }
 };
 
 /**
  * @implements {Sources.Formatter}
  * @unrestricted
  */
 Sources.ScriptIdentityFormatter = class {
   /**
    * @param {string} mimeType
    * @param {string} content
    * @param {function(string, !Sources.FormatterSourceMapping)} callback
    */
   constructor(mimeType, content, callback) {
     callback(content, new Sources.IdentityFormatterSourceMapping());
   }
 };
 
 /**
- * @typedef {{original: !Array.<number>, formatted: !Array.<number>}}
- */
-Sources.FormatterMappingPayload;
-
-/**
  * @interface
  */
 Sources.FormatterSourceMapping = function() {};
 
 Sources.FormatterSourceMapping.prototype = {
   /**
    * @param {number} lineNumber
    * @param {number=} columnNumber
    * @return {!Array.<number>}
    */
@@ skipping 34 matching lines @@
 };
 
 /**
  * @implements {Sources.FormatterSourceMapping}
  * @unrestricted
  */
 Sources.FormatterSourceMappingImpl = class {
   /**
    * @param {!Array.<number>} originalLineEndings
    * @param {!Array.<number>} formattedLineEndings
-   * @param {!Sources.FormatterMappingPayload} mapping
+   * @param {!Common.FormatterWorkerPool.FormatMapping} mapping
    */
   constructor(originalLineEndings, formattedLineEndings, mapping) {
     this._originalLineEndings = originalLineEndings;
     this._formattedLineEndings = formattedLineEndings;
     this._mapping = mapping;
   }
 
   /**
    * @override
    * @param {number} lineNumber
@@ skipping 28 matching lines @@
    * @return {number}
    */
   _convertPosition(positions1, positions2, position) {
     var index = positions1.upperBound(position) - 1;
     var convertedPosition = positions2[index] + position - positions1[index];
     if (index < positions2.length - 1 && convertedPosition > positions2[index + 1])
       convertedPosition = positions2[index + 1];
     return convertedPosition;
   }
 };