Chromium Code Reviews| 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' |
| 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
| 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS |
| 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
| 23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "bindings/v8/V8ScriptRunner.h" | 27 #include "bindings/v8/V8ScriptRunner.h" |
| 28 | 28 |
| 29 #include "bindings/v8/ScopedPersistent.h" | |
|
abarth-chromium
2013/05/20 04:23:36
This include probably isn't needed anymore.
| |
| 29 #include "bindings/v8/V8Binding.h" | 30 #include "bindings/v8/V8Binding.h" |
| 30 #include "bindings/v8/V8GCController.h" | 31 #include "bindings/v8/V8GCController.h" |
| 31 #include "bindings/v8/V8RecursionScope.h" | 32 #include "bindings/v8/V8RecursionScope.h" |
| 32 #include "core/dom/ScriptExecutionContext.h" | 33 #include "core/dom/ScriptExecutionContext.h" |
| 33 | 34 |
| 34 namespace WebCore { | 35 namespace WebCore { |
| 35 | 36 |
| 36 v8::Local<v8::Value> V8ScriptRunner::runCompiledScript(v8::Handle<v8::Script> sc ript, ScriptExecutionContext* context) | 37 v8::Local<v8::Value> V8ScriptRunner::runCompiledScript(v8::Handle<v8::Script> sc ript, ScriptExecutionContext* context) |
| 37 { | 38 { |
| 38 if (script.IsEmpty()) | 39 if (script.IsEmpty()) |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 55 if (handleOutOfMemory()) | 56 if (handleOutOfMemory()) |
| 56 ASSERT(result.IsEmpty()); | 57 ASSERT(result.IsEmpty()); |
| 57 | 58 |
| 58 if (result.IsEmpty()) | 59 if (result.IsEmpty()) |
| 59 return v8::Local<v8::Value>(); | 60 return v8::Local<v8::Value>(); |
| 60 | 61 |
| 61 crashIfV8IsDead(); | 62 crashIfV8IsDead(); |
| 62 return result; | 63 return result; |
| 63 } | 64 } |
| 64 | 65 |
| 66 v8::Local<v8::Value> V8ScriptRunner::compileAndRunInternalScript(v8::Handle<v8:: String> source, v8::Isolate* isolate) | |
| 67 { | |
| 68 v8::Local<v8::Context> context = v8::Context::New(isolate); | |
| 69 if (context.IsEmpty()) | |
| 70 return result; | |
| 71 v8::Local<v8::Value> result; | |
|
abarth-chromium
2013/05/20 04:23:21
I think you'll need to move this line up a bit in
| |
| 72 { | |
| 73 v8::Context::Scope scope(context.get()); | |
| 74 v8::TryCatch tryCatch; | |
| 75 v8::Handle<v8::Script> script = v8::Script::Compile(source); | |
| 76 if (script.IsEmpty() || tryCatch.HasCaught()) | |
| 77 return result; | |
| 78 | |
| 79 V8RecursionScope::MicrotaskSuppression recursionScope; | |
| 80 result = script->Run(); | |
| 81 if (tryCatch.HasCaught()) | |
| 82 return result; | |
| 83 } | |
| 84 return result; | |
| 85 } | |
| 86 | |
| 65 } // namespace WebCore | 87 } // namespace WebCore |
| OLD | NEW |