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 /WebKit | |
| 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 'WebKit')
| -rw-r--r-- | WebKit/android/TimeCounter.cpp | 1 | ||||
| -rw-r--r-- | WebKit/android/TimeCounter.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/WebKit/android/TimeCounter.cpp b/WebKit/android/TimeCounter.cpp index f78d46f..9e8f432 100644 --- a/WebKit/android/TimeCounter.cpp +++ b/WebKit/android/TimeCounter.cpp @@ -67,6 +67,7 @@ uint32_t TimeCounter::sStartTime[TimeCounter::TotalTimeCounterCount]; static const char* timeCounterNames[] = { "css parsing", "javascript", + "javascript parsing", "calculate style", "Java callback (frame bridge)", "parsing (may include calcStyle or Java callback)", diff --git a/WebKit/android/TimeCounter.h b/WebKit/android/TimeCounter.h index f15deef..054141b 100644 --- a/WebKit/android/TimeCounter.h +++ b/WebKit/android/TimeCounter.h @@ -42,8 +42,9 @@ class TimeCounter { public: enum Type { // function base counters - CSSTimeCounter, + CSSParseTimeCounter, JavaScriptTimeCounter, + JavaScriptParseTimeCounter, CalculateStyleTimeCounter, JavaCallbackTimeCounter, ParsingTimeCounter, |