| OLD | NEW |
| 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 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "bindings/core/v8/ScriptFunctionCall.h" | 32 #include "bindings/core/v8/ScriptFunctionCall.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/ScriptController.h" | 34 #include "bindings/core/v8/ScriptController.h" |
| 35 #include "bindings/core/v8/ScriptState.h" | 35 #include "bindings/core/v8/ScriptState.h" |
| 36 #include "bindings/core/v8/ScriptValue.h" | 36 #include "bindings/core/v8/ScriptValue.h" |
| 37 #include "bindings/core/v8/V8Binding.h" | 37 #include "bindings/core/v8/V8Binding.h" |
| 38 #include "bindings/core/v8/V8ObjectConstructor.h" | 38 #include "bindings/core/v8/V8ObjectConstructor.h" |
| 39 #include "bindings/core/v8/V8ScriptRunner.h" | 39 #include "bindings/core/v8/V8ScriptRunner.h" |
| 40 | 40 #include "v8/include/v8.h" |
| 41 #include <v8.h> | |
| 42 | 41 |
| 43 namespace blink { | 42 namespace blink { |
| 44 | 43 |
| 45 void ScriptCallArgumentHandler::appendArgument(const ScriptValue& argument) | 44 void ScriptCallArgumentHandler::appendArgument(const ScriptValue& argument) |
| 46 { | 45 { |
| 47 if (argument.scriptState() != m_scriptState) { | 46 if (argument.scriptState() != m_scriptState) { |
| 48 appendUndefinedArgument(); | 47 appendUndefinedArgument(); |
| 49 return; | 48 return; |
| 50 } | 49 } |
| 51 m_arguments.append(argument); | 50 m_arguments.append(argument); |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 v8::Local<v8::Object> result = V8ObjectConstructor::newInstance(m_scriptStat
e->isolate(), constructor, m_arguments.size(), info.get()); | 192 v8::Local<v8::Object> result = V8ObjectConstructor::newInstance(m_scriptStat
e->isolate(), constructor, m_arguments.size(), info.get()); |
| 194 if (tryCatch.HasCaught()) { | 193 if (tryCatch.HasCaught()) { |
| 195 hadException = true; | 194 hadException = true; |
| 196 return ScriptValue(); | 195 return ScriptValue(); |
| 197 } | 196 } |
| 198 | 197 |
| 199 return ScriptValue(m_scriptState.get(), result); | 198 return ScriptValue(m_scriptState.get(), result); |
| 200 } | 199 } |
| 201 | 200 |
| 202 } // namespace blink | 201 } // namespace blink |
| OLD | NEW |