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

Side by Side Diff: Source/bindings/modules/v8/custom/V8CustomSQLStatementErrorCallback.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, 2012 Google Inc. All rights reserved. 2 * Copyright (c) 2009, 2012 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 { 43 {
44 if (!canInvokeCallback()) 44 if (!canInvokeCallback())
45 return true; 45 return true;
46 46
47 v8::Isolate* isolate = m_scriptState->isolate(); 47 v8::Isolate* isolate = m_scriptState->isolate();
48 if (!m_scriptState->contextIsValid()) 48 if (!m_scriptState->contextIsValid())
49 return true; 49 return true;
50 50
51 ScriptState::Scope scope(m_scriptState.get()); 51 ScriptState::Scope scope(m_scriptState.get());
52 52
53 v8::Handle<v8::Value> transactionHandle = toV8(transaction, m_scriptState->c ontext()->Global(), isolate); 53 v8::Local<v8::Value> transactionHandle = toV8(transaction, m_scriptState->co ntext()->Global(), isolate);
54 v8::Handle<v8::Value> errorHandle = toV8(error, m_scriptState->context()->Gl obal(), isolate); 54 v8::Local<v8::Value> errorHandle = toV8(error, m_scriptState->context()->Glo bal(), isolate);
55 if (transactionHandle.IsEmpty() || errorHandle.IsEmpty()) { 55 if (transactionHandle.IsEmpty() || errorHandle.IsEmpty()) {
56 if (!isScriptControllerTerminating()) 56 if (!isScriptControllerTerminating())
57 CRASH(); 57 CRASH();
58 return true; 58 return true;
59 } 59 }
60 60
61 ASSERT(transactionHandle->IsObject()); 61 ASSERT(transactionHandle->IsObject());
62 62
63 v8::Handle<v8::Value> argv[] = { 63 v8::Local<v8::Value> argv[] = {
64 transactionHandle, 64 transactionHandle,
65 errorHandle 65 errorHandle
66 }; 66 };
67 67
68 v8::TryCatch exceptionCatcher; 68 v8::TryCatch exceptionCatcher;
69 exceptionCatcher.SetVerbose(true); 69 exceptionCatcher.SetVerbose(true);
70 70
71 v8::Handle<v8::Value> result = ScriptController::callFunction(executionConte xt(), m_callback.newLocal(isolate), m_scriptState->context()->Global(), WTF_ARRA Y_LENGTH(argv), argv, isolate); 71 v8::Local<v8::Value> result = ScriptController::callFunction(executionContex t(), m_callback.newLocal(isolate), m_scriptState->context()->Global(), WTF_ARRAY _LENGTH(argv), argv, isolate);
72 72
73 // FIXME: This comment doesn't make much sense given what the code is actual ly doing. 73 // FIXME: This comment doesn't make much sense given what the code is actual ly doing.
74 // 74 //
75 // Step 6: If the error callback returns false, then move on to the next 75 // Step 6: If the error callback returns false, then move on to the next
76 // statement, if any, or onto the next overall step otherwise. Otherwise, 76 // statement, if any, or onto the next overall step otherwise. Otherwise,
77 // the error callback did not return false, or there was no error callback. 77 // the error callback did not return false, or there was no error callback.
78 // Jump to the last step in the overall steps. 78 // Jump to the last step in the overall steps.
79 return exceptionCatcher.HasCaught() || (!result.IsEmpty() && result->Boolean Value()); 79 return exceptionCatcher.HasCaught() || (!result.IsEmpty() && result->Boolean Value());
80 } 80 }
81 81
82 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698