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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/V8HiddenValue.cpp

Issue 1466733006: Revert of Switch V8HiddenValue from hidden values to privates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 v8::Local<v8::Context> context = scriptState->context(); 28 return object->GetHiddenValue(key);
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>();
37 } 29 }
38 30
39 bool V8HiddenValue::setHiddenValue(ScriptState* scriptState, v8::Local<v8::Objec t> object, v8::Local<v8::String> key, v8::Local<v8::Value> value) 31 bool V8HiddenValue::setHiddenValue(ScriptState* scriptState, v8::Local<v8::Objec t> object, v8::Local<v8::String> key, v8::Local<v8::Value> value)
40 { 32 {
41 return v8CallBoolean(object->SetPrivate(scriptState->context(), v8::Private: :ForApi(scriptState->isolate(), key), value)); 33 return object->SetHiddenValue(key, value);
42 } 34 }
43 35
44 bool V8HiddenValue::deleteHiddenValue(ScriptState* scriptState, v8::Local<v8::Ob ject> object, v8::Local<v8::String> key) 36 bool V8HiddenValue::deleteHiddenValue(ScriptState* scriptState, v8::Local<v8::Ob ject> object, v8::Local<v8::String> key)
45 { 37 {
46 return v8CallBoolean(object->DeletePrivate(scriptState->context(), v8::Priva te::ForApi(scriptState->isolate(), key))); 38 return object->DeleteHiddenValue(key);
47 } 39 }
48 40
49 v8::Local<v8::Value> V8HiddenValue::getHiddenValueFromMainWorldWrapper(ScriptSta te* scriptState, ScriptWrappable* wrappable, v8::Local<v8::String> key) 41 v8::Local<v8::Value> V8HiddenValue::getHiddenValueFromMainWorldWrapper(ScriptSta te* scriptState, ScriptWrappable* wrappable, v8::Local<v8::String> key)
50 { 42 {
51 v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(scriptState->isol ate()); 43 v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(scriptState->isol ate());
52 return wrapper.IsEmpty() ? v8::Local<v8::Value>() : getHiddenValue(scriptSta te, wrapper, key); 44 return wrapper.IsEmpty() ? v8::Local<v8::Value>() : getHiddenValue(scriptSta te, wrapper, key);
53 } 45 }
54 46
55 } // namespace blink 47 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698