127883 2014-01-29 17:57:09 -0800 Pass navigation IDs along to LoadRequest and Reload 2014-01-29 18:02:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 973559 0 andersca 2014-01-29 17:57:09 -0800 Pass navigation IDs along to LoadRequest and Reload 973562 1 222616 andersca 2014-01-29 17:57:56 -0800 Created attachment 222616 Patch 973566 2 222616 sam 2014-01-29 18:00:41 -0800 Comment on attachment 222616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222616&action=review > Source/WebKit2/WebProcess/WebPage/WebDocumentLoader.cpp:44 > + printf("set navigation id %llu\n", navigationID); WAT 973567 3 222616 mitz 2014-01-29 18:01:20 -0800 Comment on attachment 222616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222616&action=review > Source/WebKit2/WebProcess/WebPage/WebDocumentLoader.cpp:44 > + printf("set navigation id %llu\n", navigationID); No way! 973569 4 andersca 2014-01-29 18:02:29 -0800 Committed r163060: <http://trac.webkit.org/changeset/163060> 222616 2014-01-29 17:57:56 -0800 2014-01-29 18:01:20 -0800 Patch bug-127883-20140129175756.patch text/plain 12502 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzMDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWIyZjRmYTk1NWMzZDY5 YjEwMTY3OGUzNTZlYTQzZmMzZjVjMDFmOS4uMzVlZDg2NjdlZGRkMzY1ZWJlYzljN2QzYTQ2ZTdl NzQ0MTVhMjFhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE0LTAxLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUGFzcyBuYXZpZ2F0 aW9uIElEcyBhbG9uZyB0byBMb2FkUmVxdWVzdCBhbmQgUmVsb2FkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc4ODMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmxvYWRGaWxlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpyZWxvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmdlbmVyYXRlTmF2aWdh dGlvbklEKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkRvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViRG9jdW1lbnRMb2FkZXI6OnNldE5hdmlnYXRpb25JRCk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQ YWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9hZFJlcXVlc3QpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpyZWxvYWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjcmVh dGVEb2N1bWVudExvYWRlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwor MjAxNC0wMS0yOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAg ICAgIC1bV0tXZWJWaWV3IGxvYWRSZXF1ZXN0Ol0gc2hvdWxkIHJldHVybiBhIFdLTmF2aWdhdGlv bgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3ODcz CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZWFkZDYx Yjc1YmI5NjYyMzRmZjk0ZTY3MWExNWI5MGQ0MDhhYWRiZi4uZDU3MWE0YTMxYmY5ZmQzNjU3MWNl NTEyZTk1NjZiYTE1ZDBlZmMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTMyNCw2ICszMjQsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQ YWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYgogICAg ICwgbV9tYXlTdGFydE1lZGlhV2hlbkluV2luZG93KHRydWUpCiAgICAgLCBtX3dhaXRpbmdGb3JE aWRVcGRhdGVWaWV3U3RhdGUoZmFsc2UpCiAgICAgLCBtX3Njcm9sbFBpbm5pbmdCZWhhdmlvcihE b05vdFBpbikKKyAgICAsIG1fbmF2aWdhdGlvbklEKDApCiB7CiAgICAgdXBkYXRlVmlld1N0YXRl KCk7CiAKQEAgLTYyMCw3ICs2MjEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3Qo Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBBUEk6Ok9iamVjdCogdXNlcgogICAgIGJv b2wgY3JlYXRlZEV4dGVuc2lvbiA9IG1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5k bGUocmVxdWVzdC51cmwoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgaWYgKGNyZWF0 ZWRFeHRlbnNpb24pCiAgICAgICAgIG1fcHJvY2Vzcy0+d2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxl UmVhZFNhbmRib3hFeHRlbnNpb24oKTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkxvYWRSZXF1ZXN0KHJlcXVlc3QsIHNhbmRib3hFeHRlbnNpb25IYW5kbGUsIFdlYkNv bnRleHRVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEsIHByb2Nlc3MoKSkpLCBtX3BhZ2VJRCk7 CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkUmVxdWVzdChnZW5l cmF0ZU5hdmlnYXRpb25JRCgpLCByZXF1ZXN0LCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJD b250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9wYWdlSUQp OwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwogfQogCkBA IC02NDcsNyArNjQ4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRGaWxlKGNvbnN0IFN0cmlu ZyYgZmlsZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiByZXNvdXJjZUQKICAgICBTYW5kYm94RXh0 ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZTsKICAgICBTYW5kYm94RXh0ZW5z aW9uOjpjcmVhdGVIYW5kbGUocmVzb3VyY2VEaXJlY3RvcnlQYXRoLCBTYW5kYm94RXh0ZW5zaW9u OjpSZWFkT25seSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgbV9wcm9jZXNzLT5hc3N1 bWVSZWFkQWNjZXNzVG9CYXNlVVJMKHJlc291cmNlRGlyZWN0b3J5VVJMKTsKLSAgICBtX3Byb2Nl c3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRSZXF1ZXN0KGZpbGVVUkwsIHNhbmRib3hF eHRlbnNpb25IYW5kbGUsIFdlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEsIHBy b2Nlc3MoKSkpLCBtX3BhZ2VJRCk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpMb2FkUmVxdWVzdChnZW5lcmF0ZU5hdmlnYXRpb25JRCgpLCBmaWxlVVJMLCBzYW5kYm94 RXh0ZW5zaW9uSGFuZGxlLCBXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBw cm9jZXNzKCkpKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLT5zdGFydCgpOwogfQogCkBAIC03MzUsNyArNzM2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnJlbG9hZChib29sIHJlbG9hZEZyb21PcmlnaW4pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK LSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlJlbG9hZChyZWxvYWRGcm9t T3JpZ2luLCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKSwgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UmVsb2FkKGdlbmVyYXRlTmF2aWdhdGlvbklEKCks IHJlbG9hZEZyb21PcmlnaW4sIHNhbmRib3hFeHRlbnNpb25IYW5kbGUpLCBtX3BhZ2VJRCk7CiAg ICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAKQEAgLTEz MDUsNiArMTMwNiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlS2V5Ym9hcmRFdmVudChj b25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiBldmVudCkKICAgICAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpLZXlFdmVudChldmVudCksIG1fcGFnZUlEKTsKIH0KIAor dWludDY0X3QgV2ViUGFnZVByb3h5OjpnZW5lcmF0ZU5hdmlnYXRpb25JRCgpCit7CisgICAgcmV0 dXJuICsrbV9uYXZpZ2F0aW9uSUQ7Cit9CisKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5kUGx1Z2luKGNvbnN0IFN0cmluZyYgbWltZVR5cGUs IHVpbnQzMl90IHByb2Nlc3NUeXBlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZywgY29uc3QgU3Ry aW5nJiBmcmFtZVVSTFN0cmluZywgY29uc3QgU3RyaW5nJiBwYWdlVVJMU3RyaW5nLCBib29sIGFs bG93T25seUFwcGxpY2F0aW9uUGx1Z2lucywgdWludDY0X3QmIHBsdWdpblByb2Nlc3NUb2tlbiwg U3RyaW5nJiBuZXdNaW1lVHlwZSwgdWludDMyX3QmIHBsdWdpbkxvYWRQb2xpY3ksIFN0cmluZyYg dW5hdmFpbGFiaWxpdHlEZXNjcmlwdGlvbikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAppbmRleCAwNDBlOGE2YjVhYzNhZTM4Yjk4ZGI5NTM1NzMxZDFkZGY3ODBlZDc1 Li5hOGJlNjEzNWYzODc1MmE0NTQzYTgwNmExZjY0YWU5ZjY3NzNhZDIyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMTY4LDYgKzExNjgsOCBAQCBwcml2YXRl OgogICAgIHZvaWQgZmluZFBsdWdpbihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCB1aW50MzJfdCBw cm9jZXNzVHlwZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZnJhbWVV UkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgcGFnZVVSTFN0cmluZywgYm9vbCBhbGxvd09ubHlBcHBs aWNhdGlvblBsdWdpbnMsIHVpbnQ2NF90JiBwbHVnaW5Qcm9jZXNzVG9rZW4sIFN0cmluZyYgbmV3 TUlNRVR5cGUsIHVpbnQzMl90JiBwbHVnaW5Mb2FkUG9saWN5LCBTdHJpbmcmIHVuYXZhaWxhYmls aXR5RGVzY3JpcHRpb24pOwogI2VuZGlmCiAKKyAgICB1aW50NjRfdCBnZW5lcmF0ZU5hdmlnYXRp b25JRCgpOworCiAgICAgUGFnZUNsaWVudCYgbV9wYWdlQ2xpZW50OwogICAgIHN0ZDo6dW5pcXVl X3B0cjxBUEk6OkxvYWRlckNsaWVudD4gbV9sb2FkZXJDbGllbnQ7CiAgICAgc3RkOjp1bmlxdWVf cHRyPEFQSTo6UG9saWN5Q2xpZW50PiBtX3BvbGljeUNsaWVudDsKQEAgLTEzOTAsNiArMTM5Miw4 IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICAgICAgCiAgICAgV2ViQ29yZTo6U2Nyb2xsUGlubmlu Z0JlaGF2aW9yIG1fc2Nyb2xsUGlubmluZ0JlaGF2aW9yOworCisgICAgdWludDY0X3QgbV9uYXZp Z2F0aW9uSUQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJEb2N1bWVudExvYWRlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4 IDRiNmExNjMzY2FmN2NhZjlhYzE2ZTk1MDBmMWVkMDZmYTZiOTQ2ZjMuLmI0ZWEzN2Y2ZjM0ODEw ZTNhMjU3ZmVkZWY2ODFhZjdjODFiNDI5ZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJEb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkRvY3VtZW50TG9hZGVyLmNwcApAQCAtNDEsNiArNDEs NyBAQCB2b2lkIFdlYkRvY3VtZW50TG9hZGVyOjpzZXROYXZpZ2F0aW9uSUQodWludDY0X3QgbmF2 aWdhdGlvbklEKQogICAgIEFTU0VSVChuYXZpZ2F0aW9uSUQpOwogICAgIEFTU0VSVCghbV9uYXZp Z2F0aW9uSUQpOwogCisgICAgcHJpbnRmKCJzZXQgbmF2aWdhdGlvbiBpZCAlbGx1XG4iLCBuYXZp Z2F0aW9uSUQpOwogICAgIG1fbmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbklEOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggOGQ3ZWNh NGRiYWExMjk5ZDU3NDNlZThkNjg5NzI3YjdkYjQ4MTMxMi4uZDQ3MTQ3NDJlYTc1ODE2YjgxNzI5 Njg3ZDJjMGM0NTAxZGI4ZGU0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcApAQCAtMjg4LDYgKzI4OCw3IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWlu dDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJz KQogICAgICwgbV91c2VBc3luY1Njcm9sbGluZyhmYWxzZSkKICAgICAsIG1fdmlld1N0YXRlKHBh cmFtZXRlcnMudmlld1N0YXRlKQogICAgICwgbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEJ5 V2ViUHJlZmVyZW5jZSgiUHJvY2VzcyBzdXBwcmVzc2lvbiBpcyBkaXNhYmxlZC4iKQorICAgICwg bV9wZW5kaW5nTmF2aWdhdGlvbklEKDApCiB7CiAgICAgQVNTRVJUKG1fcGFnZUlEKTsKICAgICAv LyBGSVhNRTogVGhpcyBpcyBhIG5vbi1pZGVhbCBsb2NhdGlvbiBmb3IgdGhpcyBTZXR0aW5nIGFu ZApAQCAtOTAwLDcgKzkwMSw3IEBAIHZvaWQgV2ViUGFnZTo6bG9hZFVSTEluRnJhbWUoY29uc3Qg U3RyaW5nJiB1cmwsIHVpbnQ2NF90IGZyYW1lSUQpCiAgICAgZnJhbWUtPmNvcmVGcmFtZSgpLT5s b2FkZXIoKS5sb2FkKEZyYW1lTG9hZFJlcXVlc3QoZnJhbWUtPmNvcmVGcmFtZSgpLCBSZXNvdXJj ZVJlcXVlc3QoVVJMKFVSTCgpLCB1cmwpKSkpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWRSZXF1 ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU2FuZGJveEV4dGVuc2lv bjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBk ZWNvZGVyKQordm9pZCBXZWJQYWdlOjpsb2FkUmVxdWVzdCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQs IGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6 SGFuZGxlJiBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNv ZGVyKQogewogICAgIFNlbmRTdG9wUmVzcG9uc2l2ZW5lc3NUaW1lciBzdG9wcGVyKHRoaXMpOwog CkBAIC05MDksNiArOTEwLDkgQEAgdm9pZCBXZWJQYWdlOjpsb2FkUmVxdWVzdChjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFNhbmRib3hFeHRlbnNpb24KICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHVzZXJNZXNzYWdlRGVjb2RlcikpCiAgICAgICAgIHJldHVybjsKIAorICAg IEFTU0VSVCghbV9wZW5kaW5nTmF2aWdhdGlvbklEKTsKKyAgICBtX3BlbmRpbmdOYXZpZ2F0aW9u SUQgPSBuYXZpZ2F0aW9uSUQ7CisKICAgICBtX3NhbmRib3hFeHRlbnNpb25UcmFja2VyLmJlZ2lu TG9hZChtX21haW5GcmFtZS5nZXQoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAKICAgICAv LyBMZXQgdGhlIEluamVjdGVkQnVuZGxlIGtub3cgd2UgYXJlIGFib3V0IHRvIHN0YXJ0IHRoZSBs b2FkLCBwYXNzaW5nIHRoZSB1c2VyIGRhdGEgZnJvbSB0aGUgVUlQcm9jZXNzCkBAIC05MTcsNiAr OTIxLDggQEAgdm9pZCBXZWJQYWdlOjpsb2FkUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QsIGNvbnN0IFNhbmRib3hFeHRlbnNpb24KIAogICAgIC8vIEluaXRhdGUgdGhlIGxv YWQgaW4gV2ViQ29yZS4KICAgICBtX21haW5GcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLmxv YWQoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFtZS0+Y29yZUZyYW1lKCksIHJlcXVlc3QpKTsK KworICAgIEFTU0VSVCghbV9wZW5kaW5nTmF2aWdhdGlvbklEKTsKIH0KIAogdm9pZCBXZWJQYWdl Ojpsb2FkRGF0YUltcGwoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciwgY29u c3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFVS TCYgYmFzZVVSTCwgY29uc3QgVVJMJiB1bnJlYWNoYWJsZVVSTCwgSVBDOjpNZXNzYWdlRGVjb2Rl ciYgZGVjb2RlcikKQEAgLTEwMDIsMTAgKzEwMDgsMTMgQEAgdm9pZCBXZWJQYWdlOjpzZXREZWZl cnNMb2FkaW5nKGJvb2wgZGVmZXJzTG9hZGluZykKICAgICBtX3BhZ2UtPnNldERlZmVyc0xvYWRp bmcoZGVmZXJzTG9hZGluZyk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6cmVsb2FkKGJvb2wgcmVsb2Fk RnJvbU9yaWdpbiwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5kYm94RXh0ZW5z aW9uSGFuZGxlKQordm9pZCBXZWJQYWdlOjpyZWxvYWQodWludDY0X3QgbmF2aWdhdGlvbklELCBi b29sIHJlbG9hZEZyb21PcmlnaW4sIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYgc2Fu ZGJveEV4dGVuc2lvbkhhbmRsZSkKIHsKICAgICBTZW5kU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIg c3RvcHBlcih0aGlzKTsKIAorICAgIEFTU0VSVCghbV9wZW5kaW5nTmF2aWdhdGlvbklEKTsKKyAg ICBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQgPSBuYXZpZ2F0aW9uSUQ7CisKICAgICBtX3NhbmRib3hF eHRlbnNpb25UcmFja2VyLmJlZ2luTG9hZChtX21haW5GcmFtZS5nZXQoKSwgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSk7CiAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5yZWxv YWQocmVsb2FkRnJvbU9yaWdpbik7CiB9CkBAIC00MTYzLDcgKzQxNzIsMTIgQEAgUGFzc1JlZlB0 cjxEb2N1bWVudExvYWRlcj4gV2ViUGFnZTo6Y3JlYXRlRG9jdW1lbnRMb2FkZXIoRnJhbWUmIGZy YW1lLCBjb25zdCBSZXMKIHsKICAgICBSZWZQdHI8V2ViRG9jdW1lbnRMb2FkZXI+IGRvY3VtZW50 TG9hZGVyID0gV2ViRG9jdW1lbnRMb2FkZXI6OmNyZWF0ZShyZXF1ZXN0LCBzdWJzdGl0dXRlRGF0 YSk7CiAKLSAgICAvLyBGSVhNRTogU2V0IHRoZSBuYXZpZ2F0aW9uIElEIGlmIHBvc3NpYmxlLgor ICAgIGlmIChtX3BlbmRpbmdOYXZpZ2F0aW9uSUQpIHsKKyAgICAgICAgQVNTRVJUKGZyYW1lLmlz TWFpbkZyYW1lKCkpOworCisgICAgICAgIGRvY3VtZW50TG9hZGVyLT5zZXROYXZpZ2F0aW9uSUQo bV9wZW5kaW5nTmF2aWdhdGlvbklEKTsKKyAgICAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0g MDsKKyAgICB9CiAKICAgICByZXR1cm4gZG9jdW1lbnRMb2FkZXIucmVsZWFzZSgpOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggYTk4MzM1OWY1 ZGEzMzg0N2Y4YzMwNmNhYTkzNTUzYjRjNzExMTgyNS4uYWE0YzUxNzkzODNmNzczYjY1N2QwMGI4 YzI3N2QwNDFmOTE5ZjQzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCkBAIC03MjMsMTMgKzcyMywxMyBAQCBwcml2YXRlOgogCiAgICAgLy8gQWN0aW9u cwogICAgIHZvaWQgdHJ5Q2xvc2UoKTsKLSAgICB2b2lkIGxvYWRSZXF1ZXN0KGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFNhbmRib3hFeHRlbnNpb246OkhhbmRsZSYsIElQ Qzo6TWVzc2FnZURlY29kZXImKTsKKyAgICB2b2lkIGxvYWRSZXF1ZXN0KHVpbnQ2NF90IG5hdmln YXRpb25JRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU2FuZGJveEV4 dGVuc2lvbjo6SGFuZGxlJiwgSVBDOjpNZXNzYWdlRGVjb2RlciYpOwogICAgIHZvaWQgbG9hZERh dGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29u c3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgSVBDOjpNZXNz YWdlRGVjb2RlciYpOwogICAgIHZvaWQgbG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1s U3RyaW5nLCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIElQQzo6TWVzc2FnZURlY29kZXImKTsKICAg ICB2b2lkIGxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywg Y29uc3QgU3RyaW5nJiBiYXNlVVJMLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMLCBJUEM6 Ok1lc3NhZ2VEZWNvZGVyJik7CiAgICAgdm9pZCBsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0 cmluZyYsIElQQzo6TWVzc2FnZURlY29kZXImKTsKICAgICB2b2lkIGxvYWRXZWJBcmNoaXZlRGF0 YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7Ci0gICAg dm9pZCByZWxvYWQoYm9vbCByZWxvYWRGcm9tT3JpZ2luLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGUmKTsKKyAgICB2b2lkIHJlbG9hZCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wg cmVsb2FkRnJvbU9yaWdpbiwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CiAgICAg dm9pZCBnb0ZvcndhcmQodWludDY0X3QpOwogICAgIHZvaWQgZ29CYWNrKHVpbnQ2NF90KTsKICAg ICB2b2lkIGdvVG9CYWNrRm9yd2FyZEl0ZW0odWludDY0X3QpOwpAQCAtMTA1OSw2ICsxMDU5LDgg QEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpWaWV3U3RhdGU6OkZsYWdzIG1fdmlld1N0YXRlOwog CiAgICAgVXNlckFjdGl2aXR5IG1fcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRCeVdlYlByZWZl cmVuY2U7CisKKyAgICB1aW50NjRfdCBtX3BlbmRpbmdOYXZpZ2F0aW9uSUQ7CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggZmRlYjljNmM0MjBhZGIwNmY2YTUxM2E2 Y2RlNGU3YTc2MGEzYjYxYi4uMmEzOTc1OGMzOTRjNzZhNmEyZTkxNWUxYzE4Mjc3Y2FiMzVhNzEy ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW4KQEAgLTgyLDE0ICs4MiwxNCBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExl Z2FjeVJlY2VpdmVyIHsKICAgICBUcnlSZXN0b3JlU2Nyb2xsUG9zaXRpb24oKQogCiAgICAgTG9h ZFVSTEluRnJhbWUoU3RyaW5nIHVybCwgdWludDY0X3QgZnJhbWVJRCkKLSAgICBMb2FkUmVxdWVz dChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgV2ViS2l0OjpTYW5kYm94RXh0ZW5z aW9uOjpIYW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSwgV2ViS2l0OjpXZWJDb250ZXh0VXNl ck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYworICAgIExvYWRSZXF1ZXN0KHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QsIFdlYktp dDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hFeHRlbnNpb25IYW5kbGUsIFdlYktp dDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBM b2FkRGF0YShJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSwgU3RyaW5nIE1JTUVUeXBlLCBTdHJpbmcg ZW5jb2RpbmcsIFN0cmluZyBiYXNlVVJMLCBXZWJLaXQ6OldlYkNvbnRleHRVc2VyTWVzc2FnZUVu Y29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgTG9hZEhUTUxTdHJpbmcoU3RyaW5nIGh0bWxT dHJpbmcsIFN0cmluZyBiYXNlVVJMLCBXZWJLaXQ6OldlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29k ZXIgdXNlckRhdGEpIFZhcmlhZGljCiAgICAgTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoU3RyaW5n IGh0bWxTdHJpbmcsIFN0cmluZyBiYXNlVVJMLCBTdHJpbmcgdW5yZWFjaGFibGVVUkwsIFdlYktp dDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBM b2FkUGxhaW5UZXh0U3RyaW5nKFN0cmluZyBzdHJpbmcsIFdlYktpdDo6V2ViQ29udGV4dFVzZXJN ZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKICAgICBMb2FkV2ViQXJjaGl2ZURhdGEo SVBDOjpEYXRhUmVmZXJlbmNlIHdlYkFyY2hpdmVEYXRhLCBXZWJLaXQ6OldlYkNvbnRleHRVc2Vy TWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCiAKLSAgICBSZWxvYWQoYm9vbCByZWxv YWRGcm9tT3JpZ2luLCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRsZSBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKQorICAgIFJlbG9hZCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGJvb2wgcmVs b2FkRnJvbU9yaWdpbiwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUgc2FuZGJveEV4 dGVuc2lvbkhhbmRsZSkKICAgICBTdG9wTG9hZGluZygpCiAKICAgICBTdG9wTG9hZGluZ0ZyYW1l KHVpbnQ2NF90IGZyYW1lSUQpCg==