summaryrefslogtreecommitdiffstats
path: root/WebKit/android/TimeCounter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge Webkit at r71558: Cache.h relocated as MemoryCache.hTeng-Hui Zhu2010-11-171-1/+1
| | | | | | | http://trac.webkit.org/changeset/71492 http://trac.webkit.org/changeset/71499 Change-Id: Iacd8a22d0c1caece7bec2273f1d4e69dd3e4eb2c
* Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cppKristian Monsen2010-07-021-1/+1
| | | | | | | | | | | | 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
* Merge webkit.org at r58033 : Update location of CString.hSteve Block2010-05-111-4/+3
| | | | | | See http://trac.webkit.org/changeset/56825 Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
* Use STLPort instead of our stripped version.Patrick Scott2009-12-021-0/+3
| | | | | | | This fixes the simulator build and allows us to get closer to sharing code with chromium. STLPort was copied with minor edits from the Android port of gears.
* Moves get_thread_msec from JavaScriptCore/wtf/CurrentTime to ↵Steve Block2009-11-201-8/+24
| | | | | | | | | | | WebKit/android/Timecounter. This function is an Android addition to JavaScriptCore::WTF, but is not used anywhere in WebCore or JavaScriptCore. Futhermore, JavaScriptCore/wtf/CurrentTime does not contain any other platform additions. It's used primarily in WebKit/android/TimeCounter, so I've moved it there. I've also updated the name to getThreadMsec to match WebKit style. Change-Id: Ia4f91efd3caaafd1fb079afe6c493aefea402582
* Fixes license headers for all files in WebKit/android, other than those in stl/.Steve Block2009-11-131-1/+1
| | | | | | | | | | | | | These files have not yet been upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. This change adds licenses where absent or simply fixes the names of copyright holders in the license text to 'THE COPYRIGHT OWNER' and cleans up formatting. Files in stl/ currently use licenses other than BSD-style and will require more careful treatment. Change-Id: I67ad4b8932e432d3eaaeecdfeb0d09418496228d
* Add re-entry count for QemuTracerAuto class.Feng Qian2009-08-171-0/+2
|
* Add instrumentation for V8.Grace Kloba2009-07-081-0/+2
|
* Remove JavaScript node size in the instrumentation as it is using arena now. ↵Grace Kloba2009-07-011-1/+1
| | | | Added JSC namespace for the TimeCounter.
* resolved conflicts for merge of dac9d5be to masterGrace Kloba2009-06-291-0/+1
|\
| * Add JavaScript parsing into instrumentation. Also modify css parsing ↵Grace Kloba2009-06-261-0/+1
| | | | | | | | calculations.
* | Make WebCore built with V8.Feng Qian2009-04-241-4/+7
|/ | | | Picked up several new files from Chrome port.
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-1/+17
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+156
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-161/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-7/+12
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-12/+7
|
* auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-131-6/+51
|
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-0/+116