diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /JavaScriptCore/runtime/Executable.h | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'JavaScriptCore/runtime/Executable.h')
| -rw-r--r-- | JavaScriptCore/runtime/Executable.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/JavaScriptCore/runtime/Executable.h b/JavaScriptCore/runtime/Executable.h index c168ac8..feab7ef 100644 --- a/JavaScriptCore/runtime/Executable.h +++ b/JavaScriptCore/runtime/Executable.h @@ -144,6 +144,7 @@ namespace JSC { , m_features(0) { #if ENABLE(CODEBLOCK_SAMPLING) + relaxAdoptionRequirement(); if (SamplingTool* sampler = globalData->interpreter->sampler()) sampler->notifyOfScope(this); #else @@ -157,6 +158,7 @@ namespace JSC { , m_features(0) { #if ENABLE(CODEBLOCK_SAMPLING) + relaxAdoptionRequirement(); if (SamplingTool* sampler = exec->globalData().interpreter->sampler()) sampler->notifyOfScope(this); #else @@ -347,7 +349,7 @@ namespace JSC { const Identifier& name() { return m_name; } size_t parameterCount() const { return m_parameters->size(); } - unsigned variableCount() const { return m_numVariables; } + unsigned capturedVariableCount() const { return m_numCapturedVariables; } UString paramString() const; SharedSymbolTable* symbolTable() const { return m_symbolTable; } @@ -364,7 +366,7 @@ namespace JSC { virtual PassOwnPtr<ExceptionInfo> reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*); - unsigned m_numVariables : 31; + unsigned m_numCapturedVariables : 31; bool m_forceUsesArguments : 1; RefPtr<FunctionParameters> m_parameters; |