219495 2020-12-03 09:56:04 -0800 IntersectionObserver {root:document}: Getting a different rootBounds.top than both FF/Chrome for a scrolled window 2021-01-12 23:24:21 -0800 1 1 1 Unclassified WebKit Layout and Rendering Safari 14 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 220403 1 friedj cathiechen ajuma bfulgham cathiechen cdumez darin esprehn+autocc ews-watchlist kangil.han simon.fraser smoley webkit-bug-importer zalan oldest_to_newest 1711705 0 friedj 2020-12-03 09:56:04 -0800 Hi webkit folks! While working on a PR to update the w3c/IntersectionObserver polyfill with `root:document` support, I believe I may have found an issue with the WebKit implementation. A `root:document` IntersectionObserver seems to be firing entries with a `rootBounds` that is relative to the scrollingElement.scrollTop. Both Chrome and FF always use `top:0` in this case. According to the spec, I think the rootBounds should be equal to the document viewport (spec: https://www.w3.org/TR/intersection-observer/#intersectionobserver-root-intersection-rectangle). Example: ```html <!DOCTYPE html> <html> <head><title>IntersectionObserver RootBounds Test.</title></head> <body> <script> function init() { window.document.body.style = 'height: 2000px'; window.scrollTo(0, 110); const io = new window.IntersectionObserver((e) => { const p = document.createElement('p'); p.innerText = `rootBounds: ${JSON.stringify(e[0].rootBounds)}`; document.body.appendChild(p); }, {root: document}); io.observe(document.querySelector('body')); } window.addEventListener('DOMContentLoaded', init); </script> </body> </html> ``` 1711717 1 friedj 2020-12-03 10:14:00 -0800 Here is the example page running on jsbin: https://output.jsbin.com/vawazepuqe. To run: 1. Load the jsbin link 2. Scroll up to see the inserted <p> tag with rootBounds info 1711743 2 friedj 2020-12-03 11:54:25 -0800 (In reply to Jake Fried from comment #1) > Here is the example page running on jsbin: > https://output.jsbin.com/vawazepuqe. > > To run: > 1. Load the jsbin link > 2. Scroll up to see the inserted <p> tag with rootBounds info I've since learned that I needed to make an account for the jsbin link not to expire. Same instructions, but new link: https://jsbin.com/rugolaw/1 1712583 3 smoley 2020-12-07 13:39:20 -0800 Thanks for filing, I can reproduce this on Safari 14.0.2 and STP116. 1712584 4 webkit-bug-importer 2020-12-07 13:39:35 -0800 <rdar://problem/72061982> 1717942 5 417177 cathiechen 2021-01-07 07:40:18 -0800 Created attachment 417177 Patch 1717969 6 417177 darin 2021-01-07 09:12:03 -0800 Comment on attachment 417177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417177&action=review > Source/WebCore/dom/Document.cpp:7675 > + else if (observer.root() == &target.document()) > + localRootBounds = frameView.layoutViewportRect(); Is this exactly the right place for the check check? Should it be before the hasOverflowClip or before the isContainingBlockAncestorFor check? Is the single test case in WPT sufficient coverage? 1717998 7 417177 simon.fraser 2021-01-07 10:46:21 -0800 Comment on attachment 417177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417177&action=review >> Source/WebCore/dom/Document.cpp:7675 >> + localRootBounds = frameView.layoutViewportRect(); > > Is this exactly the right place for the check check? Should it be before the hasOverflowClip or before the isContainingBlockAncestorFor check? > > Is the single test case in WPT sufficient coverage? And is frameView.layoutViewportRect() correct? What's the right behavior for zoomed pages? Is this tested? 1718305 8 417177 cathiechen 2021-01-08 08:39:06 -0800 Comment on attachment 417177 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417177&action=review Hi, Thanks for the review:) >>> Source/WebCore/dom/Document.cpp:7675 >>> + localRootBounds = frameView.layoutViewportRect(); >> >> Is this exactly the right place for the check check? Should it be before the hasOverflowClip or before the isContainingBlockAncestorFor check? >> >> Is the single test case in WPT sufficient coverage? > > And is frameView.layoutViewportRect() correct? What's the right behavior for zoomed pages? Is this tested? Hi Darin, Yeah, I think it makes sense to check document before hasOverflowClip. And yes, there's only one test for it. I landed the test early this week:) Hi Simon, It seems the rects are not right for zoomed pages. Sorry, I didn't test it before. We use layout rect here and in `Document::updateIntersectionObservations`, it uses `absoluteToClientRect`. They seem not match, for `absoluteToClientRect` move offset to `visibleContentRect` which aligns to `visualViewportRect`. I think maybe in `Document::updateIntersectionObservations` we should use `absoluteToLayoutViewportRect` instead. Do you think we can fix the zoom issue in a new bug, or do you prefer to fix it here? 1718308 9 417270 cathiechen 2021-01-08 08:50:00 -0800 Created attachment 417270 Patch 1718314 10 simon.fraser 2021-01-08 09:39:07 -0800 From what I recall, Intersection Observer v1. was specified to use the layout viewport for root intersections. I think the v2 spec added an option for visual viewport? 1718328 11 cathiechen 2021-01-08 09:57:15 -0800 (In reply to Simon Fraser (smfr) from comment #10) > From what I recall, Intersection Observer v1. was specified to use the > layout viewport for root intersections. I think the v2 spec added an option > for visual viewport? Ah, I found this in github. https://github.com/w3c/IntersectionObserver/issues/95 Will take a close look tomorrow:) 1718996 12 417457 cathiechen 2021-01-12 07:59:07 -0800 Created attachment 417457 Patch 1718997 13 cathiechen 2021-01-12 08:00:01 -0800 (In reply to Simon Fraser (smfr) from comment #10) > From what I recall, Intersection Observer v1. was specified to use the > layout viewport for root intersections. I think the v2 spec added an option > for visual viewport? Hi Simon, It seems the issue hasn't reached to a conclusion.(https://github.com/w3c/IntersectionObserver/issues/95). The latest Editor's Draft has added a note about this. (https://w3c.github.io/IntersectionObserver/#intersectionobserver-root-intersection-rectangle). > Note: Root intersection rectangle is not affected by pinch zoom and will report the unadjusted viewport, consistent with the intent of pinch zooming (to act like a magnifying glass and NOT change layout.) I think it means the coordinator of rootBounds should be layoutViewportRect, for "it is not affected by pinch zoom". In the code, `computeIntersectionState()` returns absolute rootBounds rect, then in `Document::updateIntersectionObservations` it transform the rect by `absoluteToClientRect` which first transform the absolute rect to a document rect (unscales the zoom factor), then transform the document rect to a client rect which move the location to unscaled `visibleContentRect().location()`. The `visibleContentRect().location()` is the scroll position of ScrollView which will be effected by pinch zoom. For layoutViewportRect, I think it should align to m_layoutViewportOrigin. So I think we should use `absoluteToLayoutViewportRect` instead of `absoluteToClientRect`, to return a rect that is based on layoutViewportRect. WDYT? Are you agreed with this change? 1719031 14 simon.fraser 2021-01-12 09:44:28 -0800 (In reply to cathiechen from comment #13) > So I think we should use `absoluteToLayoutViewportRect` instead of > `absoluteToClientRect`, to return a rect that is based on layoutViewportRect. > > WDYT? Are you agreed with this change? That sounds right. 1719219 15 cathiechen 2021-01-12 23:18:45 -0800 (In reply to Simon Fraser (smfr) from comment #14) > (In reply to cathiechen from comment #13) > > So I think we should use `absoluteToLayoutViewportRect` instead of > > `absoluteToClientRect`, to return a rect that is based on layoutViewportRect. > > > > WDYT? Are you agreed with this change? > > That sounds right. Thanks:) 1719220 16 ews-feeder 2021-01-12 23:24:12 -0800 Committed r271433: <https://trac.webkit.org/changeset/271433> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417457. 417177 2021-01-07 07:40:18 -0800 2021-01-08 08:49:55 -0800 Patch bug-219495-20210107234016.patch text/plain 3167 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUyNmJjNTM5MjE3MzUy OTY5NjZhZjNiOWJhMmNjZGRlNTE5NDIyYi4uZTc5ZDE4YzMzYTJjOWQwM2U5NTM0NTRiNjI2Zjgx MTI1YTVjMDVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAxLTA3ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgcm9vdEJvdW5k cyBvZiBJbnRlcnNlY3Rpb25PYnNlcnZlckVudHJ5IGlzIG5vdCBjb3JyZWN0IHdoZW4ge3Jvb3Q6 ZG9jdW1lbnR9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTk0OTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXaGVuIHtyb290OmRvY3VtZW50fSwgcm9vdEJvdW5kcyBzaG91bGQgYmUgdGhlIHJvb3QgaW50 ZXJzZWN0aW9uIHJlY3RhbmdsZSB3aGljaCBpcyB0aGUgZG9jdW1lbnQncyB2aWV3cG9ydCwKKyAg ICAgICAgcGVyIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvI2Rv bS1pbnRlcnNlY3Rpb25vYnNlcnZlcmVudHJ5LXJvb3Rib3VuZHMKKworICAgICAgICAqIGRvbS9E b2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlSW50ZXJzZWN0aW9uU3RhdGUp OgorCiAyMDIxLTAxLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBPbmx5IHVwZGF0ZSB0aGUgcmVzb3VyY2VzIHdoZW4gcmVuZGVyaW5nIFNW RyBzZWxlY3RlZCB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5MzAwZWU0NmQ0Njhk ZTUzOWVlZDM4MWJmODFhZTA5ZjdkNmM2Mjc4Li5iOTljYTc2NjQwOGNmMGVmNzhiODhiYjEwYTY1 ZjIwZGUxMjlkMGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTc2NzEsNiArNzY3MSw4 IEBAIHN0YXRpYyBPcHRpb25hbDxJbnRlcnNlY3Rpb25PYnNlcnZhdGlvblN0YXRlPiBjb21wdXRl SW50ZXJzZWN0aW9uU3RhdGUoRnJhbWVWaWV3CiAKICAgICAgICAgaWYgKHJvb3RSZW5kZXJlci0+ aGFzT3ZlcmZsb3dDbGlwKCkpCiAgICAgICAgICAgICBsb2NhbFJvb3RCb3VuZHMgPSByb290UmVu ZGVyZXItPmNvbnRlbnRCb3hSZWN0KCk7CisgICAgICAgIGVsc2UgaWYgKG9ic2VydmVyLnJvb3Qo KSA9PSAmdGFyZ2V0LmRvY3VtZW50KCkpCisgICAgICAgICAgICBsb2NhbFJvb3RCb3VuZHMgPSBm cmFtZVZpZXcubGF5b3V0Vmlld3BvcnRSZWN0KCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IGxvY2FsUm9vdEJvdW5kcyA9IHsgRmxvYXRQb2ludCgpLCByb290UmVuZGVyZXItPnNpemUoKSB9 OwogICAgIH0gZWxzZSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCBjNmIyMzE4 YWY0ZTM2YjMzZGE5Nzk2YTRiNjYyMmI2NjlhNWZlZGYwLi4wYjYwZmZlMTE4OGJjNmUzYzBhNWVm NmQxMTBlMTcxY2I3MmY2M2U0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMS0wMS0wNyAgQ2F0aGllIENoZW4gIDxjYXRoaWVjaGVuQGlnYWxpYS5j b20+CisKKyAgICAgICAgVGhlIHJvb3RCb3VuZHMgb2YgSW50ZXJzZWN0aW9uT2JzZXJ2ZXJFbnRy eSBpcyBub3QgY29ycmVjdCB3aGVuIHtyb290OmRvY3VtZW50fQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDk1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaW50ZXJz ZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1lbnQtd2l0aC1kb2N1bWVudC1yb290LWV4cGVjdGVk LnR4dDoKKwogMjAyMS0wMS0wNyAgQ2F0aGllIENoZW4gIDxjYXRoaWVjaGVuQGlnYWxpYS5jb20+ CiAKICAgICAgICAgVXBkYXRlIFdQVCB0ZXN0IHN1aXRlIGZvciBpbnRlcnNlY3Rpb24tb2JzZXJ2 ZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1lbnQtd2l0aC1kb2N1bWVudC1yb290 LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1lbnQtd2l0aC1kb2N1bWVudC1yb290 LWV4cGVjdGVkLnR4dAppbmRleCBjOWFmMmI3YTQ3YzBlZGU1ZjY5ZjVlNTZjYWJmOGYwZDMxMTdj MzdkLi5hNTE1Mjc4MDlmMmEzZWEyN2I1MzcyYzZhNjIyMzA5NjZmNmZkOGJmIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2ludGVyc2VjdGlv bi1vYnNlcnZlci9zYW1lLWRvY3VtZW50LXdpdGgtZG9jdW1lbnQtcm9vdC1leHBlY3RlZC50eHQK KysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNl Y3Rpb24tb2JzZXJ2ZXIvc2FtZS1kb2N1bWVudC13aXRoLWRvY3VtZW50LXJvb3QtZXhwZWN0ZWQu dHh0CkBAIC0xLDUgKzEsNSBAQAogCiBQQVNTIEludGVyc2VjdGlvbk9ic2VydmVyIGluIGEgc2lu Z2xlIGRvY3VtZW50IHVzaW5nIGRvY3VtZW50IGFzIHJvb3QuCiBQQVNTIEZpcnN0IHJBRi4KLUZB SUwgZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPSAzMDAgYXNzZXJ0X2VxdWFs czogZW50cmllcy5sZW5ndGggZXhwZWN0ZWQgMiBidXQgZ290IDEKK1BBU1MgZG9jdW1lbnQuc2Ny b2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPSAzMDAKIAo= 417270 2021-01-08 08:50:00 -0800 2021-01-12 07:59:02 -0800 Patch bug-219495-20210109004957.patch text/plain 3302 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUyNmJjNTM5MjE3MzUy OTY5NjZhZjNiOWJhMmNjZGRlNTE5NDIyYi4uMjliNGQ5NWI3NmYxMjBhZmQxZjNkMGIwNzllYWU4 ZjM1MWUzZWFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTAxLTA3ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgcm9vdEJvdW5k cyBvZiBJbnRlcnNlY3Rpb25PYnNlcnZlckVudHJ5IGlzIG5vdCBjb3JyZWN0IHdoZW4ge3Jvb3Q6 ZG9jdW1lbnR9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTk0OTUKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBX aGVuIHtyb290OmRvY3VtZW50fSwgcm9vdEJvdW5kcyBzaG91bGQgYmUgdGhlIHJvb3QgaW50ZXJz ZWN0aW9uIHJlY3RhbmdsZSB3aGljaCBpcyB0aGUgZG9jdW1lbnQncyB2aWV3cG9ydCwKKyAgICAg ICAgcGVyIGh0dHBzOi8vd3d3LnczLm9yZy9UUi9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvI2RvbS1p bnRlcnNlY3Rpb25vYnNlcnZlcmVudHJ5LXJvb3Rib3VuZHMKKworICAgICAgICAqIGRvbS9Eb2N1 bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlSW50ZXJzZWN0aW9uU3RhdGUpOgor CiAyMDIxLTAxLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K IAogICAgICAgICBPbmx5IHVwZGF0ZSB0aGUgcmVzb3VyY2VzIHdoZW4gcmVuZGVyaW5nIFNWRyBz ZWxlY3RlZCB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5MzAwZWU0NmQ0NjhkZTUz OWVlZDM4MWJmODFhZTA5ZjdkNmM2Mjc4Li5iYzk3OTc2OWI3M2Q1YzY1ZGU3MGZmNWM0MDY1NDcw ZWNmOWJkODNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTc2NjksNyArNzY2OSw5IEBA IHN0YXRpYyBPcHRpb25hbDxJbnRlcnNlY3Rpb25PYnNlcnZhdGlvblN0YXRlPiBjb21wdXRlSW50 ZXJzZWN0aW9uU3RhdGUoRnJhbWVWaWV3CiAgICAgICAgIGlmICghcm9vdFJlbmRlcmVyLT5pc0Nv bnRhaW5pbmdCbG9ja0FuY2VzdG9yRm9yKCp0YXJnZXRSZW5kZXJlcikpCiAgICAgICAgICAgICBy ZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAgICAgIGlmIChyb290UmVuZGVyZXItPmhhc092ZXJm bG93Q2xpcCgpKQorICAgICAgICBpZiAob2JzZXJ2ZXIucm9vdCgpID09ICZ0YXJnZXQuZG9jdW1l bnQoKSkKKyAgICAgICAgICAgIGxvY2FsUm9vdEJvdW5kcyA9IGZyYW1lVmlldy5sYXlvdXRWaWV3 cG9ydFJlY3QoKTsKKyAgICAgICAgZWxzZSBpZiAocm9vdFJlbmRlcmVyLT5oYXNPdmVyZmxvd0Ns aXAoKSkKICAgICAgICAgICAgIGxvY2FsUm9vdEJvdW5kcyA9IHJvb3RSZW5kZXJlci0+Y29udGVu dEJveFJlY3QoKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbG9jYWxSb290Qm91bmRzID0g eyBGbG9hdFBvaW50KCksIHJvb3RSZW5kZXJlci0+c2l6ZSgpIH07CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZwppbmRleCBjNmIyMzE4YWY0ZTM2YjMzZGE5Nzk2YTRiNjYyMmI2NjlhNWZlZGYw Li41MWM5ZmVlNzZhN2JhM2IxNTMyNjg4OWUyMGRlZTAwZmE4Mjc3Y2JhIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wMS0wNyAgQ2F0aGllIENo ZW4gIDxjYXRoaWVjaGVuQGlnYWxpYS5jb20+CisKKyAgICAgICAgVGhlIHJvb3RCb3VuZHMgb2Yg SW50ZXJzZWN0aW9uT2JzZXJ2ZXJFbnRyeSBpcyBub3QgY29ycmVjdCB3aGVuIHtyb290OmRvY3Vt ZW50fQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5 NDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiB3ZWIt cGxhdGZvcm0tdGVzdHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1lbnQtd2l0aC1k b2N1bWVudC1yb290LWV4cGVjdGVkLnR4dDoKKwogMjAyMS0wMS0wNyAgQ2F0aGllIENoZW4gIDxj YXRoaWVjaGVuQGlnYWxpYS5jb20+CiAKICAgICAgICAgVXBkYXRlIFdQVCB0ZXN0IHN1aXRlIGZv ciBpbnRlcnNlY3Rpb24tb2JzZXJ2ZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1l bnQtd2l0aC1kb2N1bWVudC1yb290LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1l bnQtd2l0aC1kb2N1bWVudC1yb290LWV4cGVjdGVkLnR4dAppbmRleCBjOWFmMmI3YTQ3YzBlZGU1 ZjY5ZjVlNTZjYWJmOGYwZDMxMTdjMzdkLi5hNTE1Mjc4MDlmMmEzZWEyN2I1MzcyYzZhNjIyMzA5 NjZmNmZkOGJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2ludGVyc2VjdGlvbi1vYnNlcnZlci9zYW1lLWRvY3VtZW50LXdpdGgtZG9jdW1l bnQtcm9vdC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvc2FtZS1kb2N1bWVudC13aXRoLWRv Y3VtZW50LXJvb3QtZXhwZWN0ZWQudHh0CkBAIC0xLDUgKzEsNSBAQAogCiBQQVNTIEludGVyc2Vj dGlvbk9ic2VydmVyIGluIGEgc2luZ2xlIGRvY3VtZW50IHVzaW5nIGRvY3VtZW50IGFzIHJvb3Qu CiBQQVNTIEZpcnN0IHJBRi4KLUZBSUwgZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxU b3AgPSAzMDAgYXNzZXJ0X2VxdWFsczogZW50cmllcy5sZW5ndGggZXhwZWN0ZWQgMiBidXQgZ290 IDEKK1BBU1MgZG9jdW1lbnQuc2Nyb2xsaW5nRWxlbWVudC5zY3JvbGxUb3AgPSAzMDAKIAo= 417457 2021-01-12 07:59:07 -0800 2021-01-12 23:24:16 -0800 Patch bug-219495-20210112235905.patch text/plain 4618 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUyNmJjNTM5MjE3MzUy OTY5NjZhZjNiOWJhMmNjZGRlNTE5NDIyYi4uYzczZmIxZTNhMGIxOGRkYTc2YzEzMGYwODQwOTc1 ODZiN2FkOGZlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTA3ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgcm9vdEJvdW5k cyBvZiBJbnRlcnNlY3Rpb25PYnNlcnZlckVudHJ5IGlzIG5vdCBjb3JyZWN0IHdoZW4ge3Jvb3Q6 ZG9jdW1lbnR9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTk0OTUKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBX aGVuIHtyb290OmRvY3VtZW50fSwgcm9vdEJvdW5kcyBzaG91bGQgYmUgdGhlIHJvb3QgaW50ZXJz ZWN0aW9uIHJlY3RhbmdsZSB3aGljaCBpcyB0aGUgZG9jdW1lbnQncyB2aWV3cG9ydCwKKyAgICAg ICAgcGVyIFsxXS4gVGhlIGNvb3JkaW5hdG9yIG9mIHJvb3RCb3VuZHMgc2hvdWxkIGJlIGxheW91 dFZpZXdwb3J0UmVjdCwgZm9yIHJvb3QgaW50ZXJzZWN0aW9uIHJlY3RhbmdsZSBpcyBub3QgYWZm ZWN0ZWQgYnkgcGluY2ggem9vbSBbMl0uCisKKyAgICAgICAgWzFdIGh0dHBzOi8vd3d3LnczLm9y Zy9UUi9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvI2RvbS1pbnRlcnNlY3Rpb25vYnNlcnZlcmVudHJ5 LXJvb3Rib3VuZHMKKyAgICAgICAgWzJdIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9JbnRlcnNlY3Rp b25PYnNlcnZlci8jaW50ZXJzZWN0aW9ub2JzZXJ2ZXItcm9vdC1pbnRlcnNlY3Rpb24tcmVjdGFu Z2xlCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29t cHV0ZUludGVyc2VjdGlvblN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRh dGVJbnRlcnNlY3Rpb25PYnNlcnZhdGlvbnMpOgorCiAyMDIxLTAxLTA3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBPbmx5IHVwZGF0ZSB0aGUg cmVzb3VyY2VzIHdoZW4gcmVuZGVyaW5nIFNWRyBzZWxlY3RlZCB0ZXh0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAppbmRleCA5MzAwZWU0NmQ0NjhkZTUzOWVlZDM4MWJmODFhZTA5ZjdkNmM2Mjc4Li41 OTNiMTE0YzhkZDEzMWM5NDc1NTI4OGI1NTlhZGI0NGRiZWIxYjE4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKQEAgLTc2NjksNyArNzY2OSw5IEBAIHN0YXRpYyBPcHRpb25hbDxJbnRlcnNlY3Rp b25PYnNlcnZhdGlvblN0YXRlPiBjb21wdXRlSW50ZXJzZWN0aW9uU3RhdGUoRnJhbWVWaWV3CiAg ICAgICAgIGlmICghcm9vdFJlbmRlcmVyLT5pc0NvbnRhaW5pbmdCbG9ja0FuY2VzdG9yRm9yKCp0 YXJnZXRSZW5kZXJlcikpCiAgICAgICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAg ICAgIGlmIChyb290UmVuZGVyZXItPmhhc092ZXJmbG93Q2xpcCgpKQorICAgICAgICBpZiAob2Jz ZXJ2ZXIucm9vdCgpID09ICZ0YXJnZXQuZG9jdW1lbnQoKSkKKyAgICAgICAgICAgIGxvY2FsUm9v dEJvdW5kcyA9IGZyYW1lVmlldy5sYXlvdXRWaWV3cG9ydFJlY3QoKTsKKyAgICAgICAgZWxzZSBp ZiAocm9vdFJlbmRlcmVyLT5oYXNPdmVyZmxvd0NsaXAoKSkKICAgICAgICAgICAgIGxvY2FsUm9v dEJvdW5kcyA9IHJvb3RSZW5kZXJlci0+Y29udGVudEJveFJlY3QoKTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgbG9jYWxSb290Qm91bmRzID0geyBGbG9hdFBvaW50KCksIHJvb3RSZW5kZXJl ci0+c2l6ZSgpIH07CkBAIC03Nzc4LDggKzc3ODAsNyBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVJ bnRlcnNlY3Rpb25PYnNlcnZhdGlvbnMoKQogICAgICAgICAgICAgICAgIGlmIChpbnRlcnNlY3Rp b25TdGF0ZSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvKiB0YXJnZXRGcmFtZVZpZXcgPSB0 YXJnZXQtPmRvY3VtZW50KCkudmlldygpOwogICAgICAgICAgICAgICAgICAgICB0YXJnZXRCb3Vu ZGluZ0NsaWVudFJlY3QgPSB0YXJnZXRGcmFtZVZpZXctPmFic29sdXRlVG9DbGllbnRSZWN0KGlu dGVyc2VjdGlvblN0YXRlLT5hYnNvbHV0ZVRhcmdldFJlY3QsIHRhcmdldC0+cmVuZGVyZXIoKS0+ c3R5bGUoKS5lZmZlY3RpdmVab29tKCkpOwotICAgICAgICAgICAgICAgICAgICBhdXRvKiByb290 UmVuZGVyZXIgPSBvYnNlcnZlci0+cm9vdCgpID8gb2JzZXJ2ZXItPnJvb3QoKS0+cmVuZGVyZXIo KSA6IGZyYW1lVmlldy0+cmVuZGVyVmlldygpOwotICAgICAgICAgICAgICAgICAgICBjbGllbnRS b290Qm91bmRzID0gZnJhbWVWaWV3LT5hYnNvbHV0ZVRvQ2xpZW50UmVjdChpbnRlcnNlY3Rpb25T dGF0ZS0+YWJzb2x1dGVSb290Qm91bmRzLCByb290UmVuZGVyZXItPnN0eWxlKCkuZWZmZWN0aXZl Wm9vbSgpKTsKKyAgICAgICAgICAgICAgICAgICAgY2xpZW50Um9vdEJvdW5kcyA9IGZyYW1lVmll dy0+YWJzb2x1dGVUb0xheW91dFZpZXdwb3J0UmVjdChpbnRlcnNlY3Rpb25TdGF0ZS0+YWJzb2x1 dGVSb290Qm91bmRzKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGludGVyc2VjdGlvblN0YXRl LT5pc0ludGVyc2VjdGluZykKICAgICAgICAgICAgICAgICAgICAgICAgIGNsaWVudEludGVyc2Vj dGlvblJlY3QgPSB0YXJnZXRGcmFtZVZpZXctPmFic29sdXRlVG9DbGllbnRSZWN0KGludGVyc2Vj dGlvblN0YXRlLT5hYnNvbHV0ZUludGVyc2VjdGlvblJlY3QsIHRhcmdldC0+cmVuZGVyZXIoKS0+ c3R5bGUoKS5lZmZlY3RpdmVab29tKCkpOwogICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2MvQ2hhbmdlTG9nCmluZGV4IGM2YjIzMThhZjRlMzZiMzNkYTk3OTZhNGI2NjIyYjY2OWE1 ZmVkZjAuLjUxYzlmZWU3NmE3YmEzYjE1MzI2ODg5ZTIwZGVlMDBmYTgyNzdjYmEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIxLTAxLTA3ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgcm9vdEJvdW5k cyBvZiBJbnRlcnNlY3Rpb25PYnNlcnZlckVudHJ5IGlzIG5vdCBjb3JyZWN0IHdoZW4ge3Jvb3Q6 ZG9jdW1lbnR9CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTk0OTUKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICAq IHdlYi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvc2FtZS1kb2N1bWVudC13 aXRoLWRvY3VtZW50LXJvb3QtZXhwZWN0ZWQudHh0OgorCiAyMDIxLTAxLTA3ICBDYXRoaWUgQ2hl biAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KIAogICAgICAgICBVcGRhdGUgV1BUIHRlc3Qgc3Vp dGUgZm9yIGludGVyc2VjdGlvbi1vYnNlcnZlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvc2FtZS1k b2N1bWVudC13aXRoLWRvY3VtZW50LXJvb3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9pbnRlcnNlY3Rpb24tb2JzZXJ2ZXIvc2FtZS1k b2N1bWVudC13aXRoLWRvY3VtZW50LXJvb3QtZXhwZWN0ZWQudHh0CmluZGV4IGM5YWYyYjdhNDdj MGVkZTVmNjlmNWU1NmNhYmY4ZjBkMzExN2MzN2QuLmE1MTUyNzgwOWYyYTNlYTI3YjUzNzJjNmE2 MjIzMDk2NmY2ZmQ4YmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvaW50ZXJzZWN0aW9uLW9ic2VydmVyL3NhbWUtZG9jdW1lbnQtd2l0aC1k b2N1bWVudC1yb290LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2ludGVyc2VjdGlvbi1vYnNlcnZlci9zYW1lLWRvY3VtZW50LXdp dGgtZG9jdW1lbnQtcm9vdC1leHBlY3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiAKIFBBU1MgSW50 ZXJzZWN0aW9uT2JzZXJ2ZXIgaW4gYSBzaW5nbGUgZG9jdW1lbnQgdXNpbmcgZG9jdW1lbnQgYXMg cm9vdC4KIFBBU1MgRmlyc3QgckFGLgotRkFJTCBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNj cm9sbFRvcCA9IDMwMCBhc3NlcnRfZXF1YWxzOiBlbnRyaWVzLmxlbmd0aCBleHBlY3RlZCAyIGJ1 dCBnb3QgMQorUEFTUyBkb2N1bWVudC5zY3JvbGxpbmdFbGVtZW50LnNjcm9sbFRvcCA9IDMwMAog Cg==