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

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1f777c8ec18bf078d1ad606aa9cafd3c9c5d5c05
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 11:26:18 2010 +0000

    2010-08-16  Jeremy Orlow  <jorlow at chromium.org>
    
            Ugh, the #if ENABLE() was supposed to be added to Settings not GroupSettings.
    
            * page/GroupSettings.cpp:
            (WebCore::GroupSettings::GroupSettings):
            (WebCore::GroupSettings::setLocalStorageQuotaBytes):
            * page/GroupSettings.h:
            * page/Settings.cpp:
            (WebCore::Settings::Settings):
            * page/Settings.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65410 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 11a791a..1d96228 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-08-16  Jeremy Orlow  <jorlow at chromium.org>
 
+        Ugh, the #if ENABLE() was supposed to be added to Settings not GroupSettings.
+
+        * page/GroupSettings.cpp:
+        (WebCore::GroupSettings::GroupSettings):
+        (WebCore::GroupSettings::setLocalStorageQuotaBytes):
+        * page/GroupSettings.h:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+
+2010-08-16  Jeremy Orlow  <jorlow at chromium.org>
+
         Last build fix?
 
         * page/PageGroup.cpp:
diff --git a/WebCore/page/GroupSettings.cpp b/WebCore/page/GroupSettings.cpp
index f005860..58ab74d 100644
--- a/WebCore/page/GroupSettings.cpp
+++ b/WebCore/page/GroupSettings.cpp
@@ -29,18 +29,14 @@
 namespace WebCore {
 
 GroupSettings::GroupSettings()
-#if ENABLE(DOM_STORAGE)
     : m_localStorageQuotaBytes(5 * 1024 * 1024) // Suggested by the HTML5 spec.
-#endif
 {
 }
 
-#if ENABLE(DOM_STORAGE)
 void GroupSettings::setLocalStorageQuotaBytes(unsigned quota)
 {
     m_localStorageQuotaBytes = quota;
 }
-#endif
 
 void GroupSettings::setIndexedDBDatabasePath(const String& path)
 {
diff --git a/WebCore/page/GroupSettings.h b/WebCore/page/GroupSettings.h
index b0dcd63..62a5dd2 100644
--- a/WebCore/page/GroupSettings.h
+++ b/WebCore/page/GroupSettings.h
@@ -40,10 +40,8 @@ public:
         return adoptPtr(new GroupSettings());
     }
 
-#if ENABLE(DOM_STORAGE)
     void setLocalStorageQuotaBytes(unsigned);
     unsigned localStorageQuotaBytes() const { return m_localStorageQuotaBytes; }
-#endif
 
     void setIndexedDBDatabasePath(const String&);
     const String& indexedDBDatabasePath() const { return m_indexedDBDatabasePath; }
@@ -51,9 +49,7 @@ public:
 private:
     GroupSettings();
 
-#if ENABLE(DOM_STORAGE)
     unsigned m_localStorageQuotaBytes;
-#endif
     String m_indexedDBDatabasePath;
 };
 
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index c150cb7..5074abb 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -64,7 +64,9 @@ Settings::Settings(Page* page)
     , m_defaultFontSize(0)
     , m_defaultFixedFontSize(0)
     , m_maximumDecodedImageSize(numeric_limits<size_t>::max())
+#if ENABLE(DOM_STORAGE)
     , m_sessionStorageQuota(StorageMap::noQuota)
+#endif
     , m_pluginAllowedRunTime(numeric_limits<unsigned>::max())
     , m_zoomMode(ZoomPage)
     , m_isSpatialNavigationEnabled(false)
@@ -287,10 +289,12 @@ void Settings::setLocalStorageEnabled(bool localStorageEnabled)
     m_localStorageEnabled = localStorageEnabled;
 }
 
+#if ENABLE(DOM_STORAGE)
 void Settings::setSessionStorageQuota(unsigned sessionStorageQuota)
 {
     m_sessionStorageQuota = sessionStorageQuota;
 }
+#endif
 
 void Settings::setPrivateBrowsingEnabled(bool privateBrowsingEnabled)
 {
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 9be3b4b..89a46e6 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -129,11 +129,13 @@ namespace WebCore {
         void setLocalStorageEnabled(bool);
         bool localStorageEnabled() const { return m_localStorageEnabled; }
 
+#if ENABLE(DOM_STORAGE)
         // Allow clients concerned with memory consumption to set a quota on session storage
         // since the memory used won't be released until the Page is destroyed.
         // Default is noQuota.
         void setSessionStorageQuota(unsigned);
         unsigned sessionStorageQuota() const { return m_sessionStorageQuota; }
+#endif
 
         // When this option is set, WebCore will avoid storing any record of browsing activity
         // that may persist on disk or remain displayed when the option is reset.
@@ -349,7 +351,9 @@ namespace WebCore {
         int m_defaultFontSize;
         int m_defaultFixedFontSize;
         size_t m_maximumDecodedImageSize;
+#if ENABLE(DOM_STORAGE)
         unsigned m_sessionStorageQuota;
+#endif
         unsigned m_pluginAllowedRunTime;
         ZoomMode m_zoomMode;
         bool m_isSpatialNavigationEnabled : 1;

-- 
WebKit Debian packaging