Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(846)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/Connections.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sdk/CSSStyleSheetHeader.js ('k') | third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/sdk/Connections.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js b/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js
index bf28a850664d45ccb0aea592cd95f56d2602c738..07b5839c25e65a80ac8105a380087b1664c75263 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js
@@ -1,121 +1,119 @@
// Copyright (c) 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
/**
- * @constructor
* @implements {InspectorBackendClass.Connection}
- * @param {!InspectorBackendClass.Connection.Params} params
+ * @unrestricted
*/
-WebInspector.MainConnection = function(params)
-{
+WebInspector.MainConnection = class {
+ /**
+ * @param {!InspectorBackendClass.Connection.Params} params
+ */
+ constructor(params) {
this._onMessage = params.onMessage;
this._onDisconnect = params.onDisconnect;
this._disconnected = false;
this._eventListeners = [
- InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.DispatchMessage, this._dispatchMessage, this),
- InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.DispatchMessageChunk, this._dispatchMessageChunk, this),
- InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.EvaluateForTestInFrontend, this._evaluateForTestInFrontend, this),
+ InspectorFrontendHost.events.addEventListener(
+ InspectorFrontendHostAPI.Events.DispatchMessage, this._dispatchMessage, this),
+ InspectorFrontendHost.events.addEventListener(
+ InspectorFrontendHostAPI.Events.DispatchMessageChunk, this._dispatchMessageChunk, this),
+ InspectorFrontendHost.events.addEventListener(
+ InspectorFrontendHostAPI.Events.EvaluateForTestInFrontend, this._evaluateForTestInFrontend, this),
];
-};
-
-WebInspector.MainConnection.prototype = {
+ }
+
+ /**
+ * @override
+ * @param {string} message
+ */
+ sendMessage(message) {
+ if (!this._disconnected)
+ InspectorFrontendHost.sendMessageToBackend(message);
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _dispatchMessage(event) {
+ this._onMessage.call(null, /** @type {string} */ (event.data));
+ }
+
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _dispatchMessageChunk(event) {
+ var messageChunk = /** @type {string} */ (event.data['messageChunk']);
+ var messageSize = /** @type {number} */ (event.data['messageSize']);
+ if (messageSize) {
+ this._messageBuffer = '';
+ this._messageSize = messageSize;
+ }
+ this._messageBuffer += messageChunk;
+ if (this._messageBuffer.length === this._messageSize) {
+ this._onMessage.call(null, this._messageBuffer);
+ this._messageBuffer = '';
+ this._messageSize = 0;
+ }
+ }
- /**
- * @override
- * @param {string} message
- */
- sendMessage: function(message)
- {
- if (!this._disconnected)
- InspectorFrontendHost.sendMessageToBackend(message);
- },
+ /**
+ * @param {!WebInspector.Event} event
+ */
+ _evaluateForTestInFrontend(event) {
+ if (!InspectorFrontendHost.isUnderTest())
+ return;
- /**
- * @param {!WebInspector.Event} event
- */
- _dispatchMessage: function(event)
- {
- this._onMessage.call(null, /** @type {string} */ (event.data));
- },
+ var callId = /** @type {number} */ (event.data['callId']);
+ var script = /** @type {number} */ (event.data['script']);
/**
- * @param {!WebInspector.Event} event
+ * @suppressGlobalPropertiesCheck
*/
- _dispatchMessageChunk: function(event)
- {
- var messageChunk = /** @type {string} */ (event.data["messageChunk"]);
- var messageSize = /** @type {number} */ (event.data["messageSize"]);
- if (messageSize) {
- this._messageBuffer = "";
- this._messageSize = messageSize;
- }
- this._messageBuffer += messageChunk;
- if (this._messageBuffer.length === this._messageSize) {
- this._onMessage.call(null, this._messageBuffer);
- this._messageBuffer = "";
- this._messageSize = 0;
- }
- },
-
- /**
- * @param {!WebInspector.Event} event
- */
- _evaluateForTestInFrontend: function(event)
- {
- if (!InspectorFrontendHost.isUnderTest())
- return;
-
- var callId = /** @type {number} */ (event.data["callId"]);
- var script = /** @type {number} */ (event.data["script"]);
-
- /**
- * @suppressGlobalPropertiesCheck
- */
- function invokeMethod()
- {
- try {
- script = script + "//# sourceURL=evaluateInWebInspector" + callId + ".js";
- window.eval(script);
- } catch (e) {
- console.error(e.stack);
- }
- }
-
- InspectorBackendClass.deprecatedRunAfterPendingDispatches(invokeMethod);
- },
+ function invokeMethod() {
+ try {
+ script = script + '//# sourceURL=evaluateInWebInspector' + callId + '.js';
+ window.eval(script);
+ } catch (e) {
+ console.error(e.stack);
+ }
+ }
- /**
- * @override
- * @return {!Promise}
- */
- disconnect: function()
- {
- var onDisconnect = this._onDisconnect;
- WebInspector.EventTarget.removeEventListeners(this._eventListeners);
- this._onDisconnect = null;
- this._onMessage = null;
- this._disconnected = true;
-
- var fulfill;
- var promise = new Promise(f => fulfill = f);
- InspectorFrontendHost.reattach(() => {
- onDisconnect.call(null, "force disconnect");
- fulfill();
- });
- return promise;
- },
+ InspectorBackendClass.deprecatedRunAfterPendingDispatches(invokeMethod);
+ }
+
+ /**
+ * @override
+ * @return {!Promise}
+ */
+ disconnect() {
+ var onDisconnect = this._onDisconnect;
+ WebInspector.EventTarget.removeEventListeners(this._eventListeners);
+ this._onDisconnect = null;
+ this._onMessage = null;
+ this._disconnected = true;
+
+ var fulfill;
+ var promise = new Promise(f => fulfill = f);
+ InspectorFrontendHost.reattach(() => {
+ onDisconnect.call(null, 'force disconnect');
+ fulfill();
+ });
+ return promise;
+ }
};
/**
- * @constructor
* @implements {InspectorBackendClass.Connection}
- * @param {string} url
- * @param {function()} onWebSocketDisconnect
- * @param {!InspectorBackendClass.Connection.Params} params
+ * @unrestricted
*/
-WebInspector.WebSocketConnection = function(url, onWebSocketDisconnect, params)
-{
+WebInspector.WebSocketConnection = class {
+ /**
+ * @param {string} url
+ * @param {function()} onWebSocketDisconnect
+ * @param {!InspectorBackendClass.Connection.Params} params
+ */
+ constructor(url, onWebSocketDisconnect, params) {
this._socket = new WebSocket(url);
this._socket.onerror = this._onError.bind(this);
this._socket.onopen = this._onOpen.bind(this);
@@ -126,115 +124,110 @@ WebInspector.WebSocketConnection = function(url, onWebSocketDisconnect, params)
this._onWebSocketDisconnect = onWebSocketDisconnect;
this._connected = false;
this._messages = [];
-};
-
-WebInspector.WebSocketConnection.prototype = {
- _onError: function()
- {
- this._onWebSocketDisconnect.call(null);
- // This is called if error occurred while connecting.
- this._onDisconnect.call(null, "connection failed");
- this._close();
- },
-
- _onOpen: function()
- {
- this._socket.onerror = console.error;
- this._connected = true;
- for (var message of this._messages)
- this._socket.send(message);
- this._messages = [];
- },
-
- _onClose: function()
- {
- this._onWebSocketDisconnect.call(null);
- this._onDisconnect.call(null, "websocket closed");
- this._close();
- },
-
- /**
- * @param {function()=} callback
- */
- _close: function(callback)
- {
- this._socket.onerror = null;
- this._socket.onopen = null;
- this._socket.onclose = callback || null;
- this._socket.onmessage = null;
- this._socket.close();
- this._socket = null;
- this._onWebSocketDisconnect = null;
- },
-
- /**
- * @override
- * @param {string} message
- */
- sendMessage: function(message)
- {
- if (this._connected)
- this._socket.send(message);
- else
- this._messages.push(message);
- },
-
- /**
- * @override
- * @return {!Promise}
- */
- disconnect: function()
- {
- var fulfill;
- var promise = new Promise(f => fulfill = f);
- this._close(() => {
- this._onDisconnect.call(null, "force disconnect");
- fulfill();
- });
- return promise;
- }
+ }
+
+ _onError() {
+ this._onWebSocketDisconnect.call(null);
+ // This is called if error occurred while connecting.
+ this._onDisconnect.call(null, 'connection failed');
+ this._close();
+ }
+
+ _onOpen() {
+ this._socket.onerror = console.error;
+ this._connected = true;
+ for (var message of this._messages)
+ this._socket.send(message);
+ this._messages = [];
+ }
+
+ _onClose() {
+ this._onWebSocketDisconnect.call(null);
+ this._onDisconnect.call(null, 'websocket closed');
+ this._close();
+ }
+
+ /**
+ * @param {function()=} callback
+ */
+ _close(callback) {
+ this._socket.onerror = null;
+ this._socket.onopen = null;
+ this._socket.onclose = callback || null;
+ this._socket.onmessage = null;
+ this._socket.close();
+ this._socket = null;
+ this._onWebSocketDisconnect = null;
+ }
+
+ /**
+ * @override
+ * @param {string} message
+ */
+ sendMessage(message) {
+ if (this._connected)
+ this._socket.send(message);
+ else
+ this._messages.push(message);
+ }
+
+ /**
+ * @override
+ * @return {!Promise}
+ */
+ disconnect() {
+ var fulfill;
+ var promise = new Promise(f => fulfill = f);
+ this._close(() => {
+ this._onDisconnect.call(null, 'force disconnect');
+ fulfill();
+ });
+ return promise;
+ }
};
/**
- * @constructor
* @implements {InspectorBackendClass.Connection}
- * @param {!InspectorBackendClass.Connection.Params} params
+ * @unrestricted
*/
-WebInspector.StubConnection = function(params)
-{
+WebInspector.StubConnection = class {
+ /**
+ * @param {!InspectorBackendClass.Connection.Params} params
+ */
+ constructor(params) {
this._onMessage = params.onMessage;
this._onDisconnect = params.onDisconnect;
-};
-
-WebInspector.StubConnection.prototype = {
- /**
- * @override
- * @param {string} message
- */
- sendMessage: function(message)
- {
- setTimeout(this._respondWithError.bind(this, message), 0);
- },
-
- /**
- * @param {string} message
- */
- _respondWithError: function(message)
- {
- var messageObject = JSON.parse(message);
- var error = { message: "This is a stub connection, can't dispatch message.", code: InspectorBackendClass.DevToolsStubErrorCode, data: messageObject };
- this._onMessage.call(null, { id: messageObject.id, error: error });
- },
-
- /**
- * @override
- * @return {!Promise}
- */
- disconnect: function()
- {
- this._onDisconnect.call(null, "force disconnect");
- this._onDisconnect = null;
- this._onMessage = null;
- return Promise.resolve();
- },
+ }
+
+ /**
+ * @override
+ * @param {string} message
+ */
+ sendMessage(message) {
+ setTimeout(this._respondWithError.bind(this, message), 0);
+ }
+
+ /**
+ * @param {string} message
+ */
+ _respondWithError(message) {
+ var messageObject = JSON.parse(message);
+ var error = {
+ message: 'This is a stub connection, can\'t dispatch message.',
+ code: InspectorBackendClass.DevToolsStubErrorCode,
+ data: messageObject
+ };
+ this._onMessage.call(null, {id: messageObject.id, error: error});
+ }
+
+ /**
+ * @override
+ * @return {!Promise}
+ */
+ disconnect() {
+ this._onDisconnect.call(null, 'force disconnect');
+ this._onDisconnect = null;
+ this._onMessage = null;
+ return Promise.resolve();
+ }
};
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sdk/CSSStyleSheetHeader.js ('k') | third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698