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

Commit 5d3f6e6d authored by George Mount's avatar George Mount
Browse files

Remove inFullScreenMode JNI call during drawGL call. 

 Bug 5629367
 Corresponding WebKit change: Ia6f11636

Change-Id: Icc2fb6b778ce1c9bb4dc216a558652de544028b1
parent fe0d3523

core/java/android/webkit/WebView.java

+7 −1
Original line number Diff line number Diff line
@@ -4250,6 +4250,9 @@ public class WebView extends AbsoluteLayout 


    @Override

    protected void onDraw(Canvas canvas) {

        if (inFullScreenMode()) {

            return; // no need to draw anything if we aren't visible.

        }

        // if mNativeClass is 0, the WebView is either destroyed or not

        // initialized. In either case, just draw the background color and return

        if (mNativeClass == 0) {
@@ -5833,7 +5836,8 @@ public class WebView extends AbsoluteLayout 
        }

        calcOurContentVisibleRectF(mVisibleContentRect);

        nativeUpdateDrawGLFunction(mGLViewportEmpty ? null : mGLRectViewport,

                mGLViewportEmpty ? null : mViewRectViewport, mVisibleContentRect);

                mGLViewportEmpty ? null : mViewRectViewport,

                mVisibleContentRect);

    }



    /**
@@ -5980,6 +5984,7 @@ public class WebView extends AbsoluteLayout 
        if (inFullScreenMode()) {

            mFullScreenHolder.hide();

            mFullScreenHolder = null;

            invalidate();

        }

    }
@@ -8655,6 +8660,7 @@ public class WebView extends AbsoluteLayout 
                    mFullScreenHolder = new PluginFullScreenHolder(WebView.this, orientation, npp);

                    mFullScreenHolder.setContentView(view);

                    mFullScreenHolder.show();

                    invalidate();



                    break;

                }