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

Unified Diff: net/quic/core/quic_data_reader.cc

Issue 2740453006: Add QuicStringPiece which is actually StringPiece. (Closed)
Patch Set: fix compile error and rebase Created 3 years, 9 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 | « net/quic/core/quic_data_reader.h ('k') | net/quic/core/quic_data_writer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_data_reader.cc
diff --git a/net/quic/core/quic_data_reader.cc b/net/quic/core/quic_data_reader.cc
index 855c71ab73b748743ae0cbbb2876eda245907a97..ea078de6a5f85382cf74a286a0a1aa16c0f10a62 100644
--- a/net/quic/core/quic_data_reader.cc
+++ b/net/quic/core/quic_data_reader.cc
@@ -7,8 +7,6 @@
#include "net/base/int128.h"
#include "net/quic/core/quic_packets.h"
-using base::StringPiece;
-
namespace net {
QuicDataReader::QuicDataReader(const char* data, const size_t len)
@@ -59,7 +57,7 @@ bool QuicDataReader::ReadUFloat16(uint64_t* result) {
return true;
}
-bool QuicDataReader::ReadStringPiece16(StringPiece* result) {
+bool QuicDataReader::ReadStringPiece16(QuicStringPiece* result) {
// Read resultant length.
uint16_t result_len;
if (!ReadUInt16(&result_len)) {
@@ -70,7 +68,7 @@ bool QuicDataReader::ReadStringPiece16(StringPiece* result) {
return ReadStringPiece(result, result_len);
}
-bool QuicDataReader::ReadStringPiece(StringPiece* result, size_t size) {
+bool QuicDataReader::ReadStringPiece(QuicStringPiece* result, size_t size) {
// Make sure that we have enough data to read.
if (!CanRead(size)) {
OnFailure();
@@ -78,7 +76,7 @@ bool QuicDataReader::ReadStringPiece(StringPiece* result, size_t size) {
}
// Set result.
- *result = StringPiece(data_ + pos_, size);
+ *result = QuicStringPiece(data_ + pos_, size);
// Iterate.
pos_ += size;
@@ -86,14 +84,14 @@ bool QuicDataReader::ReadStringPiece(StringPiece* result, size_t size) {
return true;
}
-StringPiece QuicDataReader::ReadRemainingPayload() {
- StringPiece payload = PeekRemainingPayload();
+QuicStringPiece QuicDataReader::ReadRemainingPayload() {
+ QuicStringPiece payload = PeekRemainingPayload();
pos_ = len_;
return payload;
}
-StringPiece QuicDataReader::PeekRemainingPayload() {
- return StringPiece(data_ + pos_, len_ - pos_);
+QuicStringPiece QuicDataReader::PeekRemainingPayload() {
+ return QuicStringPiece(data_ + pos_, len_ - pos_);
}
bool QuicDataReader::ReadBytes(void* result, size_t size) {
« no previous file with comments | « net/quic/core/quic_data_reader.h ('k') | net/quic/core/quic_data_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698