Title: [147786] trunk/Source/WebCore
- Revision
- 147786
- Author
- [email protected]
- Date
- 2013-04-05 12:40:18 -0700 (Fri, 05 Apr 2013)
Log Message
Remove the chromium code for WebCore's indexeddb module
https://bugs.webkit.org/show_bug.cgi?id=114004
Reviewed by Ryosuke Niwa.
* Modules/indexeddb/IDBBackingStore.cpp:
(WebCore::IDBBackingStore::IDBBackingStore):
* Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::openConnection):
(WebCore::IDBDatabaseBackendImpl::close):
* Modules/indexeddb/IDBFactoryBackendInterface.cpp:
* Modules/indexeddb/IDBTracing.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (147785 => 147786)
--- trunk/Source/WebCore/ChangeLog 2013-04-05 19:36:19 UTC (rev 147785)
+++ trunk/Source/WebCore/ChangeLog 2013-04-05 19:40:18 UTC (rev 147786)
@@ -1,3 +1,18 @@
+2013-04-05 Benjamin Poulain <[email protected]>
+
+ Remove the chromium code for WebCore's indexeddb module
+ https://bugs.webkit.org/show_bug.cgi?id=114004
+
+ Reviewed by Ryosuke Niwa.
+
+ * Modules/indexeddb/IDBBackingStore.cpp:
+ (WebCore::IDBBackingStore::IDBBackingStore):
+ * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::openConnection):
+ (WebCore::IDBDatabaseBackendImpl::close):
+ * Modules/indexeddb/IDBFactoryBackendInterface.cpp:
+ * Modules/indexeddb/IDBTracing.h:
+
2013-04-05 Ryosuke Niwa <[email protected]>
Cleanup after git svn left empty directories.
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp (147785 => 147786)
--- trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp 2013-04-05 19:36:19 UTC (rev 147785)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.cpp 2013-04-05 19:40:18 UTC (rev 147786)
@@ -43,9 +43,6 @@
#include "LevelDBTransaction.h"
#include "SecurityOrigin.h"
#include "SharedBuffer.h"
-#if PLATFORM(CHROMIUM)
-#include <public/Platform.h>
-#endif
#include <wtf/Assertions.h>
namespace WebCore {
@@ -349,10 +346,8 @@
IDBBackingStore::IDBBackingStore()
: m_weakFactory(this)
{
+ // FIXME: this comments was related to Chromium code. It may be incorrect
// This constructor should only be used in unit tests.
-#if PLATFORM(CHROMIUM)
- ASSERT(WebKit::Platform::current()->unitTestSupport());
-#endif
}
IDBBackingStore::~IDBBackingStore()
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (147785 => 147786)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-04-05 19:36:19 UTC (rev 147785)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2013-04-05 19:40:18 UTC (rev 147786)
@@ -38,9 +38,6 @@
#include "IDBTransactionBackendImpl.h"
#include "IDBTransactionCoordinator.h"
#include "SharedBuffer.h"
-#if PLATFORM(CHROMIUM)
-#include <public/Platform.h>
-#endif
#include <wtf/TemporaryChange.h>
namespace WebCore {
@@ -1214,10 +1211,8 @@
bool isNewDatabase = m_metadata.version == NoStringVersion && m_metadata.intVersion == IDBDatabaseMetadata::NoIntVersion;
if (version == IDBDatabaseMetadata::DefaultIntVersion) {
+ // FIXME: this comments was related to Chromium code. It may be incorrect
// For unit tests only - skip upgrade steps. Calling from script with DefaultIntVersion throws exception.
-#if PLATFORM(CHROMIUM)
- ASSERT(WebKit::Platform::current()->unitTestSupport());
-#endif
ASSERT(isNewDatabase);
m_databaseCallbacksSet.add(databaseCallbacks);
callbacks->onSuccess(this, this->metadata());
@@ -1356,11 +1351,7 @@
m_backingStore.clear();
// This check should only be false in unit tests.
-#if PLATFORM(CHROMIUM)
- ASSERT(m_factory || WebKit::Platform::current()->unitTestSupport());
-#else
ASSERT(m_factory);
-#endif
if (m_factory)
m_factory->removeIDBDatabaseBackend(m_identifier);
}
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp (147785 => 147786)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp 2013-04-05 19:36:19 UTC (rev 147785)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp 2013-04-05 19:40:18 UTC (rev 147786)
@@ -30,10 +30,6 @@
#include "IDBFactoryBackendImpl.h"
-#if PLATFORM(CHROMIUM)
-#error "Chromium should not compile this file and instead define its own version of this factory that navigates the multi-process boundry."
-#endif
-
#if ENABLE(INDEXED_DATABASE)
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTracing.h (147785 => 147786)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTracing.h 2013-04-05 19:36:19 UTC (rev 147785)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTracing.h 2013-04-05 19:40:18 UTC (rev 147786)
@@ -31,18 +31,10 @@
#if ENABLE(INDEXED_DATABASE)
-#if PLATFORM(CHROMIUM)
-
-#include "TraceEvent.h"
-#define IDB_TRACE(a) TRACE_EVENT0("IndexedDB", (a));
-
-#else
-
#include "Logging.h"
+
#define IDB_TRACE(a) LOG(StorageAPI, a)
-#endif // PLATFORM(CHROMIUM)
-
#endif // ENABLE(INDEXED_DATABASE)
#endif // IDBTracing_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
