Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: Source/bindings/v8/ScriptValue.cpp

Issue 23450039: Pass isolate to ScriptValue constructor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove useless member Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, scriptState->isolate()); 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(), scriptState->isolate());
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 {
67 if (hasNoValue()) 67 if (hasNoValue())
68 return false; 68 return false;
69 69
70 v8::HandleScope handleScope(isolate); 70 v8::HandleScope handleScope(isolate);
71 v8::Handle<v8::Value> string = v8Value(); 71 v8::Handle<v8::Value> string = v8Value();
72 if (string.IsEmpty() || !string->IsString()) 72 if (string.IsEmpty() || !string->IsString())
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698