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

Commit 27c31388 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang
Browse files

Prevent 0 content width. 

Sometimes content will be set to 0 from webkit.

issue: 3161799
Change-Id: Ib17322c2e71535105d0f961674cedce63f66a534
parent cc82f3ae

core/java/android/webkit/ZoomManager.java

+7 −3
Original line number Diff line number Diff line
@@ -572,7 +572,11 @@ class ZoomManager { 
    }



    private void setZoomOverviewWidth(int width) {

        if (width == 0) {

            mZoomOverviewWidth = WebView.DEFAULT_VIEWPORT_WIDTH;

        } else {

            mZoomOverviewWidth = width;

        }

        mInvZoomOverviewWidth = 1.0f / width;

    }
@@ -807,7 +811,7 @@ class ZoomManager { 
                    Math.max((int) (viewWidth * mInvDefaultScale),

                            Math.max(drawData.mMinPrefWidth, drawData.mViewSize.x))));

            } else {

                final int contentWidth = drawData.mContentSize.x;

                final int contentWidth = Math.max(drawData.mContentSize.x, drawData.mViewSize.x);

                setZoomOverviewWidth(Math.min(WebView.sMaxViewportWidth, contentWidth));

            }

        }
@@ -843,7 +847,7 @@ class ZoomManager { 
        updateZoomRange(viewState, viewSize.x, drawData.mMinPrefWidth);

        if (mWebView.getSettings().getUseWideViewPort() &&

            mWebView.getSettings().getUseFixedViewport()) {

            final int contentWidth = drawData.mContentSize.x;

            final int contentWidth = Math.max(drawData.mContentSize.x, drawData.mMinPrefWidth);

            setZoomOverviewWidth(Math.min(WebView.sMaxViewportWidth, contentWidth));

        }