diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp')
| -rw-r--r-- | Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp b/Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp index 3ad4644..27207e2 100644 --- a/Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp +++ b/Source/JavaScriptCore/runtime/GlobalEvalFunction.cpp @@ -34,7 +34,7 @@ ASSERT_CLASS_FITS_IN_CELL(GlobalEvalFunction); GlobalEvalFunction::GlobalEvalFunction(ExecState* exec, JSGlobalObject* globalObject, NonNullPassRefPtr<Structure> structure, int len, const Identifier& name, NativeFunction function, JSGlobalObject* cachedGlobalObject) : PrototypeFunction(exec, globalObject, structure, len, name, function) - , m_cachedGlobalObject(cachedGlobalObject) + , m_cachedGlobalObject(exec->globalData(), this, cachedGlobalObject) { ASSERT_ARG(cachedGlobalObject, cachedGlobalObject); } @@ -42,7 +42,7 @@ GlobalEvalFunction::GlobalEvalFunction(ExecState* exec, JSGlobalObject* globalOb void GlobalEvalFunction::markChildren(MarkStack& markStack) { PrototypeFunction::markChildren(markStack); - markStack.append(m_cachedGlobalObject); + markStack.append(&m_cachedGlobalObject); } } // namespace JSC |