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

Side by Side Diff: third_party/protobuf/patches/0001-ignore-option-retain-unknown-fields.patch

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 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 unified diff | Download patch
OLDNEW
(Empty)
1 --- protobuf-cleaned/src/google/protobuf/descriptor.cc 2015-12-30 13:21:46.0000 00000 -0800
2 +++ protobuf-patched/src/google/protobuf/descriptor.cc 2016-03-31 13:25:26.8400 24811 -0700
3 @@ -5591,6 +5591,18 @@
4 "\"uninterpreted_option\".");
5 }
6
7 + // TODO(xyzzyz): remove when all uses in Chromium are removed
8 + if (uninterpreted_option_->name(0).name_part() == "retain_unknown_fields") {
9 + // Chromium patch to protobuf used to introduce a retain_unknown_fields
10 + // option that would make the protobuf_lite runtime retain unknown fields
11 + // just like the protobuf_full would. A newer upstream version of protobuf
12 + // retains these unknown fields even in lite runtime, so the option is no
13 + // longer necessary. Therefore, we ignore this option, and when we remove
14 + // all the occurrences of the option from Chromium, we can remove this
15 + // ignore.
16 + return true;
17 + }
18 +
19 const Descriptor* options_descriptor = NULL;
20 // Get the options message's descriptor from the builder's pool, so that we
21 // get the version that knows about any extension options declared in the
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698