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

Side by Side Diff: third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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
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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 ASSERT(m_lockAcquired); 591 ASSERT(m_lockAcquired);
592 592
593 STORAGE_DVLOG(1) << "Opening and preflighting transaction " << this; 593 STORAGE_DVLOG(1) << "Opening and preflighting transaction " << this;
594 594
595 // Set the maximum usage for this transaction if this transactions is not 595 // Set the maximum usage for this transaction if this transactions is not
596 // read-only. 596 // read-only.
597 if (!m_readOnly) 597 if (!m_readOnly)
598 m_database->sqliteDatabase().setMaximumSize(m_database->maximumSize()); 598 m_database->sqliteDatabase().setMaximumSize(m_database->maximumSize());
599 599
600 ASSERT(!m_sqliteTransaction); 600 ASSERT(!m_sqliteTransaction);
601 m_sqliteTransaction = wrapUnique( 601 m_sqliteTransaction = WTF::wrapUnique(
602 new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly)); 602 new SQLiteTransaction(m_database->sqliteDatabase(), m_readOnly));
603 603
604 m_database->resetDeletes(); 604 m_database->resetDeletes();
605 m_database->disableAuthorizer(); 605 m_database->disableAuthorizer();
606 m_sqliteTransaction->begin(); 606 m_sqliteTransaction->begin();
607 m_database->enableAuthorizer(); 607 m_database->enableAuthorizer();
608 608
609 // Spec 4.3.2.1+2: Open a transaction to the database, jumping to the error 609 // Spec 4.3.2.1+2: Open a transaction to the database, jumping to the error
610 // callback if that fails. 610 // callback if that fails.
611 if (!m_sqliteTransaction->inProgress()) { 611 if (!m_sqliteTransaction->inProgress()) {
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 return SQLTransactionState::End; 889 return SQLTransactionState::End;
890 } 890 }
891 891
892 SQLTransactionState SQLTransactionBackend::sendToFrontendState() { 892 SQLTransactionState SQLTransactionBackend::sendToFrontendState() {
893 ASSERT(m_nextState != SQLTransactionState::Idle); 893 ASSERT(m_nextState != SQLTransactionState::Idle);
894 m_frontend->requestTransitToState(m_nextState); 894 m_frontend->requestTransitToState(m_nextState);
895 return SQLTransactionState::Idle; 895 return SQLTransactionState::Idle;
896 } 896 }
897 897
898 } // namespace blink 898 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698