third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.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

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/java/java_message_field_lite.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h

index 2bd3cdd46fc38d946f9f339346ac6754c5d9b268..292c1c56f3bf098bf502f58e11695a98d33854f6 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.h

@@ -54,7 +54,8 @@ class ImmutableMessageLiteGenerator : public MessageGenerator {

virtual void Generate(io::Printer* printer);

virtual void GenerateInterface(io::Printer* printer);

virtual void GenerateExtensionRegistrationCode(io::Printer* printer);

- virtual void GenerateStaticVariables(io::Printer* printer);

+ virtual void GenerateStaticVariables(

+ io::Printer* printer, int* bytecode_estimate);

virtual int GenerateStaticVariableInitializers(io::Printer* printer);

private:

@@ -69,12 +70,13 @@ class ImmutableMessageLiteGenerator : public MessageGenerator {

void GenerateBuilder(io::Printer* printer);

void GenerateDynamicMethodIsInitialized(io::Printer* printer);

void GenerateDynamicMethodMakeImmutable(io::Printer* printer);

- void GenerateDynamicMethodMergeFrom(io::Printer* printer);

+ void GenerateDynamicMethodVisit(io::Printer* printer);

+ void GenerateDynamicMethodMergeFromStream(io::Printer* printer);

void GenerateDynamicMethodNewBuilder(io::Printer* printer);

void GenerateInitializers(io::Printer* printer);

void GenerateEqualsAndHashCode(io::Printer* printer);

void GenerateParser(io::Printer* printer);

- void GenerateParsingConstructor(io::Printer* printer);

+ void GenerateConstructor(io::Printer* printer);

Context* context_;

ClassNameResolver* name_resolver_;