summaryrefslogtreecommitdiff
path: root/chromium/net/http/partial_data.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-14 11:38:45 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-14 17:16:47 +0000
commit3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch)
tree43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/net/http/partial_data.h
parentf61ab1ac7f855cd281809255c0aedbb1895e1823 (diff)
downloadqtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/net/http/partial_data.h')
-rw-r--r--chromium/net/http/partial_data.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/http/partial_data.h b/chromium/net/http/partial_data.h
index 8d87da5cab8..649d4623e01 100644
--- a/chromium/net/http/partial_data.h
+++ b/chromium/net/http/partial_data.h
@@ -6,6 +6,7 @@
#define NET_HTTP_PARTIAL_DATA_H_
#include "base/basictypes.h"
+#include "base/memory/weak_ptr.h"
#include "net/base/completion_callback.h"
#include "net/http/http_byte_range.h"
#include "net/http/http_request_headers.h"
@@ -119,12 +120,11 @@ class PartialData {
bool initial_validation() const { return initial_validation_; }
private:
- class Core;
// Returns the length to use when scanning the cache.
int GetNextRangeLen();
// Completion routine for our callback.
- void GetAvailableRangeCompleted(int result, int64 start);
+ void GetAvailableRangeCompleted(int64* start, int result);
int64 current_range_start_;
int64 current_range_end_;
@@ -139,8 +139,8 @@ class PartialData {
bool sparse_entry_;
bool truncated_; // We have an incomplete 200 stored.
bool initial_validation_; // Only used for truncated entries.
- Core* core_;
CompletionCallback callback_;
+ base::WeakPtrFactory<PartialData> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(PartialData);
};