| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "bindings/core/v8/V8HiddenValue.h" | 6 #include "bindings/core/v8/V8HiddenValue.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
| 9 #include "bindings/core/v8/ScriptWrappable.h" | 9 #include "bindings/core/v8/ScriptWrappable.h" |
| 10 #include "bindings/core/v8/V8Binding.h" | 10 #include "bindings/core/v8/V8Binding.h" |
| 11 | 11 |
| 12 namespace blink { | 12 namespace blink { |
| 13 | 13 |
| 14 #define V8_DEFINE_METHOD(name) \ | 14 #define V8_DEFINE_METHOD(name) \ |
| 15 v8::Local<v8::String> V8HiddenValue::name(v8::Isolate* isolate) \ | 15 v8::Local<v8::String> V8HiddenValue::name(v8::Isolate* isolate) \ |
| 16 { \ | 16 { \ |
| 17 V8HiddenValue* hiddenValue = V8PerIsolateData::from(isolate)->hiddenValue();
\ | 17 V8HiddenValue* hiddenValue = V8PerIsolateData::from(isolate)->hiddenValue();
\ |
| 18 if (hiddenValue->m_##name.isEmpty()) { \ | 18 if (hiddenValue->m_##name.isEmpty()) { \ |
| 19 hiddenValue->m_##name.set(isolate, v8AtomicString(isolate, #name)); \ | 19 hiddenValue->m_##name.set(isolate, v8AtomicString(isolate, #name)); \ |
| 20 } \ | 20 } \ |
| 21 return hiddenValue->m_##name.newLocal(isolate); \ | 21 return hiddenValue->m_##name.newLocal(isolate); \ |
| 22 } | 22 } |
| 23 | 23 |
| 24 V8_HIDDEN_VALUES(V8_DEFINE_METHOD); | 24 V8_HIDDEN_VALUES(V8_DEFINE_METHOD); |
| 25 | 25 |
| 26 v8::Local<v8::Value> V8HiddenValue::getHiddenValue(ScriptState* scriptState, v8:
:Local<v8::Object> object, v8::Local<v8::String> key) | 26 v8::Local<v8::Value> V8HiddenValue::getHiddenValue(ScriptState* scriptState, v8:
:Local<v8::Object> object, v8::Local<v8::String> key) |
| 27 { | 27 { |
| 28 return object->GetHiddenValue(key); | 28 v8::Local<v8::Context> context = scriptState->context(); |
| 29 v8::Local<v8::Private> privateKey = v8::Private::ForApi(scriptState->isolate
(), key); |
| 30 v8::Local<v8::Value> value; |
| 31 // Callsites interpret an empty handle has absence of a result. |
| 32 if (!v8CallBoolean(object->HasPrivate(context, privateKey))) |
| 33 return v8::Local<v8::Value>(); |
| 34 if (object->GetPrivate(context, privateKey).ToLocal(&value)) |
| 35 return value; |
| 36 return v8::Local<v8::Value>(); |
| 29 } | 37 } |
| 30 | 38 |
| 31 bool V8HiddenValue::setHiddenValue(ScriptState* scriptState, v8::Local<v8::Objec
t> object, v8::Local<v8::String> key, v8::Local<v8::Value> value) | 39 bool V8HiddenValue::setHiddenValue(ScriptState* scriptState, v8::Local<v8::Objec
t> object, v8::Local<v8::String> key, v8::Local<v8::Value> value) |
| 32 { | 40 { |
| 33 return object->SetHiddenValue(key, value); | 41 return v8CallBoolean(object->SetPrivate(scriptState->context(), v8::Private:
:ForApi(scriptState->isolate(), key), value)); |
| 34 } | 42 } |
| 35 | 43 |
| 36 bool V8HiddenValue::deleteHiddenValue(ScriptState* scriptState, v8::Local<v8::Ob
ject> object, v8::Local<v8::String> key) | 44 bool V8HiddenValue::deleteHiddenValue(ScriptState* scriptState, v8::Local<v8::Ob
ject> object, v8::Local<v8::String> key) |
| 37 { | 45 { |
| 38 return object->DeleteHiddenValue(key); | 46 return v8CallBoolean(object->DeletePrivate(scriptState->context(), v8::Priva
te::ForApi(scriptState->isolate(), key))); |
| 39 } | 47 } |
| 40 | 48 |
| 41 v8::Local<v8::Value> V8HiddenValue::getHiddenValueFromMainWorldWrapper(ScriptSta
te* scriptState, ScriptWrappable* wrappable, v8::Local<v8::String> key) | 49 v8::Local<v8::Value> V8HiddenValue::getHiddenValueFromMainWorldWrapper(ScriptSta
te* scriptState, ScriptWrappable* wrappable, v8::Local<v8::String> key) |
| 42 { | 50 { |
| 43 v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(scriptState->isol
ate()); | 51 v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(scriptState->isol
ate()); |
| 44 return wrapper.IsEmpty() ? v8::Local<v8::Value>() : getHiddenValue(scriptSta
te, wrapper, key); | 52 return wrapper.IsEmpty() ? v8::Local<v8::Value>() : getHiddenValue(scriptSta
te, wrapper, key); |
| 45 } | 53 } |
| 46 | 54 |
| 47 } // namespace blink | 55 } // namespace blink |
| OLD | NEW |