[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[robert at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3fb2faa430a857a70090898e17997e99e1e09a26
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 22:49:49 2010 +0000

    2010-03-12  Robert Hogan  <robert at webkit.org>
    
            Not reviewed, build fix.
    
            Revert http://trac.webkit.org/projects/webkit/changeset/55374 which broke
            the !ENABLE(DATABASE) build on all platforms when attempting to fix the
            --minimal build on Qt.
    
            Support for SQLite now seems to be non-negotiable for the Qt build but making
            it mandatory requires review, so re-break --minimal Qt build for now.
    
            Qt build issue now tracked at https://bugs.webkit.org/show_bug.cgi?id=36073
    
            * page/GeolocationPositionCache.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e38baa0..6041462 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-12  Robert Hogan  <robert at webkit.org>
+
+        Not reviewed, build fix.
+
+        Revert http://trac.webkit.org/projects/webkit/changeset/55374 which broke
+        the !ENABLE(DATABASE) build on all platforms when attempting to fix the
+        --minimal build on Qt.
+
+        Support for SQLite now seems to be non-negotiable for the Qt build but making
+        it mandatory requires review, so re-break --minimal Qt build for now.
+
+        Qt build issue now tracked at https://bugs.webkit.org/show_bug.cgi?id=36073
+
+        * page/GeolocationPositionCache.cpp:
+
 2010-03-12  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/page/GeolocationPositionCache.cpp b/WebCore/page/GeolocationPositionCache.cpp
index f891f94..8567152 100644
--- a/WebCore/page/GeolocationPositionCache.cpp
+++ b/WebCore/page/GeolocationPositionCache.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "GeolocationPositionCache.h"
 
-#if ENABLE(DATABASE)
-
 #include "Geoposition.h"
 #include "SQLValue.h"
 #include "SQLiteDatabase.h"
@@ -35,7 +33,6 @@
 #include "SQLiteStatement.h"
 #include "SQLiteTransaction.h"
 
-
 namespace WebCore {
 
 static const char* databaseName = "CachedGeoposition.db";
@@ -175,5 +172,3 @@ void GeolocationPositionCache::writeToDB(const Geoposition* position)
 }
 
 } // namespace WebCore
-
-#endif //ENABLE(DATABASE)

-- 
WebKit Debian packaging