| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 { | 48 { |
| 49 return new SQLStatement(database, callback, errorCallback); | 49 return new SQLStatement(database, callback, errorCallback); |
| 50 } | 50 } |
| 51 | 51 |
| 52 SQLStatement::SQLStatement(Database* database, SQLStatementCallback* callback, | 52 SQLStatement::SQLStatement(Database* database, SQLStatementCallback* callback, |
| 53 SQLStatementErrorCallback* errorCallback) | 53 SQLStatementErrorCallback* errorCallback) |
| 54 : m_statementCallback(callback) | 54 : m_statementCallback(callback) |
| 55 , m_statementErrorCallback(errorCallback) | 55 , m_statementErrorCallback(errorCallback) |
| 56 , m_asyncOperationId(0) | 56 , m_asyncOperationId(0) |
| 57 { | 57 { |
| 58 ASSERT(isMainThread()); |
| 58 if (hasCallback() || hasErrorCallback()) | 59 if (hasCallback() || hasErrorCallback()) |
| 59 m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarti
ng(database->executionContext(), "SQLStatement"); | 60 m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarti
ng(database->executionContext(), "SQLStatement"); |
| 60 } | 61 } |
| 61 | 62 |
| 62 SQLStatement::~SQLStatement() | 63 SQLStatement::~SQLStatement() |
| 63 { | 64 { |
| 64 } | 65 } |
| 65 | 66 |
| 66 DEFINE_TRACE(SQLStatement) | 67 DEFINE_TRACE(SQLStatement) |
| 67 { | 68 { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } else if (callback) { | 107 } else if (callback) { |
| 107 callbackError = !callback->handleEvent(transaction, m_backend->sqlResult
Set()); | 108 callbackError = !callback->handleEvent(transaction, m_backend->sqlResult
Set()); |
| 108 } | 109 } |
| 109 | 110 |
| 110 InspectorInstrumentation::traceAsyncCallbackCompleted(cookie); | 111 InspectorInstrumentation::traceAsyncCallbackCompleted(cookie); |
| 111 | 112 |
| 112 return callbackError; | 113 return callbackError; |
| 113 } | 114 } |
| 114 | 115 |
| 115 } // namespace blink | 116 } // namespace blink |
| OLD | NEW |