Remove all the swap() stuff in the PPAPI C++ wrappers....

ppapi/cpp/dev/font_dev.cc

 // Copyright (c) 2010 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 "ppapi/cpp/dev/font_dev.h"
 
 #include <algorithm>
 
 #include "ppapi/cpp/common.h"
 #include "ppapi/cpp/image_data.h"
@@ skipping 32 matching lines @@
   set_small_caps(other.small_caps());
   set_letter_spacing(other.letter_spacing());
   set_word_spacing(other.word_spacing());
 }
 
 FontDescription_Dev::~FontDescription_Dev() {
 }
 
 FontDescription_Dev& FontDescription_Dev::operator=(
     const FontDescription_Dev& other) {
-  FontDescription_Dev copy(other);
-  swap(copy);
+  pp_font_description_ = other.pp_font_description_;
+
+  // Be careful about the refcount of the string, the copy that operator= made
+  // above didn't copy a ref.
+  pp_font_description_.face = PP_MakeUndefined();
+  set_face(other.face());
+
   return *this;
 }
 
-void FontDescription_Dev::swap(FontDescription_Dev& other) {
-  // Need to fix up both the face and the pp_font_description_.face which the
-  // setter does for us.
-  Var temp = face();
-  set_face(other.face());
-  other.set_face(temp);
-
-  std::swap(pp_font_description_.family, other.pp_font_description_.family);
-  std::swap(pp_font_description_.size, other.pp_font_description_.size);
-  std::swap(pp_font_description_.weight, other.pp_font_description_.weight);
-  std::swap(pp_font_description_.italic, other.pp_font_description_.italic);
-  std::swap(pp_font_description_.small_caps,
-            other.pp_font_description_.small_caps);
-  std::swap(pp_font_description_.letter_spacing,
-            other.pp_font_description_.letter_spacing);
-  std::swap(pp_font_description_.word_spacing,
-            other.pp_font_description_.word_spacing);
-}
-
 // TextRun_Dev -----------------------------------------------------------------
 
 TextRun_Dev::TextRun_Dev() {
   pp_text_run_.text = text_.pp_var();
   pp_text_run_.rtl = PP_FALSE;
   pp_text_run_.override_direction = PP_FALSE;
 }
 
 TextRun_Dev::TextRun_Dev(const std::string& text,
                          bool rtl,
                          bool override_direction)
     : text_(text) {
   pp_text_run_.text = text_.pp_var();
   pp_text_run_.rtl = BoolToPPBool(rtl);
   pp_text_run_.override_direction = BoolToPPBool(override_direction);
 }
 
 TextRun_Dev::TextRun_Dev(const TextRun_Dev& other) : text_(other.text_) {
   pp_text_run_.text = text_.pp_var();
   pp_text_run_.rtl = other.pp_text_run_.rtl;
   pp_text_run_.override_direction = other.pp_text_run_.override_direction;
 }
 
 TextRun_Dev::~TextRun_Dev() {
 }
 
 TextRun_Dev& TextRun_Dev::operator=(const TextRun_Dev& other) {
-  TextRun_Dev copy(other);
-  swap(copy);
+  pp_text_run_ = other.pp_text_run_;
+  text_ = other.text_;
+  pp_text_run_.text = text_.pp_var();
   return *this;
 }
 
-void TextRun_Dev::swap(TextRun_Dev& other) {
-  std::swap(text_, other.text_);
-
-  // Fix up both object's pp_text_run.text to point to their text_ member.
-  pp_text_run_.text = text_.pp_var();
-  other.pp_text_run_.text = other.text_.pp_var();
-
-  std::swap(pp_text_run_.rtl, other.pp_text_run_.rtl);
-  std::swap(pp_text_run_.override_direction,
-            other.pp_text_run_.override_direction);
-}
-
 // Font ------------------------------------------------------------------------
 
 Font_Dev::Font_Dev(PP_Resource resource) : Resource(resource) {
 }
 
 Font_Dev::Font_Dev(const FontDescription_Dev& description) {
   if (!font_f)
     return;
   PassRefFromConstructor(font_f->Create(
       Module::Get()->pp_module(), &description.pp_font_description()));
 }
 
 Font_Dev::Font_Dev(const Font_Dev& other) : Resource(other) {
 }
 
 Font_Dev& Font_Dev::operator=(const Font_Dev& other) {
-  Font_Dev copy(other);
-  swap(copy);
+  Resource::operator=(other);
   return *this;
 }
 
-void Font_Dev::swap(Font_Dev& other) {
-  Resource::swap(other);
-}
-
 bool Font_Dev::Describe(FontDescription_Dev* description,
                         PP_FontMetrics_Dev* metrics) const {
   if (!font_f)
     return false;
 
   // Be careful with ownership of the |face| string. It will come back with
   // a ref of 1, which we want to assign to the |face_| member of the C++ class.
   if (!font_f->Describe(pp_resource(), &description->pp_font_description_,
                         metrics))
     return false;
@@ skipping 50 matching lines @@
                               bool image_data_is_opaque) const {
   return DrawTextAt(dest, TextRun_Dev(text), position, color,
                     Rect(dest->size()), image_data_is_opaque);
 }
 
 int32_t Font_Dev::MeasureSimpleText(const std::string& text) const {
   return MeasureText(TextRun_Dev(text));
 }
 
 }  // namespace pp