Add move constructors and assignment operators to GURL

url/gurl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "url/gurl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <ostream>
@@ skipping 61 matching lines @@
 GURL::GURL(const GURL& other)
     : spec_(other.spec_),
       is_valid_(other.is_valid_),
       parsed_(other.parsed_) {
   if (other.inner_url_)
     inner_url_.reset(new GURL(*other.inner_url_));
   // Valid filesystem urls should always have an inner_url_.
   DCHECK(!is_valid_ || !SchemeIsFileSystem() || inner_url_);
 }
 
+GURL::GURL(GURL&& other)
+    : spec_(std::move(other.spec_)),
+      is_valid_(other.is_valid_),
+      parsed_(other.parsed_),
+      inner_url_(std::move(other.inner_url_)) {
+  other.is_valid_ = false;
+  other.parsed_ = url::Parsed();
+}
+
 GURL::GURL(base::StringPiece url_string) {
   InitCanonical(url_string, true);
 }
 
 GURL::GURL(base::StringPiece16 url_string) {
   InitCanonical(url_string, true);
 }
 
 GURL::GURL(const std::string& url_string, RetainWhiteSpaceSelector) {
   InitCanonical(base::StringPiece(url_string), false);
@@ skipping 69 matching lines @@
       DCHECK(test_url.parsed_.query == parsed_.query);
       DCHECK(test_url.parsed_.ref == parsed_.ref);
     }
   }
 #endif
 }
 
 GURL::~GURL() {
 }
 
-GURL& GURL::operator=(GURL other) {
-  Swap(&other);
+GURL& GURL::operator=(const GURL& other) {
+  spec_ = other.spec_;
+  is_valid_ = other.is_valid_;
+  parsed_ = other.parsed_;
+
+  if (!other.inner_url_)
+    inner_url_.reset();
+  else if (inner_url_)
+    *inner_url_ = *other.inner_url_;
+  else
+    inner_url_.reset(new GURL(*other.inner_url_));
+
   return *this;
 }
 
+GURL& GURL::operator=(GURL&& other) {
+  spec_ = std::move(other.spec_);
+  is_valid_ = other.is_valid_;
+  parsed_ = other.parsed_;
+  inner_url_ = std::move(other.inner_url_);
+
+  other.is_valid_ = false;
+  other.parsed_ = url::Parsed();
+  return *this;
+}
+
 const std::string& GURL::spec() const {
   if (is_valid_ || spec_.empty())
     return spec_;
 
   DCHECK(false) << "Trying to get the spec of an invalid URL!";
   return EmptyStringForGURL();
 }
 
 bool GURL::operator<(const GURL& other) const {
   return spec_ < other.spec_;
@@ skipping 329 matching lines @@
 }
 
 bool operator==(const GURL& x, const base::StringPiece& spec) {
   DCHECK_EQ(GURL(spec).possibly_invalid_spec(), spec);
   return x.possibly_invalid_spec() == spec;
 }
 
 bool operator!=(const GURL& x, const base::StringPiece& spec) {
   return !(x == spec);
 }