diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /JavaScriptCore/profiler | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'JavaScriptCore/profiler')
| -rw-r--r-- | JavaScriptCore/profiler/ProfileNode.cpp | 2 | ||||
| -rw-r--r-- | JavaScriptCore/profiler/Profiler.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/JavaScriptCore/profiler/ProfileNode.cpp b/JavaScriptCore/profiler/ProfileNode.cpp index f60c72e..1391f99 100644 --- a/JavaScriptCore/profiler/ProfileNode.cpp +++ b/JavaScriptCore/profiler/ProfileNode.cpp @@ -45,7 +45,7 @@ namespace JSC { static double getCount() { #if OS(WINDOWS) - static LARGE_INTEGER frequency = {0}; + static LARGE_INTEGER frequency; if (!frequency.QuadPart) QueryPerformanceFrequency(&frequency); LARGE_INTEGER counter; diff --git a/JavaScriptCore/profiler/Profiler.cpp b/JavaScriptCore/profiler/Profiler.cpp index fe8727a..94e46a4 100644 --- a/JavaScriptCore/profiler/Profiler.cpp +++ b/JavaScriptCore/profiler/Profiler.cpp @@ -32,6 +32,7 @@ #include "CommonIdentifiers.h" #include "CallFrame.h" #include "CodeBlock.h" +#include "InternalFunction.h" #include "JSFunction.h" #include "JSGlobalObject.h" #include "Nodes.h" @@ -146,6 +147,8 @@ CallIdentifier Profiler::createCallIdentifier(ExecState* exec, JSValue functionV if (!function->executable()->isHostFunction()) return createCallIdentifierFromFunctionImp(exec, function); } + if (asObject(functionValue)->inherits(&JSFunction::info)) + return CallIdentifier(static_cast<JSFunction*>(asObject(functionValue))->name(exec), defaultSourceURL, defaultLineNumber); if (asObject(functionValue)->inherits(&InternalFunction::info)) return CallIdentifier(static_cast<InternalFunction*>(asObject(functionValue))->name(exec), defaultSourceURL, defaultLineNumber); return CallIdentifier(makeString("(", asObject(functionValue)->className(), " object)"), defaultSourceURL, defaultLineNumber); |