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

Commit 4f4a5672 authored by Leon Scroggins's avatar Leon Scroggins
Browse files

Tell nativeFindAll whether the new search matches the last one. 

Bug:3108852

Requires a change in external/webkit.

Change-Id: I4333532b4febfa9e832272cf903c3f96ebff0203
parent 5931b1f4

core/java/android/webkit/WebView.java

+3 −2
Original line number Diff line number Diff line
@@ -2763,7 +2763,7 @@ public class WebView extends AbsoluteLayout 
    public int findAll(String find) {

        if (0 == mNativeClass) return 0; // client isn't initialized

        int result = find != null ? nativeFindAll(find.toLowerCase(),

                find.toUpperCase()) : 0;

                find.toUpperCase(), find.equalsIgnoreCase(mLastFind)) : 0;

        invalidate();

        mLastFind = find;

        return result;
@@ -7427,7 +7427,8 @@ public class WebView extends AbsoluteLayout 
    private native boolean  nativeEvaluateLayersAnimations();

    private native boolean  nativeDrawGL(Rect rect, float scale, int extras);

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

    private native void     nativeFindNext(boolean forward);

    /* package */ native int      nativeFocusCandidateFramePointer();

    /* package */ native boolean  nativeFocusCandidateHasNextTextfield();