[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 56b2952dba6b41f61aae27b07747530a318f5d4d
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 10:53:12 2010 +0000

    2010-08-16  Jeremy Orlow  <jorlow at chromium.org>
    
            Ugh...another build fix.
    
            * page/GroupSettings.cpp:
            (WebCore::GroupSettings::GroupSettings):
            * page/GroupSettings.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65408 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 77779dc..848bc6a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-16  Jeremy Orlow  <jorlow at chromium.org>
 
+        Ugh...another build fix.
+
+        * page/GroupSettings.cpp:
+        (WebCore::GroupSettings::GroupSettings):
+        * page/GroupSettings.h:
+
+2010-08-16  Jeremy Orlow  <jorlow at chromium.org>
+
         Build fix.
 
         * GNUmakefile.am:
diff --git a/WebCore/page/GroupSettings.cpp b/WebCore/page/GroupSettings.cpp
index 58ab74d..f005860 100644
--- a/WebCore/page/GroupSettings.cpp
+++ b/WebCore/page/GroupSettings.cpp
@@ -29,14 +29,18 @@
 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 62a5dd2..b0dcd63 100644
--- a/WebCore/page/GroupSettings.h
+++ b/WebCore/page/GroupSettings.h
@@ -40,8 +40,10 @@ 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; }
@@ -49,7 +51,9 @@ public:
 private:
     GroupSettings();
 
+#if ENABLE(DOM_STORAGE)
     unsigned m_localStorageQuotaBytes;
+#endif
     String m_indexedDBDatabasePath;
 };
 

-- 
WebKit Debian packaging