185926 2018-05-23 16:37:58 -0700 Fix Issues with Loupe Gesture 2018-05-24 14:03:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin commit-queue thorton wenson_hsieh oldest_to_newest 1426777 0 megan_gardner 2018-05-23 16:37:58 -0700 Fix Issues with Loupe Gesture 1426784 1 341146 megan_gardner 2018-05-23 16:44:19 -0700 Created attachment 341146 Patch 1426785 2 megan_gardner 2018-05-23 16:45:06 -0700 <rdar://problem/40275709> 1426800 3 341146 thorton 2018-05-23 17:09:06 -0700 Comment on attachment 341146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341146&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3212 > +#if ENABLE(MINIMAL_SIMULATOR) > + if (!range) > + [self clearSelection]; > +#endif > if (hasAssistedNode(_assistedNodeInformation) && !range) Possibly(?) better written if (range) return; #if !ENABLE(MINIMAL_SIMULATOR) if (!hasAssistedNode(_assistedNodeInformation)) return; #endif [self clearSelection]; > Source/WebKit/WebProcess/WebPage/WebPage.h:1545 > #endif > + > +#if PLATFORM(IOS) Merge these sections > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:1147 > + if (range->collapsed()) I’m pretty sure there’s a better way to do this (to sort two positions) 1426824 4 341157 megan_gardner 2018-05-23 19:20:51 -0700 Created attachment 341157 Patch 1426846 5 341157 wenson_hsieh 2018-05-23 20:39:31 -0700 Comment on attachment 341157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341157&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3213 > + if (hasAssistedNode(_assistedNodeInformation)) I agree with Tim's earlier comment. It's a bit weird that we'd need to clear selection twice here in minimal simulator mode, if we are focusing an editable element. 1426949 6 341197 megan_gardner 2018-05-24 09:26:47 -0700 Created attachment 341197 Patch 1426994 7 341197 thorton 2018-05-24 11:07:38 -0700 Comment on attachment 341197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341197&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3212 > [self clearSelection]; You’re still repeating yourself with the clearSelection! Mine was better :P 1427041 8 341222 megan_gardner 2018-05-24 13:25:14 -0700 Created attachment 341222 Patch for landing 1427053 9 341222 commit-queue 2018-05-24 14:03:50 -0700 Comment on attachment 341222 Patch for landing Clearing flags on attachment: 341222 Committed r232164: <https://trac.webkit.org/changeset/232164> 1427054 10 commit-queue 2018-05-24 14:03:51 -0700 All reviewed patches have been landed. Closing bug. 341146 2018-05-23 16:44:19 -0700 2018-05-23 19:20:50 -0700 Patch bug-185926-20180523164419.patch text/plain 5571 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxOTQwNDIyMzc0YTI3MTlh ZmUwMGIwMjNjNzJhOWFmNjY5ZWFkMTcuLjY0OWNkMmRiOGFmYzEwMmQ4MzFhZGZhYjZjMjlkMWE4 Y2EyZjliNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDUtMjMgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggSXNzdWVzIHdp dGggTG91cGUgR2VzdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg1OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIGxvdXBlIGdlc3R1cmUgd2FzIG5vdCBnaXZpbmcgdXMgdGhlIGNvcnJlY3Qg c2VsZWN0aW9uIGluIHNvbWUgc2l0dWF0aW9ucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGdl c3R1cmVSZWNvZ25pemVyOmNhbkJlUHJldmVudGVkQnlHZXN0dXJlUmVjb2duaXplcjpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNvZ25pemVT aW11bHRhbmVvdXNseVdpdGhHZXN0dXJlUmVjb2duaXplcjpdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBzZXRTZWxlY3RlZFRleHRSYW5nZTpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2VsZWN0V2l0aEdlc3R1cmUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjbGVhclNlbGVjdGlvbik6CisKIDIwMTgtMDUtMTYg IEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW1dp bl0gSW1wbGVtZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQppbmRleCAyODA3Nzc0N2Y4NGM5MDFlNDM3Y2I3NWQzOTkyZTMwYWY1NjlmNmMxLi4xOTJm M2FmYWFjY2FlZjg1YjI5NGIxMDAxNzUzOWFmZDcyZGEwYjczIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAg LTEzMjAsNiArMTMyMCwxMSBAQCBzdGF0aWMgTlNWYWx1ZSAqbnNTaXplRm9yVGFwSGlnaGxpZ2h0 Qm9yZGVyUmFkaXVzKFdlYkNvcmU6OkludFNpemUgYm9yZGVyUmFkaXVzLAogI2lmIF9fSVBIT05F X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAogICAgIGlzRm9yY2VQcmVzc0dlc3R1 cmUgPSAocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0 YW50LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKTsKICNlbmRpZgorI2lmIEVOQUJMRShNSU5JTUFM X1NJTVVMQVRPUikKKyAgICBpZiAoKHByZXZlbnRpbmdHZXN0dXJlUmVjb2duaXplciA9PSBfdGV4 dFNlbGVjdGlvbkFzc2lzdGFudC5nZXQoKS5sb3VwZUdlc3R1cmUpICYmIChwcmV2ZW50ZWRHZXN0 dXJlUmVjb2duaXplciA9PSBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgfHwg cHJldmVudGVkR2VzdHVyZVJlY29nbml6ZXIgPT0gX2xvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVy IHx8IHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50 LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgor ICAgIAogICAgIGlmICgocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0 aW9uQXNzaXN0YW50LmdldCgpLmxvdXBlR2VzdHVyZSB8fCBpc0ZvcmNlUHJlc3NHZXN0dXJlIHx8 IFtfd2ViU2VsZWN0aW9uQXNzaXN0YW50IGlzU2VsZWN0aW9uR2VzdHVyZVJlY29nbml6ZXI6cHJl dmVudGluZ0dlc3R1cmVSZWNvZ25pemVyXSkgJiYgKHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVy ID09IF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplciB8fCBwcmV2ZW50ZWRHZXN0 dXJlUmVjb2duaXplciA9PSBfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIpKQogICAgICAgICBy ZXR1cm4gTk87CiAKQEAgLTEzNDQsNiArMTM0OSwxMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNT YW1lUGFpcihVSUdlc3R1cmVSZWNvZ25pemVyICphLCBVSUdlc3R1cmVSZWNvZ25pemVyICpiLCBV SQogICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNv Z25pemVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF93ZWJT ZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCkuc2VsZWN0aW9uTG9uZ1ByZXNzUmVjb2duaXplcikpCiAg ICAgICAgIHJldHVybiBZRVM7CiAjaWYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTIwMDAwCisjaWYgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorICAgIGlmIChpc1NhbWVQ YWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNvZ25pemVyLCBfdGV4dFNlbGVj dGlvbkFzc2lzdGFudC5nZXQoKS5sb3VwZUdlc3R1cmUsIF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50 LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgog ICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNvZ25p emVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF90ZXh0U2Vs ZWN0aW9uQXNzaXN0YW50LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKICAgICAgICAgcmV0dXJu IFlFUzsKICNlbmRpZgpAQCAtMzE5Niw2ICszMjA1LDEwIEBAIHN0YXRpYyB2b2lkIHNlbGVjdGlv bkNoYW5nZWRXaXRoVG91Y2goV0tDb250ZW50VmlldyAqdmlldywgY29uc3QgV2ViQ29yZTo6SW50 UG9pCiAKIC0gKHZvaWQpc2V0U2VsZWN0ZWRUZXh0UmFuZ2U6KFVJVGV4dFJhbmdlICopcmFuZ2UK IHsKKyNpZiBFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisgICAgaWYgKCFyYW5nZSkKKyAgICAg ICAgW3NlbGYgY2xlYXJTZWxlY3Rpb25dOworI2VuZGlmCiAgICAgaWYgKGhhc0Fzc2lzdGVkTm9k ZShfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24pICYmICFyYW5nZSkKICAgICAgICAgW3NlbGYgY2xl YXJTZWxlY3Rpb25dOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCmluZGV4IDRkYTc1YWVhNTJhMzVlZjY2Y2YxYTk5OTYwODQzNzJkY2UzZDIyZWYuLmQzMGU0 YWIzODBlYWI4NjNjNTc4ZTliYWY2MDE4MThiYzI0YjdlZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTE1NDEsNiArMTU0MSwxMCBAQCBwcml2YXRl OgogI2lmIFBMQVRGT1JNKElPUykKICAgICBib29sIG1fYWxsb3dzTWVkaWFEb2N1bWVudElubGlu ZVBsYXliYWNrIHsgZmFsc2UgfTsKICNlbmRpZgorICAgIAorI2lmIFBMQVRGT1JNKElPUykKKyAg ICBSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IG1fc3RhcnRpbmdHZXN0dXJlUmFuZ2U7CisjZW5kaWYK IAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKICAgICBSZWZQdHI8V2ViRnVsbFNjcmVlbk1h bmFnZXI+IG1fZnVsbFNjcmVlbk1hbmFnZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IGU1N2M4NmZhZDM3MmVmMGY4YmFi ZWYwNzljMzJhZDgwYjFlMmU3YmUuLmY3NDMwNGFmZTkwNzljMGZhNWM4MDM1Yjc4ZTA4NGY2ZTA4 ZmJiZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9X ZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9X ZWJQYWdlSU9TLm1tCkBAIC0xMTQxLDcgKzExNDEsMTYgQEAgdm9pZCBXZWJQYWdlOjpzZWxlY3RX aXRoR2VzdHVyZShjb25zdCBJbnRQb2ludCYgcG9pbnQsIHVpbnQzMl90IGdyYW51bGFyaXR5LCB1 aW4KICAgICAgICAgaWYgKHBvc2l0aW9uLnJvb3RFZGl0YWJsZUVsZW1lbnQoKSkKICAgICAgICAg ICAgIHJhbmdlID0gUmFuZ2U6OmNyZWF0ZSgqZnJhbWUuZG9jdW1lbnQoKSwgcG9zaXRpb24sIHBv c2l0aW9uKTsKICAgICAgICAgZWxzZQorI2lmIEVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKyAg ICAgICAgICAgIGlmIChtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlKSB7CisgICAgICAgICAgICAgICAg cmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKCpmcmFtZS5kb2N1bWVudCgpLCBtX3N0YXJ0aW5nR2VzdHVy ZVJhbmdlLT5zdGFydFBvc2l0aW9uKCksIHBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICBpZiAo cmFuZ2UtPmNvbGxhcHNlZCgpKQorICAgICAgICAgICAgICAgICAgICByYW5nZSA9IFJhbmdlOjpj cmVhdGUoKmZyYW1lLmRvY3VtZW50KCksIHBvc2l0aW9uLCBtX3N0YXJ0aW5nR2VzdHVyZVJhbmdl LT5zdGFydFBvc2l0aW9uKCkpOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAg bV9zdGFydGluZ0dlc3R1cmVSYW5nZSA9IFJhbmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50KCks IHBvc2l0aW9uLCBwb3NpdGlvbik7CisjZWxzZQogICAgICAgICAgICAgcmFuZ2UgPSB3b3JkUmFu Z2VGcm9tUG9zaXRpb24ocG9zaXRpb24pOworI2VuZGlmCiAgICAgICAgIGJyZWFrOwogCiAgICAg Y2FzZSBHZXN0dXJlVHlwZTo6VGFwQW5kQUhhbGY6CkBAIC0xMjkxLDYgKzEzMDAsNyBAQCBzdGF0 aWMgUmVmUHRyPFJhbmdlPiByYW5nZUF0V29yZEJvdW5kYXJ5Rm9yUG9zaXRpb24oRnJhbWUqIGZy YW1lLCBjb25zdCBWaXNpYmxlUAogfQogCiB2b2lkIFdlYlBhZ2U6OmNsZWFyU2VsZWN0aW9uKCl7 CisgICAgbV9zdGFydGluZ0dlc3R1cmVSYW5nZSA9IG51bGxwdHI7CiAgICAgbV9jdXJyZW50Qmxv Y2tTZWxlY3Rpb24gPSBudWxscHRyOwogICAgIG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9j dXNlZE9yTWFpbkZyYW1lKCkuc2VsZWN0aW9uKCkuY2xlYXIoKTsKIH0K 341157 2018-05-23 19:20:51 -0700 2018-05-24 09:26:46 -0700 Patch bug-185926-20180523192051.patch text/plain 6172 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxOTQwNDIyMzc0YTI3MTlh ZmUwMGIwMjNjNzJhOWFmNjY5ZWFkMTcuLjY0OWNkMmRiOGFmYzEwMmQ4MzFhZGZhYjZjMjlkMWE4 Y2EyZjliNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDUtMjMgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggSXNzdWVzIHdp dGggTG91cGUgR2VzdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg1OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIGxvdXBlIGdlc3R1cmUgd2FzIG5vdCBnaXZpbmcgdXMgdGhlIGNvcnJlY3Qg c2VsZWN0aW9uIGluIHNvbWUgc2l0dWF0aW9ucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGdl c3R1cmVSZWNvZ25pemVyOmNhbkJlUHJldmVudGVkQnlHZXN0dXJlUmVjb2duaXplcjpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNvZ25pemVT aW11bHRhbmVvdXNseVdpdGhHZXN0dXJlUmVjb2duaXplcjpdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBzZXRTZWxlY3RlZFRleHRSYW5nZTpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2VsZWN0V2l0aEdlc3R1cmUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjbGVhclNlbGVjdGlvbik6CisKIDIwMTgtMDUtMTYg IEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW1dp bl0gSW1wbGVtZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQppbmRleCAyODA3Nzc0N2Y4NGM5MDFlNDM3Y2I3NWQzOTkyZTMwYWY1NjlmNmMxLi43YmIy OWI3Yzk1OWMyZDA0NDkxOTkzZmVmMGYxOTViNDNmNmMxNWJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAg LTEzMjAsNiArMTMyMCwxMSBAQCBzdGF0aWMgTlNWYWx1ZSAqbnNTaXplRm9yVGFwSGlnaGxpZ2h0 Qm9yZGVyUmFkaXVzKFdlYkNvcmU6OkludFNpemUgYm9yZGVyUmFkaXVzLAogI2lmIF9fSVBIT05F X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAogICAgIGlzRm9yY2VQcmVzc0dlc3R1 cmUgPSAocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0 YW50LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKTsKICNlbmRpZgorI2lmIEVOQUJMRShNSU5JTUFM X1NJTVVMQVRPUikKKyAgICBpZiAoKHByZXZlbnRpbmdHZXN0dXJlUmVjb2duaXplciA9PSBfdGV4 dFNlbGVjdGlvbkFzc2lzdGFudC5nZXQoKS5sb3VwZUdlc3R1cmUpICYmIChwcmV2ZW50ZWRHZXN0 dXJlUmVjb2duaXplciA9PSBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgfHwg cHJldmVudGVkR2VzdHVyZVJlY29nbml6ZXIgPT0gX2xvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVy IHx8IHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50 LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgor ICAgIAogICAgIGlmICgocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0 aW9uQXNzaXN0YW50LmdldCgpLmxvdXBlR2VzdHVyZSB8fCBpc0ZvcmNlUHJlc3NHZXN0dXJlIHx8 IFtfd2ViU2VsZWN0aW9uQXNzaXN0YW50IGlzU2VsZWN0aW9uR2VzdHVyZVJlY29nbml6ZXI6cHJl dmVudGluZ0dlc3R1cmVSZWNvZ25pemVyXSkgJiYgKHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVy ID09IF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplciB8fCBwcmV2ZW50ZWRHZXN0 dXJlUmVjb2duaXplciA9PSBfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIpKQogICAgICAgICBy ZXR1cm4gTk87CiAKQEAgLTEzNDQsNiArMTM0OSwxMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNT YW1lUGFpcihVSUdlc3R1cmVSZWNvZ25pemVyICphLCBVSUdlc3R1cmVSZWNvZ25pemVyICpiLCBV SQogICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNv Z25pemVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF93ZWJT ZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCkuc2VsZWN0aW9uTG9uZ1ByZXNzUmVjb2duaXplcikpCiAg ICAgICAgIHJldHVybiBZRVM7CiAjaWYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTIwMDAwCisjaWYgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorICAgIGlmIChpc1NhbWVQ YWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNvZ25pemVyLCBfdGV4dFNlbGVj dGlvbkFzc2lzdGFudC5nZXQoKS5sb3VwZUdlc3R1cmUsIF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50 LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgog ICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNvZ25p emVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF90ZXh0U2Vs ZWN0aW9uQXNzaXN0YW50LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKICAgICAgICAgcmV0dXJu IFlFUzsKICNlbmRpZgpAQCAtMzE5Niw3ICszMjA1LDEyIEBAIHN0YXRpYyB2b2lkIHNlbGVjdGlv bkNoYW5nZWRXaXRoVG91Y2goV0tDb250ZW50VmlldyAqdmlldywgY29uc3QgV2ViQ29yZTo6SW50 UG9pCiAKIC0gKHZvaWQpc2V0U2VsZWN0ZWRUZXh0UmFuZ2U6KFVJVGV4dFJhbmdlICopcmFuZ2UK IHsKLSAgICBpZiAoaGFzQXNzaXN0ZWROb2RlKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbikgJiYg IXJhbmdlKQorICAgIGlmIChyYW5nZSkKKyAgICAgICAgcmV0dXJuOworI2lmIEVOQUJMRShNSU5J TUFMX1NJTVVMQVRPUikKKyAgICBbc2VsZiBjbGVhclNlbGVjdGlvbl07CisjZW5kaWYKKyAgICBp ZiAoaGFzQXNzaXN0ZWROb2RlKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbikpCiAgICAgICAgIFtz ZWxmIGNsZWFyU2VsZWN0aW9uXTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCmluZGV4IDRkYTc1YWVhNTJhMzVlZjY2Y2YxYTk5OTYwODQzNzJkY2UzZDIy ZWYuLjI4MDM2YjFkZGI3YWZjYWExZGE4ZDRjZTdkNzdiZTczNmU4M2ZjZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTE1NDAsNiArMTU0MCw3IEBA IHByaXZhdGU6CiAKICNpZiBQTEFURk9STShJT1MpCiAgICAgYm9vbCBtX2FsbG93c01lZGlhRG9j dW1lbnRJbmxpbmVQbGF5YmFjayB7IGZhbHNlIH07CisgICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdl PiBtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoRlVMTFNDUkVF Tl9BUEkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCmluZGV4IGU1N2M4NmZhZDM3MmVmMGY4YmFiZWYwNzljMzJhZDgwYjFlMmU3YmUu LjU5ZDg0NmZmMGI5OTdkNmU5NjE4ZGZhZjkxMzUxZDI2ZTM1YjFlMGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0xMTQx LDcgKzExNDEsMzEgQEAgdm9pZCBXZWJQYWdlOjpzZWxlY3RXaXRoR2VzdHVyZShjb25zdCBJbnRQ b2ludCYgcG9pbnQsIHVpbnQzMl90IGdyYW51bGFyaXR5LCB1aW4KICAgICAgICAgaWYgKHBvc2l0 aW9uLnJvb3RFZGl0YWJsZUVsZW1lbnQoKSkKICAgICAgICAgICAgIHJhbmdlID0gUmFuZ2U6OmNy ZWF0ZSgqZnJhbWUuZG9jdW1lbnQoKSwgcG9zaXRpb24sIHBvc2l0aW9uKTsKICAgICAgICAgZWxz ZQorI2lmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAgICAgICAgICAgICByYW5nZSA9IHdv cmRSYW5nZUZyb21Qb3NpdGlvbihwb3NpdGlvbik7CisjZWxzZQorICAgICAgICAgICAgc3dpdGNo ICh3a0dlc3R1cmVTdGF0ZSkgeworICAgICAgICAgICAgY2FzZSBHZXN0dXJlUmVjb2duaXplclN0 YXRlOjpCZWdhbjoKKyAgICAgICAgICAgICAgICBtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlID0gUmFu Z2U6OmNyZWF0ZSgqZnJhbWUuZG9jdW1lbnQoKSwgcG9zaXRpb24sIHBvc2l0aW9uKTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgR2VzdHVyZVJlY29nbml6ZXJTdGF0 ZTo6Q2hhbmdlZDoKKyAgICAgICAgICAgICAgICBpZiAobV9zdGFydGluZ0dlc3R1cmVSYW5nZSkg eworICAgICAgICAgICAgICAgICAgICBpZiAobV9zdGFydGluZ0dlc3R1cmVSYW5nZS0+c3RhcnRQ b3NpdGlvbigpIDwgcG9zaXRpb24pCisgICAgICAgICAgICAgICAgICAgICAgICByYW5nZSA9IFJh bmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50KCksIG1fc3RhcnRpbmdHZXN0dXJlUmFuZ2UtPnN0 YXJ0UG9zaXRpb24oKSwgcG9zaXRpb24pOworICAgICAgICAgICAgICAgICAgICBlbHNlCisgICAg ICAgICAgICAgICAgICAgICAgICByYW5nZSA9IFJhbmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50 KCksIHBvc2l0aW9uLCBtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlLT5zdGFydFBvc2l0aW9uKCkpOwor ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNh c2UgR2VzdHVyZVJlY29nbml6ZXJTdGF0ZTo6RW5kZWQ6CisgICAgICAgICAgICBjYXNlIEdlc3R1 cmVSZWNvZ25pemVyU3RhdGU6OkNhbmNlbGxlZDoKKyAgICAgICAgICAgICAgICBtX3N0YXJ0aW5n R2VzdHVyZVJhbmdlID0gbnVsbHB0cjsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIGNhc2UgR2VzdHVyZVJlY29nbml6ZXJTdGF0ZTo6RmFpbGVkOgorICAgICAgICAgICAgY2Fz ZSBHZXN0dXJlUmVjb2duaXplclN0YXRlOjpQb3NzaWJsZToKKyAgICAgICAgICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0K KyNlbmRpZgogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgR2VzdHVyZVR5cGU6OlRhcEFuZEFI YWxmOgpAQCAtMTI5MSw2ICsxMzE1LDcgQEAgc3RhdGljIFJlZlB0cjxSYW5nZT4gcmFuZ2VBdFdv cmRCb3VuZGFyeUZvclBvc2l0aW9uKEZyYW1lKiBmcmFtZSwgY29uc3QgVmlzaWJsZVAKIH0KIAog dm9pZCBXZWJQYWdlOjpjbGVhclNlbGVjdGlvbigpeworICAgIG1fc3RhcnRpbmdHZXN0dXJlUmFu Z2UgPSBudWxscHRyOwogICAgIG1fY3VycmVudEJsb2NrU2VsZWN0aW9uID0gbnVsbHB0cjsKICAg ICBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpLnNlbGVjdGlv bigpLmNsZWFyKCk7CiB9Cg== 341197 2018-05-24 09:26:47 -0700 2018-05-24 13:25:13 -0700 Patch bug-185926-20180524092647.patch text/plain 6203 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxOTQwNDIyMzc0YTI3MTlh ZmUwMGIwMjNjNzJhOWFmNjY5ZWFkMTcuLjY0OWNkMmRiOGFmYzEwMmQ4MzFhZGZhYjZjMjlkMWE4 Y2EyZjliNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDUtMjMgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggSXNzdWVzIHdp dGggTG91cGUgR2VzdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg1OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIGxvdXBlIGdlc3R1cmUgd2FzIG5vdCBnaXZpbmcgdXMgdGhlIGNvcnJlY3Qg c2VsZWN0aW9uIGluIHNvbWUgc2l0dWF0aW9ucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGdl c3R1cmVSZWNvZ25pemVyOmNhbkJlUHJldmVudGVkQnlHZXN0dXJlUmVjb2duaXplcjpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBnZXN0dXJlUmVjb2duaXplcjpzaG91bGRSZWNvZ25pemVT aW11bHRhbmVvdXNseVdpdGhHZXN0dXJlUmVjb2duaXplcjpdKToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBzZXRTZWxlY3RlZFRleHRSYW5nZTpdKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2VsZWN0V2l0aEdlc3R1cmUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjbGVhclNlbGVjdGlvbik6CisKIDIwMTgtMDUtMTYg IEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CiAKICAgICAgICAgW1dp bl0gSW1wbGVtZW50IFdlYlBhZ2U6OmhhbmRsZUVkaXRpbmdLZXlib2FyZEV2ZW50CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQppbmRleCAyODA3Nzc0N2Y4NGM5MDFlNDM3Y2I3NWQzOTkyZTMwYWY1NjlmNmMxLi40NmU3 NzZhMTFmNzUwMTBmZThiY2E4MjAwYjhjODBhNGMwNTE3MTk5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAg LTEzMjAsNiArMTMyMCwxMSBAQCBzdGF0aWMgTlNWYWx1ZSAqbnNTaXplRm9yVGFwSGlnaGxpZ2h0 Qm9yZGVyUmFkaXVzKFdlYkNvcmU6OkludFNpemUgYm9yZGVyUmFkaXVzLAogI2lmIF9fSVBIT05F X09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEyMDAwMAogICAgIGlzRm9yY2VQcmVzc0dlc3R1 cmUgPSAocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0 YW50LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKTsKICNlbmRpZgorI2lmIEVOQUJMRShNSU5JTUFM X1NJTVVMQVRPUikKKyAgICBpZiAoKHByZXZlbnRpbmdHZXN0dXJlUmVjb2duaXplciA9PSBfdGV4 dFNlbGVjdGlvbkFzc2lzdGFudC5nZXQoKS5sb3VwZUdlc3R1cmUpICYmIChwcmV2ZW50ZWRHZXN0 dXJlUmVjb2duaXplciA9PSBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgfHwg cHJldmVudGVkR2VzdHVyZVJlY29nbml6ZXIgPT0gX2xvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVy IHx8IHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50 LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgor ICAgIAogICAgIGlmICgocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2VsZWN0 aW9uQXNzaXN0YW50LmdldCgpLmxvdXBlR2VzdHVyZSB8fCBpc0ZvcmNlUHJlc3NHZXN0dXJlIHx8 IFtfd2ViU2VsZWN0aW9uQXNzaXN0YW50IGlzU2VsZWN0aW9uR2VzdHVyZVJlY29nbml6ZXI6cHJl dmVudGluZ0dlc3R1cmVSZWNvZ25pemVyXSkgJiYgKHByZXZlbnRlZEdlc3R1cmVSZWNvZ25pemVy ID09IF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplciB8fCBwcmV2ZW50ZWRHZXN0 dXJlUmVjb2duaXplciA9PSBfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIpKQogICAgICAgICBy ZXR1cm4gTk87CiAKQEAgLTEzNDQsNiArMTM0OSwxMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNT YW1lUGFpcihVSUdlc3R1cmVSZWNvZ25pemVyICphLCBVSUdlc3R1cmVSZWNvZ25pemVyICpiLCBV SQogICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNv Z25pemVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF93ZWJT ZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0KCkuc2VsZWN0aW9uTG9uZ1ByZXNzUmVjb2duaXplcikpCiAg ICAgICAgIHJldHVybiBZRVM7CiAjaWYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTIwMDAwCisjaWYgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorICAgIGlmIChpc1NhbWVQ YWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNvZ25pemVyLCBfdGV4dFNlbGVj dGlvbkFzc2lzdGFudC5nZXQoKS5sb3VwZUdlc3R1cmUsIF90ZXh0U2VsZWN0aW9uQXNzaXN0YW50 LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKKyAgICAgICAgcmV0dXJuIFlFUzsKKyNlbmRpZgog ICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVSZWNvZ25p emVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF90ZXh0U2Vs ZWN0aW9uQXNzaXN0YW50LmdldCgpLmZvcmNlUHJlc3NHZXN0dXJlKSkKICAgICAgICAgcmV0dXJu IFlFUzsKICNlbmRpZgpAQCAtMzE5Niw4ICszMjA1LDE0IEBAIHN0YXRpYyB2b2lkIHNlbGVjdGlv bkNoYW5nZWRXaXRoVG91Y2goV0tDb250ZW50VmlldyAqdmlldywgY29uc3QgV2ViQ29yZTo6SW50 UG9pCiAKIC0gKHZvaWQpc2V0U2VsZWN0ZWRUZXh0UmFuZ2U6KFVJVGV4dFJhbmdlICopcmFuZ2UK IHsKLSAgICBpZiAoaGFzQXNzaXN0ZWROb2RlKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbikgJiYg IXJhbmdlKQorICAgIGlmIChyYW5nZSkKKyAgICAgICAgcmV0dXJuOworI2lmICFFTkFCTEUoTUlO SU1BTF9TSU1VTEFUT1IpCisgICAgaWYgKGhhc0Fzc2lzdGVkTm9kZShfYXNzaXN0ZWROb2RlSW5m b3JtYXRpb24pKQogICAgICAgICBbc2VsZiBjbGVhclNlbGVjdGlvbl07CisjZWxzZQorICAgIFtz ZWxmIGNsZWFyU2VsZWN0aW9uXTsKKyNlbmRpZgogfQogCiAtIChCT09MKWhhc01hcmtlZFRleHQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA0ZGE3NWFl YTUyYTM1ZWY2NmNmMWE5OTk2MDg0MzcyZGNlM2QyMmVmLi4yODAzNmIxZGRiN2FmY2FhMWRhOGQ0 Y2U3ZDc3YmU3MzZlODNmY2U0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCkBAIC0xNTQwLDYgKzE1NDAsNyBAQCBwcml2YXRlOgogCiAjaWYgUExBVEZPUk0o SU9TKQogICAgIGJvb2wgbV9hbGxvd3NNZWRpYURvY3VtZW50SW5saW5lUGxheWJhY2sgeyBmYWxz ZSB9OworICAgIFJlZlB0cjxXZWJDb3JlOjpSYW5nZT4gbV9zdGFydGluZ0dlc3R1cmVSYW5nZTsK ICNlbmRpZgogCiAjaWYgRU5BQkxFKEZVTExTQ1JFRU5fQVBJKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBlNTdjODZmYWQz NzJlZjBmOGJhYmVmMDc5YzMyYWQ4MGIxZTJlN2JlLi41OWQ4NDZmZjBiOTk3ZDZlOTYxOGRmYWY5 MTM1MWQyNmUzNWIxZTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMTE0MSw3ICsxMTQxLDMxIEBAIHZvaWQgV2ViUGFn ZTo6c2VsZWN0V2l0aEdlc3R1cmUoY29uc3QgSW50UG9pbnQmIHBvaW50LCB1aW50MzJfdCBncmFu dWxhcml0eSwgdWluCiAgICAgICAgIGlmIChwb3NpdGlvbi5yb290RWRpdGFibGVFbGVtZW50KCkp CiAgICAgICAgICAgICByYW5nZSA9IFJhbmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50KCksIHBv c2l0aW9uLCBwb3NpdGlvbik7CiAgICAgICAgIGVsc2UKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lN VUxBVE9SKQogICAgICAgICAgICAgcmFuZ2UgPSB3b3JkUmFuZ2VGcm9tUG9zaXRpb24ocG9zaXRp b24pOworI2Vsc2UKKyAgICAgICAgICAgIHN3aXRjaCAod2tHZXN0dXJlU3RhdGUpIHsKKyAgICAg ICAgICAgIGNhc2UgR2VzdHVyZVJlY29nbml6ZXJTdGF0ZTo6QmVnYW46CisgICAgICAgICAgICAg ICAgbV9zdGFydGluZ0dlc3R1cmVSYW5nZSA9IFJhbmdlOjpjcmVhdGUoKmZyYW1lLmRvY3VtZW50 KCksIHBvc2l0aW9uLCBwb3NpdGlvbik7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBjYXNlIEdlc3R1cmVSZWNvZ25pemVyU3RhdGU6OkNoYW5nZWQ6CisgICAgICAgICAgICAg ICAgaWYgKG1fc3RhcnRpbmdHZXN0dXJlUmFuZ2UpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYg KG1fc3RhcnRpbmdHZXN0dXJlUmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSA8IHBvc2l0aW9uKQorICAg ICAgICAgICAgICAgICAgICAgICAgcmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKCpmcmFtZS5kb2N1bWVu dCgpLCBtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlLT5zdGFydFBvc2l0aW9uKCksIHBvc2l0aW9uKTsK KyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgcmFuZ2Ug PSBSYW5nZTo6Y3JlYXRlKCpmcmFtZS5kb2N1bWVudCgpLCBwb3NpdGlvbiwgbV9zdGFydGluZ0dl c3R1cmVSYW5nZS0+c3RhcnRQb3NpdGlvbigpKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIEdlc3R1cmVSZWNvZ25pemVyU3RhdGU6 OkVuZGVkOgorICAgICAgICAgICAgY2FzZSBHZXN0dXJlUmVjb2duaXplclN0YXRlOjpDYW5jZWxs ZWQ6CisgICAgICAgICAgICAgICAgbV9zdGFydGluZ0dlc3R1cmVSYW5nZSA9IG51bGxwdHI7Cisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIEdlc3R1cmVSZWNvZ25pemVy U3RhdGU6OkZhaWxlZDoKKyAgICAgICAgICAgIGNhc2UgR2VzdHVyZVJlY29nbml6ZXJTdGF0ZTo6 UG9zc2libGU6CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CisjZW5kaWYKICAgICAgICAgYnJlYWs7CiAK ICAgICBjYXNlIEdlc3R1cmVUeXBlOjpUYXBBbmRBSGFsZjoKQEAgLTEyOTEsNiArMTMxNSw3IEBA IHN0YXRpYyBSZWZQdHI8UmFuZ2U+IHJhbmdlQXRXb3JkQm91bmRhcnlGb3JQb3NpdGlvbihGcmFt ZSogZnJhbWUsIGNvbnN0IFZpc2libGVQCiB9CiAKIHZvaWQgV2ViUGFnZTo6Y2xlYXJTZWxlY3Rp b24oKXsKKyAgICBtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlID0gbnVsbHB0cjsKICAgICBtX2N1cnJl bnRCbG9ja1NlbGVjdGlvbiA9IG51bGxwdHI7CiAgICAgbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIo KS5mb2N1c2VkT3JNYWluRnJhbWUoKS5zZWxlY3Rpb24oKS5jbGVhcigpOwogfQo= 341222 2018-05-24 13:25:14 -0700 2018-05-24 14:03:50 -0700 Patch for landing bug-185926-20180524132513.patch text/plain 6210 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxOTQwNDIyMzc0YTI3MTlh ZmUwMGIwMjNjNzJhOWFmNjY5ZWFkMTcuLjNlZTE1MDg3ZTlhMTMxYmI4ZTExNDE5ZTJmMzA0OTY3 ZmY5NGZhMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTgtMDUtMjMgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggSXNzdWVzIHdp dGggTG91cGUgR2VzdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg1OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAg ICAgICBUaGUgbG91cGUgZ2VzdHVyZSB3YXMgbm90IGdpdmluZyB1cyB0aGUgY29ycmVjdCBzZWxl Y3Rpb24gaW4gc29tZSBzaXR1YXRpb25zLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgZ2VzdHVy ZVJlY29nbml6ZXI6Y2FuQmVQcmV2ZW50ZWRCeUdlc3R1cmVSZWNvZ25pemVyOl0pOgorICAgICAg ICAoLVtXS0NvbnRlbnRWaWV3IGdlc3R1cmVSZWNvZ25pemVyOnNob3VsZFJlY29nbml6ZVNpbXVs dGFuZW91c2x5V2l0aEdlc3R1cmVSZWNvZ25pemVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IHNldFNlbGVjdGVkVGV4dFJhbmdlOl0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZWxlY3RXaXRoR2VzdHVyZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OmNsZWFyU2VsZWN0aW9uKToKKwogMjAxOC0wNS0xNiAgRnVq aWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBbV2luXSBJ bXBsZW1lbnQgV2ViUGFnZTo6aGFuZGxlRWRpdGluZ0tleWJvYXJkRXZlbnQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CmluZGV4IDI4MDc3NzQ3Zjg0YzkwMWU0MzdjYjc1ZDM5OTJlMzBhZjU2OWY2YzEuLmUzZDk4ZTQw OGIyNDgxZjUyYTEzNjJjYzljMjIxODBmYjhhNDc0OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMTMy MCw2ICsxMzIwLDExIEBAIHN0YXRpYyBOU1ZhbHVlICpuc1NpemVGb3JUYXBIaWdobGlnaHRCb3Jk ZXJSYWRpdXMoV2ViQ29yZTo6SW50U2l6ZSBib3JkZXJSYWRpdXMsCiAjaWYgX19JUEhPTkVfT1Nf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTIwMDAwCiAgICAgaXNGb3JjZVByZXNzR2VzdHVyZSA9 IChwcmV2ZW50aW5nR2VzdHVyZVJlY29nbml6ZXIgPT0gX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQu Z2V0KCkuZm9yY2VQcmVzc0dlc3R1cmUpOwogI2VuZGlmCisjaWYgRU5BQkxFKE1JTklNQUxfU0lN VUxBVE9SKQorICAgIGlmICgocHJldmVudGluZ0dlc3R1cmVSZWNvZ25pemVyID09IF90ZXh0U2Vs ZWN0aW9uQXNzaXN0YW50LmdldCgpLmxvdXBlR2VzdHVyZSkgJiYgKHByZXZlbnRlZEdlc3R1cmVS ZWNvZ25pemVyID09IF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplciB8fCBwcmV2 ZW50ZWRHZXN0dXJlUmVjb2duaXplciA9PSBfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgfHwg cHJldmVudGVkR2VzdHVyZVJlY29nbml6ZXIgPT0gX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0 KCkuZm9yY2VQcmVzc0dlc3R1cmUpKQorICAgICAgICByZXR1cm4gWUVTOworI2VuZGlmCisgICAg CiAgICAgaWYgKChwcmV2ZW50aW5nR2VzdHVyZVJlY29nbml6ZXIgPT0gX3RleHRTZWxlY3Rpb25B c3Npc3RhbnQuZ2V0KCkubG91cGVHZXN0dXJlIHx8IGlzRm9yY2VQcmVzc0dlc3R1cmUgfHwgW193 ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgaXNTZWxlY3Rpb25HZXN0dXJlUmVjb2duaXplcjpwcmV2ZW50 aW5nR2VzdHVyZVJlY29nbml6ZXJdKSAmJiAocHJldmVudGVkR2VzdHVyZVJlY29nbml6ZXIgPT0g X2hpZ2hsaWdodExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyIHx8IHByZXZlbnRlZEdlc3R1cmVS ZWNvZ25pemVyID09IF9sb25nUHJlc3NHZXN0dXJlUmVjb2duaXplcikpCiAgICAgICAgIHJldHVy biBOTzsKIApAQCAtMTM0NCw2ICsxMzQ5LDEwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1NhbWVQ YWlyKFVJR2VzdHVyZVJlY29nbml6ZXIgKmEsIFVJR2VzdHVyZVJlY29nbml6ZXIgKmIsIFVJCiAg ICAgaWYgKGlzU2FtZVBhaXIoZ2VzdHVyZVJlY29nbml6ZXIsIG90aGVyR2VzdHVyZVJlY29nbml6 ZXIsIF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplci5nZXQoKSwgX3dlYlNlbGVj dGlvbkFzc2lzdGFudC5nZXQoKS5zZWxlY3Rpb25Mb25nUHJlc3NSZWNvZ25pemVyKSkKICAgICAg ICAgcmV0dXJuIFlFUzsKICNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MjAwMDAKKyNpZiBFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisgICAgaWYgKGlzU2FtZVBhaXIo Z2VzdHVyZVJlY29nbml6ZXIsIG90aGVyR2VzdHVyZVJlY29nbml6ZXIsIF90ZXh0U2VsZWN0aW9u QXNzaXN0YW50LmdldCgpLmxvdXBlR2VzdHVyZSwgX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQuZ2V0 KCkuZm9yY2VQcmVzc0dlc3R1cmUpKQorICAgICAgICByZXR1cm4gWUVTOworI2VuZGlmCiAgICAg aWYgKGlzU2FtZVBhaXIoZ2VzdHVyZVJlY29nbml6ZXIsIG90aGVyR2VzdHVyZVJlY29nbml6ZXIs IF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplci5nZXQoKSwgX3RleHRTZWxlY3Rp b25Bc3Npc3RhbnQuZ2V0KCkuZm9yY2VQcmVzc0dlc3R1cmUpKQogICAgICAgICByZXR1cm4gWUVT OwogI2VuZGlmCkBAIC0zMTk2LDggKzMyMDUsMTMgQEAgc3RhdGljIHZvaWQgc2VsZWN0aW9uQ2hh bmdlZFdpdGhUb3VjaChXS0NvbnRlbnRWaWV3ICp2aWV3LCBjb25zdCBXZWJDb3JlOjpJbnRQb2kK IAogLSAodm9pZClzZXRTZWxlY3RlZFRleHRSYW5nZTooVUlUZXh0UmFuZ2UgKilyYW5nZQogewot ICAgIGlmIChoYXNBc3Npc3RlZE5vZGUoX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uKSAmJiAhcmFu Z2UpCi0gICAgICAgIFtzZWxmIGNsZWFyU2VsZWN0aW9uXTsKKyAgICBpZiAocmFuZ2UpCisgICAg ICAgIHJldHVybjsKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorICAgIGlmICghaGFz QXNzaXN0ZWROb2RlKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbikpCisgICAgICAgIHJldHVybjsK KyNlbmRpZgorICAgIFtzZWxmIGNsZWFyU2VsZWN0aW9uXTsKIH0KIAogLSAoQk9PTCloYXNNYXJr ZWRUZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXgg NGRhNzVhZWE1MmEzNWVmNjZjZjFhOTk5NjA4NDM3MmRjZTNkMjJlZi4uMjgwMzZiMWRkYjdhZmNh YTFkYThkNGNlN2Q3N2JlNzM2ZTgzZmNlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaApAQCAtMTU0MCw2ICsxNTQwLDcgQEAgcHJpdmF0ZToKIAogI2lmIFBM QVRGT1JNKElPUykKICAgICBib29sIG1fYWxsb3dzTWVkaWFEb2N1bWVudElubGluZVBsYXliYWNr IHsgZmFsc2UgfTsKKyAgICBSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IG1fc3RhcnRpbmdHZXN0dXJl UmFuZ2U7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggZTU3 Yzg2ZmFkMzcyZWYwZjhiYWJlZjA3OWMzMmFkODBiMWUyZTdiZS4uNTlkODQ2ZmYwYjk5N2Q2ZTk2 MThkZmFmOTEzNTFkMjZlMzViMWUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTExNDEsNyArMTE0MSwzMSBAQCB2b2lk IFdlYlBhZ2U6OnNlbGVjdFdpdGhHZXN0dXJlKGNvbnN0IEludFBvaW50JiBwb2ludCwgdWludDMy X3QgZ3JhbnVsYXJpdHksIHVpbgogICAgICAgICBpZiAocG9zaXRpb24ucm9vdEVkaXRhYmxlRWxl bWVudCgpKQogICAgICAgICAgICAgcmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKCpmcmFtZS5kb2N1bWVu dCgpLCBwb3NpdGlvbiwgcG9zaXRpb24pOwogICAgICAgICBlbHNlCisjaWYgIUVOQUJMRShNSU5J TUFMX1NJTVVMQVRPUikKICAgICAgICAgICAgIHJhbmdlID0gd29yZFJhbmdlRnJvbVBvc2l0aW9u KHBvc2l0aW9uKTsKKyNlbHNlCisgICAgICAgICAgICBzd2l0Y2ggKHdrR2VzdHVyZVN0YXRlKSB7 CisgICAgICAgICAgICBjYXNlIEdlc3R1cmVSZWNvZ25pemVyU3RhdGU6OkJlZ2FuOgorICAgICAg ICAgICAgICAgIG1fc3RhcnRpbmdHZXN0dXJlUmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKCpmcmFtZS5k b2N1bWVudCgpLCBwb3NpdGlvbiwgcG9zaXRpb24pOworICAgICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgY2FzZSBHZXN0dXJlUmVjb2duaXplclN0YXRlOjpDaGFuZ2VkOgorICAgICAg ICAgICAgICAgIGlmIChtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlKSB7CisgICAgICAgICAgICAgICAg ICAgIGlmIChtX3N0YXJ0aW5nR2VzdHVyZVJhbmdlLT5zdGFydFBvc2l0aW9uKCkgPCBwb3NpdGlv bikKKyAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlID0gUmFuZ2U6OmNyZWF0ZSgqZnJhbWUu ZG9jdW1lbnQoKSwgbV9zdGFydGluZ0dlc3R1cmVSYW5nZS0+c3RhcnRQb3NpdGlvbigpLCBwb3Np dGlvbik7CisgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAg IHJhbmdlID0gUmFuZ2U6OmNyZWF0ZSgqZnJhbWUuZG9jdW1lbnQoKSwgcG9zaXRpb24sIG1fc3Rh cnRpbmdHZXN0dXJlUmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSk7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBHZXN0dXJlUmVjb2duaXpl clN0YXRlOjpFbmRlZDoKKyAgICAgICAgICAgIGNhc2UgR2VzdHVyZVJlY29nbml6ZXJTdGF0ZTo6 Q2FuY2VsbGVkOgorICAgICAgICAgICAgICAgIG1fc3RhcnRpbmdHZXN0dXJlUmFuZ2UgPSBudWxs cHRyOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBHZXN0dXJlUmVj b2duaXplclN0YXRlOjpGYWlsZWQ6CisgICAgICAgICAgICBjYXNlIEdlc3R1cmVSZWNvZ25pemVy U3RhdGU6OlBvc3NpYmxlOgorICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorI2VuZGlmCiAgICAgICAgIGJy ZWFrOwogCiAgICAgY2FzZSBHZXN0dXJlVHlwZTo6VGFwQW5kQUhhbGY6CkBAIC0xMjkxLDYgKzEz MTUsNyBAQCBzdGF0aWMgUmVmUHRyPFJhbmdlPiByYW5nZUF0V29yZEJvdW5kYXJ5Rm9yUG9zaXRp b24oRnJhbWUqIGZyYW1lLCBjb25zdCBWaXNpYmxlUAogfQogCiB2b2lkIFdlYlBhZ2U6OmNsZWFy U2VsZWN0aW9uKCl7CisgICAgbV9zdGFydGluZ0dlc3R1cmVSYW5nZSA9IG51bGxwdHI7CiAgICAg bV9jdXJyZW50QmxvY2tTZWxlY3Rpb24gPSBudWxscHRyOwogICAgIG1fcGFnZS0+Zm9jdXNDb250 cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCkuc2VsZWN0aW9uKCkuY2xlYXIoKTsKIH0K