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

Commit af95d12b authored by Leon Scroggins's avatar Leon Scroggins Committed by Android Git Automerger
Browse files

am c7ee44cb: am dfc07279: Line up WebTextView text with the page. 

Merge commit 'c7ee44cb'

* commit 'c7ee44cb':
  Line up WebTextView text with the page.
parents d7117f04 c7ee44cb

core/java/android/webkit/WebView.java

+17 −0
Original line number Diff line number Diff line
@@ -3944,6 +3944,16 @@ public class WebView extends AbsoluteLayout 
            // requestFormData, and it needs to have the correct nodePointer.

            mWebTextView.setNodePointer(nodePointer);

            mWebTextView.setType(nativeFocusCandidateType());

            Rect paddingRect = nativeFocusCandidatePaddingRect();

            if (paddingRect != null) {

                // Use contentToViewDimension since these are the dimensions of

                // the padding.

                mWebTextView.setPadding(

                        contentToViewDimension(paddingRect.left),

                        contentToViewDimension(paddingRect.top),

                        contentToViewDimension(paddingRect.right),

                        contentToViewDimension(paddingRect.bottom));

            }

            if (null == text) {

                if (DebugFlags.WEB_VIEW) {

                    Log.v(LOGTAG, "rebuildWebTextView null == text");
@@ -7427,6 +7437,13 @@ public class WebView extends AbsoluteLayout 
    /* package */ native int      nativeFocusCandidateMaxLength();

    /* package */ native String   nativeFocusCandidateName();

    private native Rect     nativeFocusCandidateNodeBounds();

    /**

     * @return A Rect with left, top, right, bottom set to the corresponding

     * padding values in the focus candidate, if it is a textfield/textarea with

     * a style.  Otherwise return null.  This is not actually a rectangle; Rect

     * is being used to pass four integers.

     */

    private native Rect     nativeFocusCandidatePaddingRect();

    /* package */ native int      nativeFocusCandidatePointer();

    private native String   nativeFocusCandidateText();

    private native int      nativeFocusCandidateTextSize();