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

Unified Diff: mojo/public/js/router.js

Issue 2618693004: Mojo JS bindings: make sure that console.log() could be used in the bindings. (Closed)
Patch Set: . Created 3 years, 11 months 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
« ios/web/webui/resources/console.js ('K') | « ios/web/webui/resources/console.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/js/router.js
diff --git a/mojo/public/js/router.js b/mojo/public/js/router.js
index 3f0d96bca5ebe63f3ec945c78413e7f87c291f12..9db122052196331adbad56f15bf60792d8c8e8ed 100644
--- a/mojo/public/js/router.js
+++ b/mojo/public/js/router.js
@@ -3,11 +3,12 @@
// found in the LICENSE file.
define("mojo/public/js/router", [
+ "console",
"mojo/public/js/codec",
"mojo/public/js/core",
"mojo/public/js/connector",
"mojo/public/js/validator",
-], function(codec, core, connector, validator) {
+], function(console, codec, core, connector, validator) {
var Connector = connector.Connector;
var MessageReader = codec.MessageReader;
@@ -117,8 +118,12 @@ define("mojo/public/js/router", [
var reader = new MessageReader(message);
var requestID = reader.requestID;
var completer = this.completers_.get(requestID);
- this.completers_.delete(requestID);
- completer.resolve(message);
+ if (completer) {
+ this.completers_.delete(requestID);
+ completer.resolve(message);
+ } else {
+ console.log("Unexpected response with request ID: " + requestID);
+ }
} else {
if (this.incomingReceiver_)
this.incomingReceiver_.accept(message);
@@ -127,10 +132,12 @@ define("mojo/public/js/router", [
Router.prototype.handleInvalidIncomingMessage_ = function(message, error) {
if (!this.testingController_) {
- // TODO(yzshen): Consider logging and notifying the embedder.
+ // TODO(yzshen): Consider notifying the embedder.
// TODO(yzshen): This should also trigger connection error handler.
// Consider making accept() return a boolean and let the connector deal
// with this, as the C++ code does.
+ console.log("Invalid message: " + validator.validationError[error]);
+
this.close();
return;
}
« ios/web/webui/resources/console.js ('K') | « ios/web/webui/resources/console.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698