diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-30 19:31:09 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 5a75385a104ae66982581502acdde1491e7c86d3 (patch) | |
| tree | 6e650fa06c348b3122a69dfb3377a0926f9bb125 /WebKit | |
| parent | 7b3d71e01ef2779f8b8939f812921d0f9b1a00a8 (diff) | |
| download | external_webkit-5a75385a104ae66982581502acdde1491e7c86d3.zip external_webkit-5a75385a104ae66982581502acdde1491e7c86d3.tar.gz external_webkit-5a75385a104ae66982581502acdde1491e7c86d3.tar.bz2 | |
Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cpp
New document parser in webkit. Just taking in the new parser.
See http://trac.webkit.org/changeset/61674
This file is now what is in webkit at the time of the merge, with ANDROID_INSTRUMENT added.
The instrumentation for Parsing now includes inline script execution, this will have to be fixed later. Updated the
description for the parsing counter.
Change-Id: I2c1bae725fe8989999620430e4745e1dfa7c450b
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/TimeCounter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/TimeCounter.cpp b/WebKit/android/TimeCounter.cpp index 3b1e476..4062bc2 100644 --- a/WebKit/android/TimeCounter.cpp +++ b/WebKit/android/TimeCounter.cpp @@ -93,7 +93,7 @@ static const char* timeCounterNames[] = { "javascript execution", "calculate style", "Java callback (frame bridge)", - "parsing (may include calcStyle or Java callback)", + "parsing (may include calcStyle, Java callback or inline script execution)", "layout", "native 1 (frame bridge)", "native 2 (resource load)", |