From ec02ee4181c49b61fce1c8fb99292dbb8139cc90 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 12 Jul 2017 14:07:37 +0200 Subject: BASELINE: Update Chromium to 59.0.3071.134 Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a Reviewed-by: Alexandru Croitor --- chromium/components/query_parser/snippet.cc | 7 +++++++ chromium/components/query_parser/snippet.h | 3 +++ 2 files changed, 10 insertions(+) (limited to 'chromium/components/query_parser') diff --git a/chromium/components/query_parser/snippet.cc b/chromium/components/query_parser/snippet.cc index f540be5ca32..3133d8feda2 100644 --- a/chromium/components/query_parser/snippet.cc +++ b/chromium/components/query_parser/snippet.cc @@ -210,9 +210,16 @@ Snippet::Snippet() { Snippet::Snippet(const Snippet& other) = default; +// TODO(bug 706963) this should be implemented as "= default" when Android +// toolchain is updated. +Snippet::Snippet(Snippet&& other) noexcept + : text_(std::move(other.text_)), matches_(std::move(other.matches_)) {} + Snippet::~Snippet() { } +Snippet& Snippet::operator=(const Snippet&) = default; + void Snippet::ComputeSnippet(const MatchPositions& match_positions, const std::string& document) { // The length of snippets we try to produce. diff --git a/chromium/components/query_parser/snippet.h b/chromium/components/query_parser/snippet.h index ed6a887cb8f..11f05d6bcdc 100644 --- a/chromium/components/query_parser/snippet.h +++ b/chromium/components/query_parser/snippet.h @@ -48,8 +48,11 @@ class Snippet { Snippet(); Snippet(const Snippet& other); + Snippet(Snippet&& other) noexcept; ~Snippet(); + Snippet& operator=(const Snippet&); + // Given |matches|, the match positions within |document|, compute the snippet // for the document. // Note that |document| is UTF-8 and the offsets in |matches| are byte -- cgit v1.2.1