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

[weinig at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 049623b2d4bea035b27054c8cee5c298696107b3
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 13 03:56:00 2009 +0000

    Rubber-stamped by Dan Bernstein.
    
    Fix the !ENABLE(DATABASE) build.
    
    * storage/SQLTransactionClient.cpp:
    * storage/SQLTransactionClient.h:
    * storage/SQLTransactionCoordinator.cpp:
    * storage/SQLTransactionCoordinator.h:
    * loader/FrameLoader.cpp:
    (WebCore::FrameLoader::stopLoading):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a9ce7f4..187c1f9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-12  Sam Weinig  <sam at webkit.org>
+
+        Rubber-stamped by Dan Bernstein.
+
+        Fix the !ENABLE(DATABASE) build.
+
+        * storage/SQLTransactionClient.cpp:
+        * storage/SQLTransactionClient.h:
+        * storage/SQLTransactionCoordinator.cpp:
+        * storage/SQLTransactionCoordinator.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading):
+
 2009-12-12  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 7e42e5a..3163ecf 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -559,6 +559,8 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic
 #if ENABLE(DATABASE)
         if (databasePolicy == DatabasePolicyStop)
             doc->stopDatabases();
+#else
+    UNUSED_PARAM(databasePolicy);
 #endif
     }
 
diff --git a/WebCore/storage/SQLTransactionClient.cpp b/WebCore/storage/SQLTransactionClient.cpp
index 5918bd8..0cf10dd 100644
--- a/WebCore/storage/SQLTransactionClient.cpp
+++ b/WebCore/storage/SQLTransactionClient.cpp
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "SQLTransactionClient.h"
 
+#if ENABLE(DATABASE)
+
 #include "ChromeClient.h"
 #include "Database.h"
 #include "DatabaseThread.h"
@@ -72,3 +74,5 @@ bool SQLTransactionClient::didExceedQuota(SQLTransaction* transaction)
 }
 
 }
+
+#endif // ENABLE(DATABASE)
diff --git a/WebCore/storage/SQLTransactionClient.h b/WebCore/storage/SQLTransactionClient.h
index e822594..801647b 100644
--- a/WebCore/storage/SQLTransactionClient.h
+++ b/WebCore/storage/SQLTransactionClient.h
@@ -31,6 +31,8 @@
 #ifndef SQLTransactionClient_h
 #define SQLTransactionClient_h
 
+#if ENABLE(DATABASE)
+
 #include <wtf/Noncopyable.h>
 
 namespace WebCore {
@@ -47,4 +49,6 @@ namespace WebCore {
     };
 }
 
+#endif // ENABLE(DATABASE)
+
 #endif // SQLTransactionClient_h
diff --git a/WebCore/storage/SQLTransactionCoordinator.cpp b/WebCore/storage/SQLTransactionCoordinator.cpp
index 30b0c4a..efdcd1d 100644
--- a/WebCore/storage/SQLTransactionCoordinator.cpp
+++ b/WebCore/storage/SQLTransactionCoordinator.cpp
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "SQLTransactionCoordinator.h"
 
+#if ENABLE(DATABASE)
+
 #include "CString.h"
 #include "Database.h"
 #include "SQLTransaction.h"
@@ -111,4 +113,6 @@ void SQLTransactionCoordinator::shutdown()
     m_coordinationInfoMap.clear();
 }
 
-}
+} // namespace WebCore
+
+#endif // ENABLE(DATABASE)
diff --git a/WebCore/storage/SQLTransactionCoordinator.h b/WebCore/storage/SQLTransactionCoordinator.h
index ae5674b..a51084f 100644
--- a/WebCore/storage/SQLTransactionCoordinator.h
+++ b/WebCore/storage/SQLTransactionCoordinator.h
@@ -31,6 +31,8 @@
 #ifndef SQLTransactionCoordinator_h
 #define SQLTransactionCoordinator_h
 
+#if ENABLE(DATABASE)
+
 #include "CString.h"
 #include "StringHash.h"
 #include <wtf/Deque.h>
@@ -62,4 +64,6 @@ namespace WebCore {
     };
 }
 
+#endif // ENABLE(DATABASE)
+
 #endif // SQLTransactionCoordinator_h

-- 
WebKit Debian packaging