diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-11-09 21:51:01 +0000 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-11-17 13:48:02 +0000 |
| commit | b359438e11520b3e3b6801ad1280e1bdef2b986c (patch) | |
| tree | 66c6170430bb1986c1d4e427bc3734e2712de3b7 /Source/WebCore/loader | |
| parent | 22e6e8f6e1a5a5e677269d6f7895ff49b1a8f41b (diff) | |
| download | external_webkit-b359438e11520b3e3b6801ad1280e1bdef2b986c.zip external_webkit-b359438e11520b3e3b6801ad1280e1bdef2b986c.tar.gz external_webkit-b359438e11520b3e3b6801ad1280e1bdef2b986c.tar.bz2 | |
Removing ANDROID_INSTRUMENTATION code
This has not been used for years, and due to WebKit merges the
results are not accurate anymore.
The resulting code is cleaner, less likely to create merge conflicts,
and does not give the impression that this can be turned on and
it will still work.
Needs CL:
https://android-git.corp.google.com/g/#/c/148912/
Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
Diffstat (limited to 'Source/WebCore/loader')
| -rw-r--r-- | Source/WebCore/loader/FrameLoader.cpp | 15 | ||||
| -rw-r--r-- | Source/WebCore/loader/cache/MemoryCache.h | 6 |
2 files changed, 0 insertions, 21 deletions
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp index 85b1541..ee0397b 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -119,11 +119,6 @@ #include "ArchiveFactory.h" #endif -#ifdef ANDROID_INSTRUMENT -#include "TimeCounter.h" -#include "RenderArena.h" -#endif - namespace WebCore { using namespace HTMLNames; @@ -1115,10 +1110,6 @@ void FrameLoader::handleFallbackContent() void FrameLoader::provisionalLoadStarted() { -#ifdef ANDROID_INSTRUMENT - if (!m_frame->tree()->parent()) - android::TimeCounter::reset(); -#endif if (m_stateMachine.firstLayoutDone()) m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad); m_frame->navigationScheduler()->cancel(true); @@ -2499,12 +2490,6 @@ void FrameLoader::checkLoadCompleteForThisFrame() if (Page* page = m_frame->page()) page->progress()->progressCompleted(m_frame); - -#ifdef ANDROID_INSTRUMENT - if (!m_frame->tree()->parent() && m_frame->document()->renderArena()) - android::TimeCounter::report(m_URL, cache()->getLiveSize(), cache()->getDeadSize(), - m_frame->document()->renderArena()->reportPoolSize()); -#endif return; } diff --git a/Source/WebCore/loader/cache/MemoryCache.h b/Source/WebCore/loader/cache/MemoryCache.h index a092eac..c9b91f9 100644 --- a/Source/WebCore/loader/cache/MemoryCache.h +++ b/Source/WebCore/loader/cache/MemoryCache.h @@ -171,12 +171,6 @@ public: void removeResourcesWithOrigin(SecurityOrigin*); void getOriginsWithCache(SecurityOriginSet& origins); -#ifdef ANDROID_INSTRUMENT - unsigned getLiveSize() { return m_liveSize; } - unsigned getDeadSize() { return m_deadSize; } -#endif - - private: MemoryCache(); ~MemoryCache(); // Not implemented to make sure nobody accidentally calls delete -- WebCore does not delete singletons. |