Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c157ee authored by Kristian Monsen's avatar Kristian Monsen
Browse files

Removing the ability to get native instrumentation as part of nav dump 

This is to be able to remove ANDROID_INSTRUMENTATION code.

Note that it would only print useful information if webcore
was compiled with ANDROID_INSTRUMENTATION on.

There is an open bug for problems with ANDROID_INSTRUMENTATION:
http://b/issue?id=2816327

Needs Browser CL:
https://android-git.corp.google.com/g/#/c/149442

Change-Id: Ie8c3c3a08a8bb15936831e25faac3155906bae70
parent 33c25e49

core/java/android/webkit/WebView.java

+0 −15
Original line number Diff line number Diff line
@@ -5019,17 +5019,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;
@@ -5219,9 +5208,6 @@ public class WebView extends AbsoluteLayout 
                case KeyEvent.KEYCODE_8:

                    dumpRenderTree(keyCode == KeyEvent.KEYCODE_7);

                    break;

                case KeyEvent.KEYCODE_9:

                    nativeInstrumentReport();

                    return true;

            }

        }
@@ -9499,7 +9485,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

core/java/android/webkit/WebViewCore.java

+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;