diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-11-17 05:49:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 05:49:13 -0800 |
| commit | 1343dcc6f50e1060fc392a2866438c1495449d0f (patch) | |
| tree | 1d6bd1020d3808031268da591653d20b9b087912 /Source/WebCore/page/FrameView.cpp | |
| parent | 821a96a38b73feb4a362a5a738f355b52667253f (diff) | |
| parent | b359438e11520b3e3b6801ad1280e1bdef2b986c (diff) | |
| download | external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.zip external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.tar.gz external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.tar.bz2 | |
Merge "Removing ANDROID_INSTRUMENTATION code"
Diffstat (limited to 'Source/WebCore/page/FrameView.cpp')
| -rw-r--r-- | Source/WebCore/page/FrameView.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index 49a7d0c..a79910b 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -62,11 +62,6 @@ #include "TextResourceDecoder.h" #include <wtf/CurrentTime.h> -#ifdef ANDROID_INSTRUMENT -#include "FrameTree.h" -#include "TimeCounter.h" -#endif - #if USE(ACCELERATED_COMPOSITING) #include "RenderLayerCompositor.h" #endif @@ -872,11 +867,6 @@ void FrameView::layout(bool allowSubtree) return; } -#ifdef ANDROID_INSTRUMENT - if (!m_frame->tree() || !m_frame->tree()->parent()) - android::TimeCounter::start(android::TimeCounter::LayoutTimeCounter); -#endif - m_nestedLayoutCount++; if (!m_layoutRoot) { @@ -1014,10 +1004,6 @@ void FrameView::layout(bool allowSubtree) updateDashboardRegions(); #endif -#ifdef ANDROID_INSTRUMENT - if (!m_frame->tree()->parent()) - android::TimeCounter::record(android::TimeCounter::LayoutTimeCounter, __FUNCTION__); -#endif ASSERT(!root->needsLayout()); updateCanBlitOnScrollRecursively(); |