diff options
| author | Grace Kloba <klobag@google.com> | 2009-06-29 18:09:35 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-06-29 18:09:35 -0700 |
| commit | 0519c65e2884fdc6cbfd79c108c2941de60c8fc8 (patch) | |
| tree | 31d7b7c469ebf42b5ab15ea3cccd93cff78d33dd /JavaScriptCore | |
| parent | 2ac011692daa197e15a21460f3c8d0e7dec53b0a (diff) | |
| parent | dac9d5be4c497a51b6e083bc9b232977d8e195c1 (diff) | |
| download | external_webkit-0519c65e2884fdc6cbfd79c108c2941de60c8fc8.zip external_webkit-0519c65e2884fdc6cbfd79c108c2941de60c8fc8.tar.gz external_webkit-0519c65e2884fdc6cbfd79c108c2941de60c8fc8.tar.bz2 | |
resolved conflicts for merge of dac9d5be to master
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/parser/Parser.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/JavaScriptCore/parser/Parser.cpp b/JavaScriptCore/parser/Parser.cpp index 96f4ae6..da47ab2 100644 --- a/JavaScriptCore/parser/Parser.cpp +++ b/JavaScriptCore/parser/Parser.cpp @@ -35,10 +35,17 @@ using std::auto_ptr; extern int jscyyparse(void*); #endif +#ifdef ANDROID_INSTRUMENT +#include "TimeCounter.h" +#endif + namespace JSC { void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg) { +#ifdef ANDROID_INSTRUMENT + android::TimeCounter::start(android::TimeCounter::JavaScriptParseTimeCounter); +#endif m_sourceElements = 0; int defaultErrLine; @@ -65,6 +72,9 @@ void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg) *errMsg = "Parse error"; m_sourceElements = 0; } +#ifdef ANDROID_INSTRUMENT + android::TimeCounter::record(android::TimeCounter::JavaScriptParseTimeCounter, __FUNCTION__); +#endif } void Parser::reparseInPlace(JSGlobalData* globalData, FunctionBodyNode* functionBodyNode) |