Diff
Modified: trunk/Source/WebCore/ChangeLog (96122 => 96123)
--- trunk/Source/WebCore/ChangeLog 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/ChangeLog 2011-09-27 17:06:26 UTC (rev 96123)
@@ -1,3 +1,20 @@
+2011-09-27 Csaba Osztrogonác <[email protected]>
+
+ Fix ENABLE(SQL_DATABASE)=0 build after r95919
+ https://bugs.webkit.org/show_bug.cgi?id=68902
+
+ r95919 enabled OFFLINE_WEB_APPLICATIONS by default and
+ it needs SQLite stuff even if ENABLE_SQL_DATABASE=0.
+
+ Reviewed by Adam Barth.
+
+ * platform/sql/SQLiteAuthorizer.cpp:
+ * platform/sql/SQLiteDatabase.cpp:
+ * platform/sql/SQLiteFileSystem.cpp:
+ * platform/sql/SQLiteStatement.cpp:
+ * platform/sql/SQLiteTransaction.cpp:
+ * storage/DatabaseAuthorizer.cpp:
+
2011-09-27 Julien Chaffraix <[email protected]>
Crash because CSSPrimitiveValue::computeLengthDouble assumes fontMetrics are available
Modified: trunk/Source/WebCore/platform/sql/SQLiteAuthorizer.cpp (96122 => 96123)
--- trunk/Source/WebCore/platform/sql/SQLiteAuthorizer.cpp 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/platform/sql/SQLiteAuthorizer.cpp 2011-09-27 17:06:26 UTC (rev 96123)
@@ -29,8 +29,6 @@
#include "config.h"
#include "DatabaseAuthorizer.h"
-#if ENABLE(SQL_DATABASE)
-
#include <sqlite3.h>
namespace WebCore {
@@ -40,5 +38,3 @@
const int SQLAuthDeny = SQLITE_DENY;
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp (96122 => 96123)
--- trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/platform/sql/SQLiteDatabase.cpp 2011-09-27 17:06:26 UTC (rev 96123)
@@ -27,8 +27,6 @@
#include "config.h"
#include "SQLiteDatabase.h"
-#if ENABLE(SQL_DATABASE)
-
#include "DatabaseAuthorizer.h"
#include "Logging.h"
#include "SQLiteFileSystem.h"
@@ -471,5 +469,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp (96122 => 96123)
--- trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/platform/sql/SQLiteFileSystem.cpp 2011-09-27 17:06:26 UTC (rev 96123)
@@ -32,8 +32,6 @@
#include "config.h"
#include "SQLiteFileSystem.h"
-#if ENABLE(SQL_DATABASE)
-
#include "FileSystem.h"
#include "SQLiteDatabase.h"
#include "SQLiteStatement.h"
@@ -125,5 +123,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp (96122 => 96123)
--- trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp 2011-09-27 17:06:26 UTC (rev 96123)
@@ -26,8 +26,6 @@
#include "config.h"
#include "SQLiteStatement.h"
-#if ENABLE(SQL_DATABASE)
-
#include "Logging.h"
#include "SQLValue.h"
#include <sqlite3.h>
@@ -545,5 +543,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/platform/sql/SQLiteTransaction.cpp (96122 => 96123)
--- trunk/Source/WebCore/platform/sql/SQLiteTransaction.cpp 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/platform/sql/SQLiteTransaction.cpp 2011-09-27 17:06:26 UTC (rev 96123)
@@ -26,8 +26,6 @@
#include "config.h"
#include "SQLiteTransaction.h"
-#if ENABLE(SQL_DATABASE)
-
#include "SQLiteDatabase.h"
namespace WebCore {
@@ -103,5 +101,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/storage/DatabaseAuthorizer.cpp (96122 => 96123)
--- trunk/Source/WebCore/storage/DatabaseAuthorizer.cpp 2011-09-27 16:55:59 UTC (rev 96122)
+++ trunk/Source/WebCore/storage/DatabaseAuthorizer.cpp 2011-09-27 17:06:26 UTC (rev 96123)
@@ -29,8 +29,6 @@
#include "config.h"
#include "DatabaseAuthorizer.h"
-#if ENABLE(SQL_DATABASE)
-
#include "PlatformString.h"
#include <wtf/PassRefPtr.h>
@@ -434,5 +432,3 @@
}
} // namespace WebCore
-
-#endif
