| OLD | NEW |
| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 type var(value); \ | 71 type var(value); \ |
| 72 if (UNLIKELY(!var.prepare())) \ | 72 if (UNLIKELY(!var.prepare())) \ |
| 73 return; | 73 return; |
| 74 | 74 |
| 75 #define TOSTRING_DEFAULT(type, var, value, retVal) \ | 75 #define TOSTRING_DEFAULT(type, var, value, retVal) \ |
| 76 type var(value); \ | 76 type var(value); \ |
| 77 if (UNLIKELY(!var.prepare())) \ | 77 if (UNLIKELY(!var.prepare())) \ |
| 78 return retVal; | 78 return retVal; |
| 79 | 79 |
| 80 template <typename T> | 80 template <typename T> |
| 81 inline bool getValueFromMaybe(v8::Maybe<T> maybe, T& outVariable) | 81 inline bool v8Call(v8::Maybe<T> maybe, T& outVariable) |
| 82 { | 82 { |
| 83 if (maybe.IsNothing()) | 83 if (maybe.IsNothing()) |
| 84 return false; | 84 return false; |
| 85 outVariable = maybe.FromJust(); | 85 outVariable = maybe.FromJust(); |
| 86 return true; | 86 return true; |
| 87 } | 87 } |
| 88 | 88 |
| 89 inline bool v8CallBoolean(v8::Maybe<bool> maybe) | 89 inline bool v8CallBoolean(v8::Maybe<bool> maybe) |
| 90 { | 90 { |
| 91 bool result; | 91 bool result; |
| 92 return getValueFromMaybe(maybe, result) && result; | 92 return v8Call(maybe, result) && result; |
| 93 } | 93 } |
| 94 | 94 |
| 95 template <typename T> | 95 template <typename T> |
| 96 inline bool v8Call(v8::Maybe<T> maybe, T& outVariable, v8::TryCatch& tryCatch) | 96 inline bool v8Call(v8::Maybe<T> maybe, T& outVariable, v8::TryCatch& tryCatch) |
| 97 { | 97 { |
| 98 bool success = getValueFromMaybe(maybe, outVariable); | 98 bool success = v8Call(maybe, outVariable); |
| 99 ASSERT(success || tryCatch.HasCaught()); | 99 ASSERT(success || tryCatch.HasCaught()); |
| 100 return success; | 100 return success; |
| 101 } | 101 } |
| 102 | 102 |
| 103 template <typename T> | 103 template <typename T> |
| 104 inline bool v8Call(v8::MaybeLocal<T> maybeLocal, v8::Local<T>& outVariable, v8::
TryCatch& tryCatch) | 104 inline bool v8Call(v8::MaybeLocal<T> maybeLocal, v8::Local<T>& outVariable, v8::
TryCatch& tryCatch) |
| 105 { | 105 { |
| 106 bool success = maybeLocal.ToLocal(&outVariable); | 106 bool success = maybeLocal.ToLocal(&outVariable); |
| 107 ASSERT(success || tryCatch.HasCaught()); | 107 ASSERT(success || tryCatch.HasCaught()); |
| 108 return success; | 108 return success; |
| 109 } | 109 } |
| 110 | 110 |
| 111 // The last "else" is to avoid dangling else problem. | 111 // The last "else" is to avoid dangling else problem. |
| 112 #define V8_CALL(outVariable, handle, methodCall, failureExpression)
\ | 112 #define V8_CALL(outVariable, handle, methodCall, failureExpression)
\ |
| 113 if (handle.IsEmpty() || !getValueFromMaybe(handle->methodCall, outVariable))
{ \ | 113 if (handle.IsEmpty() || !v8Call(handle->methodCall, outVariable)) { \ |
| 114 failureExpression;
\ | 114 failureExpression;
\ |
| 115 } else | 115 } else |
| 116 | 116 |
| 117 } // namespace blink | 117 } // namespace blink |
| 118 | 118 |
| 119 #endif // V8BindingMacros_h | 119 #endif // V8BindingMacros_h |
| OLD | NEW |