| 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 fb0ebae82b1dee5840ef737a69bcc7872f7c2d1f..4de7b411e33af871440a543cdce451e128dcf613 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h
|
| @@ -83,8 +83,6 @@ class CORE_EXPORT V8DOMConfiguration final {
|
| const char* const name;
|
| v8::AccessorNameGetterCallback getter;
|
| v8::AccessorNameSetterCallback setter;
|
| - v8::AccessorNameGetterCallback getterForMainWorld;
|
| - v8::AccessorNameSetterCallback setterForMainWorld;
|
| // TODO(vogelheim): This has to be removed too since it's only used in
|
| // accessors.
|
| // The accessor's 'result' is stored in a private property.
|
| @@ -96,6 +94,8 @@ class CORE_EXPORT V8DOMConfiguration final {
|
| unsigned propertyLocationConfiguration : 3;
|
| // HolderCheckConfiguration
|
| unsigned holderCheckConfiguration : 1;
|
| + // WorldConfiguration
|
| + unsigned worldConfiguration : 2;
|
| };
|
|
|
| static void installAttributes(v8::Isolate*,
|
| @@ -139,8 +139,6 @@ class CORE_EXPORT V8DOMConfiguration final {
|
| const char* const name;
|
| v8::FunctionCallback getter;
|
| v8::FunctionCallback setter;
|
| - v8::FunctionCallback getterForMainWorld;
|
| - v8::FunctionCallback setterForMainWorld;
|
| // The accessor's 'result' is stored in a private property.
|
| CachedAccessorCallback cachedAccessorCallback;
|
| const WrapperTypeInfo* data;
|
| @@ -150,6 +148,8 @@ class CORE_EXPORT V8DOMConfiguration final {
|
| unsigned propertyLocationConfiguration : 3;
|
| // HolderCheckConfiguration
|
| unsigned holderCheckConfiguration : 1;
|
| + // WorldConfiguration
|
| + unsigned worldConfiguration : 2;
|
| };
|
|
|
| static void installAccessors(
|
| @@ -263,9 +263,6 @@ class CORE_EXPORT V8DOMConfiguration final {
|
| v8::Local<v8::Name> methodName(v8::Isolate* isolate) const {
|
| return getSymbol(isolate);
|
| }
|
| - v8::FunctionCallback callbackForWorld(const DOMWrapperWorld&) const {
|
| - return callback;
|
| - }
|
|
|
| v8::Local<v8::Symbol> (*getSymbol)(v8::Isolate*);
|
| v8::FunctionCallback callback;
|
|
|