OLD | NEW |
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 27 matching lines...) Expand all Loading... |
38 #include "wtf/Assertions.h" | 38 #include "wtf/Assertions.h" |
39 | 39 |
40 namespace blink { | 40 namespace blink { |
41 | 41 |
42 bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr
ror* error) | 42 bool V8SQLStatementErrorCallback::handleEvent(SQLTransaction* transaction, SQLEr
ror* error) |
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::Handle<v8::Value> transactionHandle = toV8(transaction, m_scriptState->c
ontext()->Global(), isolate); |
54 v8::Handle<v8::Value> errorHandle = toV8(error, m_scriptState->context()->Gl
obal(), isolate); | 54 v8::Handle<v8::Value> errorHandle = toV8(error, m_scriptState->context()->Gl
obal(), 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; |
(...skipping 14 matching lines...) Expand all Loading... |
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 |
OLD | NEW |