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

Unified Diff: third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.h

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 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/protobuf/ruby/ext/google/protobuf_c/protobuf.h
diff --git a/third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.h b/third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.h
index 8750c93d35f8f119787fb9b5628793a950657ff9..2834c8944a6335b10964b23924f412bc19a19671 100644
--- a/third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.h
+++ b/third_party/protobuf/ruby/ext/google/protobuf_c/protobuf.h
@@ -112,8 +112,10 @@ struct Descriptor {
VALUE klass; // begins as nil
const upb_handlers* fill_handlers;
const upb_pbdecodermethod* fill_method;
+ const upb_json_parsermethod* json_fill_method;
const upb_handlers* pb_serialize_handlers;
const upb_handlers* json_serialize_handlers;
+ const upb_handlers* json_serialize_handlers_preserve;
// Handlers hold type class references for sub-message fields directly in some
// cases. We need to keep these rooted because they might otherwise be
// collected.
@@ -497,7 +499,7 @@ VALUE Message_descriptor(VALUE klass);
VALUE Message_decode(VALUE klass, VALUE data);
VALUE Message_encode(VALUE klass, VALUE msg_rb);
VALUE Message_decode_json(VALUE klass, VALUE data);
-VALUE Message_encode_json(VALUE klass, VALUE msg_rb);
+VALUE Message_encode_json(int argc, VALUE* argv, VALUE klass);
VALUE Google_Protobuf_deep_copy(VALUE self, VALUE obj);
« no previous file with comments | « third_party/protobuf/ruby/ext/google/protobuf_c/message.c ('k') | third_party/protobuf/ruby/ext/google/protobuf_c/upb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698