206268 2020-01-14 17:03:37 -0800 REGRESSION (r253394): After swiping back during a navigation, WKWebView gets stuck with the forward content, stops repainting 2020-01-14 18:03:43 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton cdumez commit-queue simon.fraser thorton oldest_to_newest 1606703 0 thorton 2020-01-14 17:03:37 -0800 REGRESSION (r253394): After swiping back during a navigation, WKWebView gets stuck with the forward content, stops repainting 1606715 1 387736 thorton 2020-01-14 17:12:46 -0800 Created attachment 387736 Patch 1606716 2 thorton 2020-01-14 17:12:54 -0800 <rdar://problem/58536702> 1606737 3 387736 simon.fraser 2020-01-14 17:39:02 -0800 Comment on attachment 387736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387736&action=review > Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm:262 > m_didCallWillEndSwipeGesture = false; > + m_didCallEndSwipeGesture = false; > + m_removeSnapshotImmediatelyWhenGestureEnds = false; Starting to feel like a state machine. 1606740 4 thorton 2020-01-14 17:41:10 -0800 (In reply to Simon Fraser (smfr) from comment #3) > Comment on attachment 387736 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387736&action=review > > > Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm:262 > > m_didCallWillEndSwipeGesture = false; > > + m_didCallEndSwipeGesture = false; > > + m_removeSnapshotImmediatelyWhenGestureEnds = false; > > Starting to feel like a state machine. STARTING!? 1606749 5 387736 commit-queue 2020-01-14 18:03:41 -0800 Comment on attachment 387736 Patch Clearing flags on attachment: 387736 Committed r254552: <https://trac.webkit.org/changeset/254552> 1606750 6 commit-queue 2020-01-14 18:03:43 -0800 All reviewed patches have been landed. Closing bug. 387736 2020-01-14 17:12:46 -0800 2020-01-14 18:03:41 -0800 Patch bug-206268-20200114171245.patch text/plain 7738 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY2ZWIyMTJhZGE0OWY4NDUx OTZiMmE4YTE4ZGZkNTY4ODM0NWY0N2UuLjhiMjM4ZTIyOTk4MGMxMjM5MmIzNGI1MjMyNTFhZjk3 ZmE5ZTBhMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjAtMDEtMTQgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjI1 MzM5NCk6IEFmdGVyIHN3aXBpbmcgYmFjayBkdXJpbmcgYSBuYXZpZ2F0aW9uLCBXS1dlYlZpZXcg Z2V0cyBzdHVjayB3aXRoIHRoZSBmb3J3YXJkIGNvbnRlbnQsIHN0b3BzIHJlcGFpbnRpbmcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjI2OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTg1MzY3MDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjplbmRTd2lwZUdl c3R1cmUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbToKKyAgICAg ICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpiZWdpblN3aXBlR2VzdHVyZSk6Cisg ICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKToK KyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpyZW1vdmVTd2lwZVNuYXBz aG90KToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5t bToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpiZWdpblN3aXBlR2Vz dHVyZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVtb3ZlU3dp cGVTbmFwc2hvdCk6CisgICAgICAgIEFmdGVyIHIyNTMzOTQsIHdlIHN0YXJ0IGxvYWRpbmcgdGhl IGRlc3RpbmF0aW9uIHBhZ2UgaW4gd2lsbEVuZFN3aXBlR2VzdHVyZSwKKyAgICAgICAgd2hlbiB3 ZSBrbm93IHRoZSBnZXN0dXJlIHdpbGwgY29tcGxldGUsIGluc3RlYWQgb2YgaW4gZW5kU3dpcGVH ZXN0dXJlLAorICAgICAgICB3aGVuIGl0IGlzIGFjdHVhbGx5IGRvbmUuCisKKyAgICAgICAgVGhp cyBtZWFucyB0aGF0IGlmIHdlIGRlY2lkZSB0aGF0IHdlIHNob3VsZCB0ZWFyIGRvd24gdGhlIHNu YXBzaG90IGltbWVkaWF0ZWx5LAorICAgICAgICB0aGlzIGNhbiBub3cgaGFwcGVuIGluIHRoZSB3 aW5kb3cgYmV0d2VlbiB3aWxsRW5kU3dpcGVHZXN0dXJlIGFuZCBlbmRTd2lwZUdlc3R1cmUuCisK KyAgICAgICAgSG93ZXZlciwgcmVtb3ZlU3dpcGVTbmFwc2hvdCBoYXMgbnVtZXJvdXMgZGVwZW5k ZW5jaWVzIG9uIGVuZFN3aXBlR2VzdHVyZQorICAgICAgICAoZXNwZWNpYWxseSBvbiBpT1MsIHdo ZXJlIHRoZXJlIGFyZSAvYWxzby8gZGVwZW5kZW5jaWVzIGluIHRoZSBvdGhlciBkaXJlY3Rpb24g LSAKKyAgICAgICAgZW5kU3dpcGVHZXN0dXJlIHdpbGwgbmV2ZXIgYmUgY2FsbGVkIGFmdGVyIHJl bW92ZVN3aXBlU25hcHNob3QgYmVjYXVzZQorICAgICAgICBvZiB0aGUgZ2VzdHVyZUlEIG1pc21h dGNoKS4KKworICAgICAgICBSZWdhcmRsZXNzLCBpdCBkb2VzIG5vdCBtYWtlIHNlbnNlIHRvIHJl bW92ZSB0aGUgc25hcHNob3Qgd2hpbGUgdGhlIGFuaW1hdGlvbgorICAgICAgICBpcyBzdGlsbCBy dW5uaW5nLiBTbywgaWYgc29tZXRoaW5nIGNhdXNlcyByZW1vdmVTd2lwZVNuYXBzaG90IHRvIGJl IGNhbGxlZAorICAgICAgICBiZWZvcmUgZW5kU3dpcGVHZXN0dXJlLCB3ZSBqdXN0IHNldCBhIGJp dCBhbmQgY2FsbCBpdCBpbnNpZGUgZW5kU3dpcGVHZXN0dXJlIGluc3RlYWQuCisKKyAgICAgICAg VGhpcyBlbmRzIHVwIHB1dHRpbmcgdGhlIHNuYXBzaG90IHJlbW92YWwgb3JkZXJpbmcgYmFjayBh cyBpdCB3YXMgYmVmb3JlIHIyNTMzOTQuCisKIDIwMjAtMDEtMTAgIEppZXdlbiBUYW4gIDxqaWV3 ZW5fdGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViQXV0aG5dIEltcGxlbWVudCBTUEkgdG8g dGVsbCBVSSBjbGllbnRzIHRvIHNlbGVjdCBhc3NlcnRpb24gcmVzcG9uc2VzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmNwcAppbmRleCA4YTE3 M2JmMzQzZDZjMjA5YWVmMTM4ODZmMDY2MDI3NTQyMTg4MTA3Li40YjA4YzY3ODhiYmNiN2RmYmJi N2ZlZDQ3ZWM0YmVhMzBlOThkNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHAKQEAgLTYwNSw2ICs2MDUsOCBAQCB2b2lkIFZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0q IHRhcmdldEl0ZW0sCiAgICAgbV9zd2lwZUNhbmNlbGxhdGlvblRyYWNrZXIgPSBudWxscHRyOwog I2VuZGlmCiAKKyAgICBtX2RpZENhbGxFbmRTd2lwZUdlc3R1cmUgPSB0cnVlOworCiAgICAgaWYg KGNhbmNlbGxlZCkgewogICAgICAgICByZW1vdmVTd2lwZVNuYXBzaG90KCk7CiAgICAgICAgIG1f d2ViUGFnZVByb3h5Lm5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKGZhbHNlLCAqdGFyZ2V0SXRlbSk7 CkBAIC02MTQsNiArNjE2LDEzIEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9sbGVyOjplbmRTd2lw ZUdlc3R1cmUoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogdGFyZ2V0SXRlbSwKICAgICBtX3dlYlBh Z2VQcm94eS5uYXZpZ2F0aW9uR2VzdHVyZURpZEVuZCh0cnVlLCAqdGFyZ2V0SXRlbSk7CiAKICAg ICBtX3NuYXBzaG90UmVtb3ZhbFRyYWNrZXIuZXZlbnRPY2N1cnJlZChTbmFwc2hvdFJlbW92YWxU cmFja2VyOjpTd2lwZUFuaW1hdGlvbkVuZCwgU25hcHNob3RSZW1vdmFsVHJhY2tlcjo6U2hvdWxk SWdub3JlRXZlbnRJZlBhdXNlZDo6Tm8pOworCisgICAgLy8gcmVtb3ZlU3dpcGVTbmFwc2hvdCgp IHdhcyBjYWxsZWQgYmV0d2VlbiB3aWxsRW5kU3dpcGVHZXN0dXJlKCkgYW5kIGVuZFN3aXBlR2Vz dHVyZSgpLgorICAgIC8vIFdlIGNvdWxkbid0IHJlbW92ZSBpdCB0aGVuLCBiZWNhdXNlIHRoZSBh bmltYXRpb24gd2FzIHN0aWxsIHJ1bm5pbmcsIGJ1dCBub3cgd2UgY2FuIQorICAgIGlmIChtX3Jl bW92ZVNuYXBzaG90SW1tZWRpYXRlbHlXaGVuR2VzdHVyZUVuZHMpIHsKKyAgICAgICAgcmVtb3Zl U3dpcGVTbmFwc2hvdCgpOworICAgICAgICByZXR1cm47CisgICAgfQogfQogCiB2b2lkIFZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6cmVxdWVzdFJlbmRlclRyZWVTaXplTm90aWZpY2F0aW9uSWZOZWVk ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250 cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIu aAppbmRleCA0M2YzZDFkOThjMzc1ODcxMDYxYWJiMzk0MDQwODhiYTRmZmVhYTQwLi42MzIzMWQ5 MTFiZWEzZWJjM2ZiMTc3Yjc2MDQyNWJlM2Q0MmQwYjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaApAQCAtNDM1LDYgKzQzNSw5IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX2lzQ29ubmVjdGVkVG9Qcm9jZXNzIHsgZmFsc2UgfTsKICAgICBi b29sIG1fZGlkU3RhcnRQcm92aXNpb25hbExvYWQgeyBmYWxzZSB9OwogCisgICAgYm9vbCBtX2Rp ZENhbGxFbmRTd2lwZUdlc3R1cmUgeyBmYWxzZSB9OworICAgIGJvb2wgbV9yZW1vdmVTbmFwc2hv dEltbWVkaWF0ZWx5V2hlbkdlc3R1cmVFbmRzIHsgZmFsc2UgfTsKKwogICAgIFNuYXBzaG90UmVt b3ZhbFRyYWNrZXIgbV9zbmFwc2hvdFJlbW92YWxUcmFja2VyOwogICAgIFdURjo6RnVuY3Rpb248 dm9pZCgpPiBtX2xvYWRDYWxsYmFjazsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbQppbmRleCA5MDZmN2M1MTc0 MWM5MzA1MzY4OTgyYzNhMDUxNGUxMjRkODM2NWFjLi40MDQ5NjljZTI4NTM2MDJlZjg1Y2Q5N2Rk MzQzYTVlZjg2ZTBhZTMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3Mv Vmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJJT1MubW0KQEAgLTI1OCw2ICsyNTgsOCBAQCB2b2lk IFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1cmUoX1VJTmF2aWdhdGlvbklu dGVyYWN0aXZlVHJhbnNpdGlvbgogICAgIFttX3N3aXBlVHJhbnNpdGlvbkNvbnRleHQgX3NldElu dGVyYWN0b3I6dHJhbnNpdGlvbl07CiAgICAgW21fc3dpcGVUcmFuc2l0aW9uQ29udGV4dCBfc2V0 VHJhbnNpdGlvbklzSW5GbGlnaHQ6WUVTXTsKICAgICBtX2RpZENhbGxXaWxsRW5kU3dpcGVHZXN0 dXJlID0gZmFsc2U7CisgICAgbV9kaWRDYWxsRW5kU3dpcGVHZXN0dXJlID0gZmFsc2U7CisgICAg bV9yZW1vdmVTbmFwc2hvdEltbWVkaWF0ZWx5V2hlbkdlc3R1cmVFbmRzID0gZmFsc2U7CiAgICAg W21fc3dpcGVUcmFuc2l0aW9uQ29udGV4dCBfc2V0SW50ZXJhY3RpdmVVcGRhdGVIYW5kbGVyOl4o Qk9PTCBmaW5pc2gsIENHRmxvYXQgcGVyY2VudCwgQk9PTCB0cmFuc2l0aW9uQ29tcGxldGVkLCBf VUlWaWV3Q29udHJvbGxlclRyYW5zaXRpb25Db250ZXh0ICopIHsKICAgICAgICAgaWYgKGZpbmlz aCkKICAgICAgICAgICAgIHdpbGxFbmRTd2lwZUdlc3R1cmUoKnRhcmdldEl0ZW0sICF0cmFuc2l0 aW9uQ29tcGxldGVkKTsKQEAgLTMxNiw2ICszMTgsOCBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJv bGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0s CiAgICAgaWYgKCFtX2RpZENhbGxXaWxsRW5kU3dpcGVHZXN0dXJlKQogICAgICAgICB3aWxsRW5k U3dpcGVHZXN0dXJlKCp0YXJnZXRJdGVtLCBjYW5jZWxsZWQpOwogCisgICAgbV9kaWRDYWxsRW5k U3dpcGVHZXN0dXJlID0gdHJ1ZTsKKwogICAgIFtjb250ZXh0IF9zZXRUcmFuc2l0aW9uSXNJbkZs aWdodDpOT107CiAgICAgW2NvbnRleHQgX3NldEludGVyYWN0b3I6bmlsXTsKICAgICBbY29udGV4 dCBfc2V0QW5pbWF0b3I6bmlsXTsKQEAgLTM0Niw2ICszNTAsMTMgQEAgdm9pZCBWaWV3R2VzdHVy ZUNvbnRyb2xsZXI6OmVuZFN3aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJn ZXRJdGVtLAogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgLy8gcmVtb3ZlU3dpcGVTbmFw c2hvdCgpIHdhcyBjYWxsZWQgYmV0d2VlbiB3aWxsRW5kU3dpcGVHZXN0dXJlKCkgYW5kIGVuZFN3 aXBlR2VzdHVyZSgpLgorICAgIC8vIFdlIGNvdWxkbid0IHJlbW92ZSBpdCB0aGVuLCBiZWNhdXNl IHRoZSBhbmltYXRpb24gd2FzIHN0aWxsIHJ1bm5pbmcsIGJ1dCBub3cgd2UgY2FuIQorICAgIGlm IChtX3JlbW92ZVNuYXBzaG90SW1tZWRpYXRlbHlXaGVuR2VzdHVyZUVuZHMpIHsKKyAgICAgICAg cmVtb3ZlU3dpcGVTbmFwc2hvdCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgYXV0 byBwYWdlSUQgPSBtX3dlYlBhZ2VQcm94eS5pZGVudGlmaWVyKCk7CiAgICAgR2VzdHVyZUlEIGdl c3R1cmVJRCA9IG1fY3VycmVudEdlc3R1cmVJRDsKIApAQCAtMzk4LDYgKzQwOSwxMSBAQCB2b2lk IFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6cmVtb3ZlU3dpcGVTbmFwc2hvdCgpCiAgICAgaWYgKG1f YWN0aXZlR2VzdHVyZVR5cGUgIT0gVmlld0dlc3R1cmVUeXBlOjpTd2lwZSkKICAgICAgICAgcmV0 dXJuOwogCisgICAgaWYgKCFtX2RpZENhbGxFbmRTd2lwZUdlc3R1cmUpIHsKKyAgICAgICAgbV9y ZW1vdmVTbmFwc2hvdEltbWVkaWF0ZWx5V2hlbkdlc3R1cmVFbmRzID0gdHJ1ZTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKwogICAgIFttX3NuYXBzaG90VmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3 XTsKICAgICBtX3NuYXBzaG90VmlldyA9IG51bGxwdHI7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5tbQppbmRl eCA0MjNhMDZhYWM2MDk3YTgyNDQ0MDQ0ZTg2ZGQyMGJiZDkyYjdjNTlhLi4yMTA1NDhjYzA3YWVl ZmI1MmJjZGVmMzAwNDY4NzczYzA1YzIyMzI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJNYWMubW0KQEAgLTQ2Nyw2ICs0 NjcsOSBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1cmUoV2Vi QmFja0ZvcndhcmRMaXN0SXRlbSogdGFyZ2V0SXRlbQogICAgIGlmIChtX3dlYlBhZ2VQcm94eS5w cmVmZXJlbmNlcygpLnZpZXdHZXN0dXJlRGVidWdnaW5nRW5hYmxlZCgpKQogICAgICAgICBhcHBs eURlYnVnZ2luZ1Byb3BlcnRpZXNUb1N3aXBlVmlld3MoKTsKIAorICAgIG1fZGlkQ2FsbEVuZFN3 aXBlR2VzdHVyZSA9IGZhbHNlOworICAgIG1fcmVtb3ZlU25hcHNob3RJbW1lZGlhdGVseVdoZW5H ZXN0dXJlRW5kcyA9IGZhbHNlOworCiAgICAgQ0FMYXllciAqbGF5ZXJBZGphY2VudFRvU25hcHNo b3QgPSBkZXRlcm1pbmVMYXllckFkamFjZW50VG9TbmFwc2hvdEZvclBhcmVudChkaXJlY3Rpb24s IHNuYXBzaG90TGF5ZXJQYXJlbnQpOwogICAgIEJPT0wgc3dpcGluZ0xlZnQgPSBpc1BoeXNpY2Fs bHlTd2lwaW5nTGVmdChkaXJlY3Rpb24pOwogICAgIGlmIChzd2lwaW5nTGVmdCkKQEAgLTU5OSw2 ICs2MDIsMTEgQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnJlbW92ZVN3aXBlU25hcHNo b3QoKQogICAgIGlmIChtX2FjdGl2ZUdlc3R1cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6U3dp cGUpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmICghbV9kaWRDYWxsRW5kU3dpcGVHZXN0dXJl KSB7CisgICAgICAgIG1fcmVtb3ZlU25hcHNob3RJbW1lZGlhdGVseVdoZW5HZXN0dXJlRW5kcyA9 IHRydWU7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAobV9jdXJyZW50U3dpcGVT bmFwc2hvdCkKICAgICAgICAgbV9jdXJyZW50U3dpcGVTbmFwc2hvdC0+c2V0Vm9sYXRpbGUodHJ1 ZSk7CiAgICAgbV9jdXJyZW50U3dpcGVTbmFwc2hvdCA9IG51bGxwdHI7Cg==