Merge "Removing the ability to get native instrumentation as part of nav dump" (10a09dc1) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -5042,17 +5042,6 @@ public class WebView extends AbsoluteLayout
		canProvideGamma, gamma);
		}

		/**
		* Dump the V8 counters to standard output.
		* Note that you need a build with V8 and WEBCORE_INSTRUMENTATION set to
		* true. Otherwise, this will do nothing.
		*
		* @hide debug only
		*/
		public void dumpV8Counters() {
		mWebViewCore.sendMessage(EventHub.DUMP_V8COUNTERS);
		}

		// This is used to determine long press with the center key. Does not
		// affect long press with the trackball/touch.
		private boolean mGotCenterDown = false;
		@@ -5242,9 +5231,6 @@ public class WebView extends AbsoluteLayout
		case KeyEvent.KEYCODE_8:
		dumpRenderTree(keyCode == KeyEvent.KEYCODE_7);
		break;
		case KeyEvent.KEYCODE_9:
		nativeInstrumentReport();
		return true;
		}
		}

		@@ -9526,7 +9512,6 @@ public class WebView extends AbsoluteLayout
		private native void nativeHideCursor();
		private native boolean nativeHitSelection(int x, int y);
		private native String nativeImageURI(int x, int y);
		private native void nativeInstrumentReport();
		private native Rect nativeLayerBounds(int layer);
		/* package */ native boolean nativeMoveCursorToNextTextInput();
		// return true if the page has been scrolled

+0 −7

Original line number	Diff line number	Diff line
		@@ -594,8 +594,6 @@ public final class WebViewCore {

		private native void nativeDumpNavTree();

		private native void nativeDumpV8Counters();

		private native void nativeSetJsFlags(String flags);

		/**
		@@ -1002,7 +1000,6 @@ public final class WebViewCore {
		static final int DUMP_DOMTREE = 170;
		static final int DUMP_RENDERTREE = 171;
		static final int DUMP_NAVTREE = 172;
		static final int DUMP_V8COUNTERS = 173;

		static final int SET_JS_FLAGS = 174;
		static final int CONTENT_INVALIDATE_ALL = 175;
		@@ -1521,10 +1518,6 @@ public final class WebViewCore {
		nativeDumpNavTree();
		break;

		case DUMP_V8COUNTERS:
		nativeDumpV8Counters();
		break;

		case SET_JS_FLAGS:
		nativeSetJsFlags((String)msg.obj);
		break;