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

Side by Side Diff: Source/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp

Issue 234403004: Rename V8TRYCATCH_* macros in v8/V8BindingMacros.h (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: BOOL*_BOOL -> BOOL* Created 6 years, 8 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 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 void V8SQLTransactionSync::executeSqlMethodCustom(const v8::FunctionCallbackInfo <v8::Value>& info) 47 void V8SQLTransactionSync::executeSqlMethodCustom(const v8::FunctionCallbackInfo <v8::Value>& info)
48 { 48 {
49 ExceptionState exceptionState(ExceptionState::ExecutionContext, "executeSql" , "SQLTransactionSync", info.Holder(), info.GetIsolate()); 49 ExceptionState exceptionState(ExceptionState::ExecutionContext, "executeSql" , "SQLTransactionSync", info.Holder(), info.GetIsolate());
50 if (!info.Length()) { 50 if (!info.Length()) {
51 exceptionState.throwDOMException(SyntaxError, ExceptionMessages::notEnou ghArguments(1, 0)); 51 exceptionState.throwDOMException(SyntaxError, ExceptionMessages::notEnou ghArguments(1, 0));
52 exceptionState.throwIfNeeded(); 52 exceptionState.throwIfNeeded();
53 return; 53 return;
54 } 54 }
55 55
56 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, statement, info[0]) ; 56 TOSTRING_VOID(V8StringResource<>, statement, info[0]);
57 57
58 Vector<SQLValue> sqlValues; 58 Vector<SQLValue> sqlValues;
59 59
60 if (info.Length() > 1 && !isUndefinedOrNull(info[1])) { 60 if (info.Length() > 1 && !isUndefinedOrNull(info[1])) {
61 if (!info[1]->IsObject()) { 61 if (!info[1]->IsObject()) {
62 exceptionState.throwDOMException(TypeMismatchError, ExceptionMessage s::argumentNullOrIncorrectType(1, "DOMString")); 62 exceptionState.throwDOMException(TypeMismatchError, ExceptionMessage s::argumentNullOrIncorrectType(1, "DOMString"));
63 exceptionState.throwIfNeeded(); 63 exceptionState.throwIfNeeded();
64 return; 64 return;
65 } 65 }
66 66
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 V8TRYCATCH_VOID(v8::Local<v8::Value>, length, sqlArgsObject->Get(v8Atomi cString(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::Handle<v8::Integer> key = v8::Integer::New(info.GetIsolate(), i) ;
78 V8TRYCATCH_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 V8TRYCATCH_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 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, sqlValu e, 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 SQLTransactionSync* transaction = V8SQLTransactionSync::toNative(info.Holder ()); 92 SQLTransactionSync* transaction = V8SQLTransactionSync::toNative(info.Holder ());
93 93
94 v8::Handle<v8::Value> result = toV8(transaction->executeSQL(statement, sqlVa lues, exceptionState), info.Holder(), info.GetIsolate()); 94 v8::Handle<v8::Value> result = toV8(transaction->executeSQL(statement, sqlVa lues, exceptionState), info.Holder(), info.GetIsolate());
95 if (exceptionState.throwIfNeeded()) 95 if (exceptionState.throwIfNeeded())
96 return; 96 return;
97 97
98 v8SetReturnValue(info, result); 98 v8SetReturnValue(info, result);
99 } 99 }
100 100
101 } // namespace WebCore 101 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8SQLTransactionCustom.cpp ('k') | Source/bindings/v8/custom/V8WebGLRenderingContextCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698