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

Side by Side Diff: Source/core/inspector/InspectorDatabaseAgent.cpp

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google 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 12 matching lines...) Expand all
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/inspector/InspectorDatabaseAgent.h" 30 #include "core/inspector/InspectorDatabaseAgent.h"
31 31
32 #include "InspectorFrontend.h" 32 #include "InspectorFrontend.h"
33 #include "bindings/v8/ExceptionStatePlaceholder.h" 33 #include "core/dom/ExceptionCodePlaceholder.h"
34 #include "core/html/VoidCallback.h" 34 #include "core/html/VoidCallback.h"
35 #include "core/inspector/InspectorDatabaseResource.h" 35 #include "core/inspector/InspectorDatabaseResource.h"
36 #include "core/inspector/InspectorState.h" 36 #include "core/inspector/InspectorState.h"
37 #include "core/inspector/InstrumentingAgents.h" 37 #include "core/inspector/InstrumentingAgents.h"
38 #include "core/loader/DocumentLoader.h" 38 #include "core/loader/DocumentLoader.h"
39 #include "core/page/Frame.h" 39 #include "core/page/Frame.h"
40 #include "core/page/Page.h" 40 #include "core/page/Page.h"
41 #include "core/platform/JSONValues.h" 41 #include "core/platform/JSONValues.h"
42 #include "core/platform/sql/SQLValue.h" 42 #include "core/platform/sql/SQLValue.h"
43 #include "modules/webdatabase/Database.h" 43 #include "modules/webdatabase/Database.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 virtual ~TransactionCallback() { } 138 virtual ~TransactionCallback() { }
139 139
140 virtual bool handleEvent(SQLTransaction* transaction) 140 virtual bool handleEvent(SQLTransaction* transaction)
141 { 141 {
142 if (!m_requestCallback->isActive()) 142 if (!m_requestCallback->isActive())
143 return true; 143 return true;
144 144
145 Vector<SQLValue> sqlValues; 145 Vector<SQLValue> sqlValues;
146 RefPtr<SQLStatementCallback> callback(StatementCallback::create(m_reques tCallback.get())); 146 RefPtr<SQLStatementCallback> callback(StatementCallback::create(m_reques tCallback.get()));
147 RefPtr<SQLStatementErrorCallback> errorCallback(StatementErrorCallback:: create(m_requestCallback.get())); 147 RefPtr<SQLStatementErrorCallback> errorCallback(StatementErrorCallback:: create(m_requestCallback.get()));
148 transaction->executeSQL(m_sqlStatement, sqlValues, callback.release(), e rrorCallback.release(), IGNORE_EXCEPTION_STATE); 148 transaction->executeSQL(m_sqlStatement, sqlValues, callback.release(), e rrorCallback.release(), IGNORE_EXCEPTION);
149 return true; 149 return true;
150 } 150 }
151 private: 151 private:
152 TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallbac k> requestCallback) 152 TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallbac k> requestCallback)
153 : m_sqlStatement(sqlStatement) 153 : m_sqlStatement(sqlStatement)
154 , m_requestCallback(requestCallback) { } 154 , m_requestCallback(requestCallback) { }
155 String m_sqlStatement; 155 String m_sqlStatement;
156 RefPtr<ExecuteSQLCallback> m_requestCallback; 156 RefPtr<ExecuteSQLCallback> m_requestCallback;
157 }; 157 };
158 158
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 322
323 Database* InspectorDatabaseAgent::databaseForId(const String& databaseId) 323 Database* InspectorDatabaseAgent::databaseForId(const String& databaseId)
324 { 324 {
325 DatabaseResourcesMap::iterator it = m_resources.find(databaseId); 325 DatabaseResourcesMap::iterator it = m_resources.find(databaseId);
326 if (it == m_resources.end()) 326 if (it == m_resources.end())
327 return 0; 327 return 0;
328 return it->value->database(); 328 return it->value->database();
329 } 329 }
330 330
331 } // namespace WebCore 331 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8SQLTransactionCustom.cpp ('k') | Source/modules/crypto/AesCbcParams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698