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

Commit 2601dccd authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "Don't try to use Network timing with the Chromium HTTP stack"

parents 35067317 acd7e2eb

core/java/android/webkit/CallbackProxy.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -920,7 +920,10 @@ class CallbackProxy extends Handler { 
        if (PERF_PROBE) {

        if (PERF_PROBE) {

            mWebCoreThreadTime = SystemClock.currentThreadTimeMillis();

            mWebCoreThreadTime = SystemClock.currentThreadTimeMillis();

            mWebCoreIdleTime = 0;

            mWebCoreIdleTime = 0;

            if (!JniUtil.useChromiumHttpStack()) {

                // Network is only used with the Android HTTP stack.

                Network.getInstance(mContext).startTiming();

                Network.getInstance(mContext).startTiming();

            }

            // un-comment this if PERF_PROBE is true

            // un-comment this if PERF_PROBE is true

//            Looper.myQueue().setWaitCallback(mIdleCallback);

//            Looper.myQueue().setWaitCallback(mIdleCallback);

        }

        }
@@ -938,8 +941,11 @@ class CallbackProxy extends Handler { 
            Log.d("WebCore", "WebCore thread used " +

            Log.d("WebCore", "WebCore thread used " +

                    (SystemClock.currentThreadTimeMillis() - mWebCoreThreadTime)

                    (SystemClock.currentThreadTimeMillis() - mWebCoreThreadTime)

                    + " ms and idled " + mWebCoreIdleTime + " ms");

                    + " ms and idled " + mWebCoreIdleTime + " ms");

            if (!JniUtil.useChromiumHttpStack()) {

                // Network is only used with the Android HTTP stack.

                Network.getInstance(mContext).stopTiming();

                Network.getInstance(mContext).stopTiming();

            }

            }

        }

        Message msg = obtainMessage(PAGE_FINISHED, url);

        Message msg = obtainMessage(PAGE_FINISHED, url);

        sendMessage(msg);

        sendMessage(msg);

    }

    }