commit | 3419140ab665596f21b385ce136419fde0924272 | [log] [tgz] |
---|---|---|
author | Tomasz Wiszkowski <ender@google.com> | Mon Dec 11 19:48:11 2023 |
committer | Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Dec 11 19:48:11 2023 |
tree | 7c4ec4e609a3f85b6a7503c1ae5aa8778d30ec69 | |
parent | 42edce0eac2d4350bcd3da951f0b9d6a365a6622 [diff] |
[M120 branch 6099] UrlBar: do not compute scroll position if text layout is unavailable. At the core, the change marks scroll position as "Pending" if Layout is not available. This is done by enhancing the condition in scrollDisplayText() with a getLayout() == null check. The condition itself was the only condition in scrollDisplayText(), otherwise the call was just a simple proxy to scrollDisplayTextInternal(). The two methods have been collapsed by relocating the check. We permit calculation of the offset even if the current scroll type is NO_SCROLL. This is because the method may still fall back to SCROLL_TO_BEGINNING if the text is empty; evaluation of the scroll position seems appropriate in that context and shouldn't depend on whether current measure/layout pass has completed. Lastly, the method pushes the resolution of the scoll directon until *after* the layout() pass has completed (previously was: until after onLayout() has completed), because this is the only time when the layout is truly resolved and isLayoutRequested() will return false, unblocking the pending scrollDisplayText fulfilment. The pushed method deduplicates mPreviousScrolledViewWidth and mPreviousWidth which both closely tracked the same underlying thing. Note: the proper fix here calls for usage of getHintLayout(), however this call is TextView private. Added lots of tests. (cherry picked from commit 318071b4c02bf32b5fde4feda8b85e8bbd225674) Fixed: 1499060 Change-Id: Id51de0d49fe99280bb95e29b1d7eb75ff1795e15 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5031350 Reviewed-by: Fred Mello <fredmello@chromium.org> Commit-Queue: Tomasz Wiszkowski <ender@google.com> Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com> Cr-Original-Commit-Position: refs/heads/main@{#1225050} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5111661 Reviewed-by: Krishna Govind <govind@chromium.org> Owners-Override: Krishna Govind <govind@chromium.org> Commit-Queue: Ted Choc <tedchoc@chromium.org> Reviewed-by: Ted Choc <tedchoc@chromium.org> Cr-Commit-Position: refs/branch-heads/6099@{#1483} Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
To check out the source code locally, don't use git clone
! Instead, follow the instructions on how to get the code.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .
For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.
If you found a bug, please file it at https://crbug.com/new.