diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/websockets/websocket_deflate_predictor.h | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/websockets/websocket_deflate_predictor.h')
| -rw-r--r-- | chromium/net/websockets/websocket_deflate_predictor.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/net/websockets/websocket_deflate_predictor.h b/chromium/net/websockets/websocket_deflate_predictor.h index 38566ddfa50..fde316e8cb8 100644 --- a/chromium/net/websockets/websocket_deflate_predictor.h +++ b/chromium/net/websockets/websocket_deflate_predictor.h @@ -7,9 +7,9 @@ #include <stddef.h> +#include <memory> #include <vector> -#include "base/memory/scoped_ptr.h" #include "net/base/net_export.h" namespace net { @@ -41,8 +41,9 @@ class NET_EXPORT_PRIVATE WebSocketDeflatePredictor { // but future frames may contain control message frames. // |frames[frame_index]| cannot be recorded yet and all preceding // data frames have to be already recorded when this method is called. - virtual Result Predict(const std::vector<scoped_ptr<WebSocketFrame>>& frames, - size_t frame_index) = 0; + virtual Result Predict( + const std::vector<std::unique_ptr<WebSocketFrame>>& frames, + size_t frame_index) = 0; // Records frame data for future prediction. // Only data frames should be recorded. Do not pass control frames' data. |