| Index: third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webdatabase/Database.cpp b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| index 3f3b630df32067a79dd643ac02a1637db06e425f..717616678e8afad4c1b992fda9a3d369530ecd1a 100644
|
| --- a/third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| +++ b/third_party/WebKit/Source/modules/webdatabase/Database.cpp
|
| @@ -897,11 +897,13 @@ Vector<String> Database::tableNames()
|
|
|
| SecurityOrigin* Database::getSecurityOrigin() const
|
| {
|
| + if (!getExecutionContext())
|
| + return nullptr;
|
| if (getExecutionContext()->isContextThread())
|
| return m_contextThreadSecurityOrigin.get();
|
| if (getDatabaseContext()->databaseThread()->isDatabaseThread())
|
| return m_databaseThreadSecurityOrigin.get();
|
| - return 0;
|
| + return nullptr;
|
| }
|
|
|
| bool Database::opened()
|
|
|