Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Unified Diff: third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp

Issue 1779413002: Remove Blink's DatabaseIdentifier implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unneeded include Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp
diff --git a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp
index 5670e2f6d27bfc5bf44f0d6012c18c35604f9b3c..60736f4e32b6f7097fc18c90b80429aba8b3e9b0 100644
--- a/third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp
@@ -34,30 +34,38 @@
#include "core/dom/ExecutionContext.h"
#include "modules/webdatabase/Database.h"
#include "modules/webdatabase/DatabaseContext.h"
-#include "platform/weborigin/DatabaseIdentifier.h"
#include "platform/weborigin/SecurityOrigin.h"
#include "public/platform/Platform.h"
#include "public/platform/WebDatabaseObserver.h"
+#include "public/platform/WebSecurityOrigin.h"
#include "public/platform/WebTraceLocation.h"
#include "wtf/Functional.h"
namespace blink {
-static void databaseModified(const String& originIdentifier, const String& databaseName)
+namespace {
+
+void databaseModified(const WebSecurityOrigin& origin, const String& databaseName)
{
if (Platform::current()->databaseObserver())
- Platform::current()->databaseObserver()->databaseModified(originIdentifier, databaseName);
+ Platform::current()->databaseObserver()->databaseModified(origin, databaseName);
}
+void databaseModifiedCrossThread(const String& originString, const String& databaseName)
+{
+ databaseModified(WebSecurityOrigin::createFromString(originString), databaseName);
+}
+
+} // namespace
+
void SQLTransactionClient::didCommitWriteTransaction(Database* database)
{
- String originIdentifier = createDatabaseIdentifierFromSecurityOrigin(database->getSecurityOrigin());
String databaseName = database->stringIdentifier();
ExecutionContext* executionContext = database->getDatabaseContext()->getExecutionContext();
if (!executionContext->isContextThread()) {
- executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&databaseModified, originIdentifier, databaseName));
+ executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&databaseModifiedCrossThread, executionContext->getSecurityOrigin()->toString(), databaseName));
} else {
- databaseModified(originIdentifier, databaseName);
+ databaseModified(WebSecurityOrigin(executionContext->getSecurityOrigin()), databaseName);
}
}
« no previous file with comments | « third_party/WebKit/Source/modules/webdatabase/QuotaTracker.cpp ('k') | third_party/WebKit/Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698