148568 2015-08-28 01:47:38 -0700 Add navigation gesture callbacks to WKPageNavigationClient 2015-08-30 04:09:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca jeffm sam oldest_to_newest 1121635 0 thorton 2015-08-28 01:47:38 -0700 Add navigation gesture callbacks to WKPageNavigationClient 1121636 1 260138 thorton 2015-08-28 01:47:54 -0700 Created attachment 260138 Patch 1121637 2 thorton 2015-08-28 01:48:19 -0700 <rdar://problem/22371346> 1121740 3 260138 andersca 2015-08-28 10:41:16 -0700 Comment on attachment 260138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=260138&action=review > Source/WebKit2/UIProcess/API/C/WKPage.cpp:98 > + typedef std::tuple<WKPageNavigationClientV0, WKPageNavigationClientV1> Versions; I don't think we need a new version of the struct yet - we haven't shipped anything that relies on it. 1121772 4 thorton 2015-08-28 11:38:55 -0700 http://trac.webkit.org/changeset/189109 260138 2015-08-28 01:47:54 -0700 2015-08-30 04:09:31 -0700 Patch bug-148568-20150828014741.patch text/plain 9288 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGQxZDZjZWQwNjM4ZjQ1 MTg3NDlhZWVhMzdiNzFhOGZlYzVmZTE3Ny4uMzZkMzA0NTU5NzI1NWY2MjYzYzQ4ZjIyZDVjNDcy OWE0YjE2MWIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA4LTI4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbmF2 aWdhdGlvbiBnZXN0dXJlIGNhbGxiYWNrcyB0byBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NjgKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzIyMzcxMzQ2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50 Lmg6CisgICAgICAgIChBUEk6Ok5hdmlnYXRpb25DbGllbnQ6OmRpZEJlZ2luTmF2aWdhdGlvbkdl c3R1cmUpOgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50Ojp3aWxsRW5kTmF2aWdhdGlv bkdlc3R1cmUpOgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRFbmROYXZpZ2F0 aW9uR2VzdHVyZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHA6CisgICAg ICAgIChXS1BhZ2VTZXRQYWdlTmF2aWdhdGlvbkNsaWVudCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLUGFnZU5hdmlnYXRpb25DbGllbnQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpuYXZpZ2F0aW9u R2VzdHVyZURpZEJlZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpuYXZpZ2F0 aW9uR2VzdHVyZVdpbGxFbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6Om5hdmln YXRpb25HZXN0dXJlRGlkRW5kKToKKwogMjAxNS0wOC0yNyAgVGltb3RoeSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVmlkZW8gZnVsbC1zY3JlZW4gc2hvdWxk bid0IHVzZSB0aGUgRHluYW1pY1NpemVXaXRoTWluaW11bVZpZXdTaXplIGxheW91dCBtb2RlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb25DbGll bnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5o CmluZGV4IDQxMjUzYzZkMTc3YTVmYWMxNGJmYTA1ZDQzNDRiMTJiNjM1ZTY1MjUuLjY0M2Y4N2I0 ZGY5ZmZmNzY3ODMyMTkyNTFkNDU2MWM5MWZhYzZkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5oCkBAIC0xMDcsNiArMTA3LDEw IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5OwogICAg IH0KICNlbmRpZgorCisgICAgdmlydHVhbCB2b2lkIGRpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmUo V2ViS2l0OjpXZWJQYWdlUHJveHkmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgd2lsbEVuZE5hdmln YXRpb25HZXN0dXJlKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgYm9vbCB3aWxsTmF2aWdhdGUsIFdl YktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbSYpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRF bmROYXZpZ2F0aW9uR2VzdHVyZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIGJvb2wgd2lsbE5hdmln YXRlLCBXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKSB7IH0KIH07CiAKIH0gLy8gbmFt ZXNwYWNlIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAppbmRl eCA0OTg2MmY4MjZjZGFkMDJkMjExNDgyM2Q2MzYzOGQ0YjI0Yzk4ODc1Li5lMzNjNWNlNGRjODli MGZiYmFjY2NjN2Y1MmYwYjkyZTMyNzM3NDlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQYWdlLmNwcApAQCAtOTUsNyArOTUsNyBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBDbGll bnRUcmFpdHM8V0tQYWdlTG9hZGVyQ2xpZW50QmFzZT4gewogfTsKIAogdGVtcGxhdGU8PiBzdHJ1 Y3QgQ2xpZW50VHJhaXRzPFdLUGFnZU5hdmlnYXRpb25DbGllbnRCYXNlPiB7Ci0gICAgdHlwZWRl ZiBzdGQ6OnR1cGxlPFdLUGFnZU5hdmlnYXRpb25DbGllbnRWMD4gVmVyc2lvbnM7CisgICAgdHlw ZWRlZiBzdGQ6OnR1cGxlPFdLUGFnZU5hdmlnYXRpb25DbGllbnRWMCwgV0tQYWdlTmF2aWdhdGlv bkNsaWVudFYxPiBWZXJzaW9uczsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IENsaWVudFRyYWl0 czxXS1BhZ2VQb2xpY3lDbGllbnRCYXNlPiB7CkBAIC0yMTAyLDYgKzIxMDIsMjcgQEAgdm9pZCBX S1BhZ2VTZXRQYWdlTmF2aWdhdGlvbkNsaWVudChXS1BhZ2VSZWYgcGFnZVJlZiwgY29uc3QgV0tQ YWdlTmF2aWdhdGlvbkNsaWUKICAgICAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICAg ICAgICAgIHJldHVybiBhZG9wdFJlZih0b0ltcGwobV9jbGllbnQuY29weVdlYkNyeXB0b01hc3Rl cktleSh0b0FQSSgmcGFnZSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbykpKTsKICAgICAgICAg fQorCisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlKFdlYlBh Z2VQcm94eSYgcGFnZSkgb3ZlcnJpZGUKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCFtX2Ns aWVudC5kaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlKQorICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIG1fY2xpZW50LmRpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmUodG9BUEkoJnBh Z2UpLCBtX2NsaWVudC5iYXNlLmNsaWVudEluZm8pOworICAgICAgICB9CisKKyAgICAgICAgdmly dHVhbCB2b2lkIGRpZEVuZE5hdmlnYXRpb25HZXN0dXJlKFdlYlBhZ2VQcm94eSYgcGFnZSwgYm9v bCB3aWxsTmF2aWdhdGUsIFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkgb3Zl cnJpZGUKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCFtX2NsaWVudC5kaWRFbmROYXZpZ2F0 aW9uR2VzdHVyZSkKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBtX2NsaWVu dC5kaWRFbmROYXZpZ2F0aW9uR2VzdHVyZSh0b0FQSSgmcGFnZSksIHdpbGxOYXZpZ2F0ZSA/IHRv QVBJKCZpdGVtKSA6IG51bGxwdHIsIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7CisgICAgICAg IH0KKworICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbEVuZE5hdmlnYXRpb25HZXN0dXJlKFdlYlBh Z2VQcm94eSYgcGFnZSwgYm9vbCB3aWxsTmF2aWdhdGUsIFdlYktpdDo6V2ViQmFja0ZvcndhcmRM aXN0SXRlbSYgaXRlbSkgb3ZlcnJpZGUKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCFtX2Ns aWVudC53aWxsRW5kTmF2aWdhdGlvbkdlc3R1cmUpCisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgbV9jbGllbnQud2lsbEVuZE5hdmlnYXRpb25HZXN0dXJlKHRvQVBJKCZwYWdl KSwgd2lsbE5hdmlnYXRlID8gdG9BUEkoJml0ZW0pIDogbnVsbHB0ciwgbV9jbGllbnQuYmFzZS5j bGllbnRJbmZvKTsKKyAgICAgICAgfQogICAgICAgICAKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExV R0lOX0FQSSkKICAgICAgICAgdmlydHVhbCBQbHVnaW5Nb2R1bGVMb2FkUG9saWN5IGRlY2lkZVBv bGljeUZvclBsdWdpbkxvYWQoV2ViUGFnZVByb3h5JiBwYWdlLCBQbHVnaW5Nb2R1bGVMb2FkUG9s aWN5IGN1cnJlbnRQbHVnaW5Mb2FkUG9saWN5LCBBUEk6OkRpY3Rpb25hcnkqIHBsdWdpbkluZm9y bWF0aW9uLCBTdHJpbmcmIHVuYXZhaWxhYmlsaXR5RGVzY3JpcHRpb24pIG92ZXJyaWRlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlTmF2aWdhdGlvbkNs aWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZU5hdmlnYXRpb25D bGllbnQuaAppbmRleCBjYjliMmY1ZmJmZmYwZWZjZTcyNDU5NTI0ZWE5MWZjYWQ2NGMzNmU3Li4x ODUxYjllZjc5ZjUzYWExMzc4MWJhZGExOWI0YjJmZTYzYmY5MzcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlTmF2aWdhdGlvbkNsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50LmgK QEAgLTY5LDYgKzY5LDEyIEBAIHR5cGVkZWYgV0tEYXRhUmVmICgqV0tQYWdlTmF2aWdhdGlvbkNv cHlXZWJDcnlwdG9NYXN0ZXJLZXlDYWxsYmFjaykoV0tQYWdlUmVmIHBhCiAgICAgCiB0eXBlZGVm IFdLUGx1Z2luTG9hZFBvbGljeSAoKldLUGFnZU5hdmlnYXRpb25EZWNpZGVQb2xpY3lGb3JQbHVn aW5Mb2FkQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS1BsdWdpbkxvYWRQb2xpY3kgY3VycmVu dFBsdWdpbkxvYWRQb2xpY3ksIFdLRGljdGlvbmFyeVJlZiBwbHVnaW5JbmZvRGljdGlvbmFyeSwg V0tTdHJpbmdSZWYqIHVuYXZhaWxhYmlsaXR5RGVzY3JpcHRpb24sIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pOwogCit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VOYXZpZ2F0aW9uRGlkQmVnaW5OYXZpZ2F0 aW9uR2VzdHVyZSkoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOworCit0 eXBlZGVmIHZvaWQgKCpXS1BhZ2VOYXZpZ2F0aW9uV2lsbEVuZE5hdmlnYXRpb25HZXN0dXJlKShX S1BhZ2VSZWYgcGFnZSwgV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGJhY2tGb3J3YXJkTGlzdEl0 ZW0sIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOworCit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VOYXZp Z2F0aW9uRGlkRW5kTmF2aWdhdGlvbkdlc3R1cmUpKFdLUGFnZVJlZiBwYWdlLCBXS0JhY2tGb3J3 YXJkTGlzdEl0ZW1SZWYgYmFja0ZvcndhcmRMaXN0SXRlbSwgY29uc3Qgdm9pZCogY2xpZW50SW5m byk7CisKIHR5cGVkZWYgc3RydWN0IFdLUGFnZU5hdmlnYXRpb25DbGllbnRCYXNlIHsKICAgICBp bnQgdmVyc2lvbjsKICAgICBjb25zdCB2b2lkKiBjbGllbnRJbmZvOwpAQCAtOTcsNiArMTAzLDM1 IEBAIHR5cGVkZWYgc3RydWN0IFdLUGFnZU5hdmlnYXRpb25DbGllbnRWMCB7CiAgICAgV0tQYWdl TmF2aWdhdGlvbkNvcHlXZWJDcnlwdG9NYXN0ZXJLZXlDYWxsYmFjayBjb3B5V2ViQ3J5cHRvTWFz dGVyS2V5OwogfSBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50VjA7CiAKK3R5cGVkZWYgc3RydWN0IFdL UGFnZU5hdmlnYXRpb25DbGllbnRWMSB7CisgICAgV0tQYWdlTmF2aWdhdGlvbkNsaWVudEJhc2Ug YmFzZTsKKworICAgIC8vIFZlcnNpb24gMC4KKyAgICBXS1BhZ2VOYXZpZ2F0aW9uRGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbkNhbGxiYWNrIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb247CisgICAgV0tQYWdlTmF2aWdhdGlvbkRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNw b25zZUNhbGxiYWNrIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25SZXNwb25zZTsKKyAgICBXS1Bh Z2VOYXZpZ2F0aW9uRGVjaWRlUG9saWN5Rm9yUGx1Z2luTG9hZENhbGxiYWNrIGRlY2lkZVBvbGlj eUZvclBsdWdpbkxvYWQ7CisgICAgV0tQYWdlTmF2aWdhdGlvbkRpZFN0YXJ0UHJvdmlzaW9uYWxO YXZpZ2F0aW9uQ2FsbGJhY2sgZGlkU3RhcnRQcm92aXNpb25hbE5hdmlnYXRpb247CisgICAgV0tQ YWdlTmF2aWdhdGlvbkRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdh dGlvbkNhbGxiYWNrIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTmF2aWdh dGlvbjsKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uRGlkRmFpbFByb3Zpc2lvbmFsTmF2aWdhdGlvbkNh bGxiYWNrIGRpZEZhaWxQcm92aXNpb25hbE5hdmlnYXRpb247CisgICAgV0tQYWdlTmF2aWdhdGlv bkRpZENvbW1pdE5hdmlnYXRpb25DYWxsYmFjayBkaWRDb21taXROYXZpZ2F0aW9uOworICAgIFdL UGFnZU5hdmlnYXRpb25EaWRGaW5pc2hOYXZpZ2F0aW9uQ2FsbGJhY2sgZGlkRmluaXNoTmF2aWdh dGlvbjsKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uRGlkRmFpbE5hdmlnYXRpb25DYWxsYmFjayBkaWRG YWlsTmF2aWdhdGlvbjsKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uRGlkRmFpbFByb3Zpc2lvbmFsTG9h ZEluU3ViZnJhbWVDYWxsYmFjayBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkSW5TdWJmcmFtZTsKKyAg ICBXS1BhZ2VOYXZpZ2F0aW9uRGlkRmluaXNoRG9jdW1lbnRMb2FkQ2FsbGJhY2sgZGlkRmluaXNo RG9jdW1lbnRMb2FkOworICAgIFdLUGFnZU5hdmlnYXRpb25EaWRTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uQ2FsbGJhY2sgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbjsKKyAgICBXS1BhZ2VOYXZpZ2F0 aW9uUmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2VDYWxsYmFjayByZW5kZXJpbmdQcm9ncmVzc0Rp ZENoYW5nZTsKKyAgICBXS1BhZ2VOYXZpZ2F0aW9uQ2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3Rl Y3Rpb25TcGFjZUNhbGxiYWNrIGNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2U7 CisgICAgV0tQYWdlTmF2aWdhdGlvbkRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUNh bGxiYWNrIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTsKKyAgICBXS1BhZ2VOYXZp Z2F0aW9uV2ViUHJvY2Vzc0RpZENyYXNoQ2FsbGJhY2sgd2ViUHJvY2Vzc0RpZENyYXNoOworICAg IFdLUGFnZU5hdmlnYXRpb25Db3B5V2ViQ3J5cHRvTWFzdGVyS2V5Q2FsbGJhY2sgY29weVdlYkNy eXB0b01hc3RlcktleTsKKworICAgIC8vIFZlcnNpb24gMS4KKworICAgIFdLUGFnZU5hdmlnYXRp b25EaWRCZWdpbk5hdmlnYXRpb25HZXN0dXJlIGRpZEJlZ2luTmF2aWdhdGlvbkdlc3R1cmU7Cisg ICAgV0tQYWdlTmF2aWdhdGlvbldpbGxFbmROYXZpZ2F0aW9uR2VzdHVyZSB3aWxsRW5kTmF2aWdh dGlvbkdlc3R1cmU7CisgICAgV0tQYWdlTmF2aWdhdGlvbkRpZEVuZE5hdmlnYXRpb25HZXN0dXJl IGRpZEVuZE5hdmlnYXRpb25HZXN0dXJlOworfSBXS1BhZ2VOYXZpZ2F0aW9uQ2xpZW50VjE7CisK IAogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IDRjZWVhMGNhY2JlMWE2MWI5NzhjNTMxNjM4ZDIwMTBiMzliYzE3MDAu LmNiNzZiNGFkNWYyY2MzZTQ3MDNlZWE0ZjFkNmQzNTMxMDAwODJkZjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC01OTA2LDcgKzU5MDYsMTEgQEAgdm9p ZCBXZWJQYWdlUHJveHk6Om5hdmlnYXRpb25HZXN0dXJlRGlkQmVnaW4oKQogCiAgICAgbV9pc1No b3dpbmdOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90ID0gdHJ1ZTsKICAgICBtX3BhZ2VDbGllbnQu bmF2aWdhdGlvbkdlc3R1cmVEaWRCZWdpbigpOwotICAgIG1fbG9hZGVyQ2xpZW50LT5uYXZpZ2F0 aW9uR2VzdHVyZURpZEJlZ2luKCp0aGlzKTsKKworICAgIGlmIChtX25hdmlnYXRpb25DbGllbnQp CisgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkQmVnaW5OYXZpZ2F0aW9uR2VzdHVyZSgq dGhpcyk7CisgICAgZWxzZQorICAgICAgICBtX2xvYWRlckNsaWVudC0+bmF2aWdhdGlvbkdlc3R1 cmVEaWRCZWdpbigqdGhpcyk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpuYXZpZ2F0aW9uR2Vz dHVyZVdpbGxFbmQoYm9vbCB3aWxsTmF2aWdhdGUsIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mIGl0 ZW0pCkBAIC01OTE0LDcgKzU5MTgsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6Om5hdmlnYXRpb25H ZXN0dXJlV2lsbEVuZChib29sIHdpbGxOYXZpZ2F0ZSwgV2ViQmFja0ZvcndhcmRMaXMKICAgICBQ YWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihtX3BhZ2VDbGllbnQpOwogCiAgICAgbV9wYWdl Q2xpZW50Lm5hdmlnYXRpb25HZXN0dXJlV2lsbEVuZCh3aWxsTmF2aWdhdGUsIGl0ZW0pOwotICAg IG1fbG9hZGVyQ2xpZW50LT5uYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQoKnRoaXMsIHdpbGxOYXZp Z2F0ZSwgaXRlbSk7CisKKyAgICBpZiAobV9uYXZpZ2F0aW9uQ2xpZW50KQorICAgICAgICBtX25h dmlnYXRpb25DbGllbnQtPndpbGxFbmROYXZpZ2F0aW9uR2VzdHVyZSgqdGhpcywgd2lsbE5hdmln YXRlLCBpdGVtKTsKKyAgICBlbHNlCisgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5uYXZpZ2F0aW9u R2VzdHVyZVdpbGxFbmQoKnRoaXMsIHdpbGxOYXZpZ2F0ZSwgaXRlbSk7CiB9CiAKIHZvaWQgV2Vi UGFnZVByb3h5OjpuYXZpZ2F0aW9uR2VzdHVyZURpZEVuZChib29sIHdpbGxOYXZpZ2F0ZSwgV2Vi QmFja0ZvcndhcmRMaXN0SXRlbSYgaXRlbSkKQEAgLTU5MjIsNyArNTkzMCwxMCBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6bmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQoYm9vbCB3aWxsTmF2aWdhdGUsIFdl YkJhY2tGb3J3YXJkTGlzdAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKG1fcGFn ZUNsaWVudCk7CiAKICAgICBtX3BhZ2VDbGllbnQubmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQod2ls bE5hdmlnYXRlLCBpdGVtKTsKLSAgICBtX2xvYWRlckNsaWVudC0+bmF2aWdhdGlvbkdlc3R1cmVE aWRFbmQoKnRoaXMsIHdpbGxOYXZpZ2F0ZSwgaXRlbSk7CisgICAgaWYgKG1fbmF2aWdhdGlvbkNs aWVudCkKKyAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRFbmROYXZpZ2F0aW9uR2VzdHVy ZSgqdGhpcywgd2lsbE5hdmlnYXRlLCBpdGVtKTsKKyAgICBlbHNlCisgICAgICAgIG1fbG9hZGVy Q2xpZW50LT5uYXZpZ2F0aW9uR2VzdHVyZURpZEVuZCgqdGhpcywgd2lsbE5hdmlnYXRlLCBpdGVt KTsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6Om5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKCkK