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

Unified Diff: base/pickle.cc

Issue 57783006: Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=231330 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile (cc perftest). Created 7 years, 1 month 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 | « base/pickle.h ('k') | chrome/browser/automation/chrome_frame_automation_provider_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/pickle.cc
diff --git a/base/pickle.cc b/base/pickle.cc
index 17fb83d1c2bc544cfd4d2ae4881bb316093ff72a..70dfa0d507a828413d9cda6c7515450601e91cf9 100644
--- a/base/pickle.cc
+++ b/base/pickle.cc
@@ -170,15 +170,15 @@ Pickle::Pickle(int header_size)
header_->payload_size = 0;
}
-Pickle::Pickle(const char* data, size_t data_len)
+Pickle::Pickle(const char* data, int data_len)
: header_(reinterpret_cast<Header*>(const_cast<char*>(data))),
header_size_(0),
capacity_after_header_(kCapacityReadOnly),
write_offset_(0) {
- if (data_len >= sizeof(Header))
+ if (data_len >= static_cast<int>(sizeof(Header)))
header_size_ = data_len - header_->payload_size;
- if (header_size_ > data_len)
+ if (header_size_ > static_cast<unsigned int>(data_len))
header_size_ = 0;
if (header_size_ != AlignInt(header_size_, sizeof(uint32)))
« no previous file with comments | « base/pickle.h ('k') | chrome/browser/automation/chrome_frame_automation_provider_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698