210182 2020-04-08 04:35:56 -0700 Make more use of FrameLoader pageID/frameID getters 2020-04-08 13:15:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez esprehn+autocc ews-watchlist gyuyoung.kim japhet kangil.han webkit-bug-importer oldest_to_newest 1639004 0 rbuis 2020-04-08 04:35:56 -0700 Remove pageID/frameID getters from FrameLoader since these are not called, instead FrameLoaderClient API is used. 1639005 1 395791 rbuis 2020-04-08 04:37:00 -0700 Created attachment 395791 Patch 1639059 2 395791 cdumez 2020-04-08 08:18:30 -0700 Comment on attachment 395791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395791&action=review > Source/WebCore/loader/FrameLoader.cpp:154 > +#define PAGE_ID ((client().pageID().valueOr(PageIdentifier())).toUInt64()) Well it was used here and the getter did not do any harm. I don't understand why we want to drop these getters. 1639062 3 rbuis 2020-04-08 08:23:50 -0700 FrameLoader is quite big and complicated, I am trying to slim it down (will take a long time obviously). If you do not like this particular patch too much, how about at least making it private and not exported? I'll rename the bug of course. 1639063 4 cdumez 2020-04-08 08:25:32 -0700 (In reply to Rob Buis from comment #3) > FrameLoader is quite big and complicated, I am trying to slim it down (will > take a long time obviously). If you do not like this particular patch too > much, how about at least making it private and not exported? I'll rename the > bug of course. If anything, I think that if anything that is using FrameLoader::client().frameID() should be fixed to use FrameLoader::frameID() instead. 1639108 5 395824 rbuis 2020-04-08 09:59:19 -0700 Created attachment 395824 Patch 1639182 6 rbuis 2020-04-08 11:40:20 -0700 (In reply to Chris Dumez from comment #4) > (In reply to Rob Buis from comment #3) > > FrameLoader is quite big and complicated, I am trying to slim it down (will > > take a long time obviously). If you do not like this particular patch too > > much, how about at least making it private and not exported? I'll rename the > > bug of course. > > If anything, I think that if anything that is using > FrameLoader::client().frameID() should be fixed to use > FrameLoader::frameID() instead. Ah, I had not considered that. Done! 1639259 7 ews-feeder 2020-04-08 13:14:55 -0700 Committed r259752: <https://trac.webkit.org/changeset/259752> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395824. 1639260 8 webkit-bug-importer 2020-04-08 13:15:14 -0700 <rdar://problem/61472882> 395791 2020-04-08 04:37:00 -0700 2020-04-08 09:59:14 -0700 Patch bug-210182-20200408133659.patch text/plain 3928 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDUwODM2ZmM5MDI4ODMz NTkyMWE1NWFjYzI3NzFjOGRmOTAzZmVjNC4uODM2OTk5NjVjYzYyZTVjNTc4NTUxOTEwNTFiNGE5 M2IxN2FkNjNhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA0LTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHBhZ2VJRC9mcmFtZUlE IGdldHRlcnMgZnJvbSBGcmFtZUxvYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHBhZ2VJRC9mcmFtZUlEIGdldHRlcnMgZnJvbSBGcmFt ZUxvYWRlciBzaW5jZSB0aGVzZQorICAgICAgICBhcmUgbm90IGNhbGxlZCwgaW5zdGVhZCBGcmFt ZUxvYWRlckNsaWVudCBBUEkgaXMgdXNlZC4KKworICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6cGFnZUlEIGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpmcmFtZUlEIGNvbnN0KTogRGVs ZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKyAgICAgICAgKiBwYWdlL0Zy YW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpwYWdlSUQgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWU6OmZyYW1lSUQgY29uc3QpOgorCiAyMDIwLTA0LTA4ICBLZWl0aCBS b2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgdGhlIHVzZSBvZiBY Q0J1aWxkIGJ5IGRlZmF1bHQgaW4gQXBwbGUgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmNwcAppbmRleCBjODZmYjc2ZmM1N2Q3MDJiNTQzMmY3NGU4YTMzMWI2YTFhZDJhYjc3 Li5lYzIxOGQ5NDZiOGYxYWI4NWQ5MjU4YzM2YzM1NjBhZjA0M2I1MTBmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE1MSw4ICsxNTEsOCBAQAogI2luY2x1ZGUgIlJ1 bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oIgogI2VuZGlmCiAKLSNkZWZpbmUgUEFHRV9JRCAoKHBh Z2VJRCgpLnZhbHVlT3IoUGFnZUlkZW50aWZpZXIoKSkpLnRvVUludDY0KCkpCi0jZGVmaW5lIEZS QU1FX0lEICgoZnJhbWVJRCgpLnZhbHVlT3IoRnJhbWVJZGVudGlmaWVyKCkpKS50b1VJbnQ2NCgp KQorI2RlZmluZSBQQUdFX0lEICgoY2xpZW50KCkucGFnZUlEKCkudmFsdWVPcihQYWdlSWRlbnRp ZmllcigpKSkudG9VSW50NjQoKSkKKyNkZWZpbmUgRlJBTUVfSUQgKChjbGllbnQoKS5mcmFtZUlE KCkudmFsdWVPcihGcmFtZUlkZW50aWZpZXIoKSkpLnRvVUludDY0KCkpCiAjZGVmaW5lIEZSQU1F TE9BREVSX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0Vf TE9HX0lGKGlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBbcGFnZUlE PSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBtYWluPSVkXSBGcmFtZUxvYWRlcjo6 IiBmbXQsIHRoaXMsIFBBR0VfSUQsIEZSQU1FX0lELCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksICMj X19WQV9BUkdTX18pCiAjZGVmaW5lIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FM TE9XRUQoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKGlzQWx3YXlzT25Mb2dnaW5n QWxsb3dlZCgpLCBjaGFubmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUi IFBSSXU2NCAiLCBtYWluPSVkXSBGcmFtZUxvYWRlcjo6IiBmbXQsIHRoaXMsIFBBR0VfSUQsIEZS QU1FX0lELCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksICMjX19WQV9BUkdTX18pCiAKQEAgLTM3Niwx NiArMzc2LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6aW5pdEZvclN5bnRoZXNpemVkRG9jdW1lbnQo Y29uc3QgVVJMJikKICAgICBtX3Byb2dyZXNzVHJhY2tlciA9IG1ha2VVbmlxdWU8RnJhbWVQcm9n cmVzc1RyYWNrZXI+KG1fZnJhbWUpOwogfQogCi1PcHRpb25hbDxQYWdlSWRlbnRpZmllcj4gRnJh bWVMb2FkZXI6OnBhZ2VJRCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGNsaWVudCgpLnBhZ2VJRCgp OwotfQotCi1PcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IEZyYW1lTG9hZGVyOjpmcmFtZUlEKCkg Y29uc3QKLXsKLSAgICByZXR1cm4gY2xpZW50KCkuZnJhbWVJRCgpOwotfQotCiB2b2lkIEZyYW1l TG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVmZXJzKQogewogICAgIGlmIChtX2RvY3Vt ZW50TG9hZGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCBjNjNhYzU2MGMy YTRkYWFjZTI3ODZjMWI3ODg3NGI2MTE4YWZmMGU0Li40MDAyYWNmOGY3MzY5NGI5OWRhNjNjYWYx ZWFjODVjMmY4NDNmNGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAtMjI4 LDkgKzIyOCw2IEBAIHB1YmxpYzoKICAgICBjb25zdCBGcmFtZUxvYWRlckNsaWVudCYgY2xpZW50 KCkgY29uc3QgeyByZXR1cm4gbV9jbGllbnQuZ2V0KCk7IH0KICAgICBGcmFtZUxvYWRlckNsaWVu dCYgY2xpZW50KCkgeyByZXR1cm4gbV9jbGllbnQuZ2V0KCk7IH0KIAotICAgIFdFQkNPUkVfRVhQ T1JUIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVyPiBwYWdlSUQoKSBjb25zdDsKLSAgICBXRUJDT1JF X0VYUE9SVCBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQoKSBjb25zdDsKLQogICAg IHZvaWQgc2V0RGVmZXJzTG9hZGluZyhib29sKTsKIAogICAgIHZvaWQgY2hlY2tDb250ZW50UG9s aWN5KGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBQb2xpY3lDaGVja0lkZW50aWZpZXIsIENvbnRl bnRQb2xpY3lEZWNpc2lvbkZ1bmN0aW9uJiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCBlNjI3 MWQ3ZTg2MDIzYmNlMDMxOTM3NTI4MDVmMjFlZTk2ZDIzNWZhLi4zYTQxZWI3NDQ3MjVmYTdjMDFh ODdlYzQ2MzU1NmEyM2JlOWI1ZjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtNjU3LDEyICs2 NTcsMTIgQEAgdm9pZCBGcmFtZTo6aW5qZWN0VXNlclNjcmlwdEltbWVkaWF0ZWx5KERPTVdyYXBw ZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVzZXJTY3JpcHQKIAogT3B0aW9uYWw8UGFnZUlkZW50aWZp ZXI+IEZyYW1lOjpwYWdlSUQoKSBjb25zdAogewotICAgIHJldHVybiBsb2FkZXIoKS5wYWdlSUQo KTsKKyAgICByZXR1cm4gbG9hZGVyKCkuY2xpZW50KCkucGFnZUlEKCk7CiB9CiAKIE9wdGlvbmFs PEZyYW1lSWRlbnRpZmllcj4gRnJhbWU6OmZyYW1lSUQoKSBjb25zdAogewotICAgIHJldHVybiBs b2FkZXIoKS5mcmFtZUlEKCk7CisgICAgcmV0dXJuIGxvYWRlcigpLmNsaWVudCgpLmZyYW1lSUQo KTsKIH0KIAogUmVuZGVyVmlldyogRnJhbWU6OmNvbnRlbnRSZW5kZXJlcigpIGNvbnN0Cg== 395824 2020-04-08 09:59:19 -0700 2020-04-08 13:14:56 -0700 Patch bug-210182-20200408185917.patch text/plain 10557 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDUwODM2ZmM5MDI4ODMz NTkyMWE1NWFjYzI3NzFjOGRmOTAzZmVjNC4uNGZkZWVlYzIyZDIxNDE4NDQxYTg1YWRjODM3ZTcx MDJlZWJmZmFhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA0LTA4ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTWFrZSBtb3JlIHVzZSBvZiBGcmFt ZUxvYWRlciBwYWdlSUQvZnJhbWVJRCBnZXR0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAxODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIG1vcmUgdXNlIG9mIEZyYW1lTG9hZGVyIHBhZ2VJ RC9mcmFtZUlEIGdldHRlcnMsIGJlZm9yZQorICAgICAgICB0aGlzIGNoYW5nZSB0aGV5IHdlcmUg b25seSB1c2VkIGludGVybmFsbHkgaW4gRnJhbWVMb2FkZXIuCisKKyAgICAgICAgKiBkb20vRG9j dW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnBhZ2VJRCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZnJhbWVJRCBjb25zdCk6CisgICAgICAgICogaHRt bC9IVE1MQW5jaG9yRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQW5jaG9yRWxl bWVudDo6aGFuZGxlQ2xpY2spOgorICAgICAgICAqIGxvYWRlci9Db29raWVKYXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q29va2llSmFyOjpjb29raWVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkNvb2tpZUphcjo6Y29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHkpOgorICAgICAgICAo V2ViQ29yZTo6Q29va2llSmFyOjpzZXRDb29raWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tp ZUphcjo6Y29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6Q29va2llSmFyOjpnZXRSYXdDb29raWVzIGNvbnN0KToKKyAgICAgICAgKiBsb2FkZXIv TmF2aWdhdGlvbkFjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVHbG9iYWxGcmFt ZUlkZW50aWZpZXIpOgorICAgICAgICAqIGxvYWRlci9Qb2xpY3lDaGVja2VyLmNwcDoKKyAgICAg ICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6 OmZyYW1lSWRlbnRpZmllciBjb25zdCk6CisKIDIwMjAtMDQtMDggIEtlaXRoIFJvbGxpbiAgPGty b2xsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSB0aGUgdXNlIG9mIFhDQnVpbGQgYnkg ZGVmYXVsdCBpbiBBcHBsZSBidWlsZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDNiMjE4OTJiNzYzZDQzN2MyMzBi YTZlMTU1NjhjMWUyYTVjMTRkMC4uYzRiYzljMGI1MzdjYjk1ODhiNmYyMDA0YjUyZDg2ODY0MDJh NTZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNC0wOCAgUm9iIEJ1aXMgIDxy YnVpc0BpZ2FsaWEuY29tPgorCisgICAgICAgIE1ha2UgbW9yZSB1c2Ugb2YgRnJhbWVMb2FkZXIg cGFnZUlEL2ZyYW1lSUQgZ2V0dGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEwMTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTWFrZSBtb3JlIHVzZSBvZiBGcmFtZUxvYWRlciBwYWdlSUQvZnJhbWVJ RCBnZXR0ZXJzLCBiZWZvcmUKKyAgICAgICAgdGhpcyBjaGFuZ2UgdGhleSB3ZXJlIG9ubHkgdXNl ZCBpbnRlcm5hbGx5IGluIEZyYW1lTG9hZGVyLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3 b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6YWRkUGFyYW1ldGVy c1NoYXJlZCk6CisKIDIwMjAtMDQtMDggIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBEcm9wIHVzYWdlIG9mIGRlcHJlY2F0ZWQgR2RrRGV2 aWNlTWFuYWdlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggODUyMTY5MmNmYjcwNzFiZjZj YzZjYzc5Y2MzNGM5YzM5Njg3NjkwNC4uMmZiNDBlM2Y4ZjVmMjFjZDA5N2UwYzQ0NTViNzg1Njgx N2FiY2UzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC03OTYxLDEyICs3OTYxLDEyIEBA IExvZ2dlciYgRG9jdW1lbnQ6OmxvZ2dlcigpCiAgICAgCiBPcHRpb25hbDxQYWdlSWRlbnRpZmll cj4gRG9jdW1lbnQ6OnBhZ2VJRCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZnJhbWUtPmxvYWRl cigpLmNsaWVudCgpLnBhZ2VJRCgpOworICAgIHJldHVybiBtX2ZyYW1lLT5sb2FkZXIoKS5wYWdl SUQoKTsKIH0KIAogT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBEb2N1bWVudDo6ZnJhbWVJRCgp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLmZyYW1lSUQo KTsKKyAgICByZXR1cm4gbV9mcmFtZS0+bG9hZGVyKCkuZnJhbWVJRCgpOwogfQogCiB2b2lkIERv Y3VtZW50OjpyZWdpc3RlckFydGljbGVFbGVtZW50KEVsZW1lbnQmIGFydGljbGUpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBbmNob3JFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTEFuY2hvckVsZW1lbnQuY3BwCmluZGV4IDcwYjNmZDM4NzA2MGMxMGQ0 MTQ4ZGFkMjczMDM0NzliNjk5YjE0YmMuLmJmODkyODg0ZjE5ZTZmOGVkOGQwMWQwZjE2ODdjZTM5 OWEwNGZhZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFuY2hvckVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEFuY2hvckVsZW1lbnQuY3BwCkBA IC00ODgsNyArNDg4LDcgQEAgdm9pZCBIVE1MQW5jaG9yRWxlbWVudDo6aGFuZGxlQ2xpY2soRXZl bnQmIGV2ZW50KQogICAgIGlmIChzeXN0ZW1QcmV2aWV3SW5mby5pc1ByZXZpZXcpIHsKICAgICAg ICAgc3lzdGVtUHJldmlld0luZm8uZWxlbWVudC5lbGVtZW50SWRlbnRpZmllciA9IGRvY3VtZW50 KCkuaWRlbnRpZmllckZvckVsZW1lbnQoKnRoaXMpOwogICAgICAgICBzeXN0ZW1QcmV2aWV3SW5m by5lbGVtZW50LmRvY3VtZW50SWRlbnRpZmllciA9IGRvY3VtZW50KCkuaWRlbnRpZmllcigpOwot ICAgICAgICBzeXN0ZW1QcmV2aWV3SW5mby5lbGVtZW50LndlYlBhZ2VJZGVudGlmaWVyID0gZG9j dW1lbnQoKS5mcmFtZSgpLT5sb2FkZXIoKS5jbGllbnQoKS5wYWdlSUQoKS52YWx1ZU9yKFBhZ2VJ ZGVudGlmaWVyIHsgfSk7CisgICAgICAgIHN5c3RlbVByZXZpZXdJbmZvLmVsZW1lbnQud2ViUGFn ZUlkZW50aWZpZXIgPSBkb2N1bWVudCgpLmZyYW1lKCktPmxvYWRlcigpLnBhZ2VJRCgpLnZhbHVl T3IoUGFnZUlkZW50aWZpZXIgeyB9KTsKICAgICAgICAgaWYgKGF1dG8qIGNoaWxkID0gZmlyc3RF bGVtZW50Q2hpbGQoKSkKICAgICAgICAgICAgIHN5c3RlbVByZXZpZXdJbmZvLnByZXZpZXdSZWN0 ID0gY2hpbGQtPmJvdW5kc0luUm9vdFZpZXdTcGFjZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0Nvb2tpZUphci5jcHAKaW5kZXggODM2ZDU3MmZkNzc5NzYyZjc4YWVmNzA5ZDNkYWM1MmRmODYz OWU5OS4uMTRjYzJkMzU4NjRhMzI4ODc5NzUwNzU0YmIwNTA4ZjBiZTBkZmJlNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nvb2tpZUphci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL0Nvb2tpZUphci5jcHAKQEAgLTMxLDcgKzMxLDYgQEAKICNpbmNsdWRlICJEb2N1 bWVudExvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIu aCIKLSNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkhUVFBDb29raWVB Y2NlcHRQb2xpY3kuaCIKICNpbmNsdWRlICJOZXR3b3JrU3RvcmFnZVNlc3Npb24uaCIKICNpbmNs dWRlICJOZXR3b3JraW5nQ29udGV4dC5oIgpAQCAtNzUsOCArNzQsOCBAQCBTdHJpbmcgQ29va2ll SmFyOjpjb29raWVzKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgVVJMJiB1cmwpIGNvbnN0CiAg ICAgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlEOwogICAgIE9wdGlvbmFsPFBhZ2VJ ZGVudGlmaWVyPiBwYWdlSUQ7CiAgICAgaWYgKGF1dG8qIGZyYW1lID0gZG9jdW1lbnQuZnJhbWUo KSkgewotICAgICAgICBmcmFtZUlEID0gZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLmZyYW1lSUQo KTsKLSAgICAgICAgcGFnZUlEID0gZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLnBhZ2VJRCgpOwor ICAgICAgICBmcmFtZUlEID0gZnJhbWUtPmxvYWRlcigpLmZyYW1lSUQoKTsKKyAgICAgICAgcGFn ZUlEID0gZnJhbWUtPmxvYWRlcigpLnBhZ2VJRCgpOwogICAgIH0KIAogICAgIHN0ZDo6cGFpcjxT dHJpbmcsIGJvb2w+IHJlc3VsdDsKQEAgLTk4LDggKzk3LDggQEAgQ29va2llUmVxdWVzdEhlYWRl ckZpZWxkUHJveHkgQ29va2llSmFyOjpjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eShjb25z dCBEb2MKICAgICBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQ7CiAgICAgT3B0aW9u YWw8UGFnZUlkZW50aWZpZXI+IHBhZ2VJRDsKICAgICBpZiAoYXV0byogZnJhbWUgPSBkb2N1bWVu dC5mcmFtZSgpKSB7Ci0gICAgICAgIGZyYW1lSUQgPSBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCku ZnJhbWVJRCgpOwotICAgICAgICBwYWdlSUQgPSBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkucGFn ZUlEKCk7CisgICAgICAgIGZyYW1lSUQgPSBmcmFtZS0+bG9hZGVyKCkuZnJhbWVJRCgpOworICAg ICAgICBwYWdlSUQgPSBmcmFtZS0+bG9hZGVyKCkucGFnZUlEKCk7CiAgICAgfQogCiAgICAgcmV0 dXJuIHsgZG9jdW1lbnQuZmlyc3RQYXJ0eUZvckNvb2tpZXMoKSwgc2FtZVNpdGVJbmZvKGRvY3Vt ZW50KSwgdXJsLCBmcmFtZUlELCBwYWdlSUQsIHNob3VsZEluY2x1ZGVTZWN1cmVDb29raWVzKGRv Y3VtZW50LCB1cmwpIH07CkBAIC0xMTAsOCArMTA5LDggQEAgdm9pZCBDb29raWVKYXI6OnNldENv b2tpZXMoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBj b28KICAgICBPcHRpb25hbDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQ7CiAgICAgT3B0aW9uYWw8 UGFnZUlkZW50aWZpZXI+IHBhZ2VJRDsKICAgICBpZiAoYXV0byogZnJhbWUgPSBkb2N1bWVudC5m cmFtZSgpKSB7Ci0gICAgICAgIGZyYW1lSUQgPSBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuZnJh bWVJRCgpOwotICAgICAgICBwYWdlSUQgPSBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkucGFnZUlE KCk7CisgICAgICAgIGZyYW1lSUQgPSBmcmFtZS0+bG9hZGVyKCkuZnJhbWVJRCgpOworICAgICAg ICBwYWdlSUQgPSBmcmFtZS0+bG9hZGVyKCkucGFnZUlEKCk7CiAgICAgfQogCiAgICAgaWYgKGF1 dG8qIHNlc3Npb24gPSBtX3N0b3JhZ2VTZXNzaW9uUHJvdmlkZXItPnN0b3JhZ2VTZXNzaW9uKCkp CkBAIC0xNDUsOCArMTQ0LDggQEAgU3RyaW5nIENvb2tpZUphcjo6Y29va2llUmVxdWVzdEhlYWRl ckZpZWxkVmFsdWUoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25zdCBVUkwmIHUKICAgICBPcHRpb25h bDxGcmFtZUlkZW50aWZpZXI+IGZyYW1lSUQ7CiAgICAgT3B0aW9uYWw8UGFnZUlkZW50aWZpZXI+ IHBhZ2VJRDsKICAgICBpZiAoYXV0byogZnJhbWUgPSBkb2N1bWVudC5mcmFtZSgpKSB7Ci0gICAg ICAgIGZyYW1lSUQgPSBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuZnJhbWVJRCgpOwotICAgICAg ICBwYWdlSUQgPSBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkucGFnZUlEKCk7CisgICAgICAgIGZy YW1lSUQgPSBmcmFtZS0+bG9hZGVyKCkuZnJhbWVJRCgpOworICAgICAgICBwYWdlSUQgPSBmcmFt ZS0+bG9hZGVyKCkucGFnZUlEKCk7CiAgICAgfQogCiAgICAgYXV0byByZXN1bHQgPSBjb29raWVS ZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShkb2N1bWVudC5maXJzdFBhcnR5Rm9yQ29va2llcygpLCBz YW1lU2l0ZUluZm8oZG9jdW1lbnQpLCB1cmwsIGZyYW1lSUQsIHBhZ2VJRCwgc2hvdWxkSW5jbHVk ZVNlY3VyZUNvb2tpZXMoZG9jdW1lbnQsIHVybCkpOwpAQCAtMTYwLDggKzE1OSw4IEBAIGJvb2wg Q29va2llSmFyOjpnZXRSYXdDb29raWVzKGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCwgY29uc3Qg VVJMJiB1cmwsIFZlY3RvcjxDCiAgICAgT3B0aW9uYWw8RnJhbWVJZGVudGlmaWVyPiBmcmFtZUlE OwogICAgIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVyPiBwYWdlSUQ7CiAgICAgaWYgKGF1dG8qIGZy YW1lID0gZG9jdW1lbnQuZnJhbWUoKSkgewotICAgICAgICBmcmFtZUlEID0gZnJhbWUtPmxvYWRl cigpLmNsaWVudCgpLmZyYW1lSUQoKTsKLSAgICAgICAgcGFnZUlEID0gZnJhbWUtPmxvYWRlcigp LmNsaWVudCgpLnBhZ2VJRCgpOworICAgICAgICBmcmFtZUlEID0gZnJhbWUtPmxvYWRlcigpLmZy YW1lSUQoKTsKKyAgICAgICAgcGFnZUlEID0gZnJhbWUtPmxvYWRlcigpLnBhZ2VJRCgpOwogICAg IH0KIAogICAgIGlmIChhdXRvKiBzZXNzaW9uID0gbV9zdG9yYWdlU2Vzc2lvblByb3ZpZGVyLT5z dG9yYWdlU2Vzc2lvbigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmln YXRpb25BY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25BY3Rpb24u Y3BwCmluZGV4IDdjNWQ1MzFjODZiNDU5Mzc1YjBhYjZhMDFmMzZkOTYxNmM3ZWM1YzkuLjg4Njc3 YTczMDYxY2RjMDBkOTEwZjExNDI3ZjEwNzE4NmVkODE5OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9OYXZpZ2F0aW9uQWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvTmF2aWdhdGlvbkFjdGlvbi5jcHAKQEAgLTMyLDcgKzMyLDYgQEAKICNpbmNsdWRlICJE b2N1bWVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIK LSNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkhpc3RvcnlJdGVtLmgi CiAjaW5jbHVkZSAiTW91c2VFdmVudC5oIgogCkBAIC00MSw3ICs0MCw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIHN0YXRpYyBHbG9iYWxGcmFtZUlkZW50aWZpZXIgY3JlYXRlR2xvYmFsRnJhbWVJ ZGVudGlmaWVyKGNvbnN0IERvY3VtZW50JiBkb2N1bWVudCkKIHsKICAgICBpZiAoZG9jdW1lbnQu ZnJhbWUoKSkKLSAgICAgICAgcmV0dXJuIHsgZG9jdW1lbnQuZnJhbWUoKS0+bG9hZGVyKCkuY2xp ZW50KCkucGFnZUlEKCkudmFsdWVPcihQYWdlSWRlbnRpZmllciB7IH0pLCBkb2N1bWVudC5mcmFt ZSgpLT5sb2FkZXIoKS5jbGllbnQoKS5mcmFtZUlEKCkudmFsdWVPcihGcmFtZUlkZW50aWZpZXIg eyB9KSB9OworICAgICAgICByZXR1cm4geyBkb2N1bWVudC5mcmFtZSgpLT5sb2FkZXIoKS5wYWdl SUQoKS52YWx1ZU9yKFBhZ2VJZGVudGlmaWVyIHsgfSksIGRvY3VtZW50LmZyYW1lKCktPmxvYWRl cigpLmZyYW1lSUQoKS52YWx1ZU9yKEZyYW1lSWRlbnRpZmllciB7IH0pIH07CiAgICAgcmV0dXJu IEdsb2JhbEZyYW1lSWRlbnRpZmllcigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUG9saWN5Q2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5 Q2hlY2tlci5jcHAKaW5kZXggYzhmNGEyMTRhYTYzYTljMDI5MmNmMzAyM2E5ZTU1Yzc0NGZmOWVl Zi4uNDYxNjlmNTA5OTk1NzQ3ZjRkZjIwMGMzYzA4Njc0Yzc3MzVhODc1YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcApAQCAtNTQsOCArNTQsOCBAQAogI2VuZGlmCiAK ICNkZWZpbmUgSVNfQUxMT1dFRCAobV9mcmFtZS5wYWdlKCkgPyBtX2ZyYW1lLnBhZ2UoKS0+c2Vz c2lvbklEKCkuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCkgOiBmYWxzZSkKLSNkZWZpbmUgUEFH RV9JRCAobV9mcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5wYWdlSUQoKS52YWx1ZU9yKFBhZ2VJZGVu dGlmaWVyKCkpLnRvVUludDY0KCkpCi0jZGVmaW5lIEZSQU1FX0lEIChtX2ZyYW1lLmxvYWRlcigp LmNsaWVudCgpLmZyYW1lSUQoKS52YWx1ZU9yKEZyYW1lSWRlbnRpZmllcigpKS50b1VJbnQ2NCgp KQorI2RlZmluZSBQQUdFX0lEIChtX2ZyYW1lLmxvYWRlcigpLnBhZ2VJRCgpLnZhbHVlT3IoUGFn ZUlkZW50aWZpZXIoKSkudG9VSW50NjQoKSkKKyNkZWZpbmUgRlJBTUVfSUQgKG1fZnJhbWUubG9h ZGVyKCkuZnJhbWVJRCgpLnZhbHVlT3IoRnJhbWVJZGVudGlmaWVyKCkpLnRvVUludDY0KCkpCiAj ZGVmaW5lIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKElT X0FMTE9XRUQsIExvYWRpbmcsICIlcCAtIFtwYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIg UFJJdTY0ICJdIFBvbGljeUNoZWNrZXI6OiIgZm10LCB0aGlzLCBQQUdFX0lELCBGUkFNRV9JRCwg IyNfX1ZBX0FSR1NfXykKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbHMuY3BwCmluZGV4IDAxZDgxYzUwYWIxNDc5OTk3ODc0M2M3NDVlM2E5Zjg2NTZlYTcw NjQuLjFjN2ZjMDBmNjViYjUyMmM1ODc1NTRkZTg5YTE2NzMxMjFlNGJkOTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTgwLDcgKzgwLDYgQEAKICNpbmNsdWRlICJGb3Jt Q29udHJvbGxlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIu aCIKLSNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5o IgogI2luY2x1ZGUgIkZ1bGxzY3JlZW5NYW5hZ2VyLmgiCiAjaW5jbHVkZSAiR0NPYnNlcnZhdGlv bi5oIgpAQCAtMjU4Myw3ICsyNTgyLDcgQEAgdWludDY0X3QgSW50ZXJuYWxzOjplbGVtZW50SWRl bnRpZmllcihFbGVtZW50JiBlbGVtZW50KSBjb25zdAogdWludDY0X3QgSW50ZXJuYWxzOjpmcmFt ZUlkZW50aWZpZXIoY29uc3QgRG9jdW1lbnQmIGRvY3VtZW50KSBjb25zdAogewogICAgIGlmIChh dXRvKiBwYWdlID0gZG9jdW1lbnQucGFnZSgpKQotICAgICAgICByZXR1cm4gcGFnZS0+bWFpbkZy YW1lKCkubG9hZGVyKCkuY2xpZW50KCkuZnJhbWVJRCgpLnZhbHVlT3IoRnJhbWVJZGVudGlmaWVy IHsgfSkudG9VSW50NjQoKTsKKyAgICAgICAgcmV0dXJuIHBhZ2UtPm1haW5GcmFtZSgpLmxvYWRl cigpLmZyYW1lSUQoKS52YWx1ZU9yKEZyYW1lSWRlbnRpZmllciB7IH0pLnRvVUludDY0KCk7CiAg ICAgcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAppbmRleCAyOGY1MDljMjJjY2ZlYTg2OWQxYmI5 NzU0NDc0MDFiMDlmNzVkM2NiLi4xNWYzZjhlOWQ4OWI2M2ExYzZhNTM1ZTE1NmY3NjRmNmRlZTNi NjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2Fk ZXJTdHJhdGVneS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvV2Vi TG9hZGVyU3RyYXRlZ3kuY3BwCkBAIC0yNzMsNyArMjczLDcgQEAgc3RhdGljIHZvaWQgYWRkUGFy YW1ldGVyc1NoYXJlZChjb25zdCBGcmFtZSogZnJhbWUsIE5ldHdvcmtSZXNvdXJjZUxvYWRQYXJh bWV0ZXIKIAogICAgIGlmIChhdXRvKiBvd25lckVsZW1lbnQgPSBmcmFtZS0+b3duZXJFbGVtZW50 KCkpIHsKICAgICAgICAgaWYgKGF1dG8qIHBhcmVudEZyYW1lID0gb3duZXJFbGVtZW50LT5kb2N1 bWVudCgpLmZyYW1lKCkpCi0gICAgICAgICAgICBwYXJhbWV0ZXJzLnBhcmVudEZyYW1lSUQgPSBw YXJlbnRGcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuZnJhbWVJRCgpOworICAgICAgICAgICAgcGFy YW1ldGVycy5wYXJlbnRGcmFtZUlEID0gcGFyZW50RnJhbWUtPmxvYWRlcigpLmZyYW1lSUQoKTsK ICAgICB9CiB9CiAK