Changeset 70406 in webkit


Ignore:
Timestamp:
Oct 23, 2010 4:49:43 PM (13 years ago)
Author:
xan@webkit.org
Message:

2010-10-23 Xan Lopez <xlopez@igalia.com>

Reviewed by Sam Weinig.

Unify globalData APIs
https://bugs.webkit.org/show_bug.cgi?id=47969

Make JSGlobalObject::globalData return a reference and adapt
callers. This unifies the API with the existing
CallFrame::globalData, which also returns a reference.

  • debugger/Debugger.cpp: (JSC::evaluateInGlobalCallFrame):
  • interpreter/CallFrame.h:
  • interpreter/Interpreter.cpp: (JSC::Interpreter::dumpRegisters):
  • jsc.cpp: (runWithScripts):
  • parser/JSParser.cpp: (JSC::jsParse):
  • parser/Parser.cpp: (JSC::Parser::parse):
  • parser/Parser.h: (JSC::Parser::parse):
  • runtime/Error.cpp: (JSC::createError): (JSC::createEvalError): (JSC::createRangeError): (JSC::createReferenceError): (JSC::createSyntaxError): (JSC::createTypeError): (JSC::createURIError):
  • runtime/FunctionConstructor.cpp: (JSC::constructFunction):
  • runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::~JSGlobalObject): (JSC::JSGlobalObject::markChildren):
  • runtime/JSGlobalObject.h: (JSC::JSGlobalObject::globalData):

WebCore:

2010-10-23 Xan Lopez <xlopez@igalia.com>

Reviewed by Sam Weinig.

Unify globalData APIs
https://bugs.webkit.org/show_bug.cgi?id=47969

Adapt code to JSGlobalObject::globalData returning a reference
instead of a pointer.

  • bindings/js/JSCallbackData.cpp: (WebCore::JSCallbackData::invokeCallback):
  • bindings/js/JSCustomXPathNSResolver.cpp: (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
  • bindings/js/JSEventListener.cpp: (WebCore::JSEventListener::handleEvent):
  • bindings/js/JSWorkerContextCustom.cpp: (WebCore::JSWorkerContext::markChildren):
  • bindings/js/JSWorkerContextErrorHandler.cpp: (WebCore::JSWorkerContextErrorHandler::handleEvent):
  • bindings/js/ScheduledAction.cpp: (WebCore::ScheduledAction::executeFunctionInContext):
  • bindings/js/WorkerScriptController.cpp: (WebCore::WorkerScriptController::evaluate):
  • bridge/NP_jsobject.cpp: (_NPN_InvokeDefault): (_NPN_Invoke): (_NPN_Evaluate): (_NPN_Construct):

WebKit2:

2010-10-23 Xan Lopez <xlopez@igalia.com>

Reviewed by Sam Weinig.

Unify globalData APIs
https://bugs.webkit.org/show_bug.cgi?id=47969

Adapt code to JSGlobalObject::globalData returning a reference
instead of a pointer.

  • WebProcess/Plugins/NPRuntimeObjectMap.cpp: (WebKit::NPRuntimeObjectMap::getOrCreateJSObject): (WebKit::NPRuntimeObjectMap::evaluate):

WebKit/mac:

2010-10-23 Xan Lopez <xlopez@igalia.com>

Reviewed by Sam Weinig.

Unify globalData APIs
https://bugs.webkit.org/show_bug.cgi?id=47969

  • Plugins/Hosted/NetscapePluginInstanceProxy.mm: (WebKit::NetscapePluginInstanceProxy::evaluate): (WebKit::NetscapePluginInstanceProxy::invoke): (WebKit::NetscapePluginInstanceProxy::invokeDefault): (WebKit::NetscapePluginInstanceProxy::construct):
  • WebView/WebScriptDebugDelegate.mm: (-[WebScriptCallFrame evaluateWebScript:]):
Location:
trunk
Files:
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r70394 r70406  
     12010-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
    1412010-10-23  Dimitri Glazkov  <dglazkov@chromium.org>
    242
  • trunk/JavaScriptCore/debugger/Debugger.cpp

    r69516 r70406  
    107107        return error;
    108108
    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);
    110110}
    111111
  • trunk/JavaScriptCore/interpreter/CallFrame.h

    r62612 r70406  
    6464        }
    6565
    66         // FIXME: Elsewhere, we use JSGlobalData* rather than JSGlobalData&.
    67         // We should make this more uniform and either use a reference everywhere
    68         // or a pointer everywhere.
    6966        JSGlobalData& globalData() const
    7067        {
  • trunk/JavaScriptCore/interpreter/Interpreter.cpp

    r70299 r70406  
    449449
    450450    CodeBlock* codeBlock = callFrame->codeBlock();
    451     RegisterFile* registerFile = &callFrame->scopeChain()->globalObject->globalData()->interpreter->registerFile();
     451    RegisterFile* registerFile = &callFrame->scopeChain()->globalObject->globalData().interpreter->registerFile();
    452452    const Register* it;
    453453    const Register* end;
  • trunk/JavaScriptCore/jsc.cpp

    r67146 r70406  
    369369        BytecodeGenerator::setDumpsGeneratedCode(true);
    370370
    371     JSGlobalData* globalData = globalObject->globalData();
     371    JSGlobalData& globalData = globalObject->globalData();
    372372
    373373#if ENABLE(SAMPLING_FLAGS)
     
    387387        }
    388388
    389         globalData->startSampling();
     389        globalData.startSampling();
    390390
    391391        Completion completion = evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script, fileName));
     
    398398        }
    399399
    400         globalData->stopSampling();
     400        globalData.stopSampling();
    401401        globalObject->globalExec()->clearException();
    402402    }
     
    405405    SamplingFlags::stop();
    406406#endif
    407     globalData->dumpSampleData(globalObject->globalExec());
     407    globalData.dumpSampleData(globalObject->globalExec());
    408408#if ENABLE(SAMPLING_COUNTERS)
    409409    AbstractSamplingCounter::dump();
    410410#endif
    411411#if ENABLE(REGEXP_TRACING)
    412     globalData->dumpRegExpTrace();
     412    globalData.dumpRegExpTrace();
    413413#endif
    414414    return success;
  • trunk/JavaScriptCore/parser/JSParser.cpp

    r69963 r70406  
    486486int jsParse(JSGlobalObject* lexicalGlobalObject, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode parserMode, const SourceCode* source)
    487487{
    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());
    489489    return parser.parseProgram(lexicalGlobalObject);
    490490}
  • trunk/JavaScriptCore/parser/Parser.cpp

    r69957 r70406  
    4646    *errMsg = UString();
    4747
    48     Lexer& lexer = *lexicalGlobalObject->globalData()->lexer;
     48    Lexer& lexer = *lexicalGlobalObject->globalData().lexer;
    4949    lexer.setCode(*m_source, m_arena);
    5050
  • trunk/JavaScriptCore/parser/Parser.h

    r69516 r70406  
    8585        m_source = &source;
    8686        if (ParsedNode::scopeIsFunction)
    87             lexicalGlobalObject->globalData()->lexer->setIsReparsing();
     87            lexicalGlobalObject->globalData().lexer->setIsReparsing();
    8888        parse(lexicalGlobalObject, parameters, strictness, ParsedNode::isFunctionNode ? JSParseFunctionCode : JSParseProgramCode, &errLine, &errMsg);
    8989
    9090        RefPtr<ParsedNode> result;
    9191        if (m_sourceElements) {
    92             result = ParsedNode::create(lexicalGlobalObject->globalData(),
     92            result = ParsedNode::create(&lexicalGlobalObject->globalData(),
    9393                m_sourceElements,
    9494                m_varDeclarations ? &m_varDeclarations->data : 0,
     
    109109                *exception = createStackOverflowError(lexicalGlobalObject);
    110110            else
    111                 *exception = addErrorInfo(lexicalGlobalObject->globalData(), createSyntaxError(lexicalGlobalObject, errMsg), errLine, source);
     111                *exception = addErrorInfo(&lexicalGlobalObject->globalData(), createSyntaxError(lexicalGlobalObject, errMsg), errLine, source);
    112112        }
    113113
  • trunk/JavaScriptCore/runtime/Error.cpp

    r69516 r70406  
    4646{
    4747    ASSERT(!message.isEmpty());
    48     return ErrorInstance::create(globalObject->globalData(), globalObject->errorStructure(), message);
     48    return ErrorInstance::create(&globalObject->globalData(), globalObject->errorStructure(), message);
    4949}
    5050
     
    5252{
    5353    ASSERT(!message.isEmpty());
    54     return ErrorInstance::create(globalObject->globalData(), globalObject->evalErrorConstructor()->errorStructure(), message);
     54    return ErrorInstance::create(&globalObject->globalData(), globalObject->evalErrorConstructor()->errorStructure(), message);
    5555}
    5656
     
    5858{
    5959    ASSERT(!message.isEmpty());
    60     return ErrorInstance::create(globalObject->globalData(), globalObject->rangeErrorConstructor()->errorStructure(), message);
     60    return ErrorInstance::create(&globalObject->globalData(), globalObject->rangeErrorConstructor()->errorStructure(), message);
    6161}
    6262
     
    6464{
    6565    ASSERT(!message.isEmpty());
    66     return ErrorInstance::create(globalObject->globalData(), globalObject->referenceErrorConstructor()->errorStructure(), message);
     66    return ErrorInstance::create(&globalObject->globalData(), globalObject->referenceErrorConstructor()->errorStructure(), message);
    6767}
    6868
     
    7070{
    7171    ASSERT(!message.isEmpty());
    72     return ErrorInstance::create(globalObject->globalData(), globalObject->syntaxErrorConstructor()->errorStructure(), message);
     72    return ErrorInstance::create(&globalObject->globalData(), globalObject->syntaxErrorConstructor()->errorStructure(), message);
    7373}
    7474
     
    7676{
    7777    ASSERT(!message.isEmpty());
    78     return ErrorInstance::create(globalObject->globalData(), globalObject->typeErrorConstructor()->errorStructure(), message);
     78    return ErrorInstance::create(&globalObject->globalData(), globalObject->typeErrorConstructor()->errorStructure(), message);
    7979}
    8080
     
    8282{
    8383    ASSERT(!message.isEmpty());
    84     return ErrorInstance::create(globalObject->globalData(), globalObject->URIErrorConstructor()->errorStructure(), message);
     84    return ErrorInstance::create(&globalObject->globalData(), globalObject->URIErrorConstructor()->errorStructure(), message);
    8585}
    8686
  • trunk/JavaScriptCore/runtime/FunctionConstructor.cpp

    r69663 r70406  
    9898
    9999    JSGlobalObject* globalObject = exec->lexicalGlobalObject();
    100     JSGlobalData* globalData = globalObject->globalData();
     100    JSGlobalData& globalData = globalObject->globalData();
    101101    SourceCode source = makeSource(program, sourceURL, lineNumber);
    102102    JSObject* exception = 0;
     
    107107    }
    108108
    109     ScopeChain scopeChain(globalObject, globalData, globalObject, exec->globalThisValue());
     109    ScopeChain scopeChain(globalObject, &globalData, globalObject, exec->globalThisValue());
    110110    return new (exec) JSFunction(exec, function, scopeChain.node());
    111111}
  • trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

    r69516 r70406  
    117117        (*it)->clearGlobalObject();
    118118       
    119     RegisterFile& registerFile = globalData()->interpreter->registerFile();
     119    RegisterFile& registerFile = globalData().interpreter->registerFile();
    120120    if (registerFile.clearGlobalObject(this))
    121121        registerFile.setNumGlobals(0);
     
    350350        (*it)->markAggregate(markStack);
    351351
    352     RegisterFile& registerFile = globalData()->interpreter->registerFile();
     352    RegisterFile& registerFile = globalData().interpreter->registerFile();
    353353    if (registerFile.globalObject() == this)
    354         registerFile.markGlobals(markStack, &globalData()->heap);
     354        registerFile.markGlobals(markStack, &globalData().heap);
    355355
    356356    markIfNeeded(markStack, d()->regExpConstructor);
  • trunk/JavaScriptCore/runtime/JSGlobalObject.h

    r70111 r70406  
    277277        void resetPrototype(JSValue prototype);
    278278
    279         JSGlobalData* globalData() { return d()->globalData.get(); }
     279        JSGlobalData& globalData() { return *d()->globalData.get(); }
    280280        JSGlobalObjectData* d() const { return static_cast<JSGlobalObjectData*>(JSVariableObject::d); }
    281281
  • trunk/WebCore/ChangeLog

    r70405 r70406  
     12010-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
    1312010-10-23  Alexey Proskuryakov  <ap@apple.com>
    232
  • trunk/WebCore/bindings/js/JSCallbackData.cpp

    r60840 r70406  
    6060    }
    6161   
    62     globalObject()->globalData()->timeoutChecker.start();
     62    globalObject()->globalData().timeoutChecker.start();
    6363    ScriptExecutionContext* context = globalObject()->scriptExecutionContext();
    6464    // We will fail to get the context if the frame has been detached.
     
    6969        ? JSMainThreadExecState::call(exec, function, callType, callData, callback(), args)
    7070        : JSC::call(exec, function, callType, callData, callback(), args);
    71     globalObject()->globalData()->timeoutChecker.stop();
     71    globalObject()->globalData().timeoutChecker.stop();
    7272
    7373    Document::updateStyleForAllDocuments();
  • trunk/WebCore/bindings/js/JSCustomXPathNSResolver.cpp

    r60631 r70406  
    9090    args.append(jsString(exec, prefix));
    9191
    92     m_globalObject->globalData()->timeoutChecker.start();
     92    m_globalObject->globalData().timeoutChecker.start();
    9393    JSValue retval = JSC::call(exec, function, callType, callData, m_customResolver, args);
    94     m_globalObject->globalData()->timeoutChecker.stop();
     94    m_globalObject->globalData().timeoutChecker.stop();
    9595
    9696    String result;
  • trunk/WebCore/bindings/js/JSEventListener.cpp

    r60631 r70406  
    109109        globalObject->setCurrentEvent(event);
    110110
    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);
    113113
    114         globalData->timeoutChecker.start();
     114        globalData.timeoutChecker.start();
    115115        JSValue retval;
    116116        if (handleEventFunction) {
     
    124124                : JSC::call(exec, jsFunction, callType, callData, currentTarget, args);
    125125        }
    126         globalData->timeoutChecker.stop();
     126        globalData.timeoutChecker.stop();
    127127
    128128        globalObject->setCurrentEvent(savedEvent);
  • trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp

    r65005 r70406  
    5858    Base::markChildren(markStack);
    5959
    60     JSGlobalData& globalData = *this->globalData();
     60    JSGlobalData& globalData = this->globalData();
    6161
    6262    markActiveObjectsForContext(markStack, globalData, scriptExecutionContext());
  • trunk/WebCore/bindings/js/JSWorkerContextErrorHandler.cpp

    r57141 r70406  
    8989        args.append(jsNumber(exec, errorEvent->lineno()));
    9090
    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);
    9393
    9494        JSValue thisValue = globalObject->toThisObject(exec);
    9595
    96         globalData->timeoutChecker.start();
     96        globalData.timeoutChecker.start();
    9797        JSValue returnValue = JSC::call(exec, jsFunction, callType, callData, thisValue, args);
    98         globalData->timeoutChecker.stop();
     98        globalData.timeoutChecker.stop();
    9999
    100100        globalObject->setCurrentEvent(savedEvent);
  • trunk/WebCore/bindings/js/ScheduledAction.cpp

    r64735 r70406  
    102102        args.append(m_args[i]);
    103103
    104     globalObject->globalData()->timeoutChecker.start();
     104    globalObject->globalData().timeoutChecker.start();
    105105    if (context->isDocument())
    106106        JSMainThreadExecState::call(exec, m_function, callType, callData, thisValue, args);
    107107    else
    108108        JSC::call(exec, m_function, callType, callData, thisValue, args);
    109     globalObject->globalData()->timeoutChecker.stop();
     109    globalObject->globalData().timeoutChecker.stop();
    110110
    111111    if (exec->hadException())
  • trunk/WebCore/bindings/js/WorkerScriptController.cpp

    r60762 r70406  
    125125
    126126    ExecState* exec = m_workerContextWrapper->globalExec();
    127     m_workerContextWrapper->globalData()->timeoutChecker.start();
     127    m_workerContextWrapper->globalData().timeoutChecker.start();
    128128    Completion comp = JSC::evaluate(exec, exec->dynamicGlobalObject()->globalScopeChain(), sourceCode.jsSourceCode(), m_workerContextWrapper);
    129     m_workerContextWrapper->globalData()->timeoutChecker.stop();
     129    m_workerContextWrapper->globalData().timeoutChecker.stop();
    130130
    131131    if (comp.complType() == Normal || comp.complType() == ReturnValue)
  • trunk/WebCore/bindings/objc/WebScriptObject.mm

    r65177 r70406  
    305305        return nil;
    306306
    307     [self _rootObject]->globalObject()->globalData()->timeoutChecker.start();
     307    [self _rootObject]->globalObject()->globalData().timeoutChecker.start();
    308308    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();
    310310
    311311    if (exec->hadException()) {
     
    334334    JSLock lock(SilenceAssertionsOnly);
    335335   
    336     [self _rootObject]->globalObject()->globalData()->timeoutChecker.start();
     336    [self _rootObject]->globalObject()->globalData().timeoutChecker.start();
    337337    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();
    339339    ComplType type = completion.complType();
    340340   
  • trunk/WebCore/bridge/NP_jsobject.cpp

    r65305 r70406  
    191191        getListFromVariantArgs(exec, args, argCount, rootObject, argList);
    192192        ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject();
    193         globalObject->globalData()->timeoutChecker.start();
     193        globalObject->globalData().timeoutChecker.start();
    194194        JSValue resultV = JSC::call(exec, function, callType, callData, function, argList);
    195         globalObject->globalData()->timeoutChecker.stop();
     195        globalObject->globalData().timeoutChecker.stop();
    196196
    197197        // Convert and return the result of the function call.
     
    241241        getListFromVariantArgs(exec, args, argCount, rootObject, argList);
    242242        ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject();
    243         globalObject->globalData()->timeoutChecker.start();
     243        globalObject->globalData().timeoutChecker.start();
    244244        JSValue resultV = JSC::call(exec, function, callType, callData, obj->imp, argList);
    245         globalObject->globalData()->timeoutChecker.stop();
     245        globalObject->globalData().timeoutChecker.stop();
    246246
    247247        // Convert and return the result of the function call.
     
    275275        String scriptString = convertNPStringToUTF16(s);
    276276        ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject();
    277         globalObject->globalData()->timeoutChecker.start();
     277        globalObject->globalData().timeoutChecker.start();
    278278        Completion completion = JSC::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(scriptString), JSC::JSValue());
    279         globalObject->globalData()->timeoutChecker.stop();
     279        globalObject->globalData().timeoutChecker.stop();
    280280        ComplType type = completion.complType();
    281281       
     
    515515        getListFromVariantArgs(exec, args, argCount, rootObject, argList);
    516516        ProtectedPtr<JSGlobalObject> globalObject = rootObject->globalObject();
    517         globalObject->globalData()->timeoutChecker.start();
     517        globalObject->globalData().timeoutChecker.start();
    518518        JSValue resultV = JSC::construct(exec, constructor, constructType, constructData, argList);
    519         globalObject->globalData()->timeoutChecker.stop();
     519        globalObject->globalData().timeoutChecker.stop();
    520520       
    521521        // Convert and return the result.
  • trunk/WebCore/bridge/jni/jni_jsobject.mm

    r65305 r70406  
    297297    MarkedArgumentBuffer argList;
    298298    getListFromJArray(exec, args, argList);
    299     rootObject->globalObject()->globalData()->timeoutChecker.start();
     299    rootObject->globalObject()->globalData().timeoutChecker.start();
    300300    JSValue result = JSC::call(exec, function, callType, callData, _imp, argList);
    301     rootObject->globalObject()->globalData()->timeoutChecker.stop();
     301    rootObject->globalObject()->globalData().timeoutChecker.stop();
    302302
    303303    return convertValueToJObject(result);
     
    316316        return 0;
    317317
    318     rootObject->globalObject()->globalData()->timeoutChecker.start();
     318    rootObject->globalObject()->globalData().timeoutChecker.start();
    319319    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();
    321321    ComplType type = completion.complType();
    322322   
  • trunk/WebKit/mac/ChangeLog

    r70403 r70406  
     12010-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
    1162010-10-23  David Kilzer  <ddkilzer@apple.com>
    217
  • trunk/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

    r69808 r70406  
    873873    frame->script()->setAllowPopupsFromPlugin(allowPopups);
    874874   
    875     globalObject->globalData()->timeoutChecker.start();
     875    globalObject->globalData().timeoutChecker.start();
    876876    Completion completion = JSC::evaluate(exec, globalObject->globalScopeChain(), makeSource(script));
    877     globalObject->globalData()->timeoutChecker.stop();
     877    globalObject->globalData().timeoutChecker.stop();
    878878    ComplType type = completion.complType();
    879879
     
    922922
    923923    ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject(pluginWorld());
    924     globalObject->globalData()->timeoutChecker.start();
     924    globalObject->globalData().timeoutChecker.start();
    925925    JSValue value = call(exec, function, callType, callData, object, argList);
    926     globalObject->globalData()->timeoutChecker.stop();
     926    globalObject->globalData().timeoutChecker.stop();
    927927       
    928928    marshalValue(exec, value, resultData, resultLength);
     
    957957
    958958    ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject(pluginWorld());
    959     globalObject->globalData()->timeoutChecker.start();
     959    globalObject->globalData().timeoutChecker.start();
    960960    JSValue value = call(exec, object, callType, callData, object, argList);
    961     globalObject->globalData()->timeoutChecker.stop();
     961    globalObject->globalData().timeoutChecker.stop();
    962962   
    963963    marshalValue(exec, value, resultData, resultLength);
     
    993993
    994994    ProtectedPtr<JSGlobalObject> globalObject = frame->script()->globalObject(pluginWorld());
    995     globalObject->globalData()->timeoutChecker.start();
     995    globalObject->globalData().timeoutChecker.start();
    996996    JSValue value = JSC::construct(exec, object, constructType, constructData, argList);
    997     globalObject->globalData()->timeoutChecker.stop();
     997    globalObject->globalData().timeoutChecker.stop();
    998998   
    999999    marshalValue(exec, value, resultData, resultLength);
  • trunk/WebKit/mac/WebView/WebScriptDebugDelegate.mm

    r57738 r70406  
    237237    // and evaluate the JS in the global object's global call frame.
    238238    JSGlobalObject* globalObject = _private->debugger->globalObject();
    239     if (self == _private->debugger->globalCallFrame() && !globalObject->globalData()->dynamicGlobalObject) {
     239    if (self == _private->debugger->globalCallFrame() && !globalObject->globalData().dynamicGlobalObject) {
    240240        JSGlobalObject* globalObject = _private->debugger->globalObject();
    241241
  • trunk/WebKit2/ChangeLog

    r70400 r70406  
     12010-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
    1152010-10-23  Alexey Proskuryakov  <ap@apple.com>
    216
  • trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp

    r65305 r70406  
    9797        return jsNPObject;
    9898
    99     JSNPObject* jsNPObject = new (globalObject->globalData()) JSNPObject(globalObject, this, npObject);
     99    JSNPObject* jsNPObject = new (&globalObject->globalData()) JSNPObject(globalObject, this, npObject);
    100100    m_jsNPObjects.set(npObject, jsNPObject);
    101101
     
    196196    JSValue thisValue = getOrCreateJSObject(globalObject, npObject);
    197197
    198     globalObject->globalData()->timeoutChecker.start();
     198    globalObject->globalData().timeoutChecker.start();
    199199    Completion completion = JSC::evaluate(exec, globalObject->globalScopeChain(), makeSource(UString(scriptString.impl())), thisValue);
    200     globalObject->globalData()->timeoutChecker.stop();
     200    globalObject->globalData().timeoutChecker.stop();
    201201
    202202    ComplType completionType = completion.complType();
Note: See TracChangeset for help on using the changeset viewer.