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

Side by Side Diff: Source/bindings/modules/v8/custom/V8SQLTransactionCustom.cpp

Issue 660243003: v8::Handle should be replaced with v8::Local in Source/bindings/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git/+/master
Patch Set: Created 6 years, 2 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 uint32_t sqlArgsLength = 0; 67 uint32_t sqlArgsLength = 0;
68 v8::Local<v8::Object> sqlArgsObject = info[1]->ToObject(); 68 v8::Local<v8::Object> sqlArgsObject = info[1]->ToObject();
69 TONATIVE_VOID(v8::Local<v8::Value>, length, sqlArgsObject->Get(v8AtomicS tring(info.GetIsolate(), "length"))); 69 TONATIVE_VOID(v8::Local<v8::Value>, length, sqlArgsObject->Get(v8AtomicS tring(info.GetIsolate(), "length")));
70 70
71 if (isUndefinedOrNull(length)) 71 if (isUndefinedOrNull(length))
72 sqlArgsLength = sqlArgsObject->GetPropertyNames()->Length(); 72 sqlArgsLength = sqlArgsObject->GetPropertyNames()->Length();
73 else 73 else
74 sqlArgsLength = length->Uint32Value(); 74 sqlArgsLength = length->Uint32Value();
75 75
76 for (unsigned i = 0; i < sqlArgsLength; ++i) { 76 for (unsigned i = 0; i < sqlArgsLength; ++i) {
77 v8::Handle<v8::Integer> key = v8::Integer::New(info.GetIsolate(), i) ; 77 v8::Local<v8::Integer> key = v8::Integer::New(info.GetIsolate(), i);
78 TONATIVE_VOID(v8::Local<v8::Value>, value, sqlArgsObject->Get(key)); 78 TONATIVE_VOID(v8::Local<v8::Value>, value, sqlArgsObject->Get(key));
79 79
80 if (value.IsEmpty() || value->IsNull()) { 80 if (value.IsEmpty() || value->IsNull()) {
81 sqlValues.append(SQLValue()); 81 sqlValues.append(SQLValue());
82 } else if (value->IsNumber()) { 82 } else if (value->IsNumber()) {
83 TONATIVE_VOID(double, sqlValue, value->NumberValue()); 83 TONATIVE_VOID(double, sqlValue, value->NumberValue());
84 sqlValues.append(SQLValue(sqlValue)); 84 sqlValues.append(SQLValue(sqlValue));
85 } else { 85 } else {
86 TOSTRING_VOID(V8StringResource<>, sqlValue, value); 86 TOSTRING_VOID(V8StringResource<>, sqlValue, value);
87 sqlValues.append(SQLValue(sqlValue)); 87 sqlValues.append(SQLValue(sqlValue));
88 } 88 }
89 } 89 }
90 } 90 }
91 91
92 SQLTransaction* transaction = V8SQLTransaction::toImpl(info.Holder()); 92 SQLTransaction* transaction = V8SQLTransaction::toImpl(info.Holder());
93 SQLStatementCallback* callback; 93 SQLStatementCallback* callback;
94 if (!isUndefinedOrNull(info[2])) { 94 if (!isUndefinedOrNull(info[2])) {
95 if (!info[2]->IsFunction()) { 95 if (!info[2]->IsFunction()) {
96 exceptionState.throwDOMException(TypeMismatchError, "The 'callback' (2nd) argument provided is not a function."); 96 exceptionState.throwDOMException(TypeMismatchError, "The 'callback' (2nd) argument provided is not a function.");
97 exceptionState.throwIfNeeded(); 97 exceptionState.throwIfNeeded();
98 return; 98 return;
99 } 99 }
100 callback = V8SQLStatementCallback::create(v8::Handle<v8::Function>::Cast (info[2]), ScriptState::current(info.GetIsolate())); 100 callback = V8SQLStatementCallback::create(v8::Local<v8::Function>::Cast( info[2]), ScriptState::current(info.GetIsolate()));
101 } else { 101 } else {
102 callback = nullptr; 102 callback = nullptr;
103 } 103 }
104 104
105 SQLStatementErrorCallback* errorCallback; 105 SQLStatementErrorCallback* errorCallback;
106 if (!isUndefinedOrNull(info[3])) { 106 if (!isUndefinedOrNull(info[3])) {
107 if (!info[3]->IsFunction()) { 107 if (!info[3]->IsFunction()) {
108 exceptionState.throwDOMException(TypeMismatchError, "The 'errorCallb ack' (3rd) argument provided is not a function."); 108 exceptionState.throwDOMException(TypeMismatchError, "The 'errorCallb ack' (3rd) argument provided is not a function.");
109 exceptionState.throwIfNeeded(); 109 exceptionState.throwIfNeeded();
110 return; 110 return;
111 } 111 }
112 errorCallback = V8SQLStatementErrorCallback::create(v8::Handle<v8::Funct ion>::Cast(info[3]), ScriptState::current(info.GetIsolate())); 112 errorCallback = V8SQLStatementErrorCallback::create(v8::Local<v8::Functi on>::Cast(info[3]), ScriptState::current(info.GetIsolate()));
113 } else { 113 } else {
114 errorCallback = nullptr; 114 errorCallback = nullptr;
115 } 115 }
116 116
117 transaction->executeSQL(statement, sqlValues, callback, errorCallback, excep tionState); 117 transaction->executeSQL(statement, sqlValues, callback, errorCallback, excep tionState);
118 exceptionState.throwIfNeeded(); 118 exceptionState.throwIfNeeded();
119 } 119 }
120 120
121 } // namespace blink 121 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698