216374 2020-09-10 12:19:36 -0700 [Repaint] RenderLayerModelObject::styleWillChange may issue redundant repaint 2020-09-10 17:32:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist fred.wang glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1687495 0 zalan 2020-09-10 12:19:36 -0700 by calling layer()->repaintIncludingDescendants() 1687496 1 webkit-bug-importer 2020-09-10 12:20:05 -0700 <rdar://problem/68657490> 1687500 2 408467 zalan 2020-09-10 12:26:40 -0700 Created attachment 408467 Patch 1687501 3 zalan 2020-09-10 12:27:15 -0700 EWS testing first. 1687509 4 408467 simon.fraser 2020-09-10 12:57:03 -0700 Comment on attachment 408467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408467&action=review > Source/WebCore/rendering/RenderElement.cpp:389 > + enum RepaintCoverage { None, RendererOnly, RendererAndDescendantsRenderersWithLayers }; RepaintCoverage is a bit ambiguous; it's not clear if it's "repaints done" or "repaints that need to be done". Maybe call it RequiredRepaint? > Source/WebCore/rendering/RenderElement.cpp:400 > + // When a layout hint happens, we do a repaint of the layer, since the layer could end up being destroyed. "layout hint" seems like old terminology. > Source/WebCore/rendering/RenderElement.cpp:401 > + auto layerMayGetDestroyed = oldStyle.position() != newStyle.position() || oldStyle.usedZIndex() != newStyle.usedZIndex() || oldStyle.clip() != newStyle.clip() || oldStyle.hasClip() != newStyle.hasClip() We can clearly do a better job of testing which style changes will result in the layer actually being destroyed. 1687531 5 zalan 2020-09-10 14:17:48 -0700 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 408467 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=408467&action=review > > > Source/WebCore/rendering/RenderElement.cpp:389 > > + enum RepaintCoverage { None, RendererOnly, RendererAndDescendantsRenderersWithLayers }; > > RepaintCoverage is a bit ambiguous; it's not clear if it's "repaints done" > or "repaints that need to be done". Maybe call it RequiredRepaint? Yeah, that sounds better. > > > Source/WebCore/rendering/RenderElement.cpp:400 > > + // When a layout hint happens, we do a repaint of the layer, since the layer could end up being destroyed. > > "layout hint" seems like old terminology. Will remove. > > > Source/WebCore/rendering/RenderElement.cpp:401 > > + auto layerMayGetDestroyed = oldStyle.position() != newStyle.position() || oldStyle.usedZIndex() != newStyle.usedZIndex() || oldStyle.clip() != newStyle.clip() || oldStyle.hasClip() != newStyle.hasClip() > > We can clearly do a better job of testing which style changes will result in > the layer actually being destroyed. I am sure we can. I don't think it should be part of this patch though. 1687544 6 408479 zalan 2020-09-10 14:51:24 -0700 Created attachment 408479 Patch 1687549 7 408479 simon.fraser 2020-09-10 14:57:53 -0700 Comment on attachment 408479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408479&action=review > Source/WebCore/rendering/RenderElement.cpp:401 > + auto layerMayGetDestroyed = oldStyle.position() != newStyle.position() || oldStyle.usedZIndex() != newStyle.usedZIndex() || oldStyle.clip() != newStyle.clip() || oldStyle.hasClip() != newStyle.hasClip() > + || oldStyle.hasAutoUsedZIndex() != newStyle.hasAutoUsedZIndex() || oldStyle.opacity() != newStyle.opacity() || oldStyle.transform() != newStyle.transform() || oldStyle.filter() != newStyle.filter(); I prefer the more wrapped version but ¯\_(ツ)_/¯ 1687558 8 408482 zalan 2020-09-10 15:10:45 -0700 Created attachment 408482 Patch 1687608 9 ews-feeder 2020-09-10 17:32:50 -0700 Committed r266901: <https://trac.webkit.org/changeset/266901> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408482. 408467 2020-09-10 12:26:40 -0700 2020-09-10 14:51:22 -0700 Patch bug-216374-20200910122639.patch text/plain 9776 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRhODMxNzQ4MDdkNmE4 ZDk0N2VmZmFkOWI3OGNhNTBiODYxZTBhNC4uODRkM2JiZGE2MmM3Njc3YzdkZjk0ZDIzOTViMTZk YmE4ZWU4NDdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA5LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlcGFpbnRdIFJlbmRlckxh eWVyTW9kZWxPYmplY3Q6OnN0eWxlV2lsbENoYW5nZSBtYXkgaXNzdWUgcmVkdW5kYW50IHJlcGFp bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjM3 NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg2NTc0OTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUgcmVwYWludEluY2x1ZGluZ0Rl c2NlbmRhbnRzKCkgY2FsbHMgdG8gcmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlKCkgdG8gYXZvaWQg cmVkdW5kYW50IHJlcGFpbnRzIG9uIHRoZSBzYW1lIHJlbmRlcmVyLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVu dDo6cmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXJNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVs T2JqZWN0OjpzdHlsZVdpbGxDaGFuZ2UpOgorCiAyMDIwLTA5LTEwICBTYWlkIEFib3UtSGFsbGF3 YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NHXSBSRUdSRVNTSU9OIChC aWcgU3VyKTogQSBHSUYgaW1hZ2Ugd2l0aCBhIGZpbml0ZSBsb29wQ291bnQgbG9vcHMgYW4gZXh0 cmEgY3ljbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRl eCAwYWExZTc2YjBmNjUxOTQ4MjYyNjVkMmQ1MmFhMTRhMTgxNDIwNTAwLi42NWUxMTJjNmYwZWQz YzczMDhjODQ2MzRmZTEyNDk4YmE3MzE2NzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVsZW1lbnQuY3BwCkBAIC0zODYsMzYgKzM4Niw1NCBAQCBib29sIFJlbmRlckVsZW1l bnQ6OnJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3Qg UmVuZGVyUwogICAgICAgICAvLyBSZXBhaW50IG9uIGhpZGRlbiByZW5kZXJlciBpcyBhIG5vLW9w LgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIGF1dG8gc2hvdWxkUmVwYWludEJl Zm9yZVN0eWxlQ2hhbmdlID0gWyZdIHsKKyAgICBlbnVtIFJlcGFpbnRDb3ZlcmFnZSB7IE5vbmUs IFJlbmRlcmVyT25seSwgUmVuZGVyZXJBbmREZXNjZW5kYW50c1JlbmRlcmVyc1dpdGhMYXllcnMg fTsKKyAgICBhdXRvIHNob3VsZFJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZSA9IFsmXSgpIC0+IFJl cGFpbnRDb3ZlcmFnZSB7CiAgICAgICAgIGlmICghcGFyZW50KCkpIHsKICAgICAgICAgICAgIC8v IENhbid0IHJlc29sdmUgYWJzb2x1dGUgY29vcmRpbmF0ZXMuCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gUmVwYWludENvdmVyYWdlOjpOb25lOworICAgICAg ICB9CisgICAgICAgIGlmIChpczxSZW5kZXJMYXllck1vZGVsT2JqZWN0Pih0aGlzKSAmJiBoYXNM YXllcigpKSB7CisgICAgICAgICAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6OlJlcGFp bnRMYXllcikKKyAgICAgICAgICAgICAgICByZXR1cm4gUmVwYWludENvdmVyYWdlOjpSZW5kZXJl ckFuZERlc2NlbmRhbnRzUmVuZGVyZXJzV2l0aExheWVyczsKKworICAgICAgICAgICAgaWYgKGRp ZmYgPT0gU3R5bGVEaWZmZXJlbmNlOjpMYXlvdXQgfHwgZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6 OlNpbXBsaWZpZWRMYXlvdXQpIHsKKyAgICAgICAgICAgICAgICAvLyBXaGVuIGEgbGF5b3V0IGhp bnQgaGFwcGVucywgd2UgZG8gYSByZXBhaW50IG9mIHRoZSBsYXllciwgc2luY2UgdGhlIGxheWVy IGNvdWxkIGVuZCB1cCBiZWluZyBkZXN0cm95ZWQuCisgICAgICAgICAgICAgICAgYXV0byBsYXll ck1heUdldERlc3Ryb3llZCA9IG9sZFN0eWxlLnBvc2l0aW9uKCkgIT0gbmV3U3R5bGUucG9zaXRp b24oKSB8fCBvbGRTdHlsZS51c2VkWkluZGV4KCkgIT0gbmV3U3R5bGUudXNlZFpJbmRleCgpIHx8 IG9sZFN0eWxlLmNsaXAoKSAhPSBuZXdTdHlsZS5jbGlwKCkgfHwgb2xkU3R5bGUuaGFzQ2xpcCgp ICE9IG5ld1N0eWxlLmhhc0NsaXAoKQorICAgICAgICAgICAgICAgICAgICB8fCBvbGRTdHlsZS5o YXNBdXRvVXNlZFpJbmRleCgpICE9IG5ld1N0eWxlLmhhc0F1dG9Vc2VkWkluZGV4KCkgfHwgb2xk U3R5bGUub3BhY2l0eSgpICE9IG5ld1N0eWxlLm9wYWNpdHkoKSB8fCBvbGRTdHlsZS50cmFuc2Zv cm0oKSAhPSBuZXdTdHlsZS50cmFuc2Zvcm0oKSB8fCBvbGRTdHlsZS5maWx0ZXIoKSAhPSBuZXdT dHlsZS5maWx0ZXIoKTsKKyAgICAgICAgICAgICAgICBpZiAobGF5ZXJNYXlHZXREZXN0cm95ZWQp CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXBhaW50Q292ZXJhZ2U6OlJlbmRlcmVyQW5k RGVzY2VuZGFudHNSZW5kZXJlcnNXaXRoTGF5ZXJzOworICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgICAgIGlmIChzaG91bGRSZXBhaW50Rm9yU3R5bGVEaWZmZXJlbmNlKGRpZmYpKQotICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICByZXR1cm4gUmVwYWludENvdmVyYWdl OjpSZW5kZXJlck9ubHk7CiAgICAgICAgIGlmIChuZXdTdHlsZS5vdXRsaW5lU2l6ZSgpIDwgb2xk U3R5bGUub3V0bGluZVNpemUoKSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAg ICAgcmV0dXJuIFJlcGFpbnRDb3ZlcmFnZTo6UmVuZGVyZXJPbmx5OwogICAgICAgICBpZiAoaXM8 UmVuZGVyTGF5ZXJNb2RlbE9iamVjdD4oKnRoaXMpKSB7CiAgICAgICAgICAgICAvLyBJZiB3ZSBk b24ndCBoYXZlIGEgbGF5ZXIgeWV0LCBidXQgd2UgYXJlIGdvaW5nIHRvIGdldCBvbmUgYmVjYXVz ZSBvZiB0cmFuc2Zvcm0gb3Igb3BhY2l0eSwgdGhlbiB3ZSBuZWVkIHRvIHJlcGFpbnQgdGhlIG9s ZCBwb3NpdGlvbiBvZiB0aGUgb2JqZWN0LgogICAgICAgICAgICAgYm9vbCBoYXNMYXllciA9IGRv d25jYXN0PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+KCp0aGlzKS5oYXNMYXllcigpOwogICAgICAg ICAgICAgYm9vbCB3aWxsSGF2ZUxheWVyID0gbmV3U3R5bGUuaGFzVHJhbnNmb3JtKCkgfHwgbmV3 U3R5bGUub3BhY2l0eSgpIDwgMSB8fCBuZXdTdHlsZS5oYXNGaWx0ZXIoKSB8fCBuZXdTdHlsZS5o YXNCYWNrZHJvcEZpbHRlcigpOwogICAgICAgICAgICAgaWYgKCFoYXNMYXllciAmJiB3aWxsSGF2 ZUxheWVyKQotICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIHJl dHVybiBSZXBhaW50Q292ZXJhZ2U6OlJlbmRlcmVyT25seTsKICAgICAgICAgfQogICAgICAgICBp ZiAoaXM8UmVuZGVyQm94PigqdGhpcykpIHsKICAgICAgICAgICAgIGlmIChkaWZmID09IFN0eWxl RGlmZmVyZW5jZTo6TGF5b3V0ICYmIG9sZFN0eWxlLnBvc2l0aW9uKCkgIT0gbmV3U3R5bGUucG9z aXRpb24oKSAmJiBvbGRTdHlsZS5wb3NpdGlvbigpID09IFBvc2l0aW9uVHlwZTo6U3RhdGljKQot ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIHJldHVybiBSZXBh aW50Q292ZXJhZ2U6OlJlbmRlcmVyT25seTsKICAgICAgICAgfQogICAgICAgICBpZiAoZGlmZiA+ IFN0eWxlRGlmZmVyZW5jZTo6UmVwYWludExheWVyICYmIG9sZFN0eWxlLnZpc2liaWxpdHkoKSAh PSBuZXdTdHlsZS52aXNpYmlsaXR5KCkpIHsKICAgICAgICAgICAgIGlmIChhdXRvKiBlbmNsb3Np bmdMYXllciA9IHRoaXMtPmVuY2xvc2luZ0xheWVyKCkpIHsKICAgICAgICAgICAgICAgICBhdXRv IHJlbmRlcmVyV2lsbEJlSGlkZGVuID0gbmV3U3R5bGUudmlzaWJpbGl0eSgpICE9IFZpc2liaWxp dHk6OlZpc2libGU7CiAgICAgICAgICAgICAgICAgaWYgKHJlbmRlcmVyV2lsbEJlSGlkZGVuICYm IGVuY2xvc2luZ0xheWVyLT5oYXNWaXNpYmxlQ29udGVudCgpICYmICh0aGlzID09ICZlbmNsb3Np bmdMYXllci0+cmVuZGVyZXIoKSB8fCBlbmNsb3NpbmdMYXllci0+cmVuZGVyZXIoKS5zdHlsZSgp LnZpc2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5OjpWaXNpYmxlKSkKLSAgICAgICAgICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXBhaW50Q292ZXJh Z2U6OlJlbmRlcmVyT25seTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIHJldHVybiBSZXBhaW50Q292ZXJhZ2U6Ok5vbmU7CiAgICAgfSgp OwotICAgIGlmIChzaG91bGRSZXBhaW50QmVmb3JlU3R5bGVDaGFuZ2UpIHsKKyAgICBpZiAoc2hv dWxkUmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlID09IFJlcGFpbnRDb3ZlcmFnZTo6UmVuZGVyZXJB bmREZXNjZW5kYW50c1JlbmRlcmVyc1dpdGhMYXllcnMpIHsKKyAgICAgICAgQVNTRVJUKGhhc0xh eWVyKCkpOworICAgICAgICBkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2JqZWN0PigqdGhpcyku bGF5ZXIoKS0+cmVwYWludEluY2x1ZGluZ0Rlc2NlbmRhbnRzKCk7CisgICAgICAgIHJldHVybiB0 cnVlOworICAgIH0KKyAgICBpZiAoc2hvdWxkUmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlID09IFJl cGFpbnRDb3ZlcmFnZTo6UmVuZGVyZXJPbmx5KSB7CiAgICAgICAgIHJlcGFpbnQoKTsKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyTW9kZWxPYmplY3QuY3BwCmluZGV4IDc3ODc0MWY0Y2Q3ZjJkYTI2NzI0YTMy NTg5MzU3NWRkNTgzOWI3NDUuLjlkMzMwZGZiNzU2ZTUyOGNmMDNmNThkZTM1MzM2ZmMxOTEyMzgw MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVs T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2Rl bE9iamVjdC5jcHAKQEAgLTExMywzNiArMTEzLDkgQEAgdm9pZCBSZW5kZXJMYXllck1vZGVsT2Jq ZWN0OjpzdHlsZVdpbGxDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclMK ICAgICBpZiAoc19oYWRMYXllcikKICAgICAgICAgc19sYXllcldhc1NlbGZQYWludGluZyA9IGxh eWVyKCktPmlzU2VsZlBhaW50aW5nTGF5ZXIoKTsKIAotICAgIC8vIElmIG91ciB6LWluZGV4IGNo YW5nZXMgdmFsdWUgb3Igb3VyIHZpc2liaWxpdHkgY2hhbmdlcywKLSAgICAvLyB3ZSBuZWVkIHRv IGRpcnR5IG91ciBzdGFja2luZyBjb250ZXh0J3Mgei1vcmRlciBsaXN0LgotICAgIGNvbnN0IFJl bmRlclN0eWxlKiBvbGRTdHlsZSA9IGhhc0luaXRpYWxpemVkU3R5bGUoKSA/ICZzdHlsZSgpIDog bnVsbHB0cjsKLSAgICBpZiAob2xkU3R5bGUpIHsKLSAgICAgICAgaWYgKHBhcmVudCgpKSB7Ci0g ICAgICAgICAgICAvLyBEbyBhIHJlcGFpbnQgd2l0aCB0aGUgb2xkIHN0eWxlIGZpcnN0LCBlLmcu LCBmb3IgZXhhbXBsZSBpZiB3ZSBnbyBmcm9tCi0gICAgICAgICAgICAvLyBoYXZpbmcgYW4gb3V0 bGluZSB0byBub3QgaGF2aW5nIGFuIG91dGxpbmUuCi0gICAgICAgICAgICBpZiAoZGlmZiA9PSBT dHlsZURpZmZlcmVuY2U6OlJlcGFpbnRMYXllcikgewotICAgICAgICAgICAgICAgIGxheWVyKCkt PnJlcGFpbnRJbmNsdWRpbmdEZXNjZW5kYW50cygpOwotICAgICAgICAgICAgICAgIGlmICghKG9s ZFN0eWxlLT5jbGlwKCkgPT0gbmV3U3R5bGUuY2xpcCgpKSkKLSAgICAgICAgICAgICAgICAgICAg bGF5ZXIoKS0+Y2xlYXJDbGlwUmVjdHNJbmNsdWRpbmdEZXNjZW5kYW50cygpOwotICAgICAgICAg ICAgfQotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlOjpM YXlvdXQgfHwgZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6OlNpbXBsaWZpZWRMYXlvdXQpIHsKLSAg ICAgICAgICAgIC8vIFdoZW4gYSBsYXlvdXQgaGludCBoYXBwZW5zLCB3ZSBkbyBhIHJlcGFpbnQg b2YgdGhlIGxheWVyLCBzaW5jZSB0aGUgbGF5ZXIgY291bGQgZW5kIHVwIGJlaW5nIGRlc3Ryb3ll ZC4KLSAgICAgICAgICAgIGlmIChoYXNMYXllcigpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG9s ZFN0eWxlLT5wb3NpdGlvbigpICE9IG5ld1N0eWxlLnBvc2l0aW9uKCkKLSAgICAgICAgICAgICAg ICAgICAgfHwgb2xkU3R5bGUtPnVzZWRaSW5kZXgoKSAhPSBuZXdTdHlsZS51c2VkWkluZGV4KCkK LSAgICAgICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUtPmhhc0F1dG9Vc2VkWkluZGV4KCkgIT0g bmV3U3R5bGUuaGFzQXV0b1VzZWRaSW5kZXgoKQotICAgICAgICAgICAgICAgICAgICB8fCAhKG9s ZFN0eWxlLT5jbGlwKCkgPT0gbmV3U3R5bGUuY2xpcCgpKQotICAgICAgICAgICAgICAgICAgICB8 fCBvbGRTdHlsZS0+aGFzQ2xpcCgpICE9IG5ld1N0eWxlLmhhc0NsaXAoKQotICAgICAgICAgICAg ICAgICAgICB8fCBvbGRTdHlsZS0+b3BhY2l0eSgpICE9IG5ld1N0eWxlLm9wYWNpdHkoKQotICAg ICAgICAgICAgICAgICAgICB8fCBvbGRTdHlsZS0+dHJhbnNmb3JtKCkgIT0gbmV3U3R5bGUudHJh bnNmb3JtKCkKLSAgICAgICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUtPmZpbHRlcigpICE9IG5l d1N0eWxlLmZpbHRlcigpCi0gICAgICAgICAgICAgICAgICAgICkKLSAgICAgICAgICAgICAgICBs YXllcigpLT5yZXBhaW50SW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgfQotICAgIH0KKyAgICBhdXRvKiBvbGRTdHlsZSA9IGhhc0luaXRpYWxpemVkU3R5bGUo KSA/ICZzdHlsZSgpIDogbnVsbHB0cjsKKyAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6 OlJlcGFpbnRMYXllciAmJiBwYXJlbnQoKSAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+Y2xpcCgp ICE9IG5ld1N0eWxlLmNsaXAoKSkKKyAgICAgICAgbGF5ZXIoKS0+Y2xlYXJDbGlwUmVjdHNJbmNs dWRpbmdEZXNjZW5kYW50cygpOwogCiAgICAgUmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdl KGRpZmYsIG5ld1N0eWxlKTsKIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxYTQ5OWYzY2Q4ODIzMzliZTIwYWE0N2M2ODJh MTRiNzRjMjllMjI3Li43NWMyY2RhNDIxNjgxNGE3ZmM3NTNhODU0NDJmMTM4MzlmY2QwNDZmIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDktMTAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KKworICAgICAgICBbUmVwYWludF0gUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6c3R5 bGVXaWxsQ2hhbmdlIG1heSBpc3N1ZSByZWR1bmRhbnQgcmVwYWludAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2Mzc0CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS82ODY1NzQ5MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGNzczMvYmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3Rh Y2tpbmctY29udGV4dC1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZvcm0vaW9zL2NzczMv YmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBl Y3RlZC50eHQ6CisKIDIwMjAtMDktMDkgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5j b20+CiAKICAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogbV9maW5pc2hlZE5vZGVzLmlzRW1wdHko KSBpbiBBdWRpb0NvbnRleHQgZGVzdHJ1Y3RvcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3Nz My9ibGVuZGluZy9yZXBhaW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0LWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2NzczMvYmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2Rl LWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBlY3RlZC50eHQKaW5kZXggNWVlOGMwNjI4Nzc3 ZjU2YzBhZGVmZWU1N2I5ZmI4ZTQxYjNkZWIxNy4uNzRhNTBlZDFhMmQ1MGQzYzE2ZDJmNzUyZjhj NjBiNGJhMjllNjdmYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9ibGVuZGluZy9yZXBh aW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9jc3MzL2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0 YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0CkBAIC0xOSw3ICsxOSw2IEBAIFRlc3QgaWYgdW5z ZXR0aW5nIGEgcGFyZW50J3Mgc3RhY2tpbmcgY29udGV4dCBjb3JyZWN0bHkgdXBkYXRlcyBpdHMg cGFyZW50IGlzb2xhCiAgIChyZWN0IDI4IDUyNiA2MCA2MCkKICAgKHJlY3QgNDggNTI2IDYwIDYw KQogICAocmVjdCA0OCA0MDggNjAgNjApCi0gIChyZWN0IDQ4IDQwOCA2MCA2MCkKICAgKHJlY3Qg NDggNjQ0IDYwIDYwKQogICAocmVjdCA2OCA2NDQgNjAgNjApCiAgIChyZWN0IDQ4IDY0NCA2MCA2 MCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9jc3MzL2JsZW5kaW5nL3Jl cGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2NzczMvYmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2Rl LWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBlY3RlZC50eHQKaW5kZXggYThhYzk3NGRlODE3 MDc0Y2ZkZGZkZWU3NDA4MmVlNTM4N2NkNTlhOC4uOTVjOWViM2RmOGEzZDI0YjE5NDc5MzJmNThj OGNkM2Q5YTM2M2IwOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2NzczMv YmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2NzczMvYmxlbmRpbmcvcmVw YWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBlY3RlZC50eHQKQEAg LTE5LDcgKzE5LDYgQEAgVGVzdCBpZiB1bnNldHRpbmcgYSBwYXJlbnQncyBzdGFja2luZyBjb250 ZXh0IGNvcnJlY3RseSB1cGRhdGVzIGl0cyBwYXJlbnQgaXNvbGEKICAgKHJlY3QgMjggNTM2IDYw IDYwKQogICAocmVjdCA0OCA1MzYgNjAgNjApCiAgIChyZWN0IDQ4IDQxNiA2MCA2MCkKLSAgKHJl Y3QgNDggNDE2IDYwIDYwKQogICAocmVjdCA0OCA2NTYgNjAgNjApCiAgIChyZWN0IDY4IDY1NiA2 MCA2MCkKICAgKHJlY3QgNDggNjU2IDYwIDYwKQo= 408479 2020-09-10 14:51:24 -0700 2020-09-10 15:10:44 -0700 Patch bug-216374-20200910145123.patch text/plain 9763 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRhODMxNzQ4MDdkNmE4 ZDk0N2VmZmFkOWI3OGNhNTBiODYxZTBhNC4uODRkM2JiZGE2MmM3Njc3YzdkZjk0ZDIzOTViMTZk YmE4ZWU4NDdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA5LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlcGFpbnRdIFJlbmRlckxh eWVyTW9kZWxPYmplY3Q6OnN0eWxlV2lsbENoYW5nZSBtYXkgaXNzdWUgcmVkdW5kYW50IHJlcGFp bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjM3 NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg2NTc0OTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUgcmVwYWludEluY2x1ZGluZ0Rl c2NlbmRhbnRzKCkgY2FsbHMgdG8gcmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlKCkgdG8gYXZvaWQg cmVkdW5kYW50IHJlcGFpbnRzIG9uIHRoZSBzYW1lIHJlbmRlcmVyLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVu dDo6cmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXJNb2RlbE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllck1vZGVs T2JqZWN0OjpzdHlsZVdpbGxDaGFuZ2UpOgorCiAyMDIwLTA5LTEwICBTYWlkIEFib3UtSGFsbGF3 YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NHXSBSRUdSRVNTSU9OIChC aWcgU3VyKTogQSBHSUYgaW1hZ2Ugd2l0aCBhIGZpbml0ZSBsb29wQ291bnQgbG9vcHMgYW4gZXh0 cmEgY3ljbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRl eCAwYWExZTc2YjBmNjUxOTQ4MjYyNjVkMmQ1MmFhMTRhMTgxNDIwNTAwLi5kZjc0ZGZhMDViMzM2 MGE5YzFkNDkwNzkwODg1YzhhYjk0MmIyYzg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVsZW1lbnQuY3BwCkBAIC0zODYsMzYgKzM4Niw1MyBAQCBib29sIFJlbmRlckVsZW1l bnQ6OnJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3Qg UmVuZGVyUwogICAgICAgICAvLyBSZXBhaW50IG9uIGhpZGRlbiByZW5kZXJlciBpcyBhIG5vLW9w LgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIGF1dG8gc2hvdWxkUmVwYWludEJl Zm9yZVN0eWxlQ2hhbmdlID0gWyZdIHsKKyAgICBlbnVtIFJlcXVpcmVkUmVwYWludCB7IE5vbmUs IFJlbmRlcmVyT25seSwgUmVuZGVyZXJBbmREZXNjZW5kYW50c1JlbmRlcmVyc1dpdGhMYXllcnMg fTsKKyAgICBhdXRvIHNob3VsZFJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZSA9IFsmXSgpIC0+IFJl cXVpcmVkUmVwYWludCB7CiAgICAgICAgIGlmICghcGFyZW50KCkpIHsKICAgICAgICAgICAgIC8v IENhbid0IHJlc29sdmUgYWJzb2x1dGUgY29vcmRpbmF0ZXMuCi0gICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgICAgICByZXR1cm4gUmVxdWlyZWRSZXBhaW50OjpOb25lOworICAgICAg ICB9CisgICAgICAgIGlmIChpczxSZW5kZXJMYXllck1vZGVsT2JqZWN0Pih0aGlzKSAmJiBoYXNM YXllcigpKSB7CisgICAgICAgICAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6OlJlcGFp bnRMYXllcikKKyAgICAgICAgICAgICAgICByZXR1cm4gUmVxdWlyZWRSZXBhaW50OjpSZW5kZXJl ckFuZERlc2NlbmRhbnRzUmVuZGVyZXJzV2l0aExheWVyczsKKyAgICAgICAgICAgIGlmIChkaWZm ID09IFN0eWxlRGlmZmVyZW5jZTo6TGF5b3V0IHx8IGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlOjpT aW1wbGlmaWVkTGF5b3V0KSB7CisgICAgICAgICAgICAgICAgLy8gQ2VydGFpbiBzdHlsZSBjaGFu Z2VzIHJlcXVpcmUgbGF5ZXIgcmVwYWludCwgc2luY2UgdGhlIGxheWVyIGNvdWxkIGVuZCB1cCBi ZWluZyBkZXN0cm95ZWQuCisgICAgICAgICAgICAgICAgYXV0byBsYXllck1heUdldERlc3Ryb3ll ZCA9IG9sZFN0eWxlLnBvc2l0aW9uKCkgIT0gbmV3U3R5bGUucG9zaXRpb24oKSB8fCBvbGRTdHls ZS51c2VkWkluZGV4KCkgIT0gbmV3U3R5bGUudXNlZFpJbmRleCgpIHx8IG9sZFN0eWxlLmNsaXAo KSAhPSBuZXdTdHlsZS5jbGlwKCkgfHwgb2xkU3R5bGUuaGFzQ2xpcCgpICE9IG5ld1N0eWxlLmhh c0NsaXAoKQorICAgICAgICAgICAgICAgICAgICB8fCBvbGRTdHlsZS5oYXNBdXRvVXNlZFpJbmRl eCgpICE9IG5ld1N0eWxlLmhhc0F1dG9Vc2VkWkluZGV4KCkgfHwgb2xkU3R5bGUub3BhY2l0eSgp ICE9IG5ld1N0eWxlLm9wYWNpdHkoKSB8fCBvbGRTdHlsZS50cmFuc2Zvcm0oKSAhPSBuZXdTdHls ZS50cmFuc2Zvcm0oKSB8fCBvbGRTdHlsZS5maWx0ZXIoKSAhPSBuZXdTdHlsZS5maWx0ZXIoKTsK KyAgICAgICAgICAgICAgICBpZiAobGF5ZXJNYXlHZXREZXN0cm95ZWQpCisgICAgICAgICAgICAg ICAgICAgIHJldHVybiBSZXF1aXJlZFJlcGFpbnQ6OlJlbmRlcmVyQW5kRGVzY2VuZGFudHNSZW5k ZXJlcnNXaXRoTGF5ZXJzOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGlmIChz aG91bGRSZXBhaW50Rm9yU3R5bGVEaWZmZXJlbmNlKGRpZmYpKQotICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgICAgICByZXR1cm4gUmVxdWlyZWRSZXBhaW50OjpSZW5kZXJlck9ubHk7 CiAgICAgICAgIGlmIChuZXdTdHlsZS5vdXRsaW5lU2l6ZSgpIDwgb2xkU3R5bGUub3V0bGluZVNp emUoKSkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0dXJuIFJlcXVp cmVkUmVwYWludDo6UmVuZGVyZXJPbmx5OwogICAgICAgICBpZiAoaXM8UmVuZGVyTGF5ZXJNb2Rl bE9iamVjdD4oKnRoaXMpKSB7CiAgICAgICAgICAgICAvLyBJZiB3ZSBkb24ndCBoYXZlIGEgbGF5 ZXIgeWV0LCBidXQgd2UgYXJlIGdvaW5nIHRvIGdldCBvbmUgYmVjYXVzZSBvZiB0cmFuc2Zvcm0g b3Igb3BhY2l0eSwgdGhlbiB3ZSBuZWVkIHRvIHJlcGFpbnQgdGhlIG9sZCBwb3NpdGlvbiBvZiB0 aGUgb2JqZWN0LgogICAgICAgICAgICAgYm9vbCBoYXNMYXllciA9IGRvd25jYXN0PFJlbmRlckxh eWVyTW9kZWxPYmplY3Q+KCp0aGlzKS5oYXNMYXllcigpOwogICAgICAgICAgICAgYm9vbCB3aWxs SGF2ZUxheWVyID0gbmV3U3R5bGUuaGFzVHJhbnNmb3JtKCkgfHwgbmV3U3R5bGUub3BhY2l0eSgp IDwgMSB8fCBuZXdTdHlsZS5oYXNGaWx0ZXIoKSB8fCBuZXdTdHlsZS5oYXNCYWNrZHJvcEZpbHRl cigpOwogICAgICAgICAgICAgaWYgKCFoYXNMYXllciAmJiB3aWxsSGF2ZUxheWVyKQotICAgICAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIHJldHVybiBSZXF1aXJlZFJl cGFpbnQ6OlJlbmRlcmVyT25seTsKICAgICAgICAgfQogICAgICAgICBpZiAoaXM8UmVuZGVyQm94 PigqdGhpcykpIHsKICAgICAgICAgICAgIGlmIChkaWZmID09IFN0eWxlRGlmZmVyZW5jZTo6TGF5 b3V0ICYmIG9sZFN0eWxlLnBvc2l0aW9uKCkgIT0gbmV3U3R5bGUucG9zaXRpb24oKSAmJiBvbGRT dHlsZS5wb3NpdGlvbigpID09IFBvc2l0aW9uVHlwZTo6U3RhdGljKQotICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIHJldHVybiBSZXF1aXJlZFJlcGFpbnQ6OlJl bmRlcmVyT25seTsKICAgICAgICAgfQogICAgICAgICBpZiAoZGlmZiA+IFN0eWxlRGlmZmVyZW5j ZTo6UmVwYWludExheWVyICYmIG9sZFN0eWxlLnZpc2liaWxpdHkoKSAhPSBuZXdTdHlsZS52aXNp YmlsaXR5KCkpIHsKICAgICAgICAgICAgIGlmIChhdXRvKiBlbmNsb3NpbmdMYXllciA9IHRoaXMt PmVuY2xvc2luZ0xheWVyKCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIHJlbmRlcmVyV2lsbEJl SGlkZGVuID0gbmV3U3R5bGUudmlzaWJpbGl0eSgpICE9IFZpc2liaWxpdHk6OlZpc2libGU7CiAg ICAgICAgICAgICAgICAgaWYgKHJlbmRlcmVyV2lsbEJlSGlkZGVuICYmIGVuY2xvc2luZ0xheWVy LT5oYXNWaXNpYmxlQ29udGVudCgpICYmICh0aGlzID09ICZlbmNsb3NpbmdMYXllci0+cmVuZGVy ZXIoKSB8fCBlbmNsb3NpbmdMYXllci0+cmVuZGVyZXIoKS5zdHlsZSgpLnZpc2liaWxpdHkoKSAh PSBWaXNpYmlsaXR5OjpWaXNpYmxlKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBSZXF1aXJlZFJlcGFpbnQ6OlJlbmRlcmVyT25s eTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIHJldHVybiBSZXF1aXJlZFJlcGFpbnQ6Ok5vbmU7CiAgICAgfSgpOwotICAgIGlmIChzaG91 bGRSZXBhaW50QmVmb3JlU3R5bGVDaGFuZ2UpIHsKKyAgICBpZiAoc2hvdWxkUmVwYWludEJlZm9y ZVN0eWxlQ2hhbmdlID09IFJlcXVpcmVkUmVwYWludDo6UmVuZGVyZXJBbmREZXNjZW5kYW50c1Jl bmRlcmVyc1dpdGhMYXllcnMpIHsKKyAgICAgICAgQVNTRVJUKGhhc0xheWVyKCkpOworICAgICAg ICBkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2JqZWN0PigqdGhpcykubGF5ZXIoKS0+cmVwYWlu dEluY2x1ZGluZ0Rlc2NlbmRhbnRzKCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAg ICBpZiAoc2hvdWxkUmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlID09IFJlcXVpcmVkUmVwYWludDo6 UmVuZGVyZXJPbmx5KSB7CiAgICAgICAgIHJlcGFpbnQoKTsKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9k ZWxPYmplY3QuY3BwCmluZGV4IDc3ODc0MWY0Y2Q3ZjJkYTI2NzI0YTMyNTg5MzU3NWRkNTgzOWI3 NDUuLmI2ZTBhYmM3MThkNTJmMGNiZWQ5ZTM2NmI2NWJkN2ZkNTA0YzgxZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAKQEAg LTExMywzNyArMTEzLDkgQEAgdm9pZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0OjpzdHlsZVdpbGxD aGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclMKICAgICBpZiAoc19oYWRM YXllcikKICAgICAgICAgc19sYXllcldhc1NlbGZQYWludGluZyA9IGxheWVyKCktPmlzU2VsZlBh aW50aW5nTGF5ZXIoKTsKIAotICAgIC8vIElmIG91ciB6LWluZGV4IGNoYW5nZXMgdmFsdWUgb3Ig b3VyIHZpc2liaWxpdHkgY2hhbmdlcywKLSAgICAvLyB3ZSBuZWVkIHRvIGRpcnR5IG91ciBzdGFj a2luZyBjb250ZXh0J3Mgei1vcmRlciBsaXN0LgotICAgIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRT dHlsZSA9IGhhc0luaXRpYWxpemVkU3R5bGUoKSA/ICZzdHlsZSgpIDogbnVsbHB0cjsKLSAgICBp ZiAob2xkU3R5bGUpIHsKLSAgICAgICAgaWYgKHBhcmVudCgpKSB7Ci0gICAgICAgICAgICAvLyBE byBhIHJlcGFpbnQgd2l0aCB0aGUgb2xkIHN0eWxlIGZpcnN0LCBlLmcuLCBmb3IgZXhhbXBsZSBp ZiB3ZSBnbyBmcm9tCi0gICAgICAgICAgICAvLyBoYXZpbmcgYW4gb3V0bGluZSB0byBub3QgaGF2 aW5nIGFuIG91dGxpbmUuCi0gICAgICAgICAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6 OlJlcGFpbnRMYXllcikgewotICAgICAgICAgICAgICAgIGxheWVyKCktPnJlcGFpbnRJbmNsdWRp bmdEZXNjZW5kYW50cygpOwotICAgICAgICAgICAgICAgIGlmICghKG9sZFN0eWxlLT5jbGlwKCkg PT0gbmV3U3R5bGUuY2xpcCgpKSkKLSAgICAgICAgICAgICAgICAgICAgbGF5ZXIoKS0+Y2xlYXJD bGlwUmVjdHNJbmNsdWRpbmdEZXNjZW5kYW50cygpOwotICAgICAgICAgICAgfQotICAgICAgICB9 Ci0KLSAgICAgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlOjpMYXlvdXQgfHwgZGlmZiA9 PSBTdHlsZURpZmZlcmVuY2U6OlNpbXBsaWZpZWRMYXlvdXQpIHsKLSAgICAgICAgICAgIC8vIFdo ZW4gYSBsYXlvdXQgaGludCBoYXBwZW5zLCB3ZSBkbyBhIHJlcGFpbnQgb2YgdGhlIGxheWVyLCBz aW5jZSB0aGUgbGF5ZXIgY291bGQgZW5kIHVwIGJlaW5nIGRlc3Ryb3llZC4KLSAgICAgICAgICAg IGlmIChoYXNMYXllcigpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG9sZFN0eWxlLT5wb3NpdGlv bigpICE9IG5ld1N0eWxlLnBvc2l0aW9uKCkKLSAgICAgICAgICAgICAgICAgICAgfHwgb2xkU3R5 bGUtPnVzZWRaSW5kZXgoKSAhPSBuZXdTdHlsZS51c2VkWkluZGV4KCkKLSAgICAgICAgICAgICAg ICAgICAgfHwgb2xkU3R5bGUtPmhhc0F1dG9Vc2VkWkluZGV4KCkgIT0gbmV3U3R5bGUuaGFzQXV0 b1VzZWRaSW5kZXgoKQotICAgICAgICAgICAgICAgICAgICB8fCAhKG9sZFN0eWxlLT5jbGlwKCkg PT0gbmV3U3R5bGUuY2xpcCgpKQotICAgICAgICAgICAgICAgICAgICB8fCBvbGRTdHlsZS0+aGFz Q2xpcCgpICE9IG5ld1N0eWxlLmhhc0NsaXAoKQotICAgICAgICAgICAgICAgICAgICB8fCBvbGRT dHlsZS0+b3BhY2l0eSgpICE9IG5ld1N0eWxlLm9wYWNpdHkoKQotICAgICAgICAgICAgICAgICAg ICB8fCBvbGRTdHlsZS0+dHJhbnNmb3JtKCkgIT0gbmV3U3R5bGUudHJhbnNmb3JtKCkKLSAgICAg ICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUtPmZpbHRlcigpICE9IG5ld1N0eWxlLmZpbHRlcigp Ci0gICAgICAgICAgICAgICAgICAgICkKLSAgICAgICAgICAgICAgICBsYXllcigpLT5yZXBhaW50 SW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0K LQorICAgIGF1dG8qIG9sZFN0eWxlID0gaGFzSW5pdGlhbGl6ZWRTdHlsZSgpID8gJnN0eWxlKCkg OiBudWxscHRyOworICAgIGlmIChkaWZmID09IFN0eWxlRGlmZmVyZW5jZTo6UmVwYWludExheWVy ICYmIHBhcmVudCgpICYmIG9sZFN0eWxlICYmIG9sZFN0eWxlLT5jbGlwKCkgIT0gbmV3U3R5bGUu Y2xpcCgpKQorICAgICAgICBsYXllcigpLT5jbGVhckNsaXBSZWN0c0luY2x1ZGluZ0Rlc2NlbmRh bnRzKCk7CiAgICAgUmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hhbmdlKGRpZmYsIG5ld1N0eWxl KTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDFhNDk5ZjNjZDg4MjMzOWJlMjBhYTQ3YzY4MmExNGI3NGMyOWUyMjcu Ljc1YzJjZGE0MjE2ODE0YTdmYzc1M2E4NTQ0MmYxMzgzOWZjZDA0NmYgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNCBAQAorMjAyMC0wOS0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisg ICAgICAgIFtSZXBhaW50XSBSZW5kZXJMYXllck1vZGVsT2JqZWN0OjpzdHlsZVdpbGxDaGFuZ2Ug bWF5IGlzc3VlIHJlZHVuZGFudCByZXBhaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYzNzQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY4NjU3 NDkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog Y3NzMy9ibGVuZGluZy9yZXBhaW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0 LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvY3NzMy9ibGVuZGluZy9yZXBh aW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dDoKKwog MjAyMC0wOS0wOSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAg ICBBU1NFUlRJT04gRkFJTEVEOiBtX2ZpbmlzaGVkTm9kZXMuaXNFbXB0eSgpIGluIEF1ZGlvQ29u dGV4dCBkZXN0cnVjdG9yCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2JsZW5kaW5nL3Jl cGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvY3NzMy9ibGVuZGluZy9yZXBhaW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFj a2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dAppbmRleCA1ZWU4YzA2Mjg3NzdmNTZjMGFkZWZlZTU3 YjlmYjhlNDFiM2RlYjE3Li43NGE1MGVkMWEyZDUwZDNjMTZkMmY3NTJmOGM2MGI0YmEyOWU2N2Zi IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9jc3MzL2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9k ZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2NzczMvYmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4 dC1leHBlY3RlZC50eHQKQEAgLTE5LDcgKzE5LDYgQEAgVGVzdCBpZiB1bnNldHRpbmcgYSBwYXJl bnQncyBzdGFja2luZyBjb250ZXh0IGNvcnJlY3RseSB1cGRhdGVzIGl0cyBwYXJlbnQgaXNvbGEK ICAgKHJlY3QgMjggNTI2IDYwIDYwKQogICAocmVjdCA0OCA1MjYgNjAgNjApCiAgIChyZWN0IDQ4 IDQwOCA2MCA2MCkKLSAgKHJlY3QgNDggNDA4IDYwIDYwKQogICAocmVjdCA0OCA2NDQgNjAgNjAp CiAgIChyZWN0IDY4IDY0NCA2MCA2MCkKICAgKHJlY3QgNDggNjQ0IDYwIDYwKQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL2NzczMvYmxlbmRpbmcvcmVwYWludC9ibGVuZC1t b2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3MvY3NzMy9ibGVuZGluZy9yZXBhaW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFj a2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dAppbmRleCBhOGFjOTc0ZGU4MTcwNzRjZmRkZmRlZTc0 MDgyZWU1Mzg3Y2Q1OWE4Li45NWM5ZWIzZGY4YTNkMjRiMTk0NzkzMmY1OGM4Y2QzZDlhMzYzYjA5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvY3NzMy9ibGVuZGluZy9yZXBh aW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvY3NzMy9ibGVuZGluZy9yZXBhaW50L2JsZW5kLW1v ZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dApAQCAtMTksNyArMTksNiBA QCBUZXN0IGlmIHVuc2V0dGluZyBhIHBhcmVudCdzIHN0YWNraW5nIGNvbnRleHQgY29ycmVjdGx5 IHVwZGF0ZXMgaXRzIHBhcmVudCBpc29sYQogICAocmVjdCAyOCA1MzYgNjAgNjApCiAgIChyZWN0 IDQ4IDUzNiA2MCA2MCkKICAgKHJlY3QgNDggNDE2IDYwIDYwKQotICAocmVjdCA0OCA0MTYgNjAg NjApCiAgIChyZWN0IDQ4IDY1NiA2MCA2MCkKICAgKHJlY3QgNjggNjU2IDYwIDYwKQogICAocmVj dCA0OCA2NTYgNjAgNjApCg== 408482 2020-09-10 15:10:45 -0700 2020-09-10 17:32:51 -0700 Patch bug-216374-20200910151045.patch text/plain 9891 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2ODI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRhODMxNzQ4MDdkNmE4 ZDk0N2VmZmFkOWI3OGNhNTBiODYxZTBhNC4uOTA0YmFmNWNjNTQ2NWNmMGIxMGNiYmJiN2YwZTA5 ZDYyYmI1ZjBhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA5LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlcGFpbnRdIFJlbmRlckxh eWVyTW9kZWxPYmplY3Q6OnN0eWxlV2lsbENoYW5nZSBtYXkgaXNzdWUgcmVkdW5kYW50IHJlcGFp bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjM3 NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjg2NTc0OTA+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIE1vdmUgdGhlIHJlcGFpbnRJbmNsdWRpbmdEZXNj ZW5kYW50cygpIGNhbGxzIHRvIHJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZSgpIHRvIGF2b2lkIHJl ZHVuZGFudCByZXBhaW50cyBvbiB0aGUgc2FtZSByZW5kZXJlci4KKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6 OnJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyTW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJNb2RlbE9i amVjdDo6c3R5bGVXaWxsQ2hhbmdlKToKKwogMjAyMC0wOS0xMCAgU2FpZCBBYm91LUhhbGxhd2Eg IDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgogCiAgICAgICAgIFtDR10gUkVHUkVTU0lPTiAoQmln IFN1cik6IEEgR0lGIGltYWdlIHdpdGggYSBmaW5pdGUgbG9vcENvdW50IGxvb3BzIGFuIGV4dHJh IGN5Y2xlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKaW5kZXgg MGFhMWU3NmIwZjY1MTk0ODI2MjY1ZDJkNTJhYTE0YTE4MTQyMDUwMC4uZDQ4ZWI4ZDk2Y2FkM2Ji ZDQ3NjI2ZjRkYzBkNmUwOTllZmFlZDkzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJFbGVtZW50LmNwcApAQCAtMzg2LDM2ICszODYsNTkgQEAgYm9vbCBSZW5kZXJFbGVtZW50 OjpyZXBhaW50QmVmb3JlU3R5bGVDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJl bmRlclMKICAgICAgICAgLy8gUmVwYWludCBvbiBoaWRkZW4gcmVuZGVyZXIgaXMgYSBuby1vcC4K ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLSAgICBhdXRvIHNob3VsZFJlcGFpbnRCZWZv cmVTdHlsZUNoYW5nZSA9IFsmXSB7CisgICAgZW51bSBjbGFzcyBSZXF1aXJlZFJlcGFpbnQgeyBO b25lLCBSZW5kZXJlck9ubHksIFJlbmRlcmVyQW5kRGVzY2VuZGFudHNSZW5kZXJlcnNXaXRoTGF5 ZXJzIH07CisgICAgYXV0byBzaG91bGRSZXBhaW50QmVmb3JlU3R5bGVDaGFuZ2UgPSBbJl0oKSAt PiBSZXF1aXJlZFJlcGFpbnQgewogICAgICAgICBpZiAoIXBhcmVudCgpKSB7CiAgICAgICAgICAg ICAvLyBDYW4ndCByZXNvbHZlIGFic29sdXRlIGNvb3JkaW5hdGVzLgotICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJuIFJlcXVpcmVkUmVwYWludDo6Tm9uZTsKKyAg ICAgICAgfQorICAgICAgICBpZiAoaXM8UmVuZGVyTGF5ZXJNb2RlbE9iamVjdD4odGhpcykgJiYg aGFzTGF5ZXIoKSkgeworICAgICAgICAgICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlOjpS ZXBhaW50TGF5ZXIpCisgICAgICAgICAgICAgICAgcmV0dXJuIFJlcXVpcmVkUmVwYWludDo6UmVu ZGVyZXJBbmREZXNjZW5kYW50c1JlbmRlcmVyc1dpdGhMYXllcnM7CisgICAgICAgICAgICBpZiAo ZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6OkxheW91dCB8fCBkaWZmID09IFN0eWxlRGlmZmVyZW5j ZTo6U2ltcGxpZmllZExheW91dCkgeworICAgICAgICAgICAgICAgIC8vIENlcnRhaW4gc3R5bGUg Y2hhbmdlcyByZXF1aXJlIGxheWVyIHJlcGFpbnQsIHNpbmNlIHRoZSBsYXllciBjb3VsZCBlbmQg dXAgYmVpbmcgZGVzdHJveWVkLgorICAgICAgICAgICAgICAgIGF1dG8gbGF5ZXJNYXlHZXREZXN0 cm95ZWQgPSBvbGRTdHlsZS5wb3NpdGlvbigpICE9IG5ld1N0eWxlLnBvc2l0aW9uKCkKKyAgICAg ICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUudXNlZFpJbmRleCgpICE9IG5ld1N0eWxlLnVzZWRa SW5kZXgoKQorICAgICAgICAgICAgICAgICAgICB8fCBvbGRTdHlsZS5oYXNBdXRvVXNlZFpJbmRl eCgpICE9IG5ld1N0eWxlLmhhc0F1dG9Vc2VkWkluZGV4KCkKKyAgICAgICAgICAgICAgICAgICAg fHwgb2xkU3R5bGUuY2xpcCgpICE9IG5ld1N0eWxlLmNsaXAoKQorICAgICAgICAgICAgICAgICAg ICB8fCBvbGRTdHlsZS5oYXNDbGlwKCkgIT0gbmV3U3R5bGUuaGFzQ2xpcCgpCisgICAgICAgICAg ICAgICAgICAgIHx8IG9sZFN0eWxlLm9wYWNpdHkoKSAhPSBuZXdTdHlsZS5vcGFjaXR5KCkKKyAg ICAgICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUudHJhbnNmb3JtKCkgIT0gbmV3U3R5bGUudHJh bnNmb3JtKCkKKyAgICAgICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUuZmlsdGVyKCkgIT0gbmV3 U3R5bGUuZmlsdGVyKCk7CisgICAgICAgICAgICAgICAgaWYgKGxheWVyTWF5R2V0RGVzdHJveWVk KQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gUmVxdWlyZWRSZXBhaW50OjpSZW5kZXJlckFu ZERlc2NlbmRhbnRzUmVuZGVyZXJzV2l0aExheWVyczsKKyAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgICAgICBpZiAoc2hvdWxkUmVwYWludEZvclN0eWxlRGlmZmVyZW5jZShkaWZmKSkKLSAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0dXJuIFJlcXVpcmVkUmVwYWlu dDo6UmVuZGVyZXJPbmx5OwogICAgICAgICBpZiAobmV3U3R5bGUub3V0bGluZVNpemUoKSA8IG9s ZFN0eWxlLm91dGxpbmVTaXplKCkpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAg ICAgIHJldHVybiBSZXF1aXJlZFJlcGFpbnQ6OlJlbmRlcmVyT25seTsKICAgICAgICAgaWYgKGlz PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+KCp0aGlzKSkgewogICAgICAgICAgICAgLy8gSWYgd2Ug ZG9uJ3QgaGF2ZSBhIGxheWVyIHlldCwgYnV0IHdlIGFyZSBnb2luZyB0byBnZXQgb25lIGJlY2F1 c2Ugb2YgdHJhbnNmb3JtIG9yIG9wYWNpdHksIHRoZW4gd2UgbmVlZCB0byByZXBhaW50IHRoZSBv bGQgcG9zaXRpb24gb2YgdGhlIG9iamVjdC4KICAgICAgICAgICAgIGJvb2wgaGFzTGF5ZXIgPSBk b3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2JqZWN0PigqdGhpcykuaGFzTGF5ZXIoKTsKICAgICAg ICAgICAgIGJvb2wgd2lsbEhhdmVMYXllciA9IG5ld1N0eWxlLmhhc1RyYW5zZm9ybSgpIHx8IG5l d1N0eWxlLm9wYWNpdHkoKSA8IDEgfHwgbmV3U3R5bGUuaGFzRmlsdGVyKCkgfHwgbmV3U3R5bGUu aGFzQmFja2Ryb3BGaWx0ZXIoKTsKICAgICAgICAgICAgIGlmICghaGFzTGF5ZXIgJiYgd2lsbEhh dmVMYXllcikKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gUmVxdWlyZWRSZXBhaW50OjpSZW5kZXJlck9ubHk7CiAgICAgICAgIH0KICAgICAgICAg aWYgKGlzPFJlbmRlckJveD4oKnRoaXMpKSB7CiAgICAgICAgICAgICBpZiAoZGlmZiA9PSBTdHls ZURpZmZlcmVuY2U6OkxheW91dCAmJiBvbGRTdHlsZS5wb3NpdGlvbigpICE9IG5ld1N0eWxlLnBv c2l0aW9uKCkgJiYgb2xkU3R5bGUucG9zaXRpb24oKSA9PSBQb3NpdGlvblR5cGU6OlN0YXRpYykK LSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4gUmVx dWlyZWRSZXBhaW50OjpSZW5kZXJlck9ubHk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGRpZmYg PiBTdHlsZURpZmZlcmVuY2U6OlJlcGFpbnRMYXllciAmJiBvbGRTdHlsZS52aXNpYmlsaXR5KCkg IT0gbmV3U3R5bGUudmlzaWJpbGl0eSgpKSB7CiAgICAgICAgICAgICBpZiAoYXV0byogZW5jbG9z aW5nTGF5ZXIgPSB0aGlzLT5lbmNsb3NpbmdMYXllcigpKSB7CiAgICAgICAgICAgICAgICAgYXV0 byByZW5kZXJlcldpbGxCZUhpZGRlbiA9IG5ld1N0eWxlLnZpc2liaWxpdHkoKSAhPSBWaXNpYmls aXR5OjpWaXNpYmxlOwogICAgICAgICAgICAgICAgIGlmIChyZW5kZXJlcldpbGxCZUhpZGRlbiAm JiBlbmNsb3NpbmdMYXllci0+aGFzVmlzaWJsZUNvbnRlbnQoKSAmJiAodGhpcyA9PSAmZW5jbG9z aW5nTGF5ZXItPnJlbmRlcmVyKCkgfHwgZW5jbG9zaW5nTGF5ZXItPnJlbmRlcmVyKCkuc3R5bGUo KS52aXNpYmlsaXR5KCkgIT0gVmlzaWJpbGl0eTo6VmlzaWJsZSkpCi0gICAgICAgICAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gUmVxdWlyZWRSZXBh aW50OjpSZW5kZXJlck9ubHk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gUmVxdWlyZWRSZXBhaW50OjpOb25lOwogICAgIH0o KTsKLSAgICBpZiAoc2hvdWxkUmVwYWludEJlZm9yZVN0eWxlQ2hhbmdlKSB7CisgICAgaWYgKHNo b3VsZFJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZSA9PSBSZXF1aXJlZFJlcGFpbnQ6OlJlbmRlcmVy QW5kRGVzY2VuZGFudHNSZW5kZXJlcnNXaXRoTGF5ZXJzKSB7CisgICAgICAgIEFTU0VSVChoYXNM YXllcigpKTsKKyAgICAgICAgZG93bmNhc3Q8UmVuZGVyTGF5ZXJNb2RlbE9iamVjdD4oKnRoaXMp LmxheWVyKCktPnJlcGFpbnRJbmNsdWRpbmdEZXNjZW5kYW50cygpOworICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICB9CisgICAgaWYgKHNob3VsZFJlcGFpbnRCZWZvcmVTdHlsZUNoYW5nZSA9PSBS ZXF1aXJlZFJlcGFpbnQ6OlJlbmRlcmVyT25seSkgewogICAgICAgICByZXBhaW50KCk7CiAgICAg ICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmNwcAppbmRleCA3Nzg3NDFmNGNkN2YyZGEyNjcyNGEz MjU4OTM1NzVkZDU4MzliNzQ1Li5iNmUwYWJjNzE4ZDUyZjBjYmVkOWUzNjZiNjViZDdmZDUwNGM4 MWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2Rl bE9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9k ZWxPYmplY3QuY3BwCkBAIC0xMTMsMzcgKzExMyw5IEBAIHZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9i amVjdDo6c3R5bGVXaWxsQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJT CiAgICAgaWYgKHNfaGFkTGF5ZXIpCiAgICAgICAgIHNfbGF5ZXJXYXNTZWxmUGFpbnRpbmcgPSBs YXllcigpLT5pc1NlbGZQYWludGluZ0xheWVyKCk7CiAKLSAgICAvLyBJZiBvdXIgei1pbmRleCBj aGFuZ2VzIHZhbHVlIG9yIG91ciB2aXNpYmlsaXR5IGNoYW5nZXMsCi0gICAgLy8gd2UgbmVlZCB0 byBkaXJ0eSBvdXIgc3RhY2tpbmcgY29udGV4dCdzIHotb3JkZXIgbGlzdC4KLSAgICBjb25zdCBS ZW5kZXJTdHlsZSogb2xkU3R5bGUgPSBoYXNJbml0aWFsaXplZFN0eWxlKCkgPyAmc3R5bGUoKSA6 IG51bGxwdHI7Ci0gICAgaWYgKG9sZFN0eWxlKSB7Ci0gICAgICAgIGlmIChwYXJlbnQoKSkgewot ICAgICAgICAgICAgLy8gRG8gYSByZXBhaW50IHdpdGggdGhlIG9sZCBzdHlsZSBmaXJzdCwgZS5n LiwgZm9yIGV4YW1wbGUgaWYgd2UgZ28gZnJvbQotICAgICAgICAgICAgLy8gaGF2aW5nIGFuIG91 dGxpbmUgdG8gbm90IGhhdmluZyBhbiBvdXRsaW5lLgotICAgICAgICAgICAgaWYgKGRpZmYgPT0g U3R5bGVEaWZmZXJlbmNlOjpSZXBhaW50TGF5ZXIpIHsKLSAgICAgICAgICAgICAgICBsYXllcigp LT5yZXBhaW50SW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKLSAgICAgICAgICAgICAgICBpZiAoIShv bGRTdHlsZS0+Y2xpcCgpID09IG5ld1N0eWxlLmNsaXAoKSkpCi0gICAgICAgICAgICAgICAgICAg IGxheWVyKCktPmNsZWFyQ2xpcFJlY3RzSW5jbHVkaW5nRGVzY2VuZGFudHMoKTsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgfQotCi0gICAgICAgIGlmIChkaWZmID09IFN0eWxlRGlmZmVyZW5jZTo6 TGF5b3V0IHx8IGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNlOjpTaW1wbGlmaWVkTGF5b3V0KSB7Ci0g ICAgICAgICAgICAvLyBXaGVuIGEgbGF5b3V0IGhpbnQgaGFwcGVucywgd2UgZG8gYSByZXBhaW50 IG9mIHRoZSBsYXllciwgc2luY2UgdGhlIGxheWVyIGNvdWxkIGVuZCB1cCBiZWluZyBkZXN0cm95 ZWQuCi0gICAgICAgICAgICBpZiAoaGFzTGF5ZXIoKSkgewotICAgICAgICAgICAgICAgIGlmIChv bGRTdHlsZS0+cG9zaXRpb24oKSAhPSBuZXdTdHlsZS5wb3NpdGlvbigpCi0gICAgICAgICAgICAg ICAgICAgIHx8IG9sZFN0eWxlLT51c2VkWkluZGV4KCkgIT0gbmV3U3R5bGUudXNlZFpJbmRleCgp Ci0gICAgICAgICAgICAgICAgICAgIHx8IG9sZFN0eWxlLT5oYXNBdXRvVXNlZFpJbmRleCgpICE9 IG5ld1N0eWxlLmhhc0F1dG9Vc2VkWkluZGV4KCkKLSAgICAgICAgICAgICAgICAgICAgfHwgIShv bGRTdHlsZS0+Y2xpcCgpID09IG5ld1N0eWxlLmNsaXAoKSkKLSAgICAgICAgICAgICAgICAgICAg fHwgb2xkU3R5bGUtPmhhc0NsaXAoKSAhPSBuZXdTdHlsZS5oYXNDbGlwKCkKLSAgICAgICAgICAg ICAgICAgICAgfHwgb2xkU3R5bGUtPm9wYWNpdHkoKSAhPSBuZXdTdHlsZS5vcGFjaXR5KCkKLSAg ICAgICAgICAgICAgICAgICAgfHwgb2xkU3R5bGUtPnRyYW5zZm9ybSgpICE9IG5ld1N0eWxlLnRy YW5zZm9ybSgpCi0gICAgICAgICAgICAgICAgICAgIHx8IG9sZFN0eWxlLT5maWx0ZXIoKSAhPSBu ZXdTdHlsZS5maWx0ZXIoKQotICAgICAgICAgICAgICAgICAgICApCi0gICAgICAgICAgICAgICAg bGF5ZXIoKS0+cmVwYWludEluY2x1ZGluZ0Rlc2NlbmRhbnRzKCk7Ci0gICAgICAgICAgICB9Ci0g ICAgICAgIH0KLSAgICB9Ci0KKyAgICBhdXRvKiBvbGRTdHlsZSA9IGhhc0luaXRpYWxpemVkU3R5 bGUoKSA/ICZzdHlsZSgpIDogbnVsbHB0cjsKKyAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVu Y2U6OlJlcGFpbnRMYXllciAmJiBwYXJlbnQoKSAmJiBvbGRTdHlsZSAmJiBvbGRTdHlsZS0+Y2xp cCgpICE9IG5ld1N0eWxlLmNsaXAoKSkKKyAgICAgICAgbGF5ZXIoKS0+Y2xlYXJDbGlwUmVjdHNJ bmNsdWRpbmdEZXNjZW5kYW50cygpOwogICAgIFJlbmRlckVsZW1lbnQ6OnN0eWxlV2lsbENoYW5n ZShkaWZmLCBuZXdTdHlsZSk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxYTQ5OWYzY2Q4ODIzMzliZTIwYWE0N2M2 ODJhMTRiNzRjMjllMjI3Li5mMGFjZDQ2MTZmNGQzZDY4MzI4M2NkMjYwM2IyMjRjZGM4OTIxOGUw IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDktMTAgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KKworICAgICAgICBbUmVwYWludF0gUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6 c3R5bGVXaWxsQ2hhbmdlIG1heSBpc3N1ZSByZWR1bmRhbnQgcmVwYWludAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2Mzc0CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82ODY1NzQ5MD4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIu CisKKyAgICAgICAgKiBjc3MzL2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0 YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9jc3Mz L2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhw ZWN0ZWQudHh0OgorCiAyMDIwLTA5LTA5ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUu Y29tPgogCiAgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6IG1fZmluaXNoZWROb2Rlcy5pc0VtcHR5 KCkgaW4gQXVkaW9Db250ZXh0IGRlc3RydWN0b3IKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Nz czMvYmxlbmRpbmcvcmVwYWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9jc3MzL2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9k ZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0CmluZGV4IDVlZThjMDYyODc3 N2Y1NmMwYWRlZmVlNTdiOWZiOGU0MWIzZGViMTcuLjc0YTUwZWQxYTJkNTBkM2MxNmQyZjc1MmY4 YzYwYjRiYTI5ZTY3ZmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2NzczMvYmxlbmRpbmcvcmVw YWludC9ibGVuZC1tb2RlLWlzb2xhdGUtc3RhY2tpbmctY29udGV4dC1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvY3NzMy9ibGVuZGluZy9yZXBhaW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1z dGFja2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dApAQCAtMTksNyArMTksNiBAQCBUZXN0IGlmIHVu c2V0dGluZyBhIHBhcmVudCdzIHN0YWNraW5nIGNvbnRleHQgY29ycmVjdGx5IHVwZGF0ZXMgaXRz IHBhcmVudCBpc29sYQogICAocmVjdCAyOCA1MjYgNjAgNjApCiAgIChyZWN0IDQ4IDUyNiA2MCA2 MCkKICAgKHJlY3QgNDggNDA4IDYwIDYwKQotICAocmVjdCA0OCA0MDggNjAgNjApCiAgIChyZWN0 IDQ4IDY0NCA2MCA2MCkKICAgKHJlY3QgNjggNjQ0IDYwIDYwKQogICAocmVjdCA0OCA2NDQgNjAg NjApCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3MvY3NzMy9ibGVuZGluZy9y ZXBhaW50L2JsZW5kLW1vZGUtaXNvbGF0ZS1zdGFja2luZy1jb250ZXh0LWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9jc3MzL2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9k ZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0CmluZGV4IGE4YWM5NzRkZTgx NzA3NGNmZGRmZGVlNzQwODJlZTUzODdjZDU5YTguLjk1YzllYjNkZjhhM2QyNGIxOTQ3OTMyZjU4 YzhjZDNkOWEzNjNiMDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9jc3Mz L2JsZW5kaW5nL3JlcGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9jc3MzL2JsZW5kaW5nL3Jl cGFpbnQvYmxlbmQtbW9kZS1pc29sYXRlLXN0YWNraW5nLWNvbnRleHQtZXhwZWN0ZWQudHh0CkBA IC0xOSw3ICsxOSw2IEBAIFRlc3QgaWYgdW5zZXR0aW5nIGEgcGFyZW50J3Mgc3RhY2tpbmcgY29u dGV4dCBjb3JyZWN0bHkgdXBkYXRlcyBpdHMgcGFyZW50IGlzb2xhCiAgIChyZWN0IDI4IDUzNiA2 MCA2MCkKICAgKHJlY3QgNDggNTM2IDYwIDYwKQogICAocmVjdCA0OCA0MTYgNjAgNjApCi0gIChy ZWN0IDQ4IDQxNiA2MCA2MCkKICAgKHJlY3QgNDggNjU2IDYwIDYwKQogICAocmVjdCA2OCA2NTYg NjAgNjApCiAgIChyZWN0IDQ4IDY1NiA2MCA2MCkK