From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/pickle.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chromium/base/pickle.h') diff --git a/chromium/base/pickle.h b/chromium/base/pickle.h index 1000a562dc2..6e3a08239ad 100644 --- a/chromium/base/pickle.h +++ b/chromium/base/pickle.h @@ -11,9 +11,10 @@ #include #include "base/base_export.h" +#include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/containers/span.h" #include "base/gtest_prod_util.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" @@ -56,6 +57,9 @@ class BASE_EXPORT PickleIterator { // until the message data is mutated). Do not keep the pointer around! bool ReadData(const char** data, int* length) WARN_UNUSED_RESULT; + // Similar, but using base::span for convenience. + bool ReadData(base::span* data) WARN_UNUSED_RESULT; + // A pointer to the data will be placed in |*data|. The caller specifies the // number of bytes to read, and ReadBytes will validate this length. The // pointer placed into |*data| points into the message's buffer so it will be -- cgit v1.2.1