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 23 matching lines...) Expand all Loading... |
34 #include "bindings/v8/ScriptState.h" | 34 #include "bindings/v8/ScriptState.h" |
35 #include "bindings/v8/V8Binding.h" | 35 #include "bindings/v8/V8Binding.h" |
36 #include "platform/JSONValues.h" | 36 #include "platform/JSONValues.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 ScriptValue::~ScriptValue() | 40 ScriptValue::~ScriptValue() |
41 { | 41 { |
42 } | 42 } |
43 | 43 |
44 v8::Handle<v8::Value> ScriptValue::v8Value() const | |
45 { | |
46 if (isEmpty()) | |
47 return v8::Handle<v8::Value>(); | |
48 | |
49 ASSERT(isolate()->InContext()); | |
50 | |
51 // This is a check to validate that you don't return a ScriptValue to a worl
d different | |
52 // from the world that created the ScriptValue. | |
53 // Probably this could be: | |
54 // if (&m_scriptState->world() == &DOMWrapperWorld::current(isolate())) | |
55 // return v8::Handle<v8::Value>(); | |
56 // instead of triggering RELEASE_ASSERT. | |
57 RELEASE_ASSERT(&m_scriptState->world() == &DOMWrapperWorld::current(isolate(
))); | |
58 return m_value->newLocal(isolate()); | |
59 } | |
60 | |
61 bool ScriptValue::toString(String& result) const | 44 bool ScriptValue::toString(String& result) const |
62 { | 45 { |
63 if (isEmpty()) | 46 if (isEmpty()) |
64 return false; | 47 return false; |
65 | 48 |
66 ScriptState::Scope scope(m_scriptState.get()); | 49 v8::HandleScope handleScope(isolate()); |
67 v8::Handle<v8::Value> string = v8Value(); | 50 v8::Handle<v8::Value> string = v8Value(); |
68 if (string.IsEmpty() || !string->IsString()) | 51 if (string.IsEmpty() || !string->IsString()) |
69 return false; | 52 return false; |
70 result = toCoreString(v8::Handle<v8::String>::Cast(string)); | 53 result = toCoreString(v8::Handle<v8::String>::Cast(string)); |
71 return true; | 54 return true; |
72 } | 55 } |
73 | 56 |
74 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const | 57 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const |
75 { | 58 { |
76 ASSERT(!scriptState->contextIsEmpty()); | 59 ASSERT(!scriptState->contextIsEmpty()); |
77 ScriptState::Scope scope(scriptState); | 60 ScriptState::Scope scope(scriptState); |
78 return v8ToJSONValue(scriptState->isolate(), v8Value(), JSONValue::maxDepth)
; | 61 return v8ToJSONValue(scriptState->isolate(), v8Value(), JSONValue::maxDepth)
; |
79 } | 62 } |
80 | 63 |
81 } // namespace WebCore | 64 } // namespace WebCore |
OLD | NEW |