From 778e0c7c940f8a22f9a43290aef378fb707ca088 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 14 Oct 2017 00:59:13 +0300 Subject: Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491 Change-Id: I3f9320f43d5d1fc5169a6c1b9dcea454974d6578 Reviewed-by: Konstantin Tokarev --- Source/JavaScriptCore/runtime/JSGlobalObject.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Source/JavaScriptCore/runtime/JSGlobalObject.cpp') diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp index 9e613a212..7d57590b4 100644 --- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp +++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp @@ -458,7 +458,10 @@ m_ ## lowerName ## Prototype->putDirectWithoutTransition(vm, vm.propertyNames->c putDirectWithoutTransition(vm, vm.propertyNames->TypeError, m_typeErrorConstructor.get(), DontEnum); putDirectWithoutTransition(vm, vm.propertyNames->URIError, m_URIErrorConstructor.get(), DontEnum); +#if !PLATFORM(QT) + // Disable ES6 Proxy because our implementation is not compliant with what real world code expects putDirectWithoutTransition(vm, vm.propertyNames->Proxy, ProxyConstructor::create(vm, ProxyConstructor::createStructure(vm, this, m_functionPrototype.get())), DontEnum); +#endif #define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \ -- cgit v1.2.1