From fa7b5bc7ebd1b00e8221747a671a23b175f9390e Mon Sep 17 00:00:00 2001 From: Johannes Henkel Date: Fri, 26 Oct 2018 23:32:01 +0000 Subject: [PATCH] [DevTools] Remove the && functions from protocol::Binary. Just using std::move appropriately is probably sufficient for avoiding extra copies and it's easier to understand what's going on. Also less code. Bug: chromium:891377 Change-Id: I321e969bdede991c223cf842a6a572704d060f11 Reviewed-on: https://chromium-review.googlesource.com/c/1302109 Commit-Queue: Johannes Henkel Reviewed-by: Dmitry Gozman Cr-Commit-Position: refs/heads/master@{#603251} --- content/browser/devtools/protocol_string.cc | 16 ++-------------- content/browser/devtools/protocol_string.h | 6 ++---- headless/lib/browser/protocol/protocol_string.cc | 16 ++-------------- headless/lib/browser/protocol/protocol_string.h | 6 ++---- .../core/inspector/v8_inspector_string.cc | 7 +------ .../core/inspector/v8_inspector_string.h | 3 +-- 6 files changed, 10 insertions(+), 44 deletions(-) diff --git a/content/browser/devtools/protocol_string.cc b/content/browser/devtools/protocol_string.cc index b96f778d38fdde..0b92afa952a0c2 100644 --- a/content/browser/devtools/protocol_string.cc +++ b/content/browser/devtools/protocol_string.cc @@ -196,25 +196,13 @@ Binary Binary::fromRefCounted(scoped_refptr memory) { } // static -Binary Binary::fromVector(std::vector&& data) { +Binary Binary::fromVector(std::vector data) { return Binary(base::RefCountedBytes::TakeVector(&data)); } // static -Binary Binary::fromVector(const std::vector& data) { - std::vector copied_data(data); - return Binary(base::RefCountedBytes::TakeVector(&copied_data)); -} - -// static -Binary Binary::fromString(std::string&& data) { +Binary Binary::fromString(std::string data) { return Binary(base::RefCountedString::TakeString(&data)); } - -// static -Binary Binary::fromString(const std::string& data) { - std::string copied_data(data); - return Binary(base::RefCountedString::TakeString(&copied_data)); -} } // namespace protocol } // namespace content diff --git a/content/browser/devtools/protocol_string.h b/content/browser/devtools/protocol_string.h index fb43a8b9f49926..90cc73dd95aa78 100644 --- a/content/browser/devtools/protocol_string.h +++ b/content/browser/devtools/protocol_string.h @@ -101,10 +101,8 @@ class CONTENT_EXPORT Binary { static Binary fromBase64(const String& base64, bool* success); static Binary fromRefCounted(scoped_refptr memory); - static Binary fromVector(std::vector&& data); - static Binary fromVector(const std::vector& data); - static Binary fromString(std::string&& data); - static Binary fromString(const std::string& data); + static Binary fromVector(std::vector data); + static Binary fromString(std::string data); private: explicit Binary(scoped_refptr bytes); diff --git a/headless/lib/browser/protocol/protocol_string.cc b/headless/lib/browser/protocol/protocol_string.cc index 5e82611694cc3e..b6b108546f855a 100644 --- a/headless/lib/browser/protocol/protocol_string.cc +++ b/headless/lib/browser/protocol/protocol_string.cc @@ -190,25 +190,13 @@ Binary Binary::fromRefCounted(scoped_refptr memory) { } // static -Binary Binary::fromVector(std::vector&& data) { +Binary Binary::fromVector(std::vector data) { return Binary(base::RefCountedBytes::TakeVector(&data)); } // static -Binary Binary::fromVector(const std::vector& data) { - std::vector copied_data(data); - return Binary(base::RefCountedBytes::TakeVector(&copied_data)); -} - -// static -Binary Binary::fromString(std::string&& data) { +Binary Binary::fromString(std::string data) { return Binary(base::RefCountedString::TakeString(&data)); } - -// static -Binary Binary::fromString(const std::string& data) { - std::string copied_data(data); - return Binary(base::RefCountedString::TakeString(&copied_data)); -} } // namespace protocol } // namespace headless diff --git a/headless/lib/browser/protocol/protocol_string.h b/headless/lib/browser/protocol/protocol_string.h index f6d988ca2a5b1a..3f0bf133f363c9 100644 --- a/headless/lib/browser/protocol/protocol_string.h +++ b/headless/lib/browser/protocol/protocol_string.h @@ -98,10 +98,8 @@ class HEADLESS_EXPORT Binary { String toBase64() const; static Binary fromBase64(const String& base64, bool* success); static Binary fromRefCounted(scoped_refptr memory); - static Binary fromVector(std::vector&& data); - static Binary fromVector(const std::vector& data); - static Binary fromString(std::string&& data); - static Binary fromString(const std::string& data); + static Binary fromVector(std::vector data); + static Binary fromString(std::string data); private: explicit Binary(scoped_refptr bytes); diff --git a/third_party/blink/renderer/core/inspector/v8_inspector_string.cc b/third_party/blink/renderer/core/inspector/v8_inspector_string.cc index c405cab7a55483..f1d6ef86e16585 100644 --- a/third_party/blink/renderer/core/inspector/v8_inspector_string.cc +++ b/third_party/blink/renderer/core/inspector/v8_inspector_string.cc @@ -139,15 +139,10 @@ Binary Binary::fromSharedBuffer(scoped_refptr buffer) { } // static -Binary Binary::fromVector(Vector&& in) { +Binary Binary::fromVector(Vector in) { return Binary(base::AdoptRef(new BinaryBasedOnVector(std::move(in)))); } -// static -Binary Binary::fromVector(const Vector& in) { - return Binary(base::AdoptRef(new BinaryBasedOnVector(in))); -} - // static Binary Binary::fromCachedData( std::unique_ptr data) { diff --git a/third_party/blink/renderer/core/inspector/v8_inspector_string.h b/third_party/blink/renderer/core/inspector/v8_inspector_string.h index a982716ab64783..ec2881753c870f 100644 --- a/third_party/blink/renderer/core/inspector/v8_inspector_string.h +++ b/third_party/blink/renderer/core/inspector/v8_inspector_string.h @@ -97,8 +97,7 @@ class CORE_EXPORT Binary { String toBase64() const; static Binary fromBase64(const String& base64, bool* success); static Binary fromSharedBuffer(scoped_refptr buffer); - static Binary fromVector(Vector&& in); - static Binary fromVector(const Vector& in); + static Binary fromVector(Vector in); // Note: |data.buffer_policy| must be // ScriptCompiler::ScriptCompiler::CachedData::BufferOwned.