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

Commit ba82e067 authored by Michael Kolb's avatar Michael Kolb Committed by Android (Google) Code Review
Browse files

Merge "fix layer scrollbar updates"

parents 438304d5 4695e20a

core/java/android/webkit/WebView.java

+2 −0
Original line number Diff line number Diff line
@@ -3742,6 +3742,8 @@ public class WebView extends AbsoluteLayout 
        nativeScrollLayer(mCurrentScrollingLayerId, x, y);

        mScrollingLayerRect.left = x;

        mScrollingLayerRect.top = y;

        mWebViewCore.sendMessage(WebViewCore.EventHub.SCROLL_LAYER, mCurrentScrollingLayerId,

                mScrollingLayerRect);

        onScrollChanged(mScrollX, mScrollY, mScrollX, mScrollY);

        invalidate();

    }

core/java/android/webkit/WebViewCore.java

+7 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,8 @@ public final class WebViewCore { 


        static final int HEARTBEAT = 197;



        static final int SCROLL_LAYER = 198;



        // private message ids

        private static final int DESTROY =     200;
@@ -1708,6 +1710,11 @@ public final class WebViewCore { 
                                mBrowserFrame.stringByEvaluatingJavaScriptFromString((String) msg.obj);

                            }

                            break;

                        case SCROLL_LAYER:

                            int nativeLayer = msg.arg1;

                            Rect rect = (Rect) msg.obj;

                            nativeScrollLayer(mNativeClass, nativeLayer,

                                    rect);

                    }

                }

            };