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

Commit 204a8285 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 9490fe40: Merge "Fix lastVisible/global rects" into ics-mr1

* commit '9490fe40':
  Fix lastVisible/global rects
parents 05997759 9490fe40
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -2861,8 +2861,8 @@ public class WebView extends AbsoluteLayout
    }

    // Used to avoid sending many visible rect messages.
    private Rect mLastVisibleRectSent;
    private Rect mLastGlobalRect;
    private Rect mLastVisibleRectSent = new Rect();
    private Rect mLastGlobalRect = new Rect();
    private Rect mVisibleRect = new Rect();
    private Rect mGlobalVisibleRect = new Rect();
    private Point mScrollOffset = new Point();
@@ -2878,7 +2878,7 @@ public class WebView extends AbsoluteLayout
                mWebViewCore.sendMessage(EventHub.SET_SCROLL_OFFSET,
                        nativeMoveGeneration(), mSendScrollEvent ? 1 : 0, mScrollOffset);
            }
            mLastVisibleRectSent = mVisibleRect;
            mLastVisibleRectSent.set(mVisibleRect);
            mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
        }
        if (getGlobalVisibleRect(mGlobalVisibleRect)
@@ -2894,7 +2894,7 @@ public class WebView extends AbsoluteLayout
            if (!mBlockWebkitViewMessages) {
                mWebViewCore.sendMessage(EventHub.SET_GLOBAL_BOUNDS, mGlobalVisibleRect);
            }
            mLastGlobalRect = mGlobalVisibleRect;
            mLastGlobalRect.set(mGlobalVisibleRect);
        }
        return mVisibleRect;
    }