Chromium Code Reviews| Index: third_party/WebKit/Source/modules/webdatabase/DatabaseContext.cpp |
| diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.cpp |
| index 6f5c036024071203951d127c6abd2c0afe26dee5..2ce7237af419f8c4a40e556d34b602132ecfa149 100644 |
| --- a/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.cpp |
| +++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.cpp |
| @@ -69,7 +69,7 @@ namespace blink { |
| // 1. "outlive" the ExecutionContext. |
| // - This is needed because the DatabaseContext needs to remove itself from |
| // the |
|
dcheng
2016/12/12 02:06:27
Nit: can we fix the wrapping while we're changing
|
| -// ExecutionContext's ActiveDOMObject list and ContextLifecycleObserver |
| +// ExecutionContext's SuspendableObject list and ContextLifecycleObserver |
| // list. This removal needs to be executed on the script's thread. Hence, |
| // we |
|
dcheng
2016/12/12 02:06:27
Here as well.
|
| // rely on the ExecutionContext's shutdown process to call |
| @@ -98,12 +98,12 @@ DatabaseContext* DatabaseContext::create(ExecutionContext* context) { |
| } |
| DatabaseContext::DatabaseContext(ExecutionContext* context) |
| - : ActiveDOMObject(context), |
| + : SuspendableObject(context), |
| m_hasOpenDatabases(false), |
| m_hasRequestedTermination(false) { |
| DCHECK(isMainThread()); |
| - // ActiveDOMObject expects this to be called to set internal flags. |
| + // SuspendableObject expects this to be called to set internal flags. |
| suspendIfNeeded(); |
| // For debug accounting only. We must do this before we register the |
| @@ -119,7 +119,7 @@ DatabaseContext::~DatabaseContext() { |
| DEFINE_TRACE(DatabaseContext) { |
| visitor->trace(m_databaseThread); |
| - ActiveDOMObject::trace(visitor); |
| + SuspendableObject::trace(visitor); |
| } |
| // This is called if the associated ExecutionContext is destructing while |