diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:09 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:09 -0800 |
commit | 7a355dabbffb876b2e08cf63ac4fc28a39c19c6a (patch) | |
tree | 9e94e34b23ead3c0e7f052ee2d3785404d349981 /WebCore/loader/FrameLoader.cpp | |
parent | e933faefa1e899dbd5bf371f499cc682aff46c83 (diff) | |
download | external_webkit-7a355dabbffb876b2e08cf63ac4fc28a39c19c6a.zip external_webkit-7a355dabbffb876b2e08cf63ac4fc28a39c19c6a.tar.gz external_webkit-7a355dabbffb876b2e08cf63ac4fc28a39c19c6a.tar.bz2 |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'WebCore/loader/FrameLoader.cpp')
-rw-r--r-- | WebCore/loader/FrameLoader.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 2fdb8f5..0285a8c 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -106,6 +106,10 @@ #include "SVGViewSpec.h" #endif +#ifdef ANDROID_INSTRUMENT +#include "TimeCounter.h" +#endif + using namespace JSC; namespace WebCore { @@ -119,11 +123,6 @@ using namespace HTMLNames; const unsigned int cMaxPendingSourceLengthInLowBandwidthDisplay = 128 * 1024; #endif -#ifdef ANDROID_INSTRUMENT -static double sCurrentTime = 0.0; -static uint32_t sCurrentThreadTime = 0; -#endif - struct FormSubmission { const char* action; String url; @@ -1876,11 +1875,8 @@ void FrameLoader::handleFallbackContent() void FrameLoader::provisionalLoadStarted() { #ifdef ANDROID_INSTRUMENT - if (!m_frame->tree()->parent()) { - m_frame->resetTimeCounter(); - sCurrentTime = currentTime(); - sCurrentThreadTime = get_thread_msec(); - } + if (!m_frame->tree()->parent()) + android::TimeCounter::reset(); #endif Page* page = m_frame->page(); @@ -3269,11 +3265,8 @@ void FrameLoader::checkLoadCompleteForThisFrame() page->progress()->progressCompleted(m_frame); #ifdef ANDROID_INSTRUMENT - if (!m_frame->tree()->parent()) { - m_frame->reportTimeCounter(m_URL, - static_cast<int>((currentTime() - sCurrentTime) * 1000), - (get_thread_msec() - sCurrentThreadTime)); - } + if (!m_frame->tree()->parent()) + android::TimeCounter::report(m_URL, cache()->getLiveSize(), cache()->getDeadSize()); #endif return; } |