From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 30 Jul 2010 10:46:49 +0100
Subject: Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
---
 WebKit/chromium/src/DatabaseObserver.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'WebKit/chromium/src/DatabaseObserver.cpp')

diff --git a/WebKit/chromium/src/DatabaseObserver.cpp b/WebKit/chromium/src/DatabaseObserver.cpp
index e1b7cbe..f43c9bd 100644
--- a/WebKit/chromium/src/DatabaseObserver.cpp
+++ b/WebKit/chromium/src/DatabaseObserver.cpp
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "DatabaseObserver.h"
 
+#if ENABLE(DATABASE)
+
 #include "AbstractDatabase.h"
 #include "Document.h"
 #include "ScriptExecutionContext.h"
@@ -84,3 +86,5 @@ void DatabaseObserver::databaseClosed(AbstractDatabase* database)
 }
 
 } // namespace WebCore
+
+#endif // ENABLE(DATABASE)
-- 
cgit v1.1