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

Commit ad7dd483 authored by Cary Clark's avatar Cary Clark
Browse files

scroll into view considers layers 

Remove view metrics data, which is a duplicate of
an existing interface (calcOurContentVisibleRect)

companion fix in external/webkit

http://b/2485168
parent 5bffb450

core/java/android/webkit/WebView.java

+0 −21
Original line number Diff line number Diff line
@@ -3213,27 +3213,6 @@ public class WebView extends AbsoluteLayout 
        }

    }



    private static class Metrics {

        int mScrollX;

        int mScrollY;

        int mWidth;

        int mHeight;

        float mInvScale;

    }



    private Metrics getViewMetrics() {

        Metrics metrics = new Metrics();

        metrics.mScrollX = mScrollX;

        metrics.mScrollY = computeVerticalScrollOffset();

        metrics.mWidth = getWidth();

        metrics.mHeight = getHeight() - getVisibleTitleHeight();

        if (mFindIsUp) {

            metrics.mHeight -= mFindHeight;

        }

        metrics.mInvScale = mInvActualScale;

        return metrics;

    }



    private void drawExtras(Canvas canvas, int extras) {

        // If mNativeClass is 0, we should not reach here, so we do not

        // need to check it again.