OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
3 * Copyright (C) 2011 Google, Inc. All Rights Reserved. | 3 * Copyright (C) 2011 Google, Inc. All Rights Reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 | 183 |
184 if (databaseThreadAvailable()) { | 184 if (databaseThreadAvailable()) { |
185 m_hasRequestedTermination = true; | 185 m_hasRequestedTermination = true; |
186 // This blocks until the database thread finishes the cleanup task. | 186 // This blocks until the database thread finishes the cleanup task. |
187 m_databaseThread->terminate(); | 187 m_databaseThread->terminate(); |
188 } | 188 } |
189 } | 189 } |
190 | 190 |
191 bool DatabaseContext::allowDatabaseAccess() const | 191 bool DatabaseContext::allowDatabaseAccess() const |
192 { | 192 { |
193 return toDocument(executionContext())->isActive(); | 193 return toDocument(getExecutionContext())->isActive(); |
194 } | 194 } |
195 | 195 |
196 SecurityOrigin* DatabaseContext::securityOrigin() const | 196 SecurityOrigin* DatabaseContext::getSecurityOrigin() const |
197 { | 197 { |
198 return executionContext()->securityOrigin(); | 198 return getExecutionContext()->getSecurityOrigin(); |
199 } | 199 } |
200 | 200 |
201 bool DatabaseContext::isContextThread() const | 201 bool DatabaseContext::isContextThread() const |
202 { | 202 { |
203 return executionContext()->isContextThread(); | 203 return getExecutionContext()->isContextThread(); |
204 } | 204 } |
205 | 205 |
206 } // namespace blink | 206 } // namespace blink |
OLD | NEW |