From 731df977c0511bca2206b5f333555b1205ff1f43 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 1 Nov 2010 12:19:54 +0000 Subject: Merge Chromium at r63472 : Initial merge by git. Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a --- chrome/browser/history/snippet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/history/snippet.h') diff --git a/chrome/browser/history/snippet.h b/chrome/browser/history/snippet.h index ffa8fa1..bbabef0 100644 --- a/chrome/browser/history/snippet.h +++ b/chrome/browser/history/snippet.h @@ -43,6 +43,9 @@ class Snippet { const std::string& utf8_string, Snippet::MatchPositions* match_positions); + Snippet(); + ~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 @@ -54,10 +57,7 @@ class Snippet { const MatchPositions& matches() const { return matches_; } // Efficiently swaps the contents of this snippet with the other. - void Swap(Snippet* other) { - text_.swap(other->text_); - matches_.swap(other->matches_); - } + void Swap(Snippet* other); private: // The text of the snippet. -- cgit v1.1