summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav/WebView.cpp
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-11-17 05:49:13 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-17 05:49:13 -0800
commit1343dcc6f50e1060fc392a2866438c1495449d0f (patch)
tree1d6bd1020d3808031268da591653d20b9b087912 /Source/WebKit/android/nav/WebView.cpp
parent821a96a38b73feb4a362a5a738f355b52667253f (diff)
parentb359438e11520b3e3b6801ad1280e1bdef2b986c (diff)
downloadexternal_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.zip
external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.tar.gz
external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.tar.bz2
Merge "Removing ANDROID_INSTRUMENTATION code"
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index ebf416e..332a183 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -53,9 +53,6 @@
#include "SkPicture.h"
#include "SkRect.h"
#include "SkTime.h"
-#ifdef ANDROID_INSTRUMENT
-#include "TimeCounter.h"
-#endif
#include "TilesManager.h"
#include "WebCoreJni.h"
#include "WebRequestContext.h"
@@ -2141,13 +2138,6 @@ static void nativeHideCursor(JNIEnv *env, jobject obj)
view->hideCursor();
}
-static void nativeInstrumentReport(JNIEnv *env, jobject obj)
-{
-#ifdef ANDROID_INSTRUMENT
- TimeCounter::reportNow();
-#endif
-}
-
static void nativeSelectBestAt(JNIEnv *env, jobject obj, jobject jrect)
{
WebView* view = GET_NATIVE_VIEW(env, obj);
@@ -2821,8 +2811,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
(void*) nativeHitSelection },
{ "nativeImageURI", "(II)Ljava/lang/String;",
(void*) nativeImageURI },
- { "nativeInstrumentReport", "()V",
- (void*) nativeInstrumentReport },
{ "nativeLayerBounds", "(I)Landroid/graphics/Rect;",
(void*) nativeLayerBounds },
{ "nativeMotionUp", "(III)Z",