diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 23:48:56 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 23:48:56 +0000 |
| commit | 88cb62521e420fc7cafd5cb7fc3f368f3cc3dfd0 (patch) | |
| tree | 2fb0125222ae225114d62ad6886d5ec061f71ae9 /sql/statement.cc | |
| parent | 16cf7ccb8efe62fdea69273a8410c049050ad241 (diff) | |
| download | chromium_src-88cb62521e420fc7cafd5cb7fc3f368f3cc3dfd0.zip chromium_src-88cb62521e420fc7cafd5cb7fc3f368f3cc3dfd0.tar.gz chromium_src-88cb62521e420fc7cafd5cb7fc3f368f3cc3dfd0.tar.bz2 | |
Revert 147309 - Annotate calls to SQLite functions - they have to be executed on a thread allowing IO access.
Expand scope of ScopedAllowIO in the only place where SQLite functions are used on UI thread.
Patch from Pavel Ivanov <paivanof@gmail.com>
BUG=75232,52909,137961
TEST=no test fails with message "Function marked as IO-only was called from a thread that disallows IO!"
Review URL: https://chromiumcodereview.appspot.com/10540155
Patch from Pavel Ivanov <paivanof@gmail.com>.
TBR=shess@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10806025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sql/statement.cc')
| -rw-r--r-- | sql/statement.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/statement.cc b/sql/statement.cc index 84dfd2e..3616dcc 100644 --- a/sql/statement.cc +++ b/sql/statement.cc @@ -48,7 +48,6 @@ bool Statement::CheckValid() const { } bool Statement::Run() { - ref_->AssertIOAllowed(); if (!CheckValid()) return false; @@ -56,7 +55,6 @@ bool Statement::Run() { } bool Statement::Step() { - ref_->AssertIOAllowed(); if (!CheckValid()) return false; @@ -64,7 +62,6 @@ bool Statement::Step() { } void Statement::Reset(bool clear_bound_vars) { - ref_->AssertIOAllowed(); if (is_valid()) { // We don't call CheckError() here because sqlite3_reset() returns // the last error that Step() caused thereby generating a second |