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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 return new SQLStatement(database, callback, errorCallback); 49 return new SQLStatement(database, callback, errorCallback);
50 } 50 }
51 51
52 SQLStatement::SQLStatement(Database* database, SQLStatementCallback* callback, 52 SQLStatement::SQLStatement(Database* database, SQLStatementCallback* callback,
53 SQLStatementErrorCallback* errorCallback) 53 SQLStatementErrorCallback* errorCallback)
54 : m_statementCallback(callback) 54 : m_statementCallback(callback)
55 , m_statementErrorCallback(errorCallback) 55 , m_statementErrorCallback(errorCallback)
56 , m_asyncOperationId(0) 56 , m_asyncOperationId(0)
57 { 57 {
58 if (hasCallback() || hasErrorCallback()) 58 if (hasCallback() || hasErrorCallback())
59 m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarti ng(database->executionContext(), "SQLStatement"); 59 m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarti ng(database->getExecutionContext(), "SQLStatement");
60 } 60 }
61 61
62 SQLStatement::~SQLStatement() 62 SQLStatement::~SQLStatement()
63 { 63 {
64 } 64 }
65 65
66 DEFINE_TRACE(SQLStatement) 66 DEFINE_TRACE(SQLStatement)
67 { 67 {
68 visitor->trace(m_backend); 68 visitor->trace(m_backend);
69 visitor->trace(m_statementCallback); 69 visitor->trace(m_statementCallback);
(...skipping 19 matching lines...) Expand all
89 { 89 {
90 ASSERT(transaction); 90 ASSERT(transaction);
91 ASSERT(m_backend); 91 ASSERT(m_backend);
92 92
93 bool callbackError = false; 93 bool callbackError = false;
94 94
95 SQLStatementCallback* callback = m_statementCallback.release(); 95 SQLStatementCallback* callback = m_statementCallback.release();
96 SQLStatementErrorCallback* errorCallback = m_statementErrorCallback.release( ); 96 SQLStatementErrorCallback* errorCallback = m_statementErrorCallback.release( );
97 SQLErrorData* error = m_backend->sqlError(); 97 SQLErrorData* error = m_backend->sqlError();
98 98
99 InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsync OperationCompletedCallbackStarting(transaction->database()->executionContext(), m_asyncOperationId); 99 InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsync OperationCompletedCallbackStarting(transaction->database()->getExecutionContext( ), m_asyncOperationId);
100 100
101 // Call the appropriate statement callback and track if it resulted in an er ror, 101 // Call the appropriate statement callback and track if it resulted in an er ror,
102 // because then we need to jump to the transaction error callback. 102 // because then we need to jump to the transaction error callback.
103 if (error) { 103 if (error) {
104 if (errorCallback) 104 if (errorCallback)
105 callbackError = errorCallback->handleEvent(transaction, SQLError::cr eate(*error)); 105 callbackError = errorCallback->handleEvent(transaction, SQLError::cr eate(*error));
106 } else if (callback) { 106 } else if (callback) {
107 callbackError = !callback->handleEvent(transaction, m_backend->sqlResult Set()); 107 callbackError = !callback->handleEvent(transaction, m_backend->sqlResult Set());
108 } 108 }
109 109
110 InspectorInstrumentation::traceAsyncCallbackCompleted(cookie); 110 InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
111 111
112 return callbackError; 112 return callbackError;
113 } 113 }
114 114
115 } // namespace blink 115 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698