diff options
| author | Yilun Chong <chongyilun250@sina.com> | 2019-01-08 15:06:30 -0800 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2019-01-08 15:06:30 -0800 |
| commit | 0adb74c2d36833be37b35a9ab45e4f699a1d645c (patch) | |
| tree | 70a18c55bbf8c3170638aaf10df07562271d5f51 /js | |
| parent | 11c979b591b6904d000b6533be3764615934cbc1 (diff) | |
| download | protobuf-0adb74c2d36833be37b35a9ab45e4f699a1d645c.tar.gz | |
Down-integrate internal changes to github. (#5555)
* Down-integrate internal changes to github.
* fix python conformance test
* fix csharp conformance test
* add back java map_lite_test.proto's optimize for option
* fix php conformance test
Diffstat (limited to 'js')
| -rw-r--r-- | js/binary/proto_test.js | 1 | ||||
| -rw-r--r-- | js/message.js | 7 | ||||
| -rw-r--r-- | js/testbinary.proto | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/js/binary/proto_test.js b/js/binary/proto_test.js index 161821068..ae31c8d1c 100644 --- a/js/binary/proto_test.js +++ b/js/binary/proto_test.js @@ -661,4 +661,5 @@ describe('protoBinaryTest', function() { checkAllFields(msg, msg2); }); + }); diff --git a/js/message.js b/js/message.js index 17b562e16..1ca9fac0f 100644 --- a/js/message.js +++ b/js/message.js @@ -41,6 +41,8 @@ goog.provide('jspb.Message'); goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.crypt.base64'); +goog.require('jspb.BinaryConstants'); +goog.require('jspb.BinaryReader'); goog.require('jspb.Map'); // Not needed in compilation units that have no protos with xids. @@ -622,10 +624,7 @@ jspb.Message.serializeBinaryExtensions = function(proto, writer, extensions, * Reads an extension field from the given reader and, if a valid extension, * sets the extension value. * @param {!jspb.Message} msg A jspb proto. - * @param {{ - * skipField:function(this:jspb.BinaryReader), - * getFieldNumber:function(this:jspb.BinaryReader):number - * }} reader + * @param {!jspb.BinaryReader} reader * @param {!Object} extensions The extensions object. * @param {function(this:jspb.Message,!jspb.ExtensionFieldInfo)} getExtensionFn * @param {function(this:jspb.Message,!jspb.ExtensionFieldInfo, ?)} setExtensionFn diff --git a/js/testbinary.proto b/js/testbinary.proto index ed5bdfc68..ee4d2dfac 100644 --- a/js/testbinary.proto +++ b/js/testbinary.proto @@ -242,3 +242,4 @@ enum MapValueEnum { message MapValueMessage { optional int32 foo = 1; } + |