From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Fri, 21 May 2010 16:53:46 +0100
Subject: Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
---
 WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp')

diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
index 31b53c8..92b95b6 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
@@ -33,7 +33,9 @@
 #include "config.h"
 #include "ChromeClientEfl.h"
 
+#if ENABLE(DATABASE)
 #include "DatabaseTracker.h"
+#endif
 #include "EWebKit.h"
 #include "FloatRect.h"
 #include "FrameLoader.h"
@@ -340,6 +342,7 @@ void ChromeClientEfl::reachedMaxAppCacheSize(int64_t spaceNeeded)
 }
 #endif
 
+#if ENABLE(DATABASE)
 void ChromeClientEfl::exceededDatabaseQuota(Frame* frame, const String& databaseName)
 {
     uint64_t quota = ewk_settings_web_database_default_quota_get();
@@ -349,6 +352,7 @@ void ChromeClientEfl::exceededDatabaseQuota(Frame* frame, const String& database
 
     ewk_view_exceeded_database_quota(m_view, kit(frame), databaseName.utf8().data());
 }
+#endif
 
 void ChromeClientEfl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser)
 {
-- 
cgit v1.1