Chromium Code Reviews| Index: third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h |
| diff --git a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h |
| index 2c2db634c1da82a8ed87727c207ee3d1ddd6aa43..c5606300e35410bb8b251472d1a15abd42fc847e 100644 |
| --- a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h |
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h |
| @@ -65,6 +65,13 @@ class CORE_EXPORT V8DOMConfiguration final { |
| DoNotCheckAccess, |
| }; |
| + // Bit field to select which worlds the member will be defined in. |
| + enum WorldConfiguration : unsigned { |
| + MainWorld = 1 << 0, |
| + OtherWorlds = 1 << 1, |
|
haraken
2017/03/17 18:16:14
NonMainWorlds ?
jbroman
2017/03/17 18:32:43
Done. I'd named it for the hypothetical possibilit
|
| + AllWorlds = MainWorld | OtherWorlds, |
| + }; |
| + |
| typedef v8::Local<v8::Private> (*CachedAccessorCallback)(v8::Isolate*); |
| // AttributeConfiguration translates into calls to SetNativeDataProperty() on |
| @@ -233,14 +240,9 @@ class CORE_EXPORT V8DOMConfiguration final { |
| v8::Local<v8::Name> methodName(v8::Isolate* isolate) const { |
| return v8AtomicString(isolate, name); |
| } |
| - v8::FunctionCallback callbackForWorld(const DOMWrapperWorld& world) const { |
| - return world.isMainWorld() && callbackForMainWorld ? callbackForMainWorld |
| - : callback; |
| - } |
| const char* const name; |
| v8::FunctionCallback callback; |
| - v8::FunctionCallback callbackForMainWorld; |
| int length; |
| // v8::PropertyAttribute |
| unsigned attribute : 8; |
| @@ -250,6 +252,8 @@ class CORE_EXPORT V8DOMConfiguration final { |
| unsigned holderCheckConfiguration : 1; |
| // AccessCheckConfiguration |
| unsigned accessCheckConfiguration : 1; |
| + // WorldConfiguration |
| + unsigned worldConfiguration : 2; |
| }; |
| struct SymbolKeyedMethodConfiguration { |