[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e27fe888cee2f01d5eff6b57f840eb4001d79a36
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 21:43:19 2010 +0000

    Remove unnecessary copy constructor, assignment operator and swap function.
    The defaults (for all except swap) should do just fine.
    
    Reviewed by Gavin Barraclough.
    
    * Shared/WebPreferencesStore.cpp:
    * Shared/WebPreferencesStore.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c4f5fc5..9f6c80d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-16  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        Remove unnecessary copy constructor, assignment operator and swap function.
+        The defaults (for all except swap) should do just fine.
+
+        * Shared/WebPreferencesStore.cpp:
+        * Shared/WebPreferencesStore.h:
+
 2010-08-16  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/Shared/WebPreferencesStore.cpp b/WebKit2/Shared/WebPreferencesStore.cpp
index 15a267d..8047094 100644
--- a/WebKit2/Shared/WebPreferencesStore.cpp
+++ b/WebKit2/Shared/WebPreferencesStore.cpp
@@ -49,52 +49,4 @@ WebPreferencesStore::WebPreferencesStore()
 {
 }
 
-WebPreferencesStore::WebPreferencesStore(const WebPreferencesStore& other)
-{
-    javaScriptEnabled = other.javaScriptEnabled;
-    loadsImagesAutomatically = other.loadsImagesAutomatically;
-    pluginsEnabled = other.pluginsEnabled;
-    offlineWebApplicationCacheEnabled = other.offlineWebApplicationCacheEnabled;
-    localStorageEnabled = other.localStorageEnabled;
-    fontSmoothingLevel = other.fontSmoothingLevel;
-    minimumFontSize = other.minimumFontSize;
-    minimumLogicalFontSize = other.minimumLogicalFontSize;
-    defaultFontSize = other.defaultFontSize;
-    defaultFixedFontSize = other.defaultFixedFontSize;
-    standardFontFamily = other.standardFontFamily;
-    cursiveFontFamily = other.cursiveFontFamily;
-    fantasyFontFamily = other.fantasyFontFamily;
-    fixedFontFamily = other.fixedFontFamily;
-    sansSerifFontFamily = other.sansSerifFontFamily;
-    serifFontFamily = other.serifFontFamily;
-
-}
-
-WebPreferencesStore& WebPreferencesStore::operator=(const WebPreferencesStore& other)
-{
-    WebPreferencesStore copy = other;
-    swap(copy);
-    return *this;
-}
-
-void WebPreferencesStore::swap(WebPreferencesStore& other)
-{
-    std::swap(javaScriptEnabled, other.javaScriptEnabled);
-    std::swap(loadsImagesAutomatically, other.loadsImagesAutomatically);
-    std::swap(pluginsEnabled, other.pluginsEnabled);
-    std::swap(offlineWebApplicationCacheEnabled, other.offlineWebApplicationCacheEnabled);
-    std::swap(localStorageEnabled, other.localStorageEnabled);
-    std::swap(fontSmoothingLevel, other.fontSmoothingLevel);
-    std::swap(minimumFontSize, other.minimumFontSize);
-    std::swap(minimumLogicalFontSize, other.minimumLogicalFontSize);
-    std::swap(defaultFontSize, other.defaultFontSize);
-    std::swap(defaultFixedFontSize, other.defaultFixedFontSize);
-    WTF::swap(standardFontFamily, other.standardFontFamily);
-    WTF::swap(cursiveFontFamily, other.cursiveFontFamily);
-    WTF::swap(fantasyFontFamily, other.fantasyFontFamily);
-    WTF::swap(fixedFontFamily, other.fixedFontFamily);
-    WTF::swap(sansSerifFontFamily, other.sansSerifFontFamily);
-    WTF::swap(serifFontFamily, other.serifFontFamily);
-}
-
 } // namespace WebKit
diff --git a/WebKit2/Shared/WebPreferencesStore.h b/WebKit2/Shared/WebPreferencesStore.h
index ad76fa0..b7cd977 100644
--- a/WebKit2/Shared/WebPreferencesStore.h
+++ b/WebKit2/Shared/WebPreferencesStore.h
@@ -35,9 +35,6 @@ namespace WebKit {
 
 struct WebPreferencesStore {
     WebPreferencesStore();
-    WebPreferencesStore(const WebPreferencesStore&);
-    WebPreferencesStore& operator=(const WebPreferencesStore&);
-    void swap(WebPreferencesStore&);
 
     void encode(CoreIPC::ArgumentEncoder* encoder) const
     {

-- 
WebKit Debian packaging