summaryrefslogtreecommitdiffstats
path: root/WebCore/storage
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2008-10-21 07:00:00 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2008-10-21 07:00:00 -0700
commit9364f22aed35e1a1e9d07c121510f80be3ab0502 (patch)
treed49911209b132da58d838efa852daf28d516df21 /WebCore/storage
parent87eb0cb35bad8784770ebc807e6c982432e47107 (diff)
downloadexternal_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.zip
external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.gz
external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.bz2
Initial Contribution
Diffstat (limited to 'WebCore/storage')
-rw-r--r--WebCore/storage/Database.cpp3
-rw-r--r--WebCore/storage/Database.h2
-rw-r--r--WebCore/storage/DatabaseTask.h2
-rw-r--r--WebCore/storage/DatabaseThread.h2
-rw-r--r--WebCore/storage/DatabaseTracker.cpp1
-rw-r--r--WebCore/storage/OriginQuotaManager.h2
-rw-r--r--WebCore/storage/SQLError.h2
-rw-r--r--WebCore/storage/SQLResultSet.h2
-rw-r--r--WebCore/storage/SQLResultSetRowList.h2
-rw-r--r--WebCore/storage/SQLStatement.h8
-rw-r--r--WebCore/storage/SQLStatementCallback.h2
-rw-r--r--WebCore/storage/SQLStatementErrorCallback.h2
-rw-r--r--WebCore/storage/SQLTransaction.h2
-rw-r--r--WebCore/storage/SQLTransactionCallback.h2
-rw-r--r--WebCore/storage/SQLTransactionErrorCallback.h2
15 files changed, 16 insertions, 20 deletions
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index 927d199..efe3f25 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -41,7 +41,6 @@
#include "Frame.h"
#include "InspectorController.h"
#include "Logging.h"
-#include "MainThread.h"
#include "NotImplemented.h"
#include "Page.h"
#include "OriginQuotaManager.h"
@@ -124,7 +123,7 @@ Database::Database(Document* document, const String& name, const String& expecte
if (m_name.isNull())
m_name = "";
- initializeThreadingAndMainThread();
+ initializeThreading();
m_guid = guidForOriginAndName(m_securityOrigin->toString(), name);
diff --git a/WebCore/storage/Database.h b/WebCore/storage/Database.h
index 955f023..99be370 100644
--- a/WebCore/storage/Database.h
+++ b/WebCore/storage/Database.h
@@ -29,7 +29,7 @@
#ifndef Database_h
#define Database_h
-#include <wtf/MessageQueue.h>
+#include "MessageQueue.h"
#include "PlatformString.h"
#include "SecurityOrigin.h"
#include "SQLiteDatabase.h"
diff --git a/WebCore/storage/DatabaseTask.h b/WebCore/storage/DatabaseTask.h
index d43090d..135438a 100644
--- a/WebCore/storage/DatabaseTask.h
+++ b/WebCore/storage/DatabaseTask.h
@@ -30,9 +30,9 @@
#include "ExceptionCode.h"
#include "PlatformString.h"
+#include "Threading.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassRefPtr.h>
-#include <wtf/Threading.h>
#include <wtf/Vector.h>
namespace WebCore {
diff --git a/WebCore/storage/DatabaseThread.h b/WebCore/storage/DatabaseThread.h
index e612415..a95ca37 100644
--- a/WebCore/storage/DatabaseThread.h
+++ b/WebCore/storage/DatabaseThread.h
@@ -28,7 +28,7 @@
#ifndef DatabaseThread_h
#define DatabaseThread_h
-#include <wtf/MessageQueue.h>
+#include "MessageQueue.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
diff --git a/WebCore/storage/DatabaseTracker.cpp b/WebCore/storage/DatabaseTracker.cpp
index ffdd589..c4595e9 100644
--- a/WebCore/storage/DatabaseTracker.cpp
+++ b/WebCore/storage/DatabaseTracker.cpp
@@ -35,7 +35,6 @@
#include "Document.h"
#include "FileSystem.h"
#include "Logging.h"
-#include "MainThread.h"
#include "OriginQuotaManager.h"
#include "Page.h"
#include "SecurityOrigin.h"
diff --git a/WebCore/storage/OriginQuotaManager.h b/WebCore/storage/OriginQuotaManager.h
index 3191a58..874b3f3 100644
--- a/WebCore/storage/OriginQuotaManager.h
+++ b/WebCore/storage/OriginQuotaManager.h
@@ -31,8 +31,8 @@
#include "PlatformString.h"
#include "StringHash.h"
#include "SecurityOriginHash.h"
+#include "Threading.h"
#include <wtf/HashMap.h>
-#include <wtf/Threading.h>
namespace WebCore {
diff --git a/WebCore/storage/SQLError.h b/WebCore/storage/SQLError.h
index 5e952e9..ddeebc5 100644
--- a/WebCore/storage/SQLError.h
+++ b/WebCore/storage/SQLError.h
@@ -30,7 +30,7 @@
#define SQLError_h
#include "PlatformString.h"
-#include <wtf/Threading.h>
+#include "Threading.h"
namespace WebCore {
diff --git a/WebCore/storage/SQLResultSet.h b/WebCore/storage/SQLResultSet.h
index e10befe..de7a2be 100644
--- a/WebCore/storage/SQLResultSet.h
+++ b/WebCore/storage/SQLResultSet.h
@@ -30,7 +30,7 @@
#define SQLResultSet_h
#include "SQLResultSetRowList.h"
-#include <wtf/Threading.h>
+#include "Threading.h"
namespace WebCore {
diff --git a/WebCore/storage/SQLResultSetRowList.h b/WebCore/storage/SQLResultSetRowList.h
index eda672b..306a5d3 100644
--- a/WebCore/storage/SQLResultSetRowList.h
+++ b/WebCore/storage/SQLResultSetRowList.h
@@ -35,8 +35,6 @@ namespace WebCore {
class SQLResultSetRowList : public RefCounted<SQLResultSetRowList> {
public:
- SQLResultSetRowList() : RefCounted<SQLResultSetRowList>(0) { }
-
const Vector<String>& columnNames() const { return m_columns; }
const Vector<SQLValue>& values() const { return m_result; }
diff --git a/WebCore/storage/SQLStatement.h b/WebCore/storage/SQLStatement.h
index f2fe36f..538f645 100644
--- a/WebCore/storage/SQLStatement.h
+++ b/WebCore/storage/SQLStatement.h
@@ -25,10 +25,11 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SQLStatement_h
-#define SQLStatement_h
+#ifndef SQLStatment_h
+#define SQLStatment_h
#include "PlatformString.h"
+#include "Threading.h"
#include "SQLError.h"
#include "SQLResultSet.h"
@@ -38,7 +39,6 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
-#include <wtf/Threading.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -78,4 +78,4 @@ private:
} // namespace WebCore
-#endif // SQLStatement_h
+#endif // SQLStatment_h
diff --git a/WebCore/storage/SQLStatementCallback.h b/WebCore/storage/SQLStatementCallback.h
index 58a9436..9a4b059 100644
--- a/WebCore/storage/SQLStatementCallback.h
+++ b/WebCore/storage/SQLStatementCallback.h
@@ -28,7 +28,7 @@
#ifndef SQLStatementCallback_h
#define SQLStatementCallback_h
-#include <wtf/Threading.h>
+#include "Threading.h"
namespace WebCore {
diff --git a/WebCore/storage/SQLStatementErrorCallback.h b/WebCore/storage/SQLStatementErrorCallback.h
index 5dc3f5a..37ad231 100644
--- a/WebCore/storage/SQLStatementErrorCallback.h
+++ b/WebCore/storage/SQLStatementErrorCallback.h
@@ -29,7 +29,7 @@
#ifndef SQLStatementErrorCallback_h
#define SQLStatementErrorCallback_h
-#include <wtf/Threading.h>
+#include "Threading.h"
namespace WebCore {
diff --git a/WebCore/storage/SQLTransaction.h b/WebCore/storage/SQLTransaction.h
index 2d83cc8..50dc0d2 100644
--- a/WebCore/storage/SQLTransaction.h
+++ b/WebCore/storage/SQLTransaction.h
@@ -28,7 +28,7 @@
#ifndef SQLTransaction_h
#define SQLTransaction_h
-#include <wtf/Threading.h>
+#include "Threading.h"
#include "SQLiteTransaction.h"
#include "SQLStatement.h"
diff --git a/WebCore/storage/SQLTransactionCallback.h b/WebCore/storage/SQLTransactionCallback.h
index bbe62a5..0affd1b 100644
--- a/WebCore/storage/SQLTransactionCallback.h
+++ b/WebCore/storage/SQLTransactionCallback.h
@@ -29,7 +29,7 @@
#ifndef SQLTransactionCallback_h
#define SQLTransactionCallback_h
-#include <wtf/Threading.h>
+#include "Threading.h"
namespace WebCore {
diff --git a/WebCore/storage/SQLTransactionErrorCallback.h b/WebCore/storage/SQLTransactionErrorCallback.h
index 2890556..73be74d 100644
--- a/WebCore/storage/SQLTransactionErrorCallback.h
+++ b/WebCore/storage/SQLTransactionErrorCallback.h
@@ -29,7 +29,7 @@
#ifndef SQLTransactionErrorCallback_h
#define SQLTransactionErrorCallback_h
-#include <wtf/Threading.h>
+#include "Threading.h"
namespace WebCore {