| 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 29 matching lines...) Expand all Loading... |
| 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 { |
| 49 ScriptScope scope(scriptState); | 49 ScriptScope scope(scriptState); |
| 50 return SerializedScriptValue::create(v8Value()); | 50 return SerializedScriptValue::create(v8Value(), scriptState->isolate()); |
| 51 } | 51 } |
| 52 | 52 |
| 53 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptStat
e, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThro
w) | 53 PassRefPtr<SerializedScriptValue> ScriptValue::serialize(ScriptState* scriptStat
e, MessagePortArray* messagePorts, ArrayBufferArray* arrayBuffers, bool& didThro
w) |
| 54 { | 54 { |
| 55 ScriptScope scope(scriptState); | 55 ScriptScope scope(scriptState); |
| 56 return SerializedScriptValue::create(v8Value(), messagePorts, arrayBuffers,
didThrow); | 56 return SerializedScriptValue::create(v8Value(), messagePorts, arrayBuffers,
didThrow, scriptState->isolate()); |
| 57 } | 57 } |
| 58 | 58 |
| 59 ScriptValue ScriptValue::deserialize(ScriptState* scriptState, SerializedScriptV
alue* value) | 59 ScriptValue ScriptValue::deserialize(ScriptState* scriptState, SerializedScriptV
alue* value) |
| 60 { | 60 { |
| 61 ScriptScope scope(scriptState); | 61 ScriptScope scope(scriptState); |
| 62 return ScriptValue(value->deserialize()); | 62 return ScriptValue(value->deserialize()); |
| 63 } | 63 } |
| 64 | 64 |
| 65 bool ScriptValue::getString(String& result, v8::Isolate* isolate) const | 65 bool ScriptValue::getString(String& result, v8::Isolate* isolate) const |
| 66 { | 66 { |
| (...skipping 72 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); | 145 return v8ToJSONValue(v8Value(), JSONValue::maxDepth); |
| 146 } | 146 } |
| 147 | 147 |
| 148 } // namespace WebCore | 148 } // namespace WebCore |
| OLD | NEW |