218915 2020-11-13 10:36:32 -0800 [LFC][Integration] Use the physical size when setting the pre-computed width/height on ReplacedBox 2020-11-14 09:39:18 -0800 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 glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1707302 0 zalan 2020-11-13 10:36:32 -0800 This is where the logical vs. physical flip happens for writing directions 1707305 1 414061 zalan 2020-11-13 10:41:37 -0800 Created attachment 414061 Patch 1707307 2 414061 koivisto 2020-11-13 10:44:42 -0800 Comment on attachment 414061 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414061&action=review > Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp:126 > + updateReplacedDimensions(inlineBlock) Might be nicer to have a private shared function (updateReplacedOrInlineBlockDimensions or similar) 1707308 3 zalan 2020-11-13 10:48:08 -0800 (In reply to Antti Koivisto from comment #2) > Comment on attachment 414061 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=414061&action=review > > > Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp:126 > > + updateReplacedDimensions(inlineBlock) > > Might be nicer to have a private shared function > (updateReplacedOrInlineBlockDimensions or similar) good point! 1707315 4 414065 zalan 2020-11-13 10:59:27 -0800 Created attachment 414065 Patch 1707512 5 ews-feeder 2020-11-14 09:39:00 -0800 Committed r269818: <https://trac.webkit.org/changeset/269818> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414065. 1707513 6 webkit-bug-importer 2020-11-14 09:39:18 -0800 <rdar://problem/71402371> 414061 2020-11-13 10:41:37 -0800 2020-11-13 10:58:41 -0800 Patch bug-218915-20201113104136.patch text/plain 4594 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBmZjFjYzdhMDlhMmJh ZWVhOGFjMjllZjg1MGViYjM1MTY0MTFkNS4uYTA1NzdkYzkzZmRjMzQ1ZWY3MmQxMWQ2YmM2NzQ4 ZDJjMTdkMTQ2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTExLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IFVzZSB0aGUgcGh5c2ljYWwgc2l6ZSB3aGVuIHNldHRpbmcgdGhlIHByZS1jb21wdXRlZCB3aWR0 aC9oZWlnaHQgb24gUmVwbGFjZWRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxODkxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgaXMgd2hlcmUgdGhlIGxvZ2ljYWwgdnMuIHBoeXNpY2FsIGNv b3JkaW5hdGUgZmxpcCBoYXBwZW5zIG9uIHRoZSBpbnRlZ3JhdGlvbiBsZXZlbC4KKworICAgICAg ICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OnVwZGF0ZVJl cGxhY2VkRGltZW5zaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 TGluZUxheW91dDo6dXBkYXRlSW5saW5lQmxvY2tEaW1lbnNpb25zKToKKyAgICAgICAgKiBsYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0Lmg6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9ja0Zsb3c6OmxheW91dE1vZGVybkxpbmVzKToKKwogMjAyMC0xMS0xMyAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBFbmFibGUg aW5saW5lLWJsb2NrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDEwOGQx ZTNhNjIyNjkxYjdjOWI3ZTJjZjA2MTEyMmZlZWUwNGQ4N2YuLmY1ZjFiZGVkYWU2YTIzZTBiOGIw NzFlNWNlODJmNTkxZTQ0ODhmNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3Bw CkBAIC0xMDgsMTcgKzEwOCwyNCBAQCBib29sIExpbmVMYXlvdXQ6OmNhblVzZUZvckFmdGVyU3R5 bGVDaGFuZ2UoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBTdHlsZURpZgogICAgIHJldHVy biBjYW5Vc2VGb3JMaW5lTGF5b3V0QWZ0ZXJTdHlsZUNoYW5nZShmbG93LCBkaWZmKTsKIH0KIAot dm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVSZXBsYWNlZERpbWVuc2lvbnMoY29uc3QgUmVuZGVyQm94 JiByZXBsYWNlZCkKK3ZvaWQgTGluZUxheW91dDo6dXBkYXRlUmVwbGFjZWREaW1lbnNpb25zKGNv bnN0IFJlbmRlckJveCYgcmVwbGFjZWRPcklubGluZUJsb2NrKQogewotICAgIGF1dG8mIGxheW91 dEJveCA9IG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5kZXJlcihyZXBsYWNlZCk7CisgICAgYXV0 byYgbGF5b3V0Qm94ID0gbV9ib3hUcmVlLmxheW91dEJveEZvclJlbmRlcmVyKHJlcGxhY2VkT3JJ bmxpbmVCbG9jayk7CiAgICAgYXV0byYgcmVwbGFjZWRCb3ggPSBkb3duY2FzdDxMYXlvdXQ6OlJl cGxhY2VkQm94PihsYXlvdXRCb3gpOwogCi0gICAgcmVwbGFjZWRCb3guc2V0Q29udGVudFNpemVG b3JJbnRlZ3JhdGlvbih7IHJlcGxhY2VkLmNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgcmVwbGFjZWQu Y29udGVudExvZ2ljYWxIZWlnaHQoKSB9KTsKKyAgICAvLyBBbHdheXMgdXNlIHRoZSBwaHlzaWNh bCBzaXplIGhlcmUgZm9yIGlubGluZSBsZXZlbCBib3hlcyAodGhpcyBpcyB3aGVyZSB0aGUgbG9n aWNhbCB2cy4gcGh5c2ljYWwgY29vcmRzIGZsaXAgaGFwcGVucykuCisgICAgcmVwbGFjZWRCb3gu c2V0Q29udGVudFNpemVGb3JJbnRlZ3JhdGlvbih7IHJlcGxhY2VkT3JJbmxpbmVCbG9jay5jb250 ZW50V2lkdGgoKSwgcmVwbGFjZWRPcklubGluZUJsb2NrLmNvbnRlbnRIZWlnaHQoKSB9KTsKIAot ICAgIGF1dG8gYmFzZWxpbmUgPSByZXBsYWNlZC5iYXNlbGluZVBvc2l0aW9uKEFscGhhYmV0aWNC YXNlbGluZSwgZmFsc2UgLyogZmlyc3RMaW5lICovLCBIb3Jpem9udGFsTGluZSwgUG9zaXRpb25P bkNvbnRhaW5pbmdMaW5lKTsKKyAgICBhdXRvIGJhc2VsaW5lID0gcmVwbGFjZWRPcklubGluZUJs b2NrLmJhc2VsaW5lUG9zaXRpb24oQWxwaGFiZXRpY0Jhc2VsaW5lLCBmYWxzZSAvKiBmaXJzdExp bmUgKi8sIEhvcml6b250YWxMaW5lLCBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpOwogICAgIHJl cGxhY2VkQm94LnNldEJhc2VsaW5lKGJhc2VsaW5lKTsKIH0KIAordm9pZCBMaW5lTGF5b3V0Ojp1 cGRhdGVJbmxpbmVCbG9ja0RpbWVuc2lvbnMoY29uc3QgUmVuZGVyQmxvY2smIGlubGluZUJsb2Nr KQoreworICAgIC8vIEludGVncmF0aW9uIHVzZXMgcmVwbGFjZWQgYm94ZXMgaW50ZXJuYWxseSBm b3IgaW5saW5lLWJsb2NrIGNvbnRlbnQuCisgICAgdXBkYXRlUmVwbGFjZWREaW1lbnNpb25zKGlu bGluZUJsb2NrKQorfQorCiB2b2lkIExpbmVMYXlvdXQ6OnVwZGF0ZVN0eWxlKGNvbnN0IFJlbmRl ckJveE1vZGVsT2JqZWN0JiByZW5kZXJlcikKIHsKICAgICBtX2JveFRyZWUudXBkYXRlU3R5bGUo cmVuZGVyZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5oCmluZGV4IGI5NGViYjZlMTll MGIzYjg2MjJhMDc5NGZkMTliYjMwYjlmZjgzNDQuLjZmYmU0MjRhYTAxM2QyZjdlYjFhYjc2MTc5 ZWI2NzkwNjU5MzhkYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgKQEAgLTY0LDYg KzY0LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIGNhblVzZUZvckFmdGVyU3R5bGVDaGFu Z2UoY29uc3QgUmVuZGVyQmxvY2tGbG93JiwgU3R5bGVEaWZmZXJlbmNlKTsKIAogICAgIHZvaWQg dXBkYXRlUmVwbGFjZWREaW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYpOworICAgIHZvaWQgdXBk YXRlSW5saW5lQmxvY2tEaW1lbnNpb25zKGNvbnN0IFJlbmRlckJsb2NrJik7CiAgICAgdm9pZCB1 cGRhdGVTdHlsZShjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjdCYpOwogICAgIHZvaWQgbGF5b3V0 KCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5k ZXggN2Y4N2Y5NmZhMzBjMjFhMGFmMmI5M2IxMDc2NjQwMjY5OGI2YTc4NS4uNzYzMjY5Y2ExNjVh NTA5ODIyNTExMGQyMzU2NTM4ZjFmNzlkMzNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM2MjEsOCArMzYyMSw4IEBAIHZvaWQgUmVuZGVy QmxvY2tGbG93OjpsYXlvdXRNb2Rlcm5MaW5lcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIExheW91 dFVuaXQmIHJlcGFpCiAgICAgICAgIGlmIChpczxSZW5kZXJCbG9jaz4ocmVuZGVyZXIpKSB7CiAg ICAgICAgICAgICBhdXRvJiBibG9jayA9IGRvd25jYXN0PFJlbmRlckJsb2NrPihyZW5kZXJlcik7 CiAgICAgICAgICAgICBibG9jay5sYXlvdXRJZk5lZWRlZCgpOwotICAgICAgICAgICAgLy8gRklY TUU6IFRha2luZyB0aGUgc2FtZSBwYXRoIGFzIHJlcGxhY2VkIGZvciBub3cuCi0gICAgICAgICAg ICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQudXBkYXRlUmVwbGFjZWREaW1lbnNp b25zKGJsb2NrKTsKKyAgICAgICAgICAgIEFTU0VSVChibG9jay5zdHlsZSgpLmRpc3BsYXkoKSA9 PSBEaXNwbGF5VHlwZTo6SW5saW5lQmxvY2spOworICAgICAgICAgICAgbGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRMaW5lTGF5b3V0LnVwZGF0ZUlubGluZUJsb2NrRGltZW5zaW9ucyhibG9jayk7CiAg ICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCg== 414065 2020-11-13 10:59:27 -0800 2020-11-14 09:39:01 -0800 Patch bug-218915-20201113105912.patch text/plain 4726 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NzgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBmZjFjYzdhMDlhMmJh ZWVhOGFjMjllZjg1MGViYjM1MTY0MTFkNS4uN2Q2YTg4NWFjYzBjNmJlMTZmY2MzMDQ0NGNjOWVi YWNlZGNlOTA0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTExLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IFVzZSB0aGUgcGh5c2ljYWwgc2l6ZSB3aGVuIHNldHRpbmcgdGhlIHByZS1jb21wdXRlZCB3aWR0 aC9oZWlnaHQgb24gUmVwbGFjZWRCb3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxODkxNQorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZp c3RvLgorCisgICAgICAgIFRoaXMgaXMgd2hlcmUgdGhlIGxvZ2ljYWwgdnMuIHBoeXNpY2FsIGNv b3JkaW5hdGUgZmxpcCBoYXBwZW5zIG9uIHRoZSBpbnRlZ3JhdGlvbiBsZXZlbC4KKworICAgICAg ICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ6OnVwZGF0ZVJl cGxhY2VkRGltZW5zaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6 TGluZUxheW91dDo6dXBkYXRlSW5saW5lQmxvY2tEaW1lbnNpb25zKToKKyAgICAgICAgKiBsYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0Lmg6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9ja0Zsb3c6OmxheW91dE1vZGVybkxpbmVzKToKKwogMjAyMC0xMS0xMyAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9uXSBFbmFibGUg aW5saW5lLWJsb2NrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDEwOGQx ZTNhNjIyNjkxYjdjOWI3ZTJjZjA2MTEyMmZlZWUwNGQ4N2YuLmM4ZmNhZTI2YWIwOWU3MjJhYmY1 NzM2NDQyYTdmOTRmNzg1MmFlZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3Bw CkBAIC0xMTAsMTIgKzExMCwyNCBAQCBib29sIExpbmVMYXlvdXQ6OmNhblVzZUZvckFmdGVyU3R5 bGVDaGFuZ2UoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBTdHlsZURpZgogCiB2b2lkIExp bmVMYXlvdXQ6OnVwZGF0ZVJlcGxhY2VkRGltZW5zaW9ucyhjb25zdCBSZW5kZXJCb3gmIHJlcGxh Y2VkKQogewotICAgIGF1dG8mIGxheW91dEJveCA9IG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5k ZXJlcihyZXBsYWNlZCk7CisgICAgdXBkYXRlTGF5b3V0Qm94RGltZW5zaW9ucyhyZXBsYWNlZCk7 Cit9CisKK3ZvaWQgTGluZUxheW91dDo6dXBkYXRlSW5saW5lQmxvY2tEaW1lbnNpb25zKGNvbnN0 IFJlbmRlckJsb2NrJiBpbmxpbmVCbG9jaykKK3sKKyAgICB1cGRhdGVMYXlvdXRCb3hEaW1lbnNp b25zKGlubGluZUJsb2NrKTsKK30KKwordm9pZCBMaW5lTGF5b3V0Ojp1cGRhdGVMYXlvdXRCb3hE aW1lbnNpb25zKGNvbnN0IFJlbmRlckJveCYgcmVwbGFjZWRPcklubGluZUJsb2NrKQoreworICAg IGF1dG8mIGxheW91dEJveCA9IG1fYm94VHJlZS5sYXlvdXRCb3hGb3JSZW5kZXJlcihyZXBsYWNl ZE9ySW5saW5lQmxvY2spOworICAgIC8vIEludGVybmFsbHkgYm90aCByZXBsYWNlZCBhbmQgaW5s aW5lLWJveCBjb250ZW50IHVzZSByZXBsYWNlZCBib3hlcy4KICAgICBhdXRvJiByZXBsYWNlZEJv eCA9IGRvd25jYXN0PExheW91dDo6UmVwbGFjZWRCb3g+KGxheW91dEJveCk7CiAKLSAgICByZXBs YWNlZEJveC5zZXRDb250ZW50U2l6ZUZvckludGVncmF0aW9uKHsgcmVwbGFjZWQuY29udGVudExv Z2ljYWxXaWR0aCgpLCByZXBsYWNlZC5jb250ZW50TG9naWNhbEhlaWdodCgpIH0pOworICAgIC8v IEFsd2F5cyB1c2UgdGhlIHBoeXNpY2FsIHNpemUgaGVyZSBmb3IgaW5saW5lIGxldmVsIGJveGVz ICh0aGlzIGlzIHdoZXJlIHRoZSBsb2dpY2FsIHZzLiBwaHlzaWNhbCBjb29yZHMgZmxpcCBoYXBw ZW5zKS4KKyAgICByZXBsYWNlZEJveC5zZXRDb250ZW50U2l6ZUZvckludGVncmF0aW9uKHsgcmVw bGFjZWRPcklubGluZUJsb2NrLmNvbnRlbnRXaWR0aCgpLCByZXBsYWNlZE9ySW5saW5lQmxvY2su Y29udGVudEhlaWdodCgpIH0pOwogCi0gICAgYXV0byBiYXNlbGluZSA9IHJlcGxhY2VkLmJhc2Vs aW5lUG9zaXRpb24oQWxwaGFiZXRpY0Jhc2VsaW5lLCBmYWxzZSAvKiBmaXJzdExpbmUgKi8sIEhv cml6b250YWxMaW5lLCBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpOworICAgIGF1dG8gYmFzZWxp bmUgPSByZXBsYWNlZE9ySW5saW5lQmxvY2suYmFzZWxpbmVQb3NpdGlvbihBbHBoYWJldGljQmFz ZWxpbmUsIGZhbHNlIC8qIGZpcnN0TGluZSAqLywgSG9yaXpvbnRhbExpbmUsIFBvc2l0aW9uT25D b250YWluaW5nTGluZSk7CiAgICAgcmVwbGFjZWRCb3guc2V0QmFzZWxpbmUoYmFzZWxpbmUpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmgKaW5kZXggYjk0ZWJiNmUxOWUwYjNiODYy MmEwNzk0ZmQxOWJiMzBiOWZmODM0NC4uNmFkZjhjYzVmMTA4OTE4YTRjOTZhNTlmOTY0YzM1ZDg4 OGFjZjgzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uTGluZUxheW91dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuaApAQCAtNjQsNiArNjQsNyBA QCBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgY2FuVXNlRm9yQWZ0ZXJTdHlsZUNoYW5nZShjb25z dCBSZW5kZXJCbG9ja0Zsb3cmLCBTdHlsZURpZmZlcmVuY2UpOwogCiAgICAgdm9pZCB1cGRhdGVS ZXBsYWNlZERpbWVuc2lvbnMoY29uc3QgUmVuZGVyQm94Jik7CisgICAgdm9pZCB1cGRhdGVJbmxp bmVCbG9ja0RpbWVuc2lvbnMoY29uc3QgUmVuZGVyQmxvY2smKTsKICAgICB2b2lkIHVwZGF0ZVN0 eWxlKGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0Jik7CiAgICAgdm9pZCBsYXlvdXQoKTsKIApA QCAtMTAxLDYgKzEwMiw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwcmVwYXJlRmxvYXRpbmdTdGF0 ZSgpOwogICAgIHZvaWQgY29uc3RydWN0Q29udGVudCgpOwogICAgIElubGluZUNvbnRlbnQmIGVu c3VyZUlubGluZUNvbnRlbnQoKTsKKyAgICB2b2lkIHVwZGF0ZUxheW91dEJveERpbWVuc2lvbnMo Y29uc3QgUmVuZGVyQm94Jik7CiAKICAgICBSZW5kZXJCbG9ja0Zsb3cmIGZsb3coKSB7IHJldHVy biBtX2JveFRyZWUuZmxvdygpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrRmxvdy5jcHAKaW5kZXggN2Y4N2Y5NmZhMzBjMjFhMGFmMmI5M2IxMDc2NjQwMjY5OGI2 YTc4NS4uNzYzMjY5Y2ExNjVhNTA5ODIyNTExMGQyMzU2NTM4ZjFmNzlkMzNlMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTM2MjEsOCArMzYy MSw4IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRNb2Rlcm5MaW5lcyhib29sIHJlbGF5 b3V0Q2hpbGRyZW4sIExheW91dFVuaXQmIHJlcGFpCiAgICAgICAgIGlmIChpczxSZW5kZXJCbG9j az4ocmVuZGVyZXIpKSB7CiAgICAgICAgICAgICBhdXRvJiBibG9jayA9IGRvd25jYXN0PFJlbmRl ckJsb2NrPihyZW5kZXJlcik7CiAgICAgICAgICAgICBibG9jay5sYXlvdXRJZk5lZWRlZCgpOwot ICAgICAgICAgICAgLy8gRklYTUU6IFRha2luZyB0aGUgc2FtZSBwYXRoIGFzIHJlcGxhY2VkIGZv ciBub3cuCi0gICAgICAgICAgICBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQudXBk YXRlUmVwbGFjZWREaW1lbnNpb25zKGJsb2NrKTsKKyAgICAgICAgICAgIEFTU0VSVChibG9jay5z dHlsZSgpLmRpc3BsYXkoKSA9PSBEaXNwbGF5VHlwZTo6SW5saW5lQmxvY2spOworICAgICAgICAg ICAgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LnVwZGF0ZUlubGluZUJsb2NrRGlt ZW5zaW9ucyhibG9jayk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCg==