Changeset 70406 in webkit
- Timestamp:
- Oct 23, 2010 4:49:43 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 28 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/ChangeLog
r70394 r70406 1 2010-10-23 Xan Lopez <xlopez@igalia.com> 2 3 Reviewed by Sam Weinig. 4 5 Unify globalData APIs 6 https://bugs.webkit.org/show_bug.cgi?id=47969 7 8 Make JSGlobalObject::globalData return a reference and adapt 9 callers. This unifies the API with the existing 10 CallFrame::globalData, which also returns a reference. 11 12 * debugger/Debugger.cpp: 13 (JSC::evaluateInGlobalCallFrame): 14 * interpreter/CallFrame.h: 15 * interpreter/Interpreter.cpp: 16 (JSC::Interpreter::dumpRegisters): 17 * jsc.cpp: 18 (runWithScripts): 19 * parser/JSParser.cpp: 20 (JSC::jsParse): 21 * parser/Parser.cpp: 22 (JSC::Parser::parse): 23 * parser/Parser.h: 24 (JSC::Parser::parse): 25 * runtime/Error.cpp: 26 (JSC::createError): 27 (JSC::createEvalError): 28 (JSC::createRangeError): 29 (JSC::createReferenceError): 30 (JSC::createSyntaxError): 31 (JSC::createTypeError): 32 (JSC::createURIError): 33 * runtime/FunctionConstructor.cpp: 34 (JSC::constructFunction): 35 * runtime/JSGlobalObject.cpp: 36 (JSC::JSGlobalObject::~JSGlobalObject): 37 (JSC::JSGlobalObject::markChildren): 38 * runtime/JSGlobalObject.h: 39 (JSC::JSGlobalObject::globalData): 40 1 41 2010-10-23 Dimitri Glazkov <dglazkov@chromium.org> 2 42 -
trunk/JavaScriptCore/debugger/Debugger.cpp
r69516 r70406 107 107 return error; 108 108 109 return globalObject->globalData() ->interpreter->execute(eval.get(), globalCallFrame, globalObject, globalCallFrame->scopeChain(), &exception);109 return globalObject->globalData().interpreter->execute(eval.get(), globalCallFrame, globalObject, globalCallFrame->scopeChain(), &exception); 110 110 } 111 111 -
trunk/JavaScriptCore/interpreter/CallFrame.h
r62612 r70406 64 64 } 65 65 66 // FIXME: Elsewhere, we use JSGlobalData* rather than JSGlobalData&.67 // We should make this more uniform and either use a reference everywhere68 // or a pointer everywhere.69 66 JSGlobalData& globalData() const 70 67 { -
trunk/JavaScriptCore/interpreter/Interpreter.cpp
r70299 r70406 449 449 450 450 CodeBlock* codeBlock = callFrame->codeBlock(); 451 RegisterFile* registerFile = &callFrame->scopeChain()->globalObject->globalData() ->interpreter->registerFile();451 RegisterFile* registerFile = &callFrame->scopeChain()->globalObject->globalData().interpreter->registerFile(); 452 452 const Register* it; 453 453 const Register* end; -
trunk/JavaScriptCore/jsc.cpp
r67146 r70406 369 369 BytecodeGenerator::setDumpsGeneratedCode(true); 370 370 371 JSGlobalData *globalData = globalObject->globalData();371 JSGlobalData& globalData = globalObject->globalData(); 372 372 373 373 #if ENABLE(SAMPLING_FLAGS) … … 387 387 } 388 388 389 globalData ->startSampling();389 globalData.startSampling(); 390 390 391 391 Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script, fileName)); … … 398 398 } 399 399 400 globalData ->stopSampling();400 globalData.stopSampling(); 401 401 globalObject->globalExec()->clearException(); 402 402 } … … 405 405 SamplingFlags::stop(); 406 406 #endif 407 globalData ->dumpSampleData(globalObject->globalExec());407 globalData.dumpSampleData(globalObject->globalExec()); 408 408 #if ENABLE(SAMPLING_COUNTERS) 409 409 AbstractSamplingCounter::dump(); 410 410 #endif 411 411 #if ENABLE(REGEXP_TRACING) 412 globalData ->dumpRegExpTrace();412 globalData.dumpRegExpTrace(); 413 413 #endif 414 414 return success; -
trunk/JavaScriptCore/parser/JSParser.cpp
r69963 r70406 486 486 int jsParse(JSGlobalObject* lexicalGlobalObject, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode parserMode, const SourceCode* source) 487 487 { 488 JSParser parser(lexicalGlobalObject->globalData() ->lexer,lexicalGlobalObject->globalData(), parameters, strictness == JSParseStrict, parserMode == JSParseFunctionCode, source->provider());488 JSParser parser(lexicalGlobalObject->globalData().lexer, &lexicalGlobalObject->globalData(), parameters, strictness == JSParseStrict, parserMode == JSParseFunctionCode, source->provider()); 489 489 return parser.parseProgram(lexicalGlobalObject); 490 490 } -
trunk/JavaScriptCore/parser/Parser.cpp
r69957 r70406 46 46 *errMsg = UString(); 47 47 48 Lexer& lexer = *lexicalGlobalObject->globalData() ->lexer;48 Lexer& lexer = *lexicalGlobalObject->globalData().lexer; 49 49 lexer.setCode(*m_source, m_arena); 50 50 -
trunk/JavaScriptCore/parser/Parser.h
r69516 r70406 85 85 m_source = &source; 86 86 if (ParsedNode::scopeIsFunction) 87 lexicalGlobalObject->globalData() ->lexer->setIsReparsing();87 lexicalGlobalObject->globalData().lexer->setIsReparsing(); 88 88 parse(lexicalGlobalObject, parameters, strictness, ParsedNode::isFunctionNode ? JSParseFunctionCode : JSParseProgramCode, &errLine, &errMsg); 89 89 90 90 RefPtr<ParsedNode> result; 91 91 if (m_sourceElements) { 92 result = ParsedNode::create( lexicalGlobalObject->globalData(),92 result = ParsedNode::create(&lexicalGlobalObject->globalData(), 93 93 m_sourceElements, 94 94 m_varDeclarations ? &m_varDeclarations->data : 0, … … 109 109 *exception = createStackOverflowError(lexicalGlobalObject); 110 110 else 111 *exception = addErrorInfo( lexicalGlobalObject->globalData(), createSyntaxError(lexicalGlobalObject, errMsg), errLine, source);111 *exception = addErrorInfo(&lexicalGlobalObject->globalData(), createSyntaxError(lexicalGlobalObject, errMsg), errLine, source); 112 112 } 113 113 -
trunk/JavaScriptCore/runtime/Error.cpp
r69516 r70406 46 46 { 47 47 ASSERT(!message.isEmpty()); 48 return ErrorInstance::create( globalObject->globalData(), globalObject->errorStructure(), message);48 return ErrorInstance::create(&globalObject->globalData(), globalObject->errorStructure(), message); 49 49 } 50 50 … … 52 52 { 53 53 ASSERT(!message.isEmpty()); 54 return ErrorInstance::create( globalObject->globalData(), globalObject->evalErrorConstructor()->errorStructure(), message);54 return ErrorInstance::create(&globalObject->globalData(), globalObject->evalErrorConstructor()->errorStructure(), message); 55 55 } 56 56 … … 58 58 { 59 59 ASSERT(!message.isEmpty()); 60 return ErrorInstance::create( globalObject->globalData(), globalObject->rangeErrorConstructor()->errorStructure(), message);60 return ErrorInstance::create(&globalObject->globalData(), globalObject->rangeErrorConstructor()->errorStructure(), message); 61 61 } 62 62 … … 64 64 { 65 65 ASSERT(!message.isEmpty()); 66 return ErrorInstance::create( globalObject->globalData(), globalObject->referenceErrorConstructor()->errorStructure(), message);66 return ErrorInstance::create(&globalObject->globalData(), globalObject->referenceErrorConstructor()->errorStructure(), message); 67 67 } 68 68 … … 70 70 { 71 71 ASSERT(!message.isEmpty()); 72 return ErrorInstance::create( globalObject->globalData(), globalObject->syntaxErrorConstructor()->errorStructure(), message);72 return ErrorInstance::create(&globalObject->globalData(), globalObject->syntaxErrorConstructor()->errorStructure(), message); 73 73 } 74 74 … … 76 76 { 77 77 ASSERT(!message.isEmpty()); 78 return ErrorInstance::create( globalObject->globalData(), globalObject->typeErrorConstructor()->errorStructure(), message);78 return ErrorInstance::create(&globalObject->globalData(), globalObject->typeErrorConstructor()->errorStructure(), message); 79 79 } 80 80 … … 82 82 { 83 83 ASSERT(!message.isEmpty()); 84 return ErrorInstance::create( globalObject->globalData(), globalObject->URIErrorConstructor()->errorStructure(), message);84 return ErrorInstance::create(&globalObject->globalData(), globalObject->URIErrorConstructor()->errorStructure(), message); 85 85 } 86 86 -
trunk/JavaScriptCore/runtime/FunctionConstructor.cpp
r69663 r70406 98 98 99 99 JSGlobalObject* globalObject = exec->lexicalGlobalObject(); 100 JSGlobalData *globalData = globalObject->globalData();100 JSGlobalData& globalData = globalObject->globalData(); 101 101 SourceCode source = makeSource(program, sourceURL, lineNumber); 102 102 JSObject* exception = 0; … … 107 107 } 108 108 109 ScopeChain scopeChain(globalObject, globalData, globalObject, exec->globalThisValue());109 ScopeChain scopeChain(globalObject, &globalData, globalObject, exec->globalThisValue()); 110 110 return new (exec) JSFunction(exec, function, scopeChain.node()); 111 111 } -
trunk/JavaScriptCore/runtime/JSGlobalObject.cpp
r69516 r70406 117 117 (*it)->clearGlobalObject(); 118 118 119 RegisterFile& registerFile = globalData() ->interpreter->registerFile();119 RegisterFile& registerFile = globalData().interpreter->registerFile(); 120 120 if (registerFile.clearGlobalObject(this)) 121 121 registerFile.setNumGlobals(0); … … 350 350 (*it)->markAggregate(markStack); 351 351 352 RegisterFile& registerFile = globalData() ->interpreter->registerFile();352 RegisterFile& registerFile = globalData().interpreter->registerFile(); 353 353 if (registerFile.globalObject() == this) 354 registerFile.markGlobals(markStack, &globalData() ->heap);354 registerFile.markGlobals(markStack, &globalData().heap); 355 355 356 356 markIfNeeded(markStack, d()->regExpConstructor); -
trunk/JavaScriptCore/runtime/JSGlobalObject.h
r70111 r70406 277 277 void resetPrototype(JSValue prototype); 278 278 279 JSGlobalData * globalData() { returnd()->globalData.get(); }279 JSGlobalData& globalData() { return *d()->globalData.get(); } 280 280 JSGlobalObjectData* d() const { return static_cast<JSGlobalObjectData*>(JSVariableObject::d); } 281 281 -
trunk/WebCore/ChangeLog
r70405 r70406 1 2010-10-23 Xan Lopez <xlopez@igalia.com> 2 3 Reviewed by Sam Weinig. 4 5 Unify globalData APIs 6 https://bugs.webkit.org/show_bug.cgi?id=47969 7 8 Adapt code to JSGlobalObject::globalData returning a reference 9 instead of a pointer. 10 11 * bindings/js/JSCallbackData.cpp: 12 (WebCore::JSCallbackData::invokeCallback): 13 * bindings/js/JSCustomXPathNSResolver.cpp: 14 (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI): 15 * bindings/js/JSEventListener.cpp: 16 (WebCore::JSEventListener::handleEvent): 17 * bindings/js/JSWorkerContextCustom.cpp: 18 (WebCore::JSWorkerContext::markChildren): 19 * bindings/js/JSWorkerContextErrorHandler.cpp: 20 (WebCore::JSWorkerContextErrorHandler::handleEvent): 21 * bindings/js/ScheduledAction.cpp: 22 (WebCore::ScheduledAction::executeFunctionInContext): 23 * bindings/js/WorkerScriptController.cpp: 24 (WebCore::WorkerScriptController::evaluate): 25 * bridge/NP_jsobject.cpp: 26 (_NPN_InvokeDefault): 27 (_NPN_Invoke): 28 (_NPN_Evaluate): 29 (_NPN_Construct): 30 1 31 2010-10-23 Alexey Proskuryakov <ap@apple.com> 2 32 -
trunk/WebCore/bindings/js/JSCallbackData.cpp
r60840 r70406 60 60 } 61 61 62 globalObject()->globalData() ->timeoutChecker.start();62 globalObject()->globalData().timeoutChecker.start(); 63 63 ScriptExecutionContext* context = globalObject()->scriptExecutionContext(); 64 64 // We will fail to get the context if the frame has been detached. … … 69 69 ? JSMainThreadExecState::call(exec, function, callType, callData, callback(), args) 70 70 : JSC::call(exec, function, callType, callData, callback(), args); 71 globalObject()->globalData() ->timeoutChecker.stop();71 globalObject()->globalData().timeoutChecker.stop(); 72 72 73 73 Document::updateStyleForAllDocuments(); -
trunk/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
r60631 r70406 90 90 args.append(jsString(exec, prefix)); 91 91 92 m_globalObject->globalData() ->timeoutChecker.start();92 m_globalObject->globalData().timeoutChecker.start(); 93 93 JSValue retval = JSC::call(exec, function, callType, callData, m_customResolver, args); 94 m_globalObject->globalData() ->timeoutChecker.stop();94 m_globalObject->globalData().timeoutChecker.stop(); 95 95 96 96 String result; -
trunk/WebCore/bindings/js/JSEventListener.cpp
r60631 r70406 109 109 globalObject->setCurrentEvent(event); 110 110 111 JSGlobalData *globalData = globalObject->globalData();112 DynamicGlobalObjectScope globalObjectScope(exec, globalData ->dynamicGlobalObject ? globalData->dynamicGlobalObject : globalObject);111 JSGlobalData& globalData = globalObject->globalData(); 112 DynamicGlobalObjectScope globalObjectScope(exec, globalData.dynamicGlobalObject ? globalData.dynamicGlobalObject : globalObject); 113 113 114 globalData ->timeoutChecker.start();114 globalData.timeoutChecker.start(); 115 115 JSValue retval; 116 116 if (handleEventFunction) { … … 124 124 : JSC::call(exec, jsFunction, callType, callData, currentTarget, args); 125 125 } 126 globalData ->timeoutChecker.stop();126 globalData.timeoutChecker.stop(); 127 127 128 128 globalObject->setCurrentEvent(savedEvent); -
trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp
r65005 r70406 58 58 Base::markChildren(markStack); 59 59 60 JSGlobalData& globalData = *this->globalData();60 JSGlobalData& globalData = this->globalData(); 61 61 62 62 markActiveObjectsForContext(markStack, globalData, scriptExecutionContext()); -
trunk/WebCore/bindings/js/JSWorkerContextErrorHandler.cpp
r57141 r70406 89 89 args.append(jsNumber(exec, errorEvent->lineno())); 90 90 91 JSGlobalData *globalData = globalObject->globalData();92 DynamicGlobalObjectScope globalObjectScope(exec, globalData ->dynamicGlobalObject ? globalData->dynamicGlobalObject : globalObject);91 JSGlobalData& globalData = globalObject->globalData(); 92 DynamicGlobalObjectScope globalObjectScope(exec, globalData.dynamicGlobalObject ? globalData.dynamicGlobalObject : globalObject); 93 93 94 94 JSValue thisValue = globalObject->toThisObject(exec); 95 95 96 globalData ->timeoutChecker.start();96 globalData.timeoutChecker.start(); 97 97 JSValue returnValue = JSC::call(exec, jsFunction, callType, callData, thisValue, args); 98 globalData ->timeoutChecker.stop();98 globalData.timeoutChecker.stop(); 99 99 100 100 globalObject->setCurrentEvent(savedEvent); -
trunk/WebCore/bindings/js/ScheduledAction.cpp
r64735 r70406 102 102 args.append(m_args[i]); 103 103 104 globalObject->globalData() ->timeoutChecker.start();104 globalObject->globalData().timeoutChecker.start(); 105 105 if (context->isDocument()) 106 106 JSMainThreadExecState::call(exec, m_function, callType, callData, thisValue, args); 107 107 else 108 108 JSC::call(exec, m_function, callType, callData, thisValue, args); 109 globalObject->globalData() ->timeoutChecker.stop();109 globalObject->globalData().timeoutChecker.stop(); 110 110 111 111 if (exec->hadException()) -
trunk/WebCore/bindings/js/WorkerScriptController.cpp
r60762 r70406 125 125 126 126 ExecState* exec = m_workerContextWrapper->globalExec(); 127 m_workerContextWrapper->globalData() ->timeoutChecker.start();127 m_workerContextWrapper->globalData().timeoutChecker.start(); 128 128 Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), sourceCode.jsSourceCode(), m_workerContextWrapper); 129 m_workerContextWrapper->globalData() ->timeoutChecker.stop();129 m_workerContextWrapper->globalData().timeoutChecker.stop(); 130 130 131 131 if (comp.complType() == Normal || comp.complType() == ReturnValue) -
trunk/WebCore/bindings/objc/WebScriptObject.mm
r65177 r70406 305 305 return nil; 306 306 307 [self _rootObject]->globalObject()->globalData() ->timeoutChecker.start();307 [self _rootObject]->globalObject()->globalData().timeoutChecker.start(); 308 308 JSValue result = JSMainThreadExecState::call(exec, function, callType, callData, [self _imp], argList); 309 [self _rootObject]->globalObject()->globalData() ->timeoutChecker.stop();309 [self _rootObject]->globalObject()->globalData().timeoutChecker.stop(); 310 310 311 311 if (exec->hadException()) { … … 334 334 JSLock lock(SilenceAssertionsOnly); 335 335 336 [self _rootObject]->globalObject()->globalData() ->timeoutChecker.start();336 [self _rootObject]->globalObject()->globalData().timeoutChecker.start(); 337 337 Completion completion = JSMainThreadExecState::evaluate([self _rootObject]->globalObject()->globalExec(), [self _rootObject]->globalObject()->globalScopeChain(), makeSource(String(script)), JSC::JSValue()); 338 [self _rootObject]->globalObject()->globalData() ->timeoutChecker.stop();338 [self _rootObject]->globalObject()->globalData().timeoutChecker.stop(); 339 339 ComplType type = completion.complType(); 340 340 -
trunk/WebCore/bridge/NP_jsobject.cpp
r65305 r70406 191 191 getListFromVariantArgs(exec, args, argCount, rootObject, argList); 192 192 ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject(); 193 globalObject->globalData() ->timeoutChecker.start();193 globalObject->globalData().timeoutChecker.start(); 194 194 JSValue resultV = JSC::call(exec, function, callType, callData, function, argList); 195 globalObject->globalData() ->timeoutChecker.stop();195 globalObject->globalData().timeoutChecker.stop(); 196 196 197 197 // Convert and return the result of the function call. … … 241 241 getListFromVariantArgs(exec, args, argCount, rootObject, argList); 242 242 ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject(); 243 globalObject->globalData() ->timeoutChecker.start();243 globalObject->globalData().timeoutChecker.start(); 244 244 JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList); 245 globalObject->globalData() ->timeoutChecker.stop();245 globalObject->globalData().timeoutChecker.stop(); 246 246 247 247 // Convert and return the result of the function call. … … 275 275 String scriptString = convertNPStringToUTF16(s); 276 276 ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject(); 277 globalObject->globalData() ->timeoutChecker.start();277 globalObject->globalData().timeoutChecker.start(); 278 278 Completion completion = JSC::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(scriptString), JSC::JSValue()); 279 globalObject->globalData() ->timeoutChecker.stop();279 globalObject->globalData().timeoutChecker.stop(); 280 280 ComplType type = completion.complType(); 281 281 … … 515 515 getListFromVariantArgs(exec, args, argCount, rootObject, argList); 516 516 ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject(); 517 globalObject->globalData() ->timeoutChecker.start();517 globalObject->globalData().timeoutChecker.start(); 518 518 JSValue resultV = JSC::construct(exec, constructor, constructType, constructData, argList); 519 globalObject->globalData() ->timeoutChecker.stop();519 globalObject->globalData().timeoutChecker.stop(); 520 520 521 521 // Convert and return the result. -
trunk/WebCore/bridge/jni/jni_jsobject.mm
r65305 r70406 297 297 MarkedArgumentBuffer argList; 298 298 getListFromJArray(exec, args, argList); 299 rootObject->globalObject()->globalData() ->timeoutChecker.start();299 rootObject->globalObject()->globalData().timeoutChecker.start(); 300 300 JSValue result = JSC::call(exec, function, callType, callData, _imp, argList); 301 rootObject->globalObject()->globalData() ->timeoutChecker.stop();301 rootObject->globalObject()->globalData().timeoutChecker.stop(); 302 302 303 303 return convertValueToJObject(result); … … 316 316 return 0; 317 317 318 rootObject->globalObject()->globalData() ->timeoutChecker.start();318 rootObject->globalObject()->globalData().timeoutChecker.start(); 319 319 Completion completion = JSC::evaluate(rootObject->globalObject()->globalExec(), rootObject->globalObject()->globalScopeChain(), makeSource(JavaString(script)), JSC::JSValue()); 320 rootObject->globalObject()->globalData() ->timeoutChecker.stop();320 rootObject->globalObject()->globalData().timeoutChecker.stop(); 321 321 ComplType type = completion.complType(); 322 322 -
trunk/WebKit/mac/ChangeLog
r70403 r70406 1 2010-10-23 Xan Lopez <xlopez@igalia.com> 2 3 Reviewed by Sam Weinig. 4 5 Unify globalData APIs 6 https://bugs.webkit.org/show_bug.cgi?id=47969 7 8 * Plugins/Hosted/NetscapePluginInstanceProxy.mm: 9 (WebKit::NetscapePluginInstanceProxy::evaluate): 10 (WebKit::NetscapePluginInstanceProxy::invoke): 11 (WebKit::NetscapePluginInstanceProxy::invokeDefault): 12 (WebKit::NetscapePluginInstanceProxy::construct): 13 * WebView/WebScriptDebugDelegate.mm: 14 (-[WebScriptCallFrame evaluateWebScript:]): 15 1 16 2010-10-23 David Kilzer <ddkilzer@apple.com> 2 17 -
trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
r69808 r70406 873 873 frame->script()->setAllowPopupsFromPlugin(allowPopups); 874 874 875 globalObject->globalData() ->timeoutChecker.start();875 globalObject->globalData().timeoutChecker.start(); 876 876 Completion completion = JSC::evaluate(exec, globalObject->globalScopeChain(), makeSource(script)); 877 globalObject->globalData() ->timeoutChecker.stop();877 globalObject->globalData().timeoutChecker.stop(); 878 878 ComplType type = completion.complType(); 879 879 … … 922 922 923 923 ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject(pluginWorld()); 924 globalObject->globalData() ->timeoutChecker.start();924 globalObject->globalData().timeoutChecker.start(); 925 925 JSValue value = call(exec, function, callType, callData, object, argList); 926 globalObject->globalData() ->timeoutChecker.stop();926 globalObject->globalData().timeoutChecker.stop(); 927 927 928 928 marshalValue(exec, value, resultData, resultLength); … … 957 957 958 958 ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject(pluginWorld()); 959 globalObject->globalData() ->timeoutChecker.start();959 globalObject->globalData().timeoutChecker.start(); 960 960 JSValue value = call(exec, object, callType, callData, object, argList); 961 globalObject->globalData() ->timeoutChecker.stop();961 globalObject->globalData().timeoutChecker.stop(); 962 962 963 963 marshalValue(exec, value, resultData, resultLength); … … 993 993 994 994 ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject(pluginWorld()); 995 globalObject->globalData() ->timeoutChecker.start();995 globalObject->globalData().timeoutChecker.start(); 996 996 JSValue value = JSC::construct(exec, object, constructType, constructData, argList); 997 globalObject->globalData() ->timeoutChecker.stop();997 globalObject->globalData().timeoutChecker.stop(); 998 998 999 999 marshalValue(exec, value, resultData, resultLength); -
trunk/WebKit/mac/WebView/WebScriptDebugDelegate.mm
r57738 r70406 237 237 // and evaluate the JS in the global object's global call frame. 238 238 JSGlobalObject* globalObject = _private->debugger->globalObject(); 239 if (self == _private->debugger->globalCallFrame() && !globalObject->globalData() ->dynamicGlobalObject) {239 if (self == _private->debugger->globalCallFrame() && !globalObject->globalData().dynamicGlobalObject) { 240 240 JSGlobalObject* globalObject = _private->debugger->globalObject(); 241 241 -
trunk/WebKit2/ChangeLog
r70400 r70406 1 2010-10-23 Xan Lopez <xlopez@igalia.com> 2 3 Reviewed by Sam Weinig. 4 5 Unify globalData APIs 6 https://bugs.webkit.org/show_bug.cgi?id=47969 7 8 Adapt code to JSGlobalObject::globalData returning a reference 9 instead of a pointer. 10 11 * WebProcess/Plugins/NPRuntimeObjectMap.cpp: 12 (WebKit::NPRuntimeObjectMap::getOrCreateJSObject): 13 (WebKit::NPRuntimeObjectMap::evaluate): 14 1 15 2010-10-23 Alexey Proskuryakov <ap@apple.com> 2 16 -
trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp
r65305 r70406 97 97 return jsNPObject; 98 98 99 JSNPObject* jsNPObject = new ( globalObject->globalData()) JSNPObject(globalObject, this, npObject);99 JSNPObject* jsNPObject = new (&globalObject->globalData()) JSNPObject(globalObject, this, npObject); 100 100 m_jsNPObjects.set(npObject, jsNPObject); 101 101 … … 196 196 JSValue thisValue = getOrCreateJSObject(globalObject, npObject); 197 197 198 globalObject->globalData() ->timeoutChecker.start();198 globalObject->globalData().timeoutChecker.start(); 199 199 Completion completion = JSC::evaluate(exec, globalObject->globalScopeChain(), makeSource(UString(scriptString.impl())), thisValue); 200 globalObject->globalData() ->timeoutChecker.stop();200 globalObject->globalData().timeoutChecker.stop(); 201 201 202 202 ComplType completionType = completion.complType();
Note: See TracChangeset
for help on using the changeset viewer.