Changeset 52962 in webkit for trunk/JavaScriptCore/runtime


Ignore:
Timestamp:
Jan 7, 2010, 4:44:19 PM (15 years ago)
Author:
[email protected]
Message:

Fix a crash seen on the buildbots.

Reviewed by Sam Weinig.

JavaScriptCore:

  • runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init): Disable specific function tracking here,
instead of in WebCore, to ensure that the disabling happens before a
specific function can be registered.

WebCore:

  • bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::JSDOMWindowBase): Don't disable specific
function tracking here; it's too late, as some specific functions
may already have been tracked in the base class constructor.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

    r49398 r52962  
    129129    ASSERT(JSLock::currentThreadIsHoldingLock());
    130130
     131    structure()->disableSpecificFunctionTracking();
     132
    131133    d()->globalData = Heap::heap(this)->globalData();
    132134    d()->globalScopeChain = ScopeChain(this, d()->globalData.get(), this, thisValue);
Note: See TracChangeset for help on using the changeset viewer.