Update to Chromium revision d7d5682a (#367535)

This commit is contained in:
Marshall Greenblatt
2016-01-06 14:20:54 -05:00
parent 12f19e3a33
commit d2372c3d11
131 changed files with 1914 additions and 575 deletions

View File

@@ -5,9 +5,10 @@
#ifndef CEF_LIBCEF_COMMON_NET_UPLOAD_DATA_H_
#define CEF_LIBCEF_COMMON_NET_UPLOAD_DATA_H_
#include <stdint.h>
#include "libcef/common/net/upload_element.h"
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/supports_user_data.h"
@@ -36,7 +37,7 @@ class NET_EXPORT UploadData
void AppendBytes(const char* bytes, int bytes_len);
void AppendFileRange(const base::FilePath& file_path,
uint64 offset, uint64 length,
uint64_t offset, uint64_t length,
const base::Time& expected_modification_time);
// Initializes the object to send chunks of upload data over time rather
@@ -63,8 +64,8 @@ class NET_EXPORT UploadData
// Identifies a particular upload instance, which is used by the cache to
// formulate a cache key. This value should be unique across browser
// sessions. A value of 0 is used to indicate an unspecified identifier.
void set_identifier(int64 id) { identifier_ = id; }
int64 identifier() const { return identifier_; }
void set_identifier(int64_t id) { identifier_ = id; }
int64_t identifier() const { return identifier_; }
private:
friend class base::RefCounted<UploadData>;
@@ -72,7 +73,7 @@ class NET_EXPORT UploadData
~UploadData() override;
ScopedVector<UploadElement> elements_;
int64 identifier_;
int64_t identifier_;
bool is_chunked_;
bool last_chunk_appended_;