Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/VM/Machine.cpp

    r424 r427  
    5151#include "debugger.h" 
    5252#include "operations.h" 
     53#include "SamplingTool.h" 
    5354#include <stdio.h> 
    5455 
    …… 
    476477 
    477478Machine::Machine() 
    478     : 
    479 #if SAMPLING_TOOL_ENABLED 
    480       m_sampler(0), 
    481 #else 
    482       m_reentryDepth(0) 
    483 #endif 
     479    : m_sampler(0) 
     480    , m_reentryDepth(0) 
    484481    , m_timeoutTime(0) 
    485482    , m_timeAtLastCheckTimeout(0) 
    …… 
    23752372            ArgList args(r + firstArg + 1, argCount - 1); 
    23762373 
    2377             MACHINE_SAMPLING_callingNativeFunction(); 
     2374            MACHINE_SAMPLING_callingHostFunction(); 
    23782375 
    23792376            JSValue* returnValue = callData.native.function(exec, static_cast<JSObject*>(v), thisValue, args); 
    …… 
    25022499 
    25032500            ArgList args(r + firstArg + 1, argCount - 1); 
     2501 
     2502            MACHINE_SAMPLING_callingHostFunction(); 
     2503 
    25042504            JSValue* returnValue = constructData.native.function(exec, constructor, args); 
    25052505