224664 2021-04-16 04:12:30 -0700 The implicit aspect-ratio from width and height attributes with float value is not accurate enough 2021-04-24 15:06:06 -0700 1 1 1 Unclassified WebKit Images WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209590 InRadar P2 Normal --- 1 cathiechen cathiechen changseok darin esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr rbuis simon.fraser webkit-bug-importer oldest_to_newest 1751017 0 cathiechen 2021-04-16 04:12:30 -0700 Test case with float width and height attribute fails in imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio.html 1751019 1 426207 cathiechen 2021-04-16 04:31:37 -0700 Created attachment 426207 Patch 1751039 2 426207 cathiechen 2021-04-16 06:07:44 -0700 Comment on attachment 426207 Patch Hi, I think this patch is ready for review. Thanks:) 1751059 3 426222 cathiechen 2021-04-16 07:05:25 -0700 Created attachment 426222 Patch 1751193 4 426222 darin 2021-04-16 12:33:11 -0700 Comment on attachment 426222 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426222&action=review > LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:3 > -FAIL Image width and height attributes are used to infer aspect-ratio assert_approx_equals: expected 4 +/- 0.001 but got 4.166666666666667 > +FAIL Image width and height attributes are used to infer aspect-ratio assert_approx_equals: expected 1.2547169811320755 +/- 0.001 but got 1.25 Given this patch is supposed to fix a bug, we’d normally want a test that was failing that now passes. Instead we have one failure being replaced by another? Could you explain, please? Especially wondering if we could construct a test that could show the value of the change, failing before and passing now. 1751199 5 426222 rbuis 2021-04-16 12:50:37 -0700 Comment on attachment 426222 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426222&action=review >> LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:3 >> +FAIL Image width and height attributes are used to infer aspect-ratio assert_approx_equals: expected 1.2547169811320755 +/- 0.001 but got 1.25 > > Given this patch is supposed to fix a bug, we’d normally want a test that was failing that now passes. Instead we have one failure being replaced by another? Could you explain, please? > > Especially wondering if we could construct a test that could show the value of the change, failing before and passing now. I believe the test is not well designed, instead of listing all subtests any fail means the test is stopped. So there is progress but due to the test design it is not clear. I think Antti agreed as well that the test is not ideal. 1751430 6 426222 cathiechen 2021-04-17 09:58:24 -0700 Comment on attachment 426222 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426222&action=review Hi Darin and Rob, Thanks for the review, and sorry for not to explain the patch clearly! >>> LayoutTests/imported/w3c/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-expected.txt:3 >>> +FAIL Image width and height attributes are used to infer aspect-ratio assert_approx_equals: expected 1.2547169811320755 +/- 0.001 but got 1.25 >> >> Given this patch is supposed to fix a bug, we’d normally want a test that was failing that now passes. Instead we have one failure being replaced by another? Could you explain, please? >> >> Especially wondering if we could construct a test that could show the value of the change, failing before and passing now. > > I believe the test is not well designed, instead of listing all subtests any fail means the test is stopped. So there is progress but due to the test design it is not clear. I think Antti agreed as well that the test is not ideal. Like Rob said img-aspect-ratio.html is not well-designed. The test case with width 0.8 and height 0.2 in img-aspect-ratio.html can reveal the different values. Before this patch the aspect ratio is 4.166666666666667, so it failed. After this patch, the aspect ratio is 4. In the code, 0.8 and 0.2 is converted to LayoutUnit, stored as m_intrinsicSize, then use it to calculate logical width and height. Because LayoutUnit is not accurate to present the float values, so the aspect-ratio in this test is not accurate. IIUC, the width and height attribute value is not the actual intrinsic size, so it shouldn't impact the intrinsic size. And if we need intrinsic size to decide the logical width, we should wait for the image downloaded. PS: I will add an explanation to the ChangeLog. 1751432 7 426335 cathiechen 2021-04-17 10:03:07 -0700 Created attachment 426335 Patch 1751483 8 426335 darin 2021-04-17 15:50:48 -0700 Comment on attachment 426335 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426335&action=review Looks good, but we can do better. > Source/WebCore/rendering/RenderReplaced.cpp:506 > + float attributeWidth = parseValidHTMLFloatingPointNumber(node->getAttribute(HTMLNames::widthAttr)).valueOr(0); > + float attributeHeight = parseValidHTMLFloatingPointNumber(node->getAttribute(HTMLNames::heightAttr)).valueOr(0); The parseValidHTMLFloatingPointNumber function returns an Optional<double>. But this code truncates that double to a float, then divides as float, then converts back to double. I suggest using auto here, or double and not involving single-precision float at all. 1751587 9 426335 cathiechen 2021-04-18 01:33:39 -0700 Comment on attachment 426335 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426335&action=review >> Source/WebCore/rendering/RenderReplaced.cpp:506 >> + float attributeHeight = parseValidHTMLFloatingPointNumber(node->getAttribute(HTMLNames::heightAttr)).valueOr(0); > > The parseValidHTMLFloatingPointNumber function returns an Optional<double>. But this code truncates that double to a float, then divides as float, then converts back to double. I suggest using auto here, or double and not involving single-precision float at all. Done! Thanks:) 1751589 10 426373 cathiechen 2021-04-18 01:37:25 -0700 Created attachment 426373 Patch 1751601 11 ews-feeder 2021-04-18 05:45:42 -0700 Committed r276228 (236710@main): <https://commits.webkit.org/236710@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426373. 1753918 12 webkit-bug-importer 2021-04-24 15:06:06 -0700 <rdar://problem/77110069> 426207 2021-04-16 04:31:37 -0700 2021-04-16 07:05:20 -0700 Patch bug-224664-20210416193135.patch text/plain 4943 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4MjQ2NjUyOTQwNzNl MDAzZDY2ZjYxZThmMDhjMmMwYWQ4Mjc0Yi4uNDEwNDY1MzY3MzM5NWQzYjIwMzRmOTk4OTgyYjVh ZDlkOTdiMDE3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA0LTE2ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgaW1wbGljaXQg YXNwZWN0LXJhdGlvIGZyb20gd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIHdpdGggZmxvYXQg dmFsdWUgaXMgbm90IGFjY3VyYXRlIGVub3VnaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcyBzaG91 bGQgaW1wYWN0IHRoZSBhc3BlY3QgcmF0aW8gb25seSBub3QgdGhlIGludHJpbnNpYyBzaXplLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbiBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVByZWZlcnJlZExv Z2ljYWxXaWR0aHMpOgorCiAyMDIxLTA0LTEyICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+ CiAKICAgICAgICAgQ2xhbXAgb3ZlcnJpZGluZ0NvbnRlbnRMb2dpY2FsV2lkdGgvSGVpZ2h0IHRv IHplcm8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNl ZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmluZGV4 IGI5ZTQwMGVhMjcwZGEzMTJiNWI5ZDg5OThjOTk3NGJjZTExNWZhODIuLmFhOGY1YzBiYTAxZjI1 NGI1ZDEzZmM3NDBhNDAwYjViYTBlMTBiZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNTAyLDEwICs1MDIsMTEgQEAgdm9pZCBSZW5kZXJSZXBs YWNlZDo6Y29tcHV0ZUludHJpbnNpY1JhdGlvSW5mb3JtYXRpb24oRmxvYXRTaXplJiBpbnRyaW5z aWNTaXplLAogICAgICAgICBpZiAoIWlzPFJlbmRlckltYWdlPigqdGhpcykgfHwgIWRvd25jYXN0 PFJlbmRlckltYWdlPigqdGhpcykuY2FjaGVkSW1hZ2UoKSkKICAgICAgICAgICAgIHJldHVybjsK IAotICAgICAgICBpbnRyaW5zaWNTaXplLnNldFdpZHRoKHBhcnNlVmFsaWRIVE1MRmxvYXRpbmdQ b2ludE51bWJlcihub2RlLT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjp3aWR0aEF0dHIpKS52YWx1 ZU9yKDApKTsKLSAgICAgICAgaW50cmluc2ljU2l6ZS5zZXRIZWlnaHQocGFyc2VWYWxpZEhUTUxG bG9hdGluZ1BvaW50TnVtYmVyKG5vZGUtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmhlaWdodEF0 dHIpKS52YWx1ZU9yKDApKTsKLSAgICAgICAgaWYgKGludHJpbnNpY1NpemUuaXNFbXB0eSgpKQot ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmbG9hdCBhdHRyaWJ1dGVXaWR0aCA9IHBhcnNl VmFsaWRIVE1MRmxvYXRpbmdQb2ludE51bWJlcihub2RlLT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVz Ojp3aWR0aEF0dHIpKS52YWx1ZU9yKDApOworICAgICAgICBmbG9hdCBhdHRyaWJ1dGVIZWlnaHQg PSBwYXJzZVZhbGlkSFRNTEZsb2F0aW5nUG9pbnROdW1iZXIobm9kZS0+Z2V0QXR0cmlidXRlKEhU TUxOYW1lczo6aGVpZ2h0QXR0cikpLnZhbHVlT3IoMCk7CisgICAgICAgIGlmIChhdHRyaWJ1dGVX aWR0aCA+IDAgJiYgYXR0cmlidXRlSGVpZ2h0ID4gMCkKKyAgICAgICAgICAgIGludHJpbnNpY1Jh dGlvID0gYXR0cmlidXRlV2lkdGggLyBhdHRyaWJ1dGVIZWlnaHQ7CisgICAgICAgIHJldHVybjsK ICAgICB9CiAKICAgICBpbnRyaW5zaWNSYXRpbyA9IGludHJpbnNpY1NpemUud2lkdGgoKSAvIGlu dHJpbnNpY1NpemUuaGVpZ2h0KCk7CkBAIC02NzIsMTQgKzY3Myw5IEBAIHZvaWQgUmVuZGVyUmVw bGFjZWQ6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKIAogICAgIC8vIFdlIGNhbm5v dCByZXNvbHZlIGFueSBwZXJjZW50IGxvZ2ljYWwgd2lkdGggaGVyZSBhcyB0aGUgYXZhaWxhYmxl IGxvZ2ljYWwKICAgICAvLyB3aWR0aCBtYXkgbm90IGJlIHNldCBvbiBvdXIgY29udGFpbmluZyBi bG9jay4KLSAgICBpZiAoc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc1BlcmNlbnRPckNhbGN1bGF0 ZWQoKSkgewotICAgICAgICBkb3VibGUgaW50cmluc2ljUmF0aW8gPSAwOwotICAgICAgICBGbG9h dFNpemUgY29uc3RyYWluZWRTaXplOwotICAgICAgICAvLyBGb3IgaW1hZ2VzIHdpdGggZXhwbGlj aXQgd2lkdGgvaGVpZ2h0IHRoaXMgdXBkYXRlcyB0aGUgaW5zdHJpbnNpYyBzaXplIGFzIGEgc2lk ZSBlZmZlY3QuCi0gICAgICAgIGNvbXB1dGVBc3BlY3RSYXRpb0luZm9ybWF0aW9uRm9yUmVuZGVy Qm94KGVtYmVkZGVkQ29udGVudEJveCgpLCBjb25zdHJhaW5lZFNpemUsIGludHJpbnNpY1JhdGlv KTsKLQorICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzUGVyY2VudE9yQ2FsY3VsYXRl ZCgpKQogICAgICAgICBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwotICAgIH0gZWxzZQor ICAgIGVsc2UKICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtX21heFByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChDb21wdXRlUHJl ZmVycmVkKTsKIAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDIwM2RjNjI5OTI2YzBiMWMyMmE4OTA4 NzAzYjhlNjUwMDU0OWI0NGMuLjg1ZDEwNTU2M2E4YjMwNTBiNWEwOGI3YTU5Y2VjN2VkYzgwMDIz MzQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIx LTA0LTE2ICBDYXRoaWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBU aGUgaW1wbGljaXQgYXNwZWN0LXJhdGlvIGZyb20gd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVz IHdpdGggZmxvYXQgdmFsdWUgaXMgbm90IGFjY3VyYXRlIGVub3VnaAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjY0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvaHRt bC9yZW5kZXJpbmcvcmVwbGFjZWQtZWxlbWVudHMvYXR0cmlidXRlcy1mb3ItZW1iZWRkZWQtY29u dGVudC1hbmQtaW1hZ2VzL2ltZy1hc3BlY3QtcmF0aW8tZXhwZWN0ZWQudHh0OgorCiAyMDIxLTA0 LTExICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWR1Y2UgY29t cGlsZSB0aW1lIGFuZCBiaW5hcnkgc2l6ZSBjb3N0IG9mIGVuYWJsaW5nIHByb3BlciBDU1NTdHls ZURlY2xhcmF0aW9uIHByb3BlcnR5IGFjY2VzcyBiZWhhdmlvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3JlbmRlcmluZy9yZXBs YWNlZC1lbGVtZW50cy9hdHRyaWJ1dGVzLWZvci1lbWJlZGRlZC1jb250ZW50LWFuZC1pbWFnZXMv aW1nLWFzcGVjdC1yYXRpby1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvcmVuZGVyaW5nL3JlcGxhY2VkLWVsZW1lbnRzL2F0dHJp YnV0ZXMtZm9yLWVtYmVkZGVkLWNvbnRlbnQtYW5kLWltYWdlcy9pbWctYXNwZWN0LXJhdGlvLWV4 cGVjdGVkLnR4dAppbmRleCBlZjY2Y2YzYTYyZjc0YTM3MmQ0NGIyYjQ3MTNmZTNlMzFmYjM0YTFh Li5jYTg5ZjUxNDE0YmQzNDM0YzIyNzg2NDU5MmE0ODZiN2Y2NTQ2MzUyIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvcmVuZGVyaW5n L3JlcGxhY2VkLWVsZW1lbnRzL2F0dHJpYnV0ZXMtZm9yLWVtYmVkZGVkLWNvbnRlbnQtYW5kLWlt YWdlcy9pbWctYXNwZWN0LXJhdGlvLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvcmVuZGVyaW5nL3JlcGxhY2VkLWVsZW1l bnRzL2F0dHJpYnV0ZXMtZm9yLWVtYmVkZGVkLWNvbnRlbnQtYW5kLWltYWdlcy9pbWctYXNwZWN0 LXJhdGlvLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKIAogCi1GQUlMIEltYWdlIHdpZHRo IGFuZCBoZWlnaHQgYXR0cmlidXRlcyBhcmUgdXNlZCB0byBpbmZlciBhc3BlY3QtcmF0aW8gYXNz ZXJ0X2FwcHJveF9lcXVhbHM6IGV4cGVjdGVkIDQgKy8tIDAuMDAxIGJ1dCBnb3QgNC4xNjY2NjY2 NjY2NjY2NjcKK0ZBSUwgSW1hZ2Ugd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIGFyZSB1c2Vk IHRvIGluZmVyIGFzcGVjdC1yYXRpbyBhc3NlcnRfYXBwcm94X2VxdWFsczogZXhwZWN0ZWQgMS4y NTQ3MTY5ODExMzIwNzU1ICsvLSAwLjAwMSBidXQgZ290IDEuMjUKIAo= 426222 2021-04-16 07:05:25 -0700 2021-04-17 10:03:03 -0700 Patch bug-224664-20210416220522.patch text/plain 5302 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4MjQ2NjUyOTQwNzNl MDAzZDY2ZjYxZThmMDhjMmMwYWQ4Mjc0Yi4uNjE4MjMxYjU5ZDE2MTRhNzg3OGFjYjNmOGZiYWI5 YzJkNWJiZmY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE2ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgaW1wbGljaXQg YXNwZWN0LXJhdGlvIGZyb20gd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIHdpdGggZmxvYXQg dmFsdWUgaXMgbm90IGFjY3VyYXRlIGVub3VnaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcyBzaG91 bGQgaW1wYWN0IHRoZSBhc3BlY3QgcmF0aW8gb25seSBub3QgdGhlIGludHJpbnNpYyBzaXplIHdo aWNoIHNob3VsZCBiZSBmcm9tIHRoZSBjb250ZW50LgorICAgICAgICBTaW5jZSBjb21wdXRlQXNw ZWN0UmF0aW9JbmZvcm1hdGlvbkZvclJlbmRlckJveCBkb2Vzbid0IGNoYW5nZSB0aGUgaW50cmlu c2ljIHNpemUgbm93LCBzbyB3ZSBjYW4gcmVtb3ZlIGl0IGZyb20gY29tcHV0ZVByZWZlcnJlZExv Z2ljYWxXaWR0aHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVJbnRyaW5zaWNSYXRpb0lu Zm9ybWF0aW9uIGNvbnN0KTogV2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIGNoYW5nZSBpbnRy aW5zaWNSYXRpbyBvbmx5LCBub3QgaW50cmluc2ljU2l6ZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6IGNvbXB1dGVBc3Bl Y3RSYXRpb0luZm9ybWF0aW9uRm9yUmVuZGVyQm94IGRvZXNuJ3QgY2hhbmdlIGludHJpbnNpY1Np emUgbm93LCBzbyB3ZSBjYW4gcmVtb3ZlIHRoaXMuCisKIDIwMjEtMDQtMTIgIFJvYiBCdWlzICA8 cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBDbGFtcCBvdmVycmlkaW5nQ29udGVudExvZ2lj YWxXaWR0aC9IZWlnaHQgdG8gemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZXBsYWNlZC5jcHAKaW5kZXggYjllNDAwZWEyNzBkYTMxMmI1YjlkODk5OGM5OTc0YmNlMTE1ZmE4 Mi4uYWE4ZjVjMGJhMDFmMjU0YjVkMTNmYzc0MGE0MDBiNWJhMGUxMGJlYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MDIsMTAgKzUwMiwxMSBA QCB2b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbihG bG9hdFNpemUmIGludHJpbnNpY1NpemUsCiAgICAgICAgIGlmICghaXM8UmVuZGVySW1hZ2U+KCp0 aGlzKSB8fCAhZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCp0aGlzKS5jYWNoZWRJbWFnZSgpKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGludHJpbnNpY1NpemUuc2V0V2lkdGgocGFyc2VW YWxpZEhUTUxGbG9hdGluZ1BvaW50TnVtYmVyKG5vZGUtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6 OndpZHRoQXR0cikpLnZhbHVlT3IoMCkpOwotICAgICAgICBpbnRyaW5zaWNTaXplLnNldEhlaWdo dChwYXJzZVZhbGlkSFRNTEZsb2F0aW5nUG9pbnROdW1iZXIobm9kZS0+Z2V0QXR0cmlidXRlKEhU TUxOYW1lczo6aGVpZ2h0QXR0cikpLnZhbHVlT3IoMCkpOwotICAgICAgICBpZiAoaW50cmluc2lj U2l6ZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGZsb2F0IGF0dHJp YnV0ZVdpZHRoID0gcGFyc2VWYWxpZEhUTUxGbG9hdGluZ1BvaW50TnVtYmVyKG5vZGUtPmdldEF0 dHJpYnV0ZShIVE1MTmFtZXM6OndpZHRoQXR0cikpLnZhbHVlT3IoMCk7CisgICAgICAgIGZsb2F0 IGF0dHJpYnV0ZUhlaWdodCA9IHBhcnNlVmFsaWRIVE1MRmxvYXRpbmdQb2ludE51bWJlcihub2Rl LT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpoZWlnaHRBdHRyKSkudmFsdWVPcigwKTsKKyAgICAg ICAgaWYgKGF0dHJpYnV0ZVdpZHRoID4gMCAmJiBhdHRyaWJ1dGVIZWlnaHQgPiAwKQorICAgICAg ICAgICAgaW50cmluc2ljUmF0aW8gPSBhdHRyaWJ1dGVXaWR0aCAvIGF0dHJpYnV0ZUhlaWdodDsK KyAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGludHJpbnNpY1JhdGlvID0gaW50cmluc2lj U2l6ZS53aWR0aCgpIC8gaW50cmluc2ljU2l6ZS5oZWlnaHQoKTsKQEAgLTY3MiwxNCArNjczLDkg QEAgdm9pZCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQog CiAgICAgLy8gV2UgY2Fubm90IHJlc29sdmUgYW55IHBlcmNlbnQgbG9naWNhbCB3aWR0aCBoZXJl IGFzIHRoZSBhdmFpbGFibGUgbG9naWNhbAogICAgIC8vIHdpZHRoIG1heSBub3QgYmUgc2V0IG9u IG91ciBjb250YWluaW5nIGJsb2NrLgotICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlz UGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7Ci0gICAgICAgIGRvdWJsZSBpbnRyaW5zaWNSYXRpbyA9 IDA7Ci0gICAgICAgIEZsb2F0U2l6ZSBjb25zdHJhaW5lZFNpemU7Ci0gICAgICAgIC8vIEZvciBp bWFnZXMgd2l0aCBleHBsaWNpdCB3aWR0aC9oZWlnaHQgdGhpcyB1cGRhdGVzIHRoZSBpbnN0cmlu c2ljIHNpemUgYXMgYSBzaWRlIGVmZmVjdC4KLSAgICAgICAgY29tcHV0ZUFzcGVjdFJhdGlvSW5m b3JtYXRpb25Gb3JSZW5kZXJCb3goZW1iZWRkZWRDb250ZW50Qm94KCksIGNvbnN0cmFpbmVkU2l6 ZSwgaW50cmluc2ljUmF0aW8pOwotCisgICAgaWYgKHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkpCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCk7Ci0gICAgfSBlbHNlCisgICAgZWxzZQogICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxX aWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gY29tcHV0ZVJlcGxhY2VkTG9naWNh bFdpZHRoKENvbXB1dGVQcmVmZXJyZWQpOwogCiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl VG9Vc2UgPSBzdHlsZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMjAzZGM2 Mjk5MjZjMGIxYzIyYTg5MDg3MDNiOGU2NTAwNTQ5YjQ0Yy4uODVkMTA1NTYzYThiMzA1MGI1YTA4 YjdhNTljZWM3ZWRjODAwMjMzNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTIgQEAKKzIwMjEtMDQtMTYgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEu Y29tPgorCisgICAgICAgIFRoZSBpbXBsaWNpdCBhc3BlY3QtcmF0aW8gZnJvbSB3aWR0aCBhbmQg aGVpZ2h0IGF0dHJpYnV0ZXMgd2l0aCBmbG9hdCB2YWx1ZSBpcyBub3QgYWNjdXJhdGUgZW5vdWdo CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ2NjQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1w bGF0Zm9ybS10ZXN0cy9odG1sL3JlbmRlcmluZy9yZXBsYWNlZC1lbGVtZW50cy9hdHRyaWJ1dGVz LWZvci1lbWJlZGRlZC1jb250ZW50LWFuZC1pbWFnZXMvaW1nLWFzcGVjdC1yYXRpby1leHBlY3Rl ZC50eHQ6CisKIDIwMjEtMDQtMTEgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlZHVjZSBjb21waWxlIHRpbWUgYW5kIGJpbmFyeSBzaXplIGNvc3Qgb2YgZW5hYmxp bmcgcHJvcGVyIENTU1N0eWxlRGVjbGFyYXRpb24gcHJvcGVydHkgYWNjZXNzIGJlaGF2aW9yCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0 bWwvcmVuZGVyaW5nL3JlcGxhY2VkLWVsZW1lbnRzL2F0dHJpYnV0ZXMtZm9yLWVtYmVkZGVkLWNv bnRlbnQtYW5kLWltYWdlcy9pbWctYXNwZWN0LXJhdGlvLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9yZW5kZXJpbmcvcmVwbGFj ZWQtZWxlbWVudHMvYXR0cmlidXRlcy1mb3ItZW1iZWRkZWQtY29udGVudC1hbmQtaW1hZ2VzL2lt Zy1hc3BlY3QtcmF0aW8tZXhwZWN0ZWQudHh0CmluZGV4IGVmNjZjZjNhNjJmNzRhMzcyZDQ0YjJi NDcxM2ZlM2UzMWZiMzRhMWEuLmNhODlmNTE0MTRiZDM0MzRjMjI3ODY0NTkyYTQ4NmI3ZjY1NDYz NTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvaHRtbC9yZW5kZXJpbmcvcmVwbGFjZWQtZWxlbWVudHMvYXR0cmlidXRlcy1mb3ItZW1iZWRk ZWQtY29udGVudC1hbmQtaW1hZ2VzL2ltZy1hc3BlY3QtcmF0aW8tZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9yZW5kZXJp bmcvcmVwbGFjZWQtZWxlbWVudHMvYXR0cmlidXRlcy1mb3ItZW1iZWRkZWQtY29udGVudC1hbmQt aW1hZ2VzL2ltZy1hc3BlY3QtcmF0aW8tZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBAQAogCiAK LUZBSUwgSW1hZ2Ugd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIGFyZSB1c2VkIHRvIGluZmVy IGFzcGVjdC1yYXRpbyBhc3NlcnRfYXBwcm94X2VxdWFsczogZXhwZWN0ZWQgNCArLy0gMC4wMDEg YnV0IGdvdCA0LjE2NjY2NjY2NjY2NjY2NworRkFJTCBJbWFnZSB3aWR0aCBhbmQgaGVpZ2h0IGF0 dHJpYnV0ZXMgYXJlIHVzZWQgdG8gaW5mZXIgYXNwZWN0LXJhdGlvIGFzc2VydF9hcHByb3hfZXF1 YWxzOiBleHBlY3RlZCAxLjI1NDcxNjk4MTEzMjA3NTUgKy8tIDAuMDAxIGJ1dCBnb3QgMS4yNQog Cg== 426335 2021-04-17 10:03:07 -0700 2021-04-18 01:37:21 -0700 Patch bug-224664-20210418010306.patch text/plain 5566 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4MjQ2NjUyOTQwNzNl MDAzZDY2ZjYxZThmMDhjMmMwYWQ4Mjc0Yi4uNjE4MjMxYjU5ZDE2MTRhNzg3OGFjYjNmOGZiYWI5 YzJkNWJiZmY5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE2ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgaW1wbGljaXQg YXNwZWN0LXJhdGlvIGZyb20gd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIHdpdGggZmxvYXQg dmFsdWUgaXMgbm90IGFjY3VyYXRlIGVub3VnaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcyBzaG91 bGQgaW1wYWN0IHRoZSBhc3BlY3QgcmF0aW8gb25seSBub3QgdGhlIGludHJpbnNpYyBzaXplIHdo aWNoIHNob3VsZCBiZSBmcm9tIHRoZSBjb250ZW50LgorICAgICAgICBTaW5jZSBjb21wdXRlQXNw ZWN0UmF0aW9JbmZvcm1hdGlvbkZvclJlbmRlckJveCBkb2Vzbid0IGNoYW5nZSB0aGUgaW50cmlu c2ljIHNpemUgbm93LCBzbyB3ZSBjYW4gcmVtb3ZlIGl0IGZyb20gY29tcHV0ZVByZWZlcnJlZExv Z2ljYWxXaWR0aHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVJbnRyaW5zaWNSYXRpb0lu Zm9ybWF0aW9uIGNvbnN0KTogV2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIGNoYW5nZSBpbnRy aW5zaWNSYXRpbyBvbmx5LCBub3QgaW50cmluc2ljU2l6ZS4KKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6IGNvbXB1dGVBc3Bl Y3RSYXRpb0luZm9ybWF0aW9uRm9yUmVuZGVyQm94IGRvZXNuJ3QgY2hhbmdlIGludHJpbnNpY1Np emUgbm93LCBzbyB3ZSBjYW4gcmVtb3ZlIHRoaXMuCisKIDIwMjEtMDQtMTIgIFJvYiBCdWlzICA8 cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBDbGFtcCBvdmVycmlkaW5nQ29udGVudExvZ2lj YWxXaWR0aC9IZWlnaHQgdG8gemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZXBsYWNlZC5jcHAKaW5kZXggYjllNDAwZWEyNzBkYTMxMmI1YjlkODk5OGM5OTc0YmNlMTE1ZmE4 Mi4uYWE4ZjVjMGJhMDFmMjU0YjVkMTNmYzc0MGE0MDBiNWJhMGUxMGJlYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MDIsMTAgKzUwMiwxMSBA QCB2b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbihG bG9hdFNpemUmIGludHJpbnNpY1NpemUsCiAgICAgICAgIGlmICghaXM8UmVuZGVySW1hZ2U+KCp0 aGlzKSB8fCAhZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCp0aGlzKS5jYWNoZWRJbWFnZSgpKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGludHJpbnNpY1NpemUuc2V0V2lkdGgocGFyc2VW YWxpZEhUTUxGbG9hdGluZ1BvaW50TnVtYmVyKG5vZGUtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6 OndpZHRoQXR0cikpLnZhbHVlT3IoMCkpOwotICAgICAgICBpbnRyaW5zaWNTaXplLnNldEhlaWdo dChwYXJzZVZhbGlkSFRNTEZsb2F0aW5nUG9pbnROdW1iZXIobm9kZS0+Z2V0QXR0cmlidXRlKEhU TUxOYW1lczo6aGVpZ2h0QXR0cikpLnZhbHVlT3IoMCkpOwotICAgICAgICBpZiAoaW50cmluc2lj U2l6ZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGZsb2F0IGF0dHJp YnV0ZVdpZHRoID0gcGFyc2VWYWxpZEhUTUxGbG9hdGluZ1BvaW50TnVtYmVyKG5vZGUtPmdldEF0 dHJpYnV0ZShIVE1MTmFtZXM6OndpZHRoQXR0cikpLnZhbHVlT3IoMCk7CisgICAgICAgIGZsb2F0 IGF0dHJpYnV0ZUhlaWdodCA9IHBhcnNlVmFsaWRIVE1MRmxvYXRpbmdQb2ludE51bWJlcihub2Rl LT5nZXRBdHRyaWJ1dGUoSFRNTE5hbWVzOjpoZWlnaHRBdHRyKSkudmFsdWVPcigwKTsKKyAgICAg ICAgaWYgKGF0dHJpYnV0ZVdpZHRoID4gMCAmJiBhdHRyaWJ1dGVIZWlnaHQgPiAwKQorICAgICAg ICAgICAgaW50cmluc2ljUmF0aW8gPSBhdHRyaWJ1dGVXaWR0aCAvIGF0dHJpYnV0ZUhlaWdodDsK KyAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGludHJpbnNpY1JhdGlvID0gaW50cmluc2lj U2l6ZS53aWR0aCgpIC8gaW50cmluc2ljU2l6ZS5oZWlnaHQoKTsKQEAgLTY3MiwxNCArNjczLDkg QEAgdm9pZCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQog CiAgICAgLy8gV2UgY2Fubm90IHJlc29sdmUgYW55IHBlcmNlbnQgbG9naWNhbCB3aWR0aCBoZXJl IGFzIHRoZSBhdmFpbGFibGUgbG9naWNhbAogICAgIC8vIHdpZHRoIG1heSBub3QgYmUgc2V0IG9u IG91ciBjb250YWluaW5nIGJsb2NrLgotICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlz UGVyY2VudE9yQ2FsY3VsYXRlZCgpKSB7Ci0gICAgICAgIGRvdWJsZSBpbnRyaW5zaWNSYXRpbyA9 IDA7Ci0gICAgICAgIEZsb2F0U2l6ZSBjb25zdHJhaW5lZFNpemU7Ci0gICAgICAgIC8vIEZvciBp bWFnZXMgd2l0aCBleHBsaWNpdCB3aWR0aC9oZWlnaHQgdGhpcyB1cGRhdGVzIHRoZSBpbnN0cmlu c2ljIHNpemUgYXMgYSBzaWRlIGVmZmVjdC4KLSAgICAgICAgY29tcHV0ZUFzcGVjdFJhdGlvSW5m b3JtYXRpb25Gb3JSZW5kZXJCb3goZW1iZWRkZWRDb250ZW50Qm94KCksIGNvbnN0cmFpbmVkU2l6 ZSwgaW50cmluc2ljUmF0aW8pOwotCisgICAgaWYgKHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkpCiAgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCk7Ci0gICAgfSBlbHNlCisgICAgZWxzZQogICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxX aWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gY29tcHV0ZVJlcGxhY2VkTG9naWNh bFdpZHRoKENvbXB1dGVQcmVmZXJyZWQpOwogCiAgICAgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxl VG9Vc2UgPSBzdHlsZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0No YW5nZUxvZyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggMjAzZGM2 Mjk5MjZjMGIxYzIyYTg5MDg3MDNiOGU2NTAwNTQ5YjQ0Yy4uNjViZGQyYjNmM2IzYzEwYTA0MTQ3 Yjk2ZDUyZDhjZmJhOTg5ZmEzMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMjEtMDQtMTYgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEu Y29tPgorCisgICAgICAgIFRoZSBpbXBsaWNpdCBhc3BlY3QtcmF0aW8gZnJvbSB3aWR0aCBhbmQg aGVpZ2h0IGF0dHJpYnV0ZXMgd2l0aCBmbG9hdCB2YWx1ZSBpcyBub3QgYWNjdXJhdGUgZW5vdWdo CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ2NjQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYXNw ZWN0IHJhdGlvIHRlc3QgY2FzZSB3aXRoIHdpZHRoICIwLjgiIGFuZCBoZWlnaHQgIjAuMiIgaW4g aW1nLWFzcGVjdC1yYXRpby5odG1sIGhhcyBwYXNzZWQuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFu Z2UgdGhlIGJlaGF2aW9yIG9mCisgICAgICAgIHRoZSBvcmlnaW5hbCBhc3BlY3QgcmF0aW8gdGVz dCBjYXNlKGBhc3NlcnRfcmF0aW8oaW1hZ2VzWzVdLCAxMzMvMTA2KWApIHdoaWNoIGlzIHJlbGF0 ZWQgdG8gYnVnIDIwNjE2MS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3Jl bmRlcmluZy9yZXBsYWNlZC1lbGVtZW50cy9hdHRyaWJ1dGVzLWZvci1lbWJlZGRlZC1jb250ZW50 LWFuZC1pbWFnZXMvaW1nLWFzcGVjdC1yYXRpby1leHBlY3RlZC50eHQ6CisKIDIwMjEtMDQtMTEg IFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZHVjZSBjb21waWxl IHRpbWUgYW5kIGJpbmFyeSBzaXplIGNvc3Qgb2YgZW5hYmxpbmcgcHJvcGVyIENTU1N0eWxlRGVj bGFyYXRpb24gcHJvcGVydHkgYWNjZXNzIGJlaGF2aW9yCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvcmVuZGVyaW5nL3JlcGxhY2Vk LWVsZW1lbnRzL2F0dHJpYnV0ZXMtZm9yLWVtYmVkZGVkLWNvbnRlbnQtYW5kLWltYWdlcy9pbWct YXNwZWN0LXJhdGlvLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvaHRtbC9yZW5kZXJpbmcvcmVwbGFjZWQtZWxlbWVudHMvYXR0cmlidXRl cy1mb3ItZW1iZWRkZWQtY29udGVudC1hbmQtaW1hZ2VzL2ltZy1hc3BlY3QtcmF0aW8tZXhwZWN0 ZWQudHh0CmluZGV4IGVmNjZjZjNhNjJmNzRhMzcyZDQ0YjJiNDcxM2ZlM2UzMWZiMzRhMWEuLmNh ODlmNTE0MTRiZDM0MzRjMjI3ODY0NTkyYTQ4NmI3ZjY1NDYzNTIgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9yZW5kZXJpbmcvcmVw bGFjZWQtZWxlbWVudHMvYXR0cmlidXRlcy1mb3ItZW1iZWRkZWQtY29udGVudC1hbmQtaW1hZ2Vz L2ltZy1hc3BlY3QtcmF0aW8tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9yZW5kZXJpbmcvcmVwbGFjZWQtZWxlbWVudHMv YXR0cmlidXRlcy1mb3ItZW1iZWRkZWQtY29udGVudC1hbmQtaW1hZ2VzL2ltZy1hc3BlY3QtcmF0 aW8tZXhwZWN0ZWQudHh0CkBAIC0xLDQgKzEsNCBAQAogCiAKLUZBSUwgSW1hZ2Ugd2lkdGggYW5k IGhlaWdodCBhdHRyaWJ1dGVzIGFyZSB1c2VkIHRvIGluZmVyIGFzcGVjdC1yYXRpbyBhc3NlcnRf YXBwcm94X2VxdWFsczogZXhwZWN0ZWQgNCArLy0gMC4wMDEgYnV0IGdvdCA0LjE2NjY2NjY2NjY2 NjY2NworRkFJTCBJbWFnZSB3aWR0aCBhbmQgaGVpZ2h0IGF0dHJpYnV0ZXMgYXJlIHVzZWQgdG8g aW5mZXIgYXNwZWN0LXJhdGlvIGFzc2VydF9hcHByb3hfZXF1YWxzOiBleHBlY3RlZCAxLjI1NDcx Njk4MTEzMjA3NTUgKy8tIDAuMDAxIGJ1dCBnb3QgMS4yNQogCg== 426373 2021-04-18 01:37:25 -0700 2021-04-18 05:45:43 -0700 Patch bug-224664-20210418163724.patch text/plain 5562 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4MjQ2NjUyOTQwNzNl MDAzZDY2ZjYxZThmMDhjMmMwYWQ4Mjc0Yi4uNmFlYTZjOTBjMDkxNGEzYjgyY2EyNWMwNzA5ZWQ1 MjIxOTNlMmFjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE2ICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBUaGUgaW1wbGljaXQg YXNwZWN0LXJhdGlvIGZyb20gd2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIHdpdGggZmxvYXQg dmFsdWUgaXMgbm90IGFjY3VyYXRlIGVub3VnaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCisKKyAgICAgICAgVGhlIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcyBzaG91bGQg aW1wYWN0IHRoZSBhc3BlY3QgcmF0aW8gb25seSBub3QgdGhlIGludHJpbnNpYyBzaXplIHdoaWNo IHNob3VsZCBiZSBmcm9tIHRoZSBjb250ZW50LgorICAgICAgICBTaW5jZSBjb21wdXRlQXNwZWN0 UmF0aW9JbmZvcm1hdGlvbkZvclJlbmRlckJveCBkb2Vzbid0IGNoYW5nZSB0aGUgaW50cmluc2lj IHNpemUgbm93LCBzbyB3ZSBjYW4gcmVtb3ZlIGl0IGZyb20gY29tcHV0ZVByZWZlcnJlZExvZ2lj YWxXaWR0aHMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVJbnRyaW5zaWNSYXRpb0luZm9y bWF0aW9uIGNvbnN0KTogV2lkdGggYW5kIGhlaWdodCBhdHRyaWJ1dGVzIGNoYW5nZSBpbnRyaW5z aWNSYXRpbyBvbmx5LCBub3QgaW50cmluc2ljU2l6ZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocyk6IGNvbXB1dGVBc3BlY3RS YXRpb0luZm9ybWF0aW9uRm9yUmVuZGVyQm94IGRvZXNuJ3QgY2hhbmdlIGludHJpbnNpY1NpemUg bm93LCBzbyB3ZSBjYW4gcmVtb3ZlIHRoaXMuCisKIDIwMjEtMDQtMTIgIFJvYiBCdWlzICA8cmJ1 aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBDbGFtcCBvdmVycmlkaW5nQ29udGVudExvZ2ljYWxX aWR0aC9IZWlnaHQgdG8gemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBs YWNlZC5jcHAKaW5kZXggYjllNDAwZWEyNzBkYTMxMmI1YjlkODk5OGM5OTc0YmNlMTE1ZmE4Mi4u ODU2YmEyMjc1OTMwNTVjNjBiOWI0NzI5MGZkMmY0MGUyN2RiYzY5YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MDIsMTAgKzUwMiwxMSBAQCB2 b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlSW50cmluc2ljUmF0aW9JbmZvcm1hdGlvbihGbG9h dFNpemUmIGludHJpbnNpY1NpemUsCiAgICAgICAgIGlmICghaXM8UmVuZGVySW1hZ2U+KCp0aGlz KSB8fCAhZG93bmNhc3Q8UmVuZGVySW1hZ2U+KCp0aGlzKS5jYWNoZWRJbWFnZSgpKQogICAgICAg ICAgICAgcmV0dXJuOwogCi0gICAgICAgIGludHJpbnNpY1NpemUuc2V0V2lkdGgocGFyc2VWYWxp ZEhUTUxGbG9hdGluZ1BvaW50TnVtYmVyKG5vZGUtPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6Ondp ZHRoQXR0cikpLnZhbHVlT3IoMCkpOwotICAgICAgICBpbnRyaW5zaWNTaXplLnNldEhlaWdodChw YXJzZVZhbGlkSFRNTEZsb2F0aW5nUG9pbnROdW1iZXIobm9kZS0+Z2V0QXR0cmlidXRlKEhUTUxO YW1lczo6aGVpZ2h0QXR0cikpLnZhbHVlT3IoMCkpOwotICAgICAgICBpZiAoaW50cmluc2ljU2l6 ZS5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGRvdWJsZSBhdHRyaWJ1 dGVXaWR0aCA9IHBhcnNlVmFsaWRIVE1MRmxvYXRpbmdQb2ludE51bWJlcihub2RlLT5nZXRBdHRy aWJ1dGUoSFRNTE5hbWVzOjp3aWR0aEF0dHIpKS52YWx1ZU9yKDApOworICAgICAgICBkb3VibGUg YXR0cmlidXRlSGVpZ2h0ID0gcGFyc2VWYWxpZEhUTUxGbG9hdGluZ1BvaW50TnVtYmVyKG5vZGUt PmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmhlaWdodEF0dHIpKS52YWx1ZU9yKDApOworICAgICAg ICBpZiAoYXR0cmlidXRlV2lkdGggPiAwICYmIGF0dHJpYnV0ZUhlaWdodCA+IDApCisgICAgICAg ICAgICBpbnRyaW5zaWNSYXRpbyA9IGF0dHJpYnV0ZVdpZHRoIC8gYXR0cmlidXRlSGVpZ2h0Owor ICAgICAgICByZXR1cm47CiAgICAgfQogCiAgICAgaW50cmluc2ljUmF0aW8gPSBpbnRyaW5zaWNT aXplLndpZHRoKCkgLyBpbnRyaW5zaWNTaXplLmhlaWdodCgpOwpAQCAtNjcyLDE0ICs2NzMsOSBA QCB2b2lkIFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAK ICAgICAvLyBXZSBjYW5ub3QgcmVzb2x2ZSBhbnkgcGVyY2VudCBsb2dpY2FsIHdpZHRoIGhlcmUg YXMgdGhlIGF2YWlsYWJsZSBsb2dpY2FsCiAgICAgLy8gd2lkdGggbWF5IG5vdCBiZSBzZXQgb24g b3VyIGNvbnRhaW5pbmcgYmxvY2suCi0gICAgaWYgKHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNQ ZXJjZW50T3JDYWxjdWxhdGVkKCkpIHsKLSAgICAgICAgZG91YmxlIGludHJpbnNpY1JhdGlvID0g MDsKLSAgICAgICAgRmxvYXRTaXplIGNvbnN0cmFpbmVkU2l6ZTsKLSAgICAgICAgLy8gRm9yIGlt YWdlcyB3aXRoIGV4cGxpY2l0IHdpZHRoL2hlaWdodCB0aGlzIHVwZGF0ZXMgdGhlIGluc3RyaW5z aWMgc2l6ZSBhcyBhIHNpZGUgZWZmZWN0LgotICAgICAgICBjb21wdXRlQXNwZWN0UmF0aW9JbmZv cm1hdGlvbkZvclJlbmRlckJveChlbWJlZGRlZENvbnRlbnRCb3goKSwgY29uc3RyYWluZWRTaXpl LCBpbnRyaW5zaWNSYXRpbyk7Ci0KKyAgICBpZiAoc3R5bGUoKS5sb2dpY2FsV2lkdGgoKS5pc1Bl cmNlbnRPckNhbGN1bGF0ZWQoKSkKICAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0 aHMobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo KTsKLSAgICB9IGVsc2UKKyAgICBlbHNlCiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdp ZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBjb21wdXRlUmVwbGFjZWRMb2dpY2Fs V2lkdGgoQ29tcHV0ZVByZWZlcnJlZCk7CiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVU b1VzZSA9IHN0eWxlKCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwppbmRleCAyMDNkYzYy OTkyNmMwYjFjMjJhODkwODcwM2I4ZTY1MDA1NDliNDRjLi4wOTI4NGFmNzA5OGExYTIyYTY4OTM0 MDMwNTJjMWQzZDBmNjI2NjI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMS0wNC0xNiAgQ2F0aGllIENoZW4gIDxjYXRoaWVjaGVuQGlnYWxpYS5j b20+CisKKyAgICAgICAgVGhlIGltcGxpY2l0IGFzcGVjdC1yYXRpbyBmcm9tIHdpZHRoIGFuZCBo ZWlnaHQgYXR0cmlidXRlcyB3aXRoIGZsb2F0IHZhbHVlIGlzIG5vdCBhY2N1cmF0ZSBlbm91Z2gK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDY2NAor CisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFRoZSBhc3BlY3Qg cmF0aW8gdGVzdCBjYXNlIHdpdGggd2lkdGggIjAuOCIgYW5kIGhlaWdodCAiMC4yIiBpbiBpbWct YXNwZWN0LXJhdGlvLmh0bWwgaGFzIHBhc3NlZC4gVGhpcyBwYXRjaCBkb2Vzbid0IGNoYW5nZSB0 aGUgYmVoYXZpb3Igb2YKKyAgICAgICAgdGhlIG9yaWdpbmFsIGFzcGVjdCByYXRpbyB0ZXN0IGNh c2UoYGFzc2VydF9yYXRpbyhpbWFnZXNbNV0sIDEzMy8xMDYpYCkgd2hpY2ggaXMgcmVsYXRlZCB0 byBidWcgMjA2MTYxLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvcmVuZGVy aW5nL3JlcGxhY2VkLWVsZW1lbnRzL2F0dHJpYnV0ZXMtZm9yLWVtYmVkZGVkLWNvbnRlbnQtYW5k LWltYWdlcy9pbWctYXNwZWN0LXJhdGlvLWV4cGVjdGVkLnR4dDoKKwogMjAyMS0wNC0xMSAgU2Ft IFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVkdWNlIGNvbXBpbGUgdGlt ZSBhbmQgYmluYXJ5IHNpemUgY29zdCBvZiBlbmFibGluZyBwcm9wZXIgQ1NTU3R5bGVEZWNsYXJh dGlvbiBwcm9wZXJ0eSBhY2Nlc3MgYmVoYXZpb3IKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9yZW5kZXJpbmcvcmVwbGFjZWQtZWxl bWVudHMvYXR0cmlidXRlcy1mb3ItZW1iZWRkZWQtY29udGVudC1hbmQtaW1hZ2VzL2ltZy1hc3Bl Y3QtcmF0aW8tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9odG1sL3JlbmRlcmluZy9yZXBsYWNlZC1lbGVtZW50cy9hdHRyaWJ1dGVzLWZv ci1lbWJlZGRlZC1jb250ZW50LWFuZC1pbWFnZXMvaW1nLWFzcGVjdC1yYXRpby1leHBlY3RlZC50 eHQKaW5kZXggZWY2NmNmM2E2MmY3NGEzNzJkNDRiMmI0NzEzZmUzZTMxZmIzNGExYS4uY2E4OWY1 MTQxNGJkMzQzNGMyMjc4NjQ1OTJhNDg2YjdmNjU0NjM1MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3JlbmRlcmluZy9yZXBsYWNl ZC1lbGVtZW50cy9hdHRyaWJ1dGVzLWZvci1lbWJlZGRlZC1jb250ZW50LWFuZC1pbWFnZXMvaW1n LWFzcGVjdC1yYXRpby1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9odG1sL3JlbmRlcmluZy9yZXBsYWNlZC1lbGVtZW50cy9hdHRy aWJ1dGVzLWZvci1lbWJlZGRlZC1jb250ZW50LWFuZC1pbWFnZXMvaW1nLWFzcGVjdC1yYXRpby1l eHBlY3RlZC50eHQKQEAgLTEsNCArMSw0IEBACiAKIAotRkFJTCBJbWFnZSB3aWR0aCBhbmQgaGVp Z2h0IGF0dHJpYnV0ZXMgYXJlIHVzZWQgdG8gaW5mZXIgYXNwZWN0LXJhdGlvIGFzc2VydF9hcHBy b3hfZXF1YWxzOiBleHBlY3RlZCA0ICsvLSAwLjAwMSBidXQgZ290IDQuMTY2NjY2NjY2NjY2NjY3 CitGQUlMIEltYWdlIHdpZHRoIGFuZCBoZWlnaHQgYXR0cmlidXRlcyBhcmUgdXNlZCB0byBpbmZl ciBhc3BlY3QtcmF0aW8gYXNzZXJ0X2FwcHJveF9lcXVhbHM6IGV4cGVjdGVkIDEuMjU0NzE2OTgx MTMyMDc1NSArLy0gMC4wMDEgYnV0IGdvdCAxLjI1CiAK