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

Side by Side Diff: Source/modules/webdatabase/Database.cpp

Issue 397733004: Allow assertions to be enabled in Blink Release builds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed config.gni. Minor cleanups. Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 RefPtrWillBeRawPtr<SQLError> error = SQLError::create(*errorData); 134 RefPtrWillBeRawPtr<SQLError> error = SQLError::create(*errorData);
135 callback->handleEvent(error.get()); 135 callback->handleEvent(error.get());
136 } 136 }
137 137
138 void Database::runTransaction(PassOwnPtr<SQLTransactionCallback> callback, PassO wnPtr<SQLTransactionErrorCallback> errorCallback, 138 void Database::runTransaction(PassOwnPtr<SQLTransactionCallback> callback, PassO wnPtr<SQLTransactionErrorCallback> errorCallback,
139 PassOwnPtr<VoidCallback> successCallback, bool readOnly, const ChangeVersion Data* changeVersionData) 139 PassOwnPtr<VoidCallback> successCallback, bool readOnly, const ChangeVersion Data* changeVersionData)
140 { 140 {
141 // FIXME: Rather than passing errorCallback to SQLTransaction and then somet imes firing it ourselves, 141 // FIXME: Rather than passing errorCallback to SQLTransaction and then somet imes firing it ourselves,
142 // this code should probably be pushed down into DatabaseBackend so that we only create the SQLTransaction 142 // this code should probably be pushed down into DatabaseBackend so that we only create the SQLTransaction
143 // if we're actually going to run it. 143 // if we're actually going to run it.
144 #if ASSERT_ENABLED 144 #if ENABLE(ASSERT)
145 SQLTransactionErrorCallback* originalErrorCallback = errorCallback.get(); 145 SQLTransactionErrorCallback* originalErrorCallback = errorCallback.get();
146 #endif 146 #endif
147 RefPtrWillBeRawPtr<SQLTransaction> transaction = SQLTransaction::create(this , callback, successCallback, errorCallback, readOnly); 147 RefPtrWillBeRawPtr<SQLTransaction> transaction = SQLTransaction::create(this , callback, successCallback, errorCallback, readOnly);
148 RefPtrWillBeRawPtr<SQLTransactionBackend> transactionBackend = backend()->ru nTransaction(transaction, readOnly, changeVersionData); 148 RefPtrWillBeRawPtr<SQLTransactionBackend> transactionBackend = backend()->ru nTransaction(transaction, readOnly, changeVersionData);
149 if (!transactionBackend) { 149 if (!transactionBackend) {
150 OwnPtr<SQLTransactionErrorCallback> callback = transaction->releaseError Callback(); 150 OwnPtr<SQLTransactionErrorCallback> callback = transaction->releaseError Callback();
151 ASSERT(callback == originalErrorCallback); 151 ASSERT(callback == originalErrorCallback);
152 if (callback) { 152 if (callback) {
153 OwnPtr<SQLErrorData> error = SQLErrorData::create(SQLError::UNKNOWN_ ERR, "database has been closed"); 153 OwnPtr<SQLErrorData> error = SQLErrorData::create(SQLError::UNKNOWN_ ERR, "database has been closed");
154 executionContext()->postTask(createCrossThreadTask(&callTransactionE rrorCallback, callback.release(), error.release())); 154 executionContext()->postTask(createCrossThreadTask(&callTransactionE rrorCallback, callback.release(), error.release()));
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 backend()->reportStartTransactionResult(errorSite, webSqlErrorCode, sqliteEr rorCode); 243 backend()->reportStartTransactionResult(errorSite, webSqlErrorCode, sqliteEr rorCode);
244 } 244 }
245 245
246 void Database::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode) 246 void Database::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
247 { 247 {
248 backend()->reportCommitTransactionResult(errorSite, webSqlErrorCode, sqliteE rrorCode); 248 backend()->reportCommitTransactionResult(errorSite, webSqlErrorCode, sqliteE rrorCode);
249 } 249 }
250 250
251 251
252 } // namespace WebCore 252 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698