| 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 17 matching lines...) Expand all Loading... |
| 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 "config.h" | 31 #include "config.h" |
| 32 #include "bindings/v8/ScriptValue.h" | 32 #include "bindings/v8/ScriptValue.h" |
| 33 | 33 |
| 34 #include "bindings/v8/ScriptScope.h" | 34 #include "bindings/v8/ScriptScope.h" |
| 35 #include "bindings/v8/SerializedScriptValue.h" | 35 #include "bindings/v8/SerializedScriptValue.h" |
| 36 #include "bindings/v8/V8Binding.h" | 36 #include "bindings/v8/V8Binding.h" |
| 37 #include "core/dom/MessagePort.h" | 37 #include "core/dom/MessagePort.h" |
| 38 #include "core/platform/JSONValues.h" | 38 #include "platform/JSONValues.h" |
| 39 #include "wtf/ArrayBuffer.h" | 39 #include "wtf/ArrayBuffer.h" |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 ScriptValue::~ScriptValue() | 43 ScriptValue::~ScriptValue() |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptStat
e) | 47 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptStat
e) |
| 48 { | 48 { |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 | 139 |
| 140 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const | 140 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const |
| 141 { | 141 { |
| 142 v8::HandleScope handleScope(scriptState->isolate()); | 142 v8::HandleScope handleScope(scriptState->isolate()); |
| 143 // v8::Object::GetPropertyNames() expects current context to be not null. | 143 // v8::Object::GetPropertyNames() expects current context to be not null. |
| 144 v8::Context::Scope contextScope(scriptState->context()); | 144 v8::Context::Scope contextScope(scriptState->context()); |
| 145 return v8ToJSONValue(v8Value(), JSONValue::maxDepth, scriptState->isolate())
; | 145 return v8ToJSONValue(v8Value(), JSONValue::maxDepth, scriptState->isolate())
; |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace WebCore | 148 } // namespace WebCore |
| OLD | NEW |