Changeset 187279 in webkit for trunk/Source/JavaScriptCore/API
- Timestamp:
- Jul 23, 2015, 5:55:10 PM (10 years ago)
- Location:
- trunk/Source/JavaScriptCore/API
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
r183754 r187279 63 63 } 64 64 65 extern const GlobalObjectMethodTable javaScriptCoreAPIGlobalObjectMethodTable;66 67 65 // Global object constructor. 68 66 // FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one. 69 67 template <class Parent> 70 68 JSCallbackObject<Parent>::JSCallbackObject(VM& vm, JSClassRef jsClass, Structure* structure) 71 : Parent(vm, structure , &javaScriptCoreAPIGlobalObjectMethodTable)69 : Parent(vm, structure) 72 70 , m_callbackObjectData(std::make_unique<JSCallbackObjectData>(nullptr, jsClass)) 73 71 { -
trunk/Source/JavaScriptCore/API/JSContextRef.cpp
r186966 r187279 36 36 #include "JSObject.h" 37 37 #include "JSCInlines.h" 38 #include "RuntimeFlags.h"39 38 #include "SourceProvider.h" 40 39 #include "StackVisitor.h" … … 59 58 60 59 using namespace JSC; 61 62 const GlobalObjectMethodTable JSC::javaScriptCoreAPIGlobalObjectMethodTable = { &JSGlobalObject::allowsAccessFrom, &JSGlobalObject::supportsProfiling, &JSGlobalObject::supportsRichSourceInfo, &JSGlobalObject::shouldInterruptScript, &JSGlobalObject::javaScriptRuntimeFlags, nullptr, &JSGlobalObject::shouldInterruptScriptBeforeTimeout };63 60 64 61 // From the API's perspective, a context group remains alive iff … … 155 152 156 153 if (!globalObjectClass) { 157 JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull()) , &javaScriptCoreAPIGlobalObjectMethodTable);154 JSGlobalObject* globalObject = JSGlobalObject::create(*vm, JSGlobalObject::createStructure(*vm, jsNull())); 158 155 #if ENABLE(REMOTE_INSPECTOR) 159 156 if (JSRemoteInspectorGetInspectionEnabledByDefault())
Note:
See TracChangeset
for help on using the changeset viewer.