content/public/common/common_param_traits.h - Issue 825353003: Revert of Remove deprecated methods from Pickle.

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: content/public/common/common_param_traits.h

Issue 825353003: Revert of Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/public/common/common_param_traits.h

diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h

index 52d7a2f8c9b7f37af21ec992a6d99b9d329cac50..657ef646c71986ab629dffe8f763700df8017a6c 100644

--- a/content/public/common/common_param_traits.h

+++ b/content/public/common/common_param_traits.h

@@ -89,11 +89,11 @@

}

static bool Read(const Message* m, PickleIterator* iter, param_type* r) {

#if defined(OS_WIN)

- return iter->ReadUInt32(reinterpret_cast<uint32*>(r));

+ return m->ReadUInt32(iter, reinterpret_cast<uint32*>(r));

#else

const char *data;

int data_size = 0;

- bool result = iter->ReadData(&data, &data_size);

+ bool result = m->ReadData(iter, &data, &data_size);

if (result && data_size == sizeof(gfx::NativeWindow)) {

memcpy(r, data, sizeof(gfx::NativeWindow));

} else {