Remove Pickle::BeginWriteData/TrimWriteData, it's not used

Remove Pickle::BeginWriteData/TrimWriteData, it's not used

BUG=None
R=jar@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=231911

[jam, 2013-10-24 16:15:52]

I'm not a reviewer in base

[piman, 2013-10-24 19:42:39]

D'oh
-jam +jar

[piman, 2013-10-29 01:34:27]

ping.

[jar (doing other things), 2013-10-29 18:32:10]

I *think* I saw another competing CL to do this same thing.... and LGTM'ed
it....

but this LGTM.

[commit-bot: I haz the power, 2013-10-29 19:54:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/38693003/1

[commit-bot: I haz the power, 2013-10-29 19:54:47]

Failed to apply patch for base/pickle.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file base/pickle.cc
  Hunk #3 FAILED at 171.
  1 out of 6 hunks FAILED -- saving rejects to file base/pickle.cc.rej

Patch:       base/pickle.cc
Index: base/pickle.cc
diff --git a/base/pickle.cc b/base/pickle.cc
index
af3191b9d86db2785fe375ecbcb045cf0a420870..1d34006cce8d3a97577bb213cbffa43739156939
100644
--- a/base/pickle.cc
+++ b/base/pickle.cc
@@ -153,8 +153,7 @@ bool PickleIterator::ReadBytes(const char** data, int
length) {
 Pickle::Pickle()
     : header_(NULL),
       header_size_(sizeof(Header)),
-      capacity_(0),
-      variable_buffer_offset_(0) {
+      capacity_(0) {
   Resize(kPayloadUnit);
   header_->payload_size = 0;
 }
@@ -162,8 +161,7 @@ Pickle::Pickle()
 Pickle::Pickle(int header_size)
     : header_(NULL),
       header_size_(AlignInt(header_size, sizeof(uint32))),
-      capacity_(0),
-      variable_buffer_offset_(0) {
+      capacity_(0) {
   DCHECK_GE(static_cast<size_t>(header_size), sizeof(Header));
   DCHECK_LE(header_size, kPayloadUnit);
   Resize(kPayloadUnit);
@@ -173,8 +171,7 @@ Pickle::Pickle(int header_size)
 Pickle::Pickle(const char* data, int data_len)
     : header_(reinterpret_cast<Header*>(const_cast<char*>(data))),
       header_size_(0),
-      capacity_(kCapacityReadOnly),
-      variable_buffer_offset_(0) {
+      capacity_(kCapacityReadOnly) {
   if (data_len >= static_cast<int>(sizeof(Header)))
     header_size_ = data_len - header_->payload_size;
 
@@ -192,8 +189,7 @@ Pickle::Pickle(const char* data, int data_len)
 Pickle::Pickle(const Pickle& other)
     : header_(NULL),
       header_size_(other.header_size_),
-      capacity_(0),
-      variable_buffer_offset_(other.variable_buffer_offset_) {
+      capacity_(0) {
   size_t payload_size = header_size_ + other.header_->payload_size;
   bool resized = Resize(payload_size);
   CHECK(resized);  // Realloc failed.
@@ -223,7 +219,6 @@ Pickle& Pickle::operator=(const Pickle& other) {
   CHECK(resized);  // Realloc failed.
   memcpy(header_, other.header_,
          other.header_size_ + other.header_->payload_size);
-  variable_buffer_offset_ = other.variable_buffer_offset_;
   return *this;
 }
 
@@ -267,43 +262,6 @@ bool Pickle::WriteBytes(const void* data, int data_len) {
   return true;
 }
 
-char* Pickle::BeginWriteData(int length) {
-  DCHECK_EQ(variable_buffer_offset_, 0U) <<
-    "There can only be one variable buffer in a Pickle";
-
-  if (length < 0 || !WriteInt(length))
-    return NULL;
-
-  char *data_ptr = BeginWrite(length);
-  if (!data_ptr)
-    return NULL;
-
-  variable_buffer_offset_ =
-      data_ptr - reinterpret_cast<char*>(header_) - sizeof(int);
-
-  // EndWrite doesn't necessarily have to be called after the write operation,
-  // so we call it here to pad out what the caller will eventually write.
-  EndWrite(data_ptr, length);
-  return data_ptr;
-}
-
-void Pickle::TrimWriteData(int new_length) {
-  DCHECK_NE(variable_buffer_offset_, 0U);
-
-  // Fetch the the variable buffer size
-  int* cur_length = reinterpret_cast<int*>(
-      reinterpret_cast<char*>(header_) + variable_buffer_offset_);
-
-  if (new_length < 0 || new_length > *cur_length) {
-    NOTREACHED() << "Invalid length in TrimWriteData.";
-    return;
-  }
-
-  // Update the payload size and variable buffer size
-  header_->payload_size -= (*cur_length - new_length);
-  *cur_length = new_length;
-}
-
 char* Pickle::BeginWrite(size_t length) {
   // write at a uint32-aligned offset from the beginning of the header
   size_t offset = AlignInt(header_->payload_size, sizeof(uint32));

[commit-bot: I haz the power, 2013-10-30 16:01:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/38693003/1

[commit-bot: I haz the power, 2013-10-30 16:01:30]

Failed to apply patch for base/pickle.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file base/pickle.cc
  Hunk #3 FAILED at 171.
  Hunk #6 FAILED at 263.
  2 out of 6 hunks FAILED -- saving rejects to file base/pickle.cc.rej

Patch:       base/pickle.cc
Index: base/pickle.cc
diff --git a/base/pickle.cc b/base/pickle.cc
index
af3191b9d86db2785fe375ecbcb045cf0a420870..1d34006cce8d3a97577bb213cbffa43739156939
100644
--- a/base/pickle.cc
+++ b/base/pickle.cc
@@ -153,8 +153,7 @@ bool PickleIterator::ReadBytes(const char** data, int
length) {
 Pickle::Pickle()
     : header_(NULL),
       header_size_(sizeof(Header)),
-      capacity_(0),
-      variable_buffer_offset_(0) {
+      capacity_(0) {
   Resize(kPayloadUnit);
   header_->payload_size = 0;
 }
@@ -162,8 +161,7 @@ Pickle::Pickle()
 Pickle::Pickle(int header_size)
     : header_(NULL),
       header_size_(AlignInt(header_size, sizeof(uint32))),
-      capacity_(0),
-      variable_buffer_offset_(0) {
+      capacity_(0) {
   DCHECK_GE(static_cast<size_t>(header_size), sizeof(Header));
   DCHECK_LE(header_size, kPayloadUnit);
   Resize(kPayloadUnit);
@@ -173,8 +171,7 @@ Pickle::Pickle(int header_size)
 Pickle::Pickle(const char* data, int data_len)
     : header_(reinterpret_cast<Header*>(const_cast<char*>(data))),
       header_size_(0),
-      capacity_(kCapacityReadOnly),
-      variable_buffer_offset_(0) {
+      capacity_(kCapacityReadOnly) {
   if (data_len >= static_cast<int>(sizeof(Header)))
     header_size_ = data_len - header_->payload_size;
 
@@ -192,8 +189,7 @@ Pickle::Pickle(const char* data, int data_len)
 Pickle::Pickle(const Pickle& other)
     : header_(NULL),
       header_size_(other.header_size_),
-      capacity_(0),
-      variable_buffer_offset_(other.variable_buffer_offset_) {
+      capacity_(0) {
   size_t payload_size = header_size_ + other.header_->payload_size;
   bool resized = Resize(payload_size);
   CHECK(resized);  // Realloc failed.
@@ -223,7 +219,6 @@ Pickle& Pickle::operator=(const Pickle& other) {
   CHECK(resized);  // Realloc failed.
   memcpy(header_, other.header_,
          other.header_size_ + other.header_->payload_size);
-  variable_buffer_offset_ = other.variable_buffer_offset_;
   return *this;
 }
 
@@ -267,43 +262,6 @@ bool Pickle::WriteBytes(const void* data, int data_len) {
   return true;
 }
 
-char* Pickle::BeginWriteData(int length) {
-  DCHECK_EQ(variable_buffer_offset_, 0U) <<
-    "There can only be one variable buffer in a Pickle";
-
-  if (length < 0 || !WriteInt(length))
-    return NULL;
-
-  char *data_ptr = BeginWrite(length);
-  if (!data_ptr)
-    return NULL;
-
-  variable_buffer_offset_ =
-      data_ptr - reinterpret_cast<char*>(header_) - sizeof(int);
-
-  // EndWrite doesn't necessarily have to be called after the write operation,
-  // so we call it here to pad out what the caller will eventually write.
-  EndWrite(data_ptr, length);
-  return data_ptr;
-}
-
-void Pickle::TrimWriteData(int new_length) {
-  DCHECK_NE(variable_buffer_offset_, 0U);
-
-  // Fetch the the variable buffer size
-  int* cur_length = reinterpret_cast<int*>(
-      reinterpret_cast<char*>(header_) + variable_buffer_offset_);
-
-  if (new_length < 0 || new_length > *cur_length) {
-    NOTREACHED() << "Invalid length in TrimWriteData.";
-    return;
-  }
-
-  // Update the payload size and variable buffer size
-  header_->payload_size -= (*cur_length - new_length);
-  *cur_length = new_length;
-}
-
 char* Pickle::BeginWrite(size_t length) {
   // write at a uint32-aligned offset from the beginning of the header
   size_t offset = AlignInt(header_->payload_size, sizeof(uint32));

[commit-bot: I haz the power, 2013-10-30 20:14:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/38693003/170001

[piman, 2013-10-30 20:32:17]

Committed patchset #2 manually as r231911 (presubmit successful).