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

Commit 728f1ed5 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android (Google) Code Review
Browse files

Merge "Update the scale while updating the drawGL functor"

parents 80fe2c4e 7e2346d5

core/java/android/webkit/WebView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -6111,7 +6111,7 @@ public class WebView extends AbsoluteLayout 
        calcOurContentVisibleRectF(mVisibleContentRect);

        calcOurContentVisibleRectF(mVisibleContentRect);

        nativeUpdateDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport,

        nativeUpdateDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport,

                mGLViewportEmpty ? null : mViewRectViewport,

                mGLViewportEmpty ? null : mViewRectViewport,

                mVisibleContentRect);

                mVisibleContentRect, getScale());

    }

    }





    /**

    /**
@@ -9885,7 +9885,7 @@ public class WebView extends AbsoluteLayout 
    private native int      nativeGetDrawGLFunction(int nativeInstance, Rect rect,

    private native int      nativeGetDrawGLFunction(int nativeInstance, Rect rect,

            Rect viewRect, RectF visibleRect, float scale, int extras);

            Rect viewRect, RectF visibleRect, float scale, int extras);

    private native void     nativeUpdateDrawGLFunction(Rect rect, Rect viewRect,

    private native void     nativeUpdateDrawGLFunction(Rect rect, Rect viewRect,

            RectF visibleRect);

            RectF visibleRect, float scale);

    private native void     nativeExtendSelection(int x, int y);

    private native void     nativeExtendSelection(int x, int y);

    private native int      nativeFindAll(String findLower, String findUpper,

    private native int      nativeFindAll(String findLower, String findUpper,

            boolean sameAsLastSearch);

            boolean sameAsLastSearch);