diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 10:46:49 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:34 +0100 |
| commit | 0617145a89917ae7735fe1c9538688ab9a577df5 (patch) | |
| tree | 56206078694427c37ed7bdf27eb5221398b833c0 /WebCore/storage/chromium | |
| parent | ef1adcdfc805d4d13103f6f15cc5b4d96828a60f (diff) | |
| download | external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.zip external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.gz external_webkit-0617145a89917ae7735fe1c9538688ab9a577df5.tar.bz2 | |
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Diffstat (limited to 'WebCore/storage/chromium')
| -rw-r--r-- | WebCore/storage/chromium/DatabaseObserver.h | 4 | ||||
| -rw-r--r-- | WebCore/storage/chromium/DatabaseTrackerChromium.cpp | 4 | ||||
| -rw-r--r-- | WebCore/storage/chromium/QuotaTracker.cpp | 5 | ||||
| -rw-r--r-- | WebCore/storage/chromium/QuotaTracker.h | 6 | ||||
| -rw-r--r-- | WebCore/storage/chromium/SQLTransactionClientChromium.cpp | 4 |
5 files changed, 21 insertions, 2 deletions
diff --git a/WebCore/storage/chromium/DatabaseObserver.h b/WebCore/storage/chromium/DatabaseObserver.h index e2e5184..96b5972 100644 --- a/WebCore/storage/chromium/DatabaseObserver.h +++ b/WebCore/storage/chromium/DatabaseObserver.h @@ -31,6 +31,8 @@ #ifndef DatabaseObserver_h #define DatabaseObserver_h +#if ENABLE(DATABASE) + namespace WebCore { class AbstractDatabase; @@ -49,4 +51,6 @@ public: } +#endif // ENABLE(DATABASE) + #endif // DatabaseObserver_h diff --git a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp index 7d9c4de..aad4ed9 100644 --- a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp +++ b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp @@ -31,6 +31,8 @@ #include "config.h" #include "DatabaseTracker.h" +#if ENABLE(DATABASE) + #include "AbstractDatabase.h" #include "DatabaseObserver.h" #include "QuotaTracker.h" @@ -173,3 +175,5 @@ unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase } } + +#endif // ENABLE(DATABASE) diff --git a/WebCore/storage/chromium/QuotaTracker.cpp b/WebCore/storage/chromium/QuotaTracker.cpp index 9e64942..3f48682 100644 --- a/WebCore/storage/chromium/QuotaTracker.cpp +++ b/WebCore/storage/chromium/QuotaTracker.cpp @@ -31,8 +31,9 @@ #include "config.h" #include "QuotaTracker.h" +#if ENABLE(DATABASE) + #include <wtf/StdLibExtras.h> -#include <wtf/text/CString.h> namespace WebCore { @@ -67,3 +68,5 @@ void QuotaTracker::updateDatabaseSizeAndSpaceAvailableToOrigin( } } + +#endif // ENABLE(DATABASE) diff --git a/WebCore/storage/chromium/QuotaTracker.h b/WebCore/storage/chromium/QuotaTracker.h index 41c27fe..b913563 100644 --- a/WebCore/storage/chromium/QuotaTracker.h +++ b/WebCore/storage/chromium/QuotaTracker.h @@ -31,10 +31,12 @@ #ifndef QuotaTracker_h #define QuotaTracker_h +#if ENABLE(DATABASE) + +#include "PlatformString.h" #include "SecurityOrigin.h" #include "StringHash.h" #include <wtf/HashMap.h> -#include <wtf/text/CString.h> namespace WebCore { @@ -60,4 +62,6 @@ private: } +#endif // ENABLE(DATABASE) + #endif // QuotaTracker_h diff --git a/WebCore/storage/chromium/SQLTransactionClientChromium.cpp b/WebCore/storage/chromium/SQLTransactionClientChromium.cpp index 22d95e6..6a10821 100644 --- a/WebCore/storage/chromium/SQLTransactionClientChromium.cpp +++ b/WebCore/storage/chromium/SQLTransactionClientChromium.cpp @@ -31,6 +31,8 @@ #include "config.h" #include "SQLTransactionClient.h" +#if ENABLE(DATABASE) + #include "AbstractDatabase.h" #include "DatabaseObserver.h" #include "ScriptExecutionContext.h" @@ -83,3 +85,5 @@ bool SQLTransactionClient::didExceedQuota(AbstractDatabase* database) } } + +#endif // ENABLE(DATABASE) |