233010 2021-11-11 13:10:02 -0800 Move subtree update logic in ImageOverlay::updateWithTextRecognitionResult() into a separate helper 2021-11-12 08:53:21 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi cdumez esprehn+autocc ews-watchlist hi kangil.han megan_gardner thorton webkit-bug-importer oldest_to_newest 1814183 0 wenson_hsieh 2021-11-11 13:10:02 -0800 . 1814186 1 443996 wenson_hsieh 2021-11-11 13:24:21 -0800 Created attachment 443996 Depends on #232974 1814329 2 443996 wenson_hsieh 2021-11-11 18:10:19 -0800 Comment on attachment 443996 Depends on #232974 The flaky test failure (fast/dom/Geolocation/cached-position-iframe.html) seems unrelated. 1814473 3 443996 wenson_hsieh 2021-11-12 08:49:06 -0800 Comment on attachment 443996 Depends on #232974 Thanks for the review! 1814477 4 ews-feeder 2021-11-12 08:52:27 -0800 Committed r285725 (244184@main): <https://commits.webkit.org/244184@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443996. 1814478 5 webkit-bug-importer 2021-11-12 08:53:21 -0800 <rdar://problem/85345074> 443996 2021-11-11 13:24:21 -0800 2021-11-12 08:52:28 -0800 Depends on #232974 bug-233010-20211111132421.patch text/plain 12681 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODY4MWU3Zjc4OTkzNGY3 MTFkYzU0MjcxN2VjNDIwODkwNWEzNmExYi4uYTIxYzM5MzlkMjdjNmY5ZmJkMTkzNzRmZGRlNjA2 MTQxMDNkY2Y3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTExLTExICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc3VidHJl ZSB1cGRhdGUgbG9naWMgaW4gSW1hZ2VPdmVybGF5Ojp1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9u UmVzdWx0KCkgaW50byBhIHNlcGFyYXRlIGhlbHBlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU3BsaXQgYHVwZGF0ZVdpdGhUZXh0UmVjb2duaXRpb25S ZXN1bHQoKWAgaW50byB0d28gcGhhc2VzOiB0aGUgZmlyc3Qgb2Ygd2hpY2ggdXBkYXRlcyB0aGUg VUEgc2hhZG93IERPTSB0bworICAgICAgICByZWZsZWN0IHRoZSBnaXZlbiB0ZXh0IHJlY29nbml0 aW9uIHJlc3VsdHMsIGFuZCBhIHNlY29uZCBwaGFzZSB0aGF0IHVwZGF0ZXMgaW5saW5lIHN0eWxl cyBmb3IgZWFjaCBvZiB0aGUgaW1hZ2UKKyAgICAgICAgb3ZlcmxheSBlbGVtZW50cyBieSBtYXBw aW5nIG5vcm1hbGl6ZWQgT0NSIHF1YWRzIG9udG8gcm90YXRlZCBib3VuZGluZyByZWN0cyBpbiBj bGllbnQgY29vcmRpbmF0ZXMuIFRoaXMgd2lsbAorICAgICAgICBtYWtlIGl0IGVhc2llciB0byBh ZGQgc3VwcG9ydCBmb3IgcmVwcmVzZW50aW5nIGBUZXh0UmVjb2duaXRpb25CbG9ja0RhdGFgIGFz IGltYWdlIG92ZXJsYXkgY29udGVudCBpbiB0aGUgbmV4dAorICAgICAgICBwYXRjaC4KKworICAg ICAgICAqIGRvbS9JbWFnZU92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VPdmVy bGF5OjppbWFnZU92ZXJsYXlMaW5lQ2xhc3MpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VPdmVy bGF5OjppbWFnZU92ZXJsYXlUZXh0Q2xhc3MpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VPdmVy bGF5Ojp1cGRhdGVTdWJ0cmVlKToKKworICAgICAgICBOb3cgdGhhdCB0aGlzIGlzIGFsbCBuYW1l c3BhY2VkIGluc2lkZSBgSW1hZ2VPdmVybGF5YCwgd2UgY2FuIGFsc28gc2ltcGxpZnkgc29tZSBv ZiB0aGVzZSBuYW1lcy4gSW5zdGVhZCBvZgorICAgICAgICBUZXh0UmVjb2duaXRpb25MaW5lRWxl bWVudHMgYW5kIFRleHRSZWNvZ25pdGlvbkVsZW1lbnRzLCB3ZSBjYW4ganVzdCBjYWxsIHRoZW0g TGluZUVsZW1lbnRzIGFuZCBFbGVtZW50cy4KKworICAgICAgICAoV2ViQ29yZTo6SW1hZ2VPdmVy bGF5Ojp1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9uUmVzdWx0KToKKwogMjAyMS0xMS0xMSAgV2Vu c29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGl2ZSBUZXh0 XSBBdWdtZW50IFRleHRSZWNvZ25pdGlvblJlc3VsdCB3aXRoIGEgbmV3IHR5cGUgb2YgdGV4dCBy ZWNvZ25pdGlvbiBkYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vSW1hZ2VPdmVy bGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9JbWFnZU92ZXJsYXkuY3BwCmluZGV4IDEzNGM2 NDRhYTA2NTQ5OTBlNTZkNjk4MTE1MDZmODNiZmFmZmU4ZDguLmZlOWZkMTVkNjVjMjlhOTRjZGQx ZWE0MDUyMDgwYjFjNjRlMWFlM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9JbWFn ZU92ZXJsYXkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9JbWFnZU92ZXJsYXkuY3BwCkBA IC02OSw2ICs2OSwyMiBAQCBzdGF0aWMgY29uc3QgQXRvbVN0cmluZyYgaW1hZ2VPdmVybGF5RGF0 YURldGVjdG9yQ2xhc3NOYW1lKCkKICAgICByZXR1cm4gY2xhc3NOYW1lOwogfQogCisjaWYgRU5B QkxFKElNQUdFX0FOQUxZU0lTKQorCitzdGF0aWMgY29uc3QgQXRvbVN0cmluZyYgaW1hZ2VPdmVy bGF5TGluZUNsYXNzKCkKK3sKKyAgICBzdGF0aWMgTWFpblRocmVhZE5ldmVyRGVzdHJveWVkPGNv bnN0IEF0b21TdHJpbmc+IGNsYXNzTmFtZSgiaW1hZ2Utb3ZlcmxheS1saW5lIiwgQXRvbVN0cmlu Zzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpOworICAgIHJldHVybiBjbGFzc05hbWU7Cit9CisKK3N0 YXRpYyBjb25zdCBBdG9tU3RyaW5nJiBpbWFnZU92ZXJsYXlUZXh0Q2xhc3MoKQoreworICAgIHN0 YXRpYyBNYWluVGhyZWFkTmV2ZXJEZXN0cm95ZWQ8Y29uc3QgQXRvbVN0cmluZz4gY2xhc3NOYW1l KCJpbWFnZS1vdmVybGF5LXRleHQiLCBBdG9tU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCk7 CisgICAgcmV0dXJuIGNsYXNzTmFtZTsKK30KKworI2VuZGlmIC8vIEVOQUJMRShJTUFHRV9BTkFM WVNJUykKKwogYm9vbCBoYXNPdmVybGF5KGNvbnN0IEhUTUxFbGVtZW50JiBlbGVtZW50KQogewog ICAgIGF1dG8gc2hhZG93Um9vdCA9IGVsZW1lbnQuc2hhZG93Um9vdCgpOwpAQCAtMTY2LDI0ICsx ODIsMjEgQEAgSW50UmVjdCBjb250YWluZXJSZWN0KEhUTUxFbGVtZW50JiBlbGVtZW50KQogICAg IHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KGRvd25jYXN0PFJlbmRlckltYWdlPigqcmVuZGVyZXIp LnJlcGxhY2VkQ29udGVudFJlY3QoKSk7CiB9CiAKLXZvaWQgdXBkYXRlV2l0aFRleHRSZWNvZ25p dGlvblJlc3VsdChIVE1MRWxlbWVudCYgZWxlbWVudCwgY29uc3QgVGV4dFJlY29nbml0aW9uUmVz dWx0JiByZXN1bHQsIENhY2hlVGV4dFJlY29nbml0aW9uUmVzdWx0cyBjYWNoZVRleHRSZWNvZ25p dGlvblJlc3VsdHMpCi17Ci0gICAgc3RhdGljIE1haW5UaHJlYWROZXZlckRlc3Ryb3llZDxjb25z dCBBdG9tU3RyaW5nPiBpbWFnZU92ZXJsYXlMaW5lQ2xhc3MoImltYWdlLW92ZXJsYXktbGluZSIs IEF0b21TdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKTsKLSAgICBzdGF0aWMgTWFpblRocmVh ZE5ldmVyRGVzdHJveWVkPGNvbnN0IEF0b21TdHJpbmc+IGltYWdlT3ZlcmxheVRleHRDbGFzcygi aW1hZ2Utb3ZlcmxheS10ZXh0IiwgQXRvbVN0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpOwor c3RydWN0IExpbmVFbGVtZW50cyB7CisgICAgUmVmPEhUTUxEaXZFbGVtZW50PiBsaW5lOworICAg IFZlY3RvcjxSZWY8SFRNTEVsZW1lbnQ+PiBjaGlsZHJlbjsKK307CiAKLSAgICBzdHJ1Y3QgVGV4 dFJlY29nbml0aW9uTGluZUVsZW1lbnRzIHsKLSAgICAgICAgUmVmPEhUTUxEaXZFbGVtZW50PiBs aW5lOwotICAgICAgICBWZWN0b3I8UmVmPEhUTUxFbGVtZW50Pj4gY2hpbGRyZW47Ci0gICAgfTsK LQotICAgIHN0cnVjdCBUZXh0UmVjb2duaXRpb25FbGVtZW50cyB7Ci0gICAgICAgIFJlZlB0cjxI VE1MRGl2RWxlbWVudD4gcm9vdDsKLSAgICAgICAgVmVjdG9yPFRleHRSZWNvZ25pdGlvbkxpbmVF bGVtZW50cz4gbGluZXM7Ci0gICAgICAgIFZlY3RvcjxSZWY8SFRNTERpdkVsZW1lbnQ+PiBkYXRh RGV0ZWN0b3JzOwotICAgIH07CitzdHJ1Y3QgRWxlbWVudHMgeworICAgIFJlZlB0cjxIVE1MRGl2 RWxlbWVudD4gcm9vdDsKKyAgICBWZWN0b3I8TGluZUVsZW1lbnRzPiBsaW5lczsKKyAgICBWZWN0 b3I8UmVmPEhUTUxEaXZFbGVtZW50Pj4gZGF0YURldGVjdG9yczsKK307CiAKLSAgICBib29sIGhh ZEV4aXN0aW5nVGV4dFJlY29nbml0aW9uRWxlbWVudHMgPSBmYWxzZTsKLSAgICBUZXh0UmVjb2du aXRpb25FbGVtZW50cyB0ZXh0UmVjb2duaXRpb25FbGVtZW50czsKK3N0YXRpYyBFbGVtZW50cyB1 cGRhdGVTdWJ0cmVlKEhUTUxFbGVtZW50JiBlbGVtZW50LCBjb25zdCBUZXh0UmVjb2duaXRpb25S ZXN1bHQmIHJlc3VsdCkKK3sKKyAgICBib29sIGhhZEV4aXN0aW5nRWxlbWVudHMgPSBmYWxzZTsK KyAgICBFbGVtZW50cyBlbGVtZW50czsKICAgICBSZWZQdHI8SFRNTEVsZW1lbnQ+IG1lZGlhQ29u dHJvbHNDb250YWluZXI7CiAgICAgaWYgKFJlZlB0ciBzaGFkb3dSb290ID0gZWxlbWVudC5zaGFk b3dSb290KCkpIHsKICNpZiBFTkFCTEUoTU9ERVJOX01FRElBX0NPTlRST0xTKQpAQCAtMjA3LDM4 ICsyMjAsMzggQEAgdm9pZCB1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9uUmVzdWx0KEhUTUxFbGVt ZW50JiBlbGVtZW50LCBjb25zdCBUZXh0UmVjb2duaXRpb24KICAgICAgICAgICAgICAgICBjb250 YWluZXJGb3JJbWFnZU92ZXJsYXkgPSBzaGFkb3dSb290OwogICAgICAgICAgICAgZm9yIChhdXRv JiBjaGlsZCA6IGNoaWxkcmVuT2ZUeXBlPEhUTUxEaXZFbGVtZW50PigqY29udGFpbmVyRm9ySW1h Z2VPdmVybGF5KSkgewogICAgICAgICAgICAgICAgIGlmIChjaGlsZC5nZXRJZEF0dHJpYnV0ZSgp ID09IGltYWdlT3ZlcmxheUVsZW1lbnRJZGVudGlmaWVyKCkpIHsKLSAgICAgICAgICAgICAgICAg ICAgdGV4dFJlY29nbml0aW9uRWxlbWVudHMucm9vdCA9ICZjaGlsZDsKLSAgICAgICAgICAgICAg ICAgICAgaGFkRXhpc3RpbmdUZXh0UmVjb2duaXRpb25FbGVtZW50cyA9IHRydWU7CisgICAgICAg ICAgICAgICAgICAgIGVsZW1lbnRzLnJvb3QgPSAmY2hpbGQ7CisgICAgICAgICAgICAgICAgICAg IGhhZEV4aXN0aW5nRWxlbWVudHMgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAK LSAgICBpZiAodGV4dFJlY29nbml0aW9uRWxlbWVudHMucm9vdCkgewotICAgICAgICBmb3IgKGF1 dG8mIGxpbmVPckRhdGFEZXRlY3RvciA6IGNoaWxkcmVuT2ZUeXBlPEhUTUxEaXZFbGVtZW50Pigq dGV4dFJlY29nbml0aW9uRWxlbWVudHMucm9vdCkpIHsKKyAgICBpZiAoZWxlbWVudHMucm9vdCkg eworICAgICAgICBmb3IgKGF1dG8mIGxpbmVPckRhdGFEZXRlY3RvciA6IGNoaWxkcmVuT2ZUeXBl PEhUTUxEaXZFbGVtZW50PigqZWxlbWVudHMucm9vdCkpIHsKICAgICAgICAgICAgIGlmICghbGlu ZU9yRGF0YURldGVjdG9yLmhhc0NsYXNzKCkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAK LSAgICAgICAgICAgIGlmIChsaW5lT3JEYXRhRGV0ZWN0b3IuY2xhc3NMaXN0KCkuY29udGFpbnMo aW1hZ2VPdmVybGF5TGluZUNsYXNzKSkgewotICAgICAgICAgICAgICAgIFRleHRSZWNvZ25pdGlv bkxpbmVFbGVtZW50cyBsaW5lRWxlbWVudHMgeyBsaW5lT3JEYXRhRGV0ZWN0b3IsIHsgfSB9Owor ICAgICAgICAgICAgaWYgKGxpbmVPckRhdGFEZXRlY3Rvci5jbGFzc0xpc3QoKS5jb250YWlucyhp bWFnZU92ZXJsYXlMaW5lQ2xhc3MoKSkpIHsKKyAgICAgICAgICAgICAgICBMaW5lRWxlbWVudHMg bGluZUVsZW1lbnRzIHsgbGluZU9yRGF0YURldGVjdG9yLCB7IH0gfTsKICAgICAgICAgICAgICAg ICBmb3IgKGF1dG8mIHRleHQgOiBjaGlsZHJlbk9mVHlwZTxIVE1MRGl2RWxlbWVudD4obGluZU9y RGF0YURldGVjdG9yKSkKICAgICAgICAgICAgICAgICAgICAgbGluZUVsZW1lbnRzLmNoaWxkcmVu LmFwcGVuZCh0ZXh0KTsKLSAgICAgICAgICAgICAgICB0ZXh0UmVjb2duaXRpb25FbGVtZW50cy5s aW5lcy5hcHBlbmQoV1RGTW92ZShsaW5lRWxlbWVudHMpKTsKKyAgICAgICAgICAgICAgICBlbGVt ZW50cy5saW5lcy5hcHBlbmQoV1RGTW92ZShsaW5lRWxlbWVudHMpKTsKICAgICAgICAgICAgIH0g ZWxzZSBpZiAobGluZU9yRGF0YURldGVjdG9yLmNsYXNzTGlzdCgpLmNvbnRhaW5zKGltYWdlT3Zl cmxheURhdGFEZXRlY3RvckNsYXNzTmFtZSgpKSkKLSAgICAgICAgICAgICAgICB0ZXh0UmVjb2du aXRpb25FbGVtZW50cy5kYXRhRGV0ZWN0b3JzLmFwcGVuZChsaW5lT3JEYXRhRGV0ZWN0b3IpOwor ICAgICAgICAgICAgICAgIGVsZW1lbnRzLmRhdGFEZXRlY3RvcnMuYXBwZW5kKGxpbmVPckRhdGFE ZXRlY3Rvcik7CiAgICAgICAgIH0KIAotICAgICAgICBib29sIGNhblVzZUV4aXN0aW5nVGV4dFJl Y29nbml0aW9uRWxlbWVudHMgPSAoWyZdIHsKLSAgICAgICAgICAgIGlmIChyZXN1bHQuZGF0YURl dGVjdG9ycy5zaXplKCkgIT0gdGV4dFJlY29nbml0aW9uRWxlbWVudHMuZGF0YURldGVjdG9ycy5z aXplKCkpCisgICAgICAgIGJvb2wgY2FuVXNlRXhpc3RpbmdFbGVtZW50cyA9IChbJl0geworICAg ICAgICAgICAgaWYgKHJlc3VsdC5kYXRhRGV0ZWN0b3JzLnNpemUoKSAhPSBlbGVtZW50cy5kYXRh RGV0ZWN0b3JzLnNpemUoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAg ICAgICAgIGlmIChyZXN1bHQubGluZXMuc2l6ZSgpICE9IHRleHRSZWNvZ25pdGlvbkVsZW1lbnRz LmxpbmVzLnNpemUoKSkKKyAgICAgICAgICAgIGlmIChyZXN1bHQubGluZXMuc2l6ZSgpICE9IGVs ZW1lbnRzLmxpbmVzLnNpemUoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICAgICAgICAgIGZvciAoc2l6ZV90IGxpbmVJbmRleCA9IDA7IGxpbmVJbmRleCA8IHJlc3VsdC5s aW5lcy5zaXplKCk7ICsrbGluZUluZGV4KSB7CiAgICAgICAgICAgICAgICAgYXV0byYgY2hpbGRS ZXN1bHRzID0gcmVzdWx0LmxpbmVzW2xpbmVJbmRleF0uY2hpbGRyZW47Ci0gICAgICAgICAgICAg ICAgYXV0byYgY2hpbGRUZXh0RWxlbWVudHMgPSB0ZXh0UmVjb2duaXRpb25FbGVtZW50cy5saW5l c1tsaW5lSW5kZXhdLmNoaWxkcmVuOworICAgICAgICAgICAgICAgIGF1dG8mIGNoaWxkVGV4dEVs ZW1lbnRzID0gZWxlbWVudHMubGluZXNbbGluZUluZGV4XS5jaGlsZHJlbjsKICAgICAgICAgICAg ICAgICBpZiAoY2hpbGRSZXN1bHRzLnNpemUoKSAhPSBjaGlsZFRleHRFbGVtZW50cy5zaXplKCkp CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjUxLDE4ICsyNjQsMTgg QEAgdm9pZCB1cGRhdGVXaXRoVGV4dFJlY29nbml0aW9uUmVzdWx0KEhUTUxFbGVtZW50JiBlbGVt ZW50LCBjb25zdCBUZXh0UmVjb2duaXRpb24KICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICB9KSgpOwogCi0gICAgICAgIGlmICghY2FuVXNlRXhpc3RpbmdUZXh0UmVjb2duaXRpb25F bGVtZW50cykgewotICAgICAgICAgICAgdGV4dFJlY29nbml0aW9uRWxlbWVudHMucm9vdC0+cmVt b3ZlKCk7Ci0gICAgICAgICAgICB0ZXh0UmVjb2duaXRpb25FbGVtZW50cyA9IHsgfTsKKyAgICAg ICAgaWYgKCFjYW5Vc2VFeGlzdGluZ0VsZW1lbnRzKSB7CisgICAgICAgICAgICBlbGVtZW50cy5y b290LT5yZW1vdmUoKTsKKyAgICAgICAgICAgIGVsZW1lbnRzID0geyB9OwogICAgICAgICB9CiAg ICAgfQogCiAgICAgaWYgKHJlc3VsdC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKKyAgICAg ICAgcmV0dXJuIHsgfTsKIAogICAgIFJlZiBkb2N1bWVudCA9IGVsZW1lbnQuZG9jdW1lbnQoKTsK ICAgICBSZWYgc2hhZG93Um9vdCA9IGVsZW1lbnQuZW5zdXJlVXNlckFnZW50U2hhZG93Um9vdCgp OwotICAgIGlmICghdGV4dFJlY29nbml0aW9uRWxlbWVudHMucm9vdCkgeworICAgIGlmICghZWxl bWVudHMucm9vdCkgewogICAgICAgICBhdXRvIHJvb3RDb250YWluZXIgPSBIVE1MRGl2RWxlbWVu dDo6Y3JlYXRlKGRvY3VtZW50LmdldCgpKTsKICAgICAgICAgcm9vdENvbnRhaW5lci0+c2V0SWRB dHRyaWJ1dGUoaW1hZ2VPdmVybGF5RWxlbWVudElkZW50aWZpZXIoKSk7CiAgICAgICAgIGlmIChk b2N1bWVudC0+aXNJbWFnZURvY3VtZW50KCkpCkBAIC0yNzIsMzQgKzI4NSwzNCBAQCB2b2lkIHVw ZGF0ZVdpdGhUZXh0UmVjb2duaXRpb25SZXN1bHQoSFRNTEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0 IFRleHRSZWNvZ25pdGlvbgogICAgICAgICAgICAgbWVkaWFDb250cm9sc0NvbnRhaW5lci0+YXBw ZW5kQ2hpbGQocm9vdENvbnRhaW5lcik7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHNoYWRv d1Jvb3QtPmFwcGVuZENoaWxkKHJvb3RDb250YWluZXIpOwotICAgICAgICB0ZXh0UmVjb2duaXRp b25FbGVtZW50cy5yb290ID0gcm9vdENvbnRhaW5lci5jb3B5UmVmKCk7Ci0gICAgICAgIHRleHRS ZWNvZ25pdGlvbkVsZW1lbnRzLmxpbmVzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkocmVzdWx0Lmxp bmVzLnNpemUoKSk7CisgICAgICAgIGVsZW1lbnRzLnJvb3QgPSByb290Q29udGFpbmVyLmNvcHlS ZWYoKTsKKyAgICAgICAgZWxlbWVudHMubGluZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShyZXN1 bHQubGluZXMuc2l6ZSgpKTsKICAgICAgICAgZm9yIChhdXRvJiBsaW5lIDogcmVzdWx0LmxpbmVz KSB7CiAgICAgICAgICAgICBhdXRvIGxpbmVDb250YWluZXIgPSBIVE1MRGl2RWxlbWVudDo6Y3Jl YXRlKGRvY3VtZW50LmdldCgpKTsKLSAgICAgICAgICAgIGxpbmVDb250YWluZXItPmNsYXNzTGlz dCgpLmFkZChpbWFnZU92ZXJsYXlMaW5lQ2xhc3MpOworICAgICAgICAgICAgbGluZUNvbnRhaW5l ci0+Y2xhc3NMaXN0KCkuYWRkKGltYWdlT3ZlcmxheUxpbmVDbGFzcygpKTsKICAgICAgICAgICAg IHJvb3RDb250YWluZXItPmFwcGVuZENoaWxkKGxpbmVDb250YWluZXIpOwotICAgICAgICAgICAg VGV4dFJlY29nbml0aW9uTGluZUVsZW1lbnRzIGxpbmVFbGVtZW50cyB7IGxpbmVDb250YWluZXIs IHsgfSB9OworICAgICAgICAgICAgTGluZUVsZW1lbnRzIGxpbmVFbGVtZW50cyB7IGxpbmVDb250 YWluZXIsIHsgfSB9OwogICAgICAgICAgICAgbGluZUVsZW1lbnRzLmNoaWxkcmVuLnJlc2VydmVJ bml0aWFsQ2FwYWNpdHkobGluZS5jaGlsZHJlbi5zaXplKCkpOwogICAgICAgICAgICAgZm9yIChz aXplX3QgY2hpbGRJbmRleCA9IDA7IGNoaWxkSW5kZXggPCBsaW5lLmNoaWxkcmVuLnNpemUoKTsg KytjaGlsZEluZGV4KSB7CiAgICAgICAgICAgICAgICAgYXV0byYgY2hpbGQgPSBsaW5lLmNoaWxk cmVuW2NoaWxkSW5kZXhdOwogICAgICAgICAgICAgICAgIGF1dG8gdGV4dENvbnRhaW5lciA9IEhU TUxEaXZFbGVtZW50OjpjcmVhdGUoZG9jdW1lbnQuZ2V0KCkpOwotICAgICAgICAgICAgICAgIHRl eHRDb250YWluZXItPmNsYXNzTGlzdCgpLmFkZChpbWFnZU92ZXJsYXlUZXh0Q2xhc3MpOworICAg ICAgICAgICAgICAgIHRleHRDb250YWluZXItPmNsYXNzTGlzdCgpLmFkZChpbWFnZU92ZXJsYXlU ZXh0Q2xhc3MoKSk7CiAgICAgICAgICAgICAgICAgbGluZUNvbnRhaW5lci0+YXBwZW5kQ2hpbGQo dGV4dENvbnRhaW5lcik7CiAgICAgICAgICAgICAgICAgdGV4dENvbnRhaW5lci0+YXBwZW5kQ2hp bGQoVGV4dDo6Y3JlYXRlKGRvY3VtZW50LmdldCgpLCBjaGlsZC5oYXNMZWFkaW5nV2hpdGVzcGFj ZSA/IG1ha2VTdHJpbmcoJ1xuJywgY2hpbGQudGV4dCkgOiBjaGlsZC50ZXh0KSk7CiAgICAgICAg ICAgICAgICAgbGluZUVsZW1lbnRzLmNoaWxkcmVuLnVuY2hlY2tlZEFwcGVuZChXVEZNb3ZlKHRl eHRDb250YWluZXIpKTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgbGluZUNvbnRhaW5l ci0+YXBwZW5kQ2hpbGQoSFRNTEJSRWxlbWVudDo6Y3JlYXRlKGRvY3VtZW50LmdldCgpKSk7Ci0g ICAgICAgICAgICB0ZXh0UmVjb2duaXRpb25FbGVtZW50cy5saW5lcy51bmNoZWNrZWRBcHBlbmQo V1RGTW92ZShsaW5lRWxlbWVudHMpKTsKKyAgICAgICAgICAgIGVsZW1lbnRzLmxpbmVzLnVuY2hl Y2tlZEFwcGVuZChXVEZNb3ZlKGxpbmVFbGVtZW50cykpOwogICAgICAgICB9CiAKICNpZiBFTkFC TEUoREFUQV9ERVRFQ1RJT04pCi0gICAgICAgIHRleHRSZWNvZ25pdGlvbkVsZW1lbnRzLmRhdGFE ZXRlY3RvcnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShyZXN1bHQuZGF0YURldGVjdG9ycy5zaXpl KCkpOworICAgICAgICBlbGVtZW50cy5kYXRhRGV0ZWN0b3JzLnJlc2VydmVJbml0aWFsQ2FwYWNp dHkocmVzdWx0LmRhdGFEZXRlY3RvcnMuc2l6ZSgpKTsKICAgICAgICAgZm9yIChhdXRvJiBkYXRh RGV0ZWN0b3IgOiByZXN1bHQuZGF0YURldGVjdG9ycykgewogICAgICAgICAgICAgYXV0byBkYXRh RGV0ZWN0b3JDb250YWluZXIgPSBEYXRhRGV0ZWN0aW9uOjpjcmVhdGVFbGVtZW50Rm9ySW1hZ2VP dmVybGF5KGRvY3VtZW50LmdldCgpLCBkYXRhRGV0ZWN0b3IpOwogICAgICAgICAgICAgZGF0YURl dGVjdG9yQ29udGFpbmVyLT5jbGFzc0xpc3QoKS5hZGQoaW1hZ2VPdmVybGF5RGF0YURldGVjdG9y Q2xhc3NOYW1lKCkpOwogICAgICAgICAgICAgcm9vdENvbnRhaW5lci0+YXBwZW5kQ2hpbGQoZGF0 YURldGVjdG9yQ29udGFpbmVyKTsKLSAgICAgICAgICAgIHRleHRSZWNvZ25pdGlvbkVsZW1lbnRz LmRhdGFEZXRlY3RvcnMudW5jaGVja2VkQXBwZW5kKFdURk1vdmUoZGF0YURldGVjdG9yQ29udGFp bmVyKSk7CisgICAgICAgICAgICBlbGVtZW50cy5kYXRhRGV0ZWN0b3JzLnVuY2hlY2tlZEFwcGVu ZChXVEZNb3ZlKGRhdGFEZXRlY3RvckNvbnRhaW5lcikpOwogICAgICAgICB9CiAjZW5kaWYgLy8g RU5BQkxFKERBVEFfREVURUNUSU9OKQogCkBAIC0zMDcsMTMgKzMyMCwyMyBAQCB2b2lkIHVwZGF0 ZVdpdGhUZXh0UmVjb2duaXRpb25SZXN1bHQoSFRNTEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFRl eHRSZWNvZ25pdGlvbgogICAgICAgICAgICAgZWxlbWVudC5zZXRJbmxpbmVTdHlsZVByb3BlcnR5 KENTU1Byb3BlcnR5V2Via2l0VXNlclNlbGVjdCwgQ1NTVmFsdWVUZXh0KTsKICAgICB9CiAKLSAg ICBpZiAoIWhhZEV4aXN0aW5nVGV4dFJlY29nbml0aW9uRWxlbWVudHMpIHsKKyAgICBpZiAoIWhh ZEV4aXN0aW5nRWxlbWVudHMpIHsKICAgICAgICAgc3RhdGljIE1haW5UaHJlYWROZXZlckRlc3Ry b3llZDxjb25zdCBTdHJpbmc+IHNoYWRvd1N0eWxlKFN0cmluZ0ltcGw6OmNyZWF0ZVdpdGhvdXRD b3B5aW5nKGltYWdlT3ZlcmxheVVzZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZihpbWFnZU92ZXJs YXlVc2VyQWdlbnRTdHlsZVNoZWV0KSkpOwogICAgICAgICBhdXRvIHN0eWxlID0gSFRNTFN0eWxl RWxlbWVudDo6Y3JlYXRlKEhUTUxOYW1lczo6c3R5bGVUYWcsIGRvY3VtZW50LmdldCgpLCBmYWxz ZSk7CiAgICAgICAgIHN0eWxlLT5zZXRUZXh0Q29udGVudChzaGFkb3dTdHlsZSk7CiAgICAgICAg IHNoYWRvd1Jvb3QtPmFwcGVuZENoaWxkKFdURk1vdmUoc3R5bGUpKTsKICAgICB9CiAKKyAgICBy ZXR1cm4gZWxlbWVudHM7Cit9CisKK3ZvaWQgdXBkYXRlV2l0aFRleHRSZWNvZ25pdGlvblJlc3Vs dChIVE1MRWxlbWVudCYgZWxlbWVudCwgY29uc3QgVGV4dFJlY29nbml0aW9uUmVzdWx0JiByZXN1 bHQsIENhY2hlVGV4dFJlY29nbml0aW9uUmVzdWx0cyBjYWNoZVRleHRSZWNvZ25pdGlvblJlc3Vs dHMpCit7CisgICAgYXV0byBlbGVtZW50cyA9IHVwZGF0ZVN1YnRyZWUoZWxlbWVudCwgcmVzdWx0 KTsKKyAgICBpZiAoIWVsZW1lbnRzLnJvb3QpCisgICAgICAgIHJldHVybjsKKworICAgIFJlZiBk b2N1bWVudCA9IGVsZW1lbnQuZG9jdW1lbnQoKTsKICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0 SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKCk7CiAKICAgICBhdXRvKiByZW5kZXJlciA9IGVsZW1l bnQucmVuZGVyZXIoKTsKQEAgLTMzMiw3ICszNTUsNyBAQCB2b2lkIHVwZGF0ZVdpdGhUZXh0UmVj b2duaXRpb25SZXN1bHQoSFRNTEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFRleHRSZWNvZ25pdGlv bgogCiAgICAgYm9vbCBhcHBseVVzZXJTZWxlY3RBbGwgPSBkb2N1bWVudC0+aXNJbWFnZURvY3Vt ZW50KCkgfHwgcmVuZGVyZXItPnN0eWxlKCkudXNlclNlbGVjdCgpICE9IFVzZXJTZWxlY3Q6Ok5v bmU7CiAgICAgZm9yIChzaXplX3QgbGluZUluZGV4ID0gMDsgbGluZUluZGV4IDwgcmVzdWx0Lmxp bmVzLnNpemUoKTsgKytsaW5lSW5kZXgpIHsKLSAgICAgICAgYXV0byYgbGluZUVsZW1lbnRzID0g dGV4dFJlY29nbml0aW9uRWxlbWVudHMubGluZXNbbGluZUluZGV4XTsKKyAgICAgICAgYXV0byYg bGluZUVsZW1lbnRzID0gZWxlbWVudHMubGluZXNbbGluZUluZGV4XTsKICAgICAgICAgYXV0byYg bGluZUNvbnRhaW5lciA9IGxpbmVFbGVtZW50cy5saW5lOwogICAgICAgICBhdXRvJiBsaW5lID0g cmVzdWx0LmxpbmVzW2xpbmVJbmRleF07CiAgICAgICAgIGF1dG8gbGluZVF1YWQgPSBjb252ZXJ0 VG9Db250YWluZXJDb29yZGluYXRlcyhsaW5lLm5vcm1hbGl6ZWRRdWFkKTsKQEAgLTQyMyw3ICs0 NDYsNyBAQCB2b2lkIHVwZGF0ZVdpdGhUZXh0UmVjb2duaXRpb25SZXN1bHQoSFRNTEVsZW1lbnQm IGVsZW1lbnQsIGNvbnN0IFRleHRSZWNvZ25pdGlvbgogCiAjaWYgRU5BQkxFKERBVEFfREVURUNU SU9OKQogICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMDsgaW5kZXggPCByZXN1bHQuZGF0YURldGVj dG9ycy5zaXplKCk7ICsraW5kZXgpIHsKLSAgICAgICAgYXV0byBkYXRhRGV0ZWN0b3JDb250YWlu ZXIgPSB0ZXh0UmVjb2duaXRpb25FbGVtZW50cy5kYXRhRGV0ZWN0b3JzW2luZGV4XTsKKyAgICAg ICAgYXV0byBkYXRhRGV0ZWN0b3JDb250YWluZXIgPSBlbGVtZW50cy5kYXRhRGV0ZWN0b3JzW2lu ZGV4XTsKICAgICAgICAgYXV0byYgZGF0YURldGVjdG9yID0gcmVzdWx0LmRhdGFEZXRlY3RvcnNb aW5kZXhdOwogICAgICAgICBpZiAoZGF0YURldGVjdG9yLm5vcm1hbGl6ZWRRdWFkcy5pc0VtcHR5 KCkpCiAgICAgICAgICAgICBjb250aW51ZTsK