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

Unified Diff: third_party/mojo/src/mojo/public/js/validator.js

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting Created 5 years, 7 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
Index: third_party/mojo/src/mojo/public/js/validator.js
diff --git a/third_party/mojo/src/mojo/public/js/validator.js b/third_party/mojo/src/mojo/public/js/validator.js
index 72821b75d78ca973f45c338cd0985d2959640f92..5568c5f52a688167ccae22d83afd429e0b82bd56 100644
--- a/third_party/mojo/src/mojo/public/js/validator.js
+++ b/third_party/mojo/src/mojo/public/js/validator.js
@@ -134,7 +134,7 @@ define("mojo/public/js/validator", [
}
Validator.prototype.validateMessageHeader = function() {
- var err = this.validateStructHeader(0, codec.kMessageHeaderSize, 2);
+ var err = this.validateStructHeader(0, codec.kMessageHeaderSize, 0);
if (err != validationError.NONE)
return err;
@@ -142,10 +142,10 @@ define("mojo/public/js/validator", [
var version = this.message.getHeaderVersion();
var validVersionAndNumBytes =
- (version == 2 && numBytes == codec.kMessageHeaderSize) ||
- (version == 3 &&
+ (version == 0 && numBytes == codec.kMessageHeaderSize) ||
+ (version == 1 &&
numBytes == codec.kMessageWithRequestIDHeaderSize) ||
- (version > 3 &&
+ (version > 1 &&
numBytes >= codec.kMessageWithRequestIDHeaderSize);
if (!validVersionAndNumBytes)
return validationError.UNEXPECTED_STRUCT_HEADER;
@@ -153,7 +153,7 @@ define("mojo/public/js/validator", [
var expectsResponse = this.message.expectsResponse();
var isResponse = this.message.isResponse();
- if (version == 2 && (expectsResponse || isResponse))
+ if (version == 0 && (expectsResponse || isResponse))
return validationError.MESSAGE_HEADER_MISSING_REQUEST_ID;
if (isResponse && expectsResponse)
@@ -222,7 +222,7 @@ define("mojo/public/js/validator", [
validationError.NONE : validationError.UNEXPECTED_NULL_POINTER;
var mapEncodedSize = codec.kStructHeaderSize + codec.kMapStructPayloadSize;
- var err = this.validateStructHeader(structOffset, mapEncodedSize, 2);
+ var err = this.validateStructHeader(structOffset, mapEncodedSize, 0);
if (err !== validationError.NONE)
return err;
« no previous file with comments | « third_party/mojo/src/mojo/public/js/struct_unittests.js ('k') | third_party/mojo/src/mojo/public/python/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698