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

Unified Diff: Source/modules/webdatabase/DatabaseContext.cpp

Issue 564713002: Web SQL: Remove more worker-related code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Windows build Created 6 years, 3 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
« no previous file with comments | « Source/modules/webdatabase/DatabaseContext.h ('k') | Source/modules/webdatabase/DatabaseManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webdatabase/DatabaseContext.cpp
diff --git a/Source/modules/webdatabase/DatabaseContext.cpp b/Source/modules/webdatabase/DatabaseContext.cpp
index 7313237502b80e8475f12a2edd5a25b0c801c393..456087abd8cf1966d3cf3df6aa1164b1affae824 100644
--- a/Source/modules/webdatabase/DatabaseContext.cpp
+++ b/Source/modules/webdatabase/DatabaseContext.cpp
@@ -134,9 +134,9 @@ void DatabaseContext::contextDestroyed()
ActiveDOMObject::contextDestroyed();
}
-// stop() is from stopActiveDOMObjects() which indicates that the owner LocalFrame
-// or WorkerThread is shutting down. Initiate the orderly shutdown by stopping
-// the associated databases.
+// stop() is from stopActiveDOMObjects() which indicates that the owner
+// LocalFrame is shutting down. Initiate the orderly shutdown by stopping the
+// associated databases.
void DatabaseContext::stop()
{
stopDatabases();
@@ -187,11 +187,7 @@ void DatabaseContext::stopDatabases()
bool DatabaseContext::allowDatabaseAccess() const
{
- if (executionContext()->isDocument())
- return toDocument(executionContext())->isActive();
- ASSERT(executionContext()->isWorkerGlobalScope());
- // allowDatabaseAccess is not yet implemented for workers.
- return true;
+ return toDocument(executionContext())->isActive();
}
SecurityOrigin* DatabaseContext::securityOrigin() const
« no previous file with comments | « Source/modules/webdatabase/DatabaseContext.h ('k') | Source/modules/webdatabase/DatabaseManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698