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

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

Issue 1125683002: Avoid nearly identical toImplArray() and toImplHeapArray() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « Source/modules/cachestorage/CacheTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 293
294 void SQLTransaction::executeSql(ScriptState* scriptState, const String& sqlState ment, ExceptionState& exceptionState) 294 void SQLTransaction::executeSql(ScriptState* scriptState, const String& sqlState ment, ExceptionState& exceptionState)
295 { 295 {
296 executeSQL(sqlStatement, Vector<SQLValue>(), nullptr, nullptr, exceptionStat e); 296 executeSQL(sqlStatement, Vector<SQLValue>(), nullptr, nullptr, exceptionStat e);
297 } 297 }
298 298
299 void SQLTransaction::executeSql(ScriptState* scriptState, const String& sqlState ment, const Nullable<Vector<ScriptValue>>& arguments, SQLStatementCallback* call back, SQLStatementErrorCallback* callbackError, ExceptionState& exceptionState) 299 void SQLTransaction::executeSql(ScriptState* scriptState, const String& sqlState ment, const Nullable<Vector<ScriptValue>>& arguments, SQLStatementCallback* call back, SQLStatementErrorCallback* callbackError, ExceptionState& exceptionState)
300 { 300 {
301 Vector<SQLValue> sqlValues; 301 Vector<SQLValue> sqlValues;
302 if (!arguments.isNull()) 302 if (!arguments.isNull())
303 sqlValues = toImplArray<SQLValue>(arguments.get(), scriptState->isolate( ), exceptionState); 303 sqlValues = toImplArray<Vector<SQLValue>>(arguments.get(), scriptState-> isolate(), exceptionState);
304 executeSQL(sqlStatement, sqlValues, callback, callbackError, exceptionState) ; 304 executeSQL(sqlStatement, sqlValues, callback, callbackError, exceptionState) ;
305 } 305 }
306 306
307 bool SQLTransaction::computeNextStateAndCleanupIfNeeded() 307 bool SQLTransaction::computeNextStateAndCleanupIfNeeded()
308 { 308 {
309 // Only honor the requested state transition if we're not supposed to be 309 // Only honor the requested state transition if we're not supposed to be
310 // cleaning up and shutting down: 310 // cleaning up and shutting down:
311 if (m_database->opened()) { 311 if (m_database->opened()) {
312 setStateToRequestedState(); 312 setStateToRequestedState();
313 ASSERT(m_nextState == SQLTransactionState::End 313 ASSERT(m_nextState == SQLTransactionState::End
(...skipping 19 matching lines...) Expand all
333 m_successCallback.clear(); 333 m_successCallback.clear();
334 m_errorCallback.clear(); 334 m_errorCallback.clear();
335 } 335 }
336 336
337 SQLTransactionErrorCallback* SQLTransaction::releaseErrorCallback() 337 SQLTransactionErrorCallback* SQLTransaction::releaseErrorCallback()
338 { 338 {
339 return m_errorCallback.release(); 339 return m_errorCallback.release();
340 } 340 }
341 341
342 } // namespace blink 342 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/cachestorage/CacheTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698