diff options
Diffstat (limited to 'chrome')
24 files changed, 48 insertions, 63 deletions
diff --git a/chrome/browser/sync/protocol/app_specifics.proto b/chrome/browser/sync/protocol/app_specifics.proto index e3206f0..452cc50 100644 --- a/chrome/browser/sync/protocol/app_specifics.proto +++ b/chrome/browser/sync/protocol/app_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/autofill_specifics.proto b/chrome/browser/sync/protocol/autofill_specifics.proto index e700702..a53a75a 100644 --- a/chrome/browser/sync/protocol/autofill_specifics.proto +++ b/chrome/browser/sync/protocol/autofill_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/bookmark_specifics.proto b/chrome/browser/sync/protocol/bookmark_specifics.proto index 8711aa2..c94fd2e 100644 --- a/chrome/browser/sync/protocol/bookmark_specifics.proto +++ b/chrome/browser/sync/protocol/bookmark_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/encryption.proto b/chrome/browser/sync/protocol/encryption.proto index 89aba01..6d6a792 100644 --- a/chrome/browser/sync/protocol/encryption.proto +++ b/chrome/browser/sync/protocol/encryption.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/extension_specifics.proto b/chrome/browser/sync/protocol/extension_specifics.proto index adf497d..dff29b2 100644 --- a/chrome/browser/sync/protocol/extension_specifics.proto +++ b/chrome/browser/sync/protocol/extension_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/nigori_specifics.proto b/chrome/browser/sync/protocol/nigori_specifics.proto index 205291f..aa33ba6 100644 --- a/chrome/browser/sync/protocol/nigori_specifics.proto +++ b/chrome/browser/sync/protocol/nigori_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/password_specifics.proto b/chrome/browser/sync/protocol/password_specifics.proto index fd9d086..210ec6e 100644 --- a/chrome/browser/sync/protocol/password_specifics.proto +++ b/chrome/browser/sync/protocol/password_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/preference_specifics.proto b/chrome/browser/sync/protocol/preference_specifics.proto index 77c1a45..8e221444 100644 --- a/chrome/browser/sync/protocol/preference_specifics.proto +++ b/chrome/browser/sync/protocol/preference_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/session_specifics.proto b/chrome/browser/sync/protocol/session_specifics.proto index 6fd30a2..050687d 100644 --- a/chrome/browser/sync/protocol/session_specifics.proto +++ b/chrome/browser/sync/protocol/session_specifics.proto @@ -6,7 +6,8 @@ syntax = "proto2"; -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/sync.proto b/chrome/browser/sync/protocol/sync.proto index 012dbe3..40e9906 100644 --- a/chrome/browser/sync/protocol/sync.proto +++ b/chrome/browser/sync/protocol/sync.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/sync_proto.gyp b/chrome/browser/sync/protocol/sync_proto.gyp index 9c3cf48..b748c57 100644 --- a/chrome/browser/sync/protocol/sync_proto.gyp +++ b/chrome/browser/sync/protocol/sync_proto.gyp @@ -46,7 +46,7 @@ '--cpp_out=<(SHARED_INTERMEDIATE_DIR)/protoc_out/chrome/browser/sync/protocol', '--python_out=<(PRODUCT_DIR)/pyproto/sync_pb', ], - 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', + # 'message': 'Generating C++ and Python code from <(RULE_INPUT_PATH)', }, ], 'dependencies': [ @@ -57,15 +57,11 @@ 'target_name': 'sync_proto_cpp', 'type': 'none', 'export_dependent_settings': [ - # TODO(akalin): Change back to protobuf_lite once it supports - # preserving unknown fields. - '../../../../third_party/protobuf/protobuf.gyp:protobuf', + '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'sync_proto', ], 'dependencies': [ - # TODO(akalin): Change back to protobuf_lite once it supports - # preserving unknown fields. - '../../../../third_party/protobuf/protobuf.gyp:protobuf', + '../../../../third_party/protobuf/protobuf.gyp:protobuf_lite', 'sync_proto', ], 'direct_dependent_settings': { diff --git a/chrome/browser/sync/protocol/test.proto b/chrome/browser/sync/protocol/test.proto index e218e47..4855d64 100644 --- a/chrome/browser/sync/protocol/test.proto +++ b/chrome/browser/sync/protocol/test.proto @@ -6,11 +6,8 @@ syntax = "proto2"; -// TODO(agl): In the future we hope that the lite runtime will be able to -// handle unknown fields in messages. Until then, we use the full runtime. - -// option optimize_for = LITE_RUNTIME; -// option retain_unknown_fields = true; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/theme_specifics.proto b/chrome/browser/sync/protocol/theme_specifics.proto index 7bc5133..5439bc4 100644 --- a/chrome/browser/sync/protocol/theme_specifics.proto +++ b/chrome/browser/sync/protocol/theme_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/sync/protocol/typed_url_specifics.proto b/chrome/browser/sync/protocol/typed_url_specifics.proto index f624fdb..7dd4041 100644 --- a/chrome/browser/sync/protocol/typed_url_specifics.proto +++ b/chrome/browser/sync/protocol/typed_url_specifics.proto @@ -6,10 +6,8 @@ syntax = "proto2"; -// TODO(akalin): Re-enable this once LITE_RUNTIME supports preserving -// unknown fields. - -// option optimize_for = LITE_RUNTIME; +option optimize_for = LITE_RUNTIME; +option retain_unknown_fields = true; package sync_pb; diff --git a/chrome/browser/userfeedback/proto/annotations.proto b/chrome/browser/userfeedback/proto/annotations.proto index b99aa04..9104525 100644 --- a/chrome/browser/userfeedback/proto/annotations.proto +++ b/chrome/browser/userfeedback/proto/annotations.proto @@ -6,6 +6,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; import "math.proto"; diff --git a/chrome/browser/userfeedback/proto/chrome.proto b/chrome/browser/userfeedback/proto/chrome.proto index 11b8eff..48516103 100644 --- a/chrome/browser/userfeedback/proto/chrome.proto +++ b/chrome/browser/userfeedback/proto/chrome.proto @@ -3,6 +3,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; // Chrome Browser and Chrome OS specific data. diff --git a/chrome/browser/userfeedback/proto/common.proto b/chrome/browser/userfeedback/proto/common.proto index 291e6a1..d4c3db3 100644 --- a/chrome/browser/userfeedback/proto/common.proto +++ b/chrome/browser/userfeedback/proto/common.proto @@ -6,6 +6,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; // Data present in all kinds of feedbacks, regardless of source (Web, Android, diff --git a/chrome/browser/userfeedback/proto/config.proto b/chrome/browser/userfeedback/proto/config.proto index f36c482..3511f38 100644 --- a/chrome/browser/userfeedback/proto/config.proto +++ b/chrome/browser/userfeedback/proto/config.proto @@ -6,6 +6,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; // Product for which feedback can be sent: GMail, Writely etc. diff --git a/chrome/browser/userfeedback/proto/dom.proto b/chrome/browser/userfeedback/proto/dom.proto index 23958ac..0126cc9 100644 --- a/chrome/browser/userfeedback/proto/dom.proto +++ b/chrome/browser/userfeedback/proto/dom.proto @@ -6,6 +6,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; // Data captured from HTMLDocument DOM object. diff --git a/chrome/browser/userfeedback/proto/extension.proto b/chrome/browser/userfeedback/proto/extension.proto index 71be3dc..ef4796a 100644 --- a/chrome/browser/userfeedback/proto/extension.proto +++ b/chrome/browser/userfeedback/proto/extension.proto @@ -5,6 +5,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; import "common.proto"; diff --git a/chrome/browser/userfeedback/proto/math.proto b/chrome/browser/userfeedback/proto/math.proto index c189967..782c73f5 100644 --- a/chrome/browser/userfeedback/proto/math.proto +++ b/chrome/browser/userfeedback/proto/math.proto @@ -5,6 +5,8 @@ syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + package userfeedback; // 2D Dimensions. diff --git a/chrome/browser/userfeedback/proto/web.proto b/chrome/browser/userfeedback/proto/web.proto index 71b0b29..1a4f8bb 100644 --- a/chrome/browser/userfeedback/proto/web.proto +++ b/chrome/browser/userfeedback/proto/web.proto @@ -5,6 +5,8 @@ syntax = "proto2"; package userfeedback; +option optimize_for = LITE_RUNTIME; + // Data present in Web related feedbacks import "annotations.proto"; diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 572449d..91a4636 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1032,9 +1032,7 @@ '../skia/skia.gyp:skia', '../third_party/libjingle/libjingle.gyp:libjingle', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', - # TODO(akalin): Change back to protobuf_lite once it supports - # preserving unknown fields. - '../third_party/protobuf/protobuf.gyp:protobuf#target', + '../third_party/protobuf/protobuf.gyp:protobuf_lite#target', ], 'conditions': [ ['OS=="win"', { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 8667d92..db6aa60 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3995,7 +3995,6 @@ ], 'dependencies': [ '../third_party/protobuf/protobuf.gyp:protobuf_lite', - #'../third_party/protobuf/protobuf.gyp:protobuf', '../third_party/protobuf/protobuf.gyp:protoc#host', ], 'conditions': [ @@ -4131,7 +4130,7 @@ }, ], 'dependencies': [ - '../third_party/protobuf/protobuf.gyp:protobuf', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/protobuf/protobuf.gyp:protoc#host', ], 'direct_dependent_settings': { @@ -4140,7 +4139,7 @@ ] }, 'export_dependent_settings': [ - '../third_party/protobuf/protobuf.gyp:protobuf', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', ], }, ], |