| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "bindings/core/v8/ScriptValue.h" | 31 #include "bindings/core/v8/ScriptValue.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/SerializedScriptValueFactory.h" | |
| 34 #include "bindings/core/v8/V8BindingForCore.h" | 33 #include "bindings/core/v8/V8BindingForCore.h" |
| 34 #include "bindings/core/v8/serialization/SerializedScriptValueFactory.h" |
| 35 #include "platform/bindings/ScriptState.h" | 35 #include "platform/bindings/ScriptState.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 v8::Local<v8::Value> ScriptValue::V8Value() const { | 39 v8::Local<v8::Value> ScriptValue::V8Value() const { |
| 40 if (IsEmpty()) | 40 if (IsEmpty()) |
| 41 return v8::Local<v8::Value>(); | 41 return v8::Local<v8::Value>(); |
| 42 | 42 |
| 43 DCHECK(GetIsolate()->InContext()); | 43 DCHECK(GetIsolate()->InContext()); |
| 44 | 44 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 return false; | 77 return false; |
| 78 result = ToCoreString(v8::Local<v8::String>::Cast(string)); | 78 result = ToCoreString(v8::Local<v8::String>::Cast(string)); |
| 79 return true; | 79 return true; |
| 80 } | 80 } |
| 81 | 81 |
| 82 ScriptValue ScriptValue::CreateNull(ScriptState* script_state) { | 82 ScriptValue ScriptValue::CreateNull(ScriptState* script_state) { |
| 83 return ScriptValue(script_state, v8::Null(script_state->GetIsolate())); | 83 return ScriptValue(script_state, v8::Null(script_state->GetIsolate())); |
| 84 } | 84 } |
| 85 | 85 |
| 86 } // namespace blink | 86 } // namespace blink |
| OLD | NEW |