74615 2011-12-15 09:24:04 -0800 [WK2] Extend WebNotification to include its origin 2011-12-20 14:35:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 jonlee jonlee abarth eric webkit-bug-importer oldest_to_newest 521956 0 jonlee 2011-12-15 09:24:04 -0800 The origin could be used to help distinguish the source of shown notifications. <rdar://problem/10587164> 521974 1 119442 jonlee 2011-12-15 09:46:24 -0800 Created attachment 119442 Patch 522041 2 jonlee 2011-12-15 10:45:08 -0800 Committed http://trac.webkit.org/changeset/102960 524046 3 119442 abarth 2011-12-19 11:16:21 -0800 Comment on attachment 119442 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119442&action=review > Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp:76 > - m_process->connection()->send(Messages::WebNotificationManagerProxy::Show(notification->contents().title, notification->contents().body, notificationID), page->pageID()); > + m_process->connection()->send(Messages::WebNotificationManagerProxy::Show(notification->contents().title, notification->contents().body, notification->scriptExecutionContext()->securityOrigin()->databaseIdentifier(), notificationID), page->pageID()); Notifications should not be using the database identify. The database identify is only for use by databases. Instead, you should use SecurityOrigin::toString and SecurityOrigin::createFromString. 524047 4 abarth 2011-12-19 11:16:42 -0800 identify => identifier 524832 5 jonlee 2011-12-20 14:28:11 -0800 Since this patch was already committed, tracking Adam's comment as bug 74956. 524837 6 eric 2011-12-20 14:35:02 -0800 Silly sam! :p 119442 2011-12-15 09:46:24 -0800 2011-12-19 11:16:20 -0800 Patch bug-74615-20111215094801.patch text/plain 12833 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMmZhMDkxNWM2OGYxYzcy YjBiNjBmNWYwM2JhOTEzOTdlMDY2YmVmOC4uNzA0ZGQyYjMwNDNhNWMwMGU3MWI5YTcxYjMyMmFm OWVkNGU5Y2UxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDExLTEyLTE1ICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBFeHRlbmQgV2ViTm90aWZp Y2F0aW9uIHRvIGluY2x1ZGUgaXRzIG9yaWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ2MTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNTg3 MTY0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uaDogRXhwb3NlIEFQSSB0aGF0IGNvbnZlcnRz IHRoZSBzZWN1cml0eSBvcmlnaW4gdG8gZGF0YWJhc2UKKyAgICAgICAgaWRlbnRpZmllci4KKyAg ICAgICAgKiBTaGFyZWQvQVBJL2MvV0tTZWN1cml0eU9yaWdpbi5jcHA6CisgICAgICAgIChXS1Nl Y3VyaXR5T3JpZ2luQ29weURhdGFiYXNlSWRlbnRpZmllcik6CisKKyAgICAgICAgKiBVSVByb2Nl c3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb24uaDogRXh0ZW5kIFdlYk5vdGlmaWNhdGlv biB0byBpbmNsdWRlIHRoZSBvcmlnaW4uCisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlv bjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uOjpvcmlnaW4pOgor ICAgICAgICAqIFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbi5jcHA6IFJl bW92ZSB1bm5lZWRlZCBlbmNvZGUoKSBhbmQgZGVjb2RlKCkgZnVuY3Rpb25zLgorICAgICAgICAo V2ViS2l0OjpXZWJOb3RpZmljYXRpb246OldlYk5vdGlmaWNhdGlvbik6CisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tOb3RpZmljYXRpb24uaDogRXhwb3NlIFdlYk5vdGlmaWNhdGlvbidz IG9yaWdpbigpLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS05vdGlmaWNhdGlvbi5jcHA6 CisgICAgICAgIChXS05vdGlmaWNhdGlvbkdldFNlY3VyaXR5T3JpZ2luKToKKworICAgICAgICAq IFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5tZXNz YWdlcy5pbjogVXBkYXRlIHNob3coKSB0byBpbmNsdWRlIHRoZQorICAgICAgICBvcmlnaW4gb2Yg dGhlIG5vdGlmaWNhdGlvbi4KKyAgICAgICAgKiBVSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJO b3RpZmljYXRpb25NYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJOb3RpZmlj YXRpb25NYW5hZ2VyUHJveHk6OnNob3cpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Ob3RpZmljYXRp b25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5oOgorICAgICAgICAqIFdlYlByb2Nlc3Mv Tm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViTm90aWZpY2F0aW9uTWFuYWdlcjo6c2hvdyk6IFBhc3MgdGhlIG5vdGlmaWNhdGlvbidz IGV4ZWMgY29udGV4dCdzIG9yaWdpbiBhcworICAgICAgICBpZGVudGlmaWVyLgorCiAyMDExLTEy LTEzICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgbm90aWZp Y2F0aW9ucyBvbiBNYWMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2Mv V0tTZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTZWN1 cml0eU9yaWdpbi5jcHAKaW5kZXggZjljNTE5YTg0OTVmOGFjMjU1NjM0ZGIxZmVkMmNmMjdiOTU3 MWRmZi4uY2Y3NjI0ZjQyNDIwMmI5YWFiZDQyNWRjZjczNTAwZTRkYjA4NGU4MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtNDgs NiArNDgsMTEgQEAgV0tTZWN1cml0eU9yaWdpblJlZiBXS1NlY3VyaXR5T3JpZ2luQ3JlYXRlKFdL U3RyaW5nUmVmIHByb3RvY29sLCBXS1N0cmluZ1JlZiBob3MKICAgICByZXR1cm4gdG9BUEkoc2Vj dXJpdHlPcmlnaW4ucmVsZWFzZSgpLmxlYWtSZWYoKSk7CiB9CiAKK1dLU3RyaW5nUmVmIFdLU2Vj dXJpdHlPcmlnaW5Db3B5RGF0YWJhc2VJZGVudGlmaWVyKFdLU2VjdXJpdHlPcmlnaW5SZWYgc2Vj dXJpdHlPcmlnaW4pCit7CisgICAgcmV0dXJuIHRvQ29waWVkQVBJKHRvSW1wbChzZWN1cml0eU9y aWdpbiktPmRhdGFiYXNlSWRlbnRpZmllcigpKTsKK30KKwogV0tTdHJpbmdSZWYgV0tTZWN1cml0 eU9yaWdpbkNvcHlQcm90b2NvbChXS1NlY3VyaXR5T3JpZ2luUmVmIHNlY3VyaXR5T3JpZ2luKQog ewogICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwoc2VjdXJpdHlPcmlnaW4pLT5wcm90b2Nv bCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NlY3VyaXR5 T3JpZ2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTZWN1cml0eU9yaWdpbi5o CmluZGV4IDA0YzA4ZGU2NDU3N2MxNzE2ZmNmNjVlY2JjNjUwNTI2OGUxMTdkMjUuLjI5MDQwZDg5 ODM4MjA3MDEyOTFiMWQ1MTAwZmFlMDI4ZmQ2ZDdiZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9BUEkvYy9XS1NlY3VyaXR5T3JpZ2luLmgKKysrIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL0FQSS9jL1dLU2VjdXJpdHlPcmlnaW4uaApAQCAtMzcsNiArMzcsNyBAQCBXS19FWFBP UlQgV0tUeXBlSUQgV0tTZWN1cml0eU9yaWdpbkdldFR5cGVJRCgpOwogV0tfRVhQT1JUIFdLU2Vj dXJpdHlPcmlnaW5SZWYgV0tTZWN1cml0eU9yaWdpbkNyZWF0ZUZyb21JZGVudGlmaWVyKFdLU3Ry aW5nUmVmIGlkZW50aWZpZXIpOwogV0tfRVhQT1JUIFdLU2VjdXJpdHlPcmlnaW5SZWYgV0tTZWN1 cml0eU9yaWdpbkNyZWF0ZShXS1N0cmluZ1JlZiBwcm90b2NvbCwgV0tTdHJpbmdSZWYgaG9zdCwg aW50IHBvcnQpOwogCitXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tTZWN1cml0eU9yaWdpbkNvcHlE YXRhYmFzZUlkZW50aWZpZXIoV0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbik7CiBX S19FWFBPUlQgV0tTdHJpbmdSZWYgV0tTZWN1cml0eU9yaWdpbkNvcHlQcm90b2NvbChXS1NlY3Vy aXR5T3JpZ2luUmVmIHNlY3VyaXR5T3JpZ2luKTsKIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1Nl Y3VyaXR5T3JpZ2luQ29weUhvc3QoV0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbik7 CiBXS19FWFBPUlQgdW5zaWduZWQgc2hvcnQgV0tTZWN1cml0eU9yaWdpbkdldFBvcnQoV0tTZWN1 cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tOb3RpZmljYXRpb24uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmNwcAppbmRleCAwODhlNzczNzc3Y2IxY2E2ZjVh NTY4MmZhNDBiNjBmZGFjYWE4NDNkLi5kYjdkMWYwMmZhYjU3OTI0ZThmZmY2ZjhmMjgzNTYzOWJm ODZjYmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tOb3Rp ZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS05vdGlm aWNhdGlvbi5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIldLQVBJQ2FzdC5oIgog I2luY2x1ZGUgIldlYk5vdGlmaWNhdGlvbi5oIgorI2luY2x1ZGUgIldlYlNlY3VyaXR5T3JpZ2lu LmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTQ2LDYgKzQ3LDExIEBAIFdLU3Ry aW5nUmVmIFdLTm90aWZpY2F0aW9uQ29weUJvZHkoV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0 aW9uKQogICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+Ym9keSgp KTsKIH0KIAorV0tTZWN1cml0eU9yaWdpblJlZiBXS05vdGlmaWNhdGlvbkdldFNlY3VyaXR5T3Jp Z2luKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlvbikKK3sKKyAgICByZXR1cm4gdG9BUEko dG9JbXBsKG5vdGlmaWNhdGlvbiktPm9yaWdpbigpKTsKK30KKwogdWludDY0X3QgV0tOb3RpZmlj YXRpb25HZXRJRChXS05vdGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pCiB7CiAgICAgcmV0dXJu IHRvSW1wbChub3RpZmljYXRpb24pLT5ub3RpZmljYXRpb25JRCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tOb3RpZmljYXRpb24uaAppbmRleCBkMzk1ZjVkZmMxOWQ3 YTZjYmZhNDMwNmQ5YWRkMzk0YWMwYzEyNDM5Li4wNzMxMWFmM2YxMTViNjE0MTM1YmIzZDkwNjU0 NDdiYmY1ZWNiOTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tOb3RpZmljYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tO b3RpZmljYXRpb24uaApAQCAtMzYsNiArMzYsNyBAQCBXS19FWFBPUlQgV0tUeXBlSUQgV0tOb3Rp ZmljYXRpb25HZXRUeXBlSUQoKTsKIAogV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLTm90aWZpY2F0 aW9uQ29weVRpdGxlKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlvbik7CiBXS19FWFBPUlQg V0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5Qm9keShXS05vdGlmaWNhdGlvblJlZiBub3Rp ZmljYXRpb24pOworV0tfRVhQT1JUIFdLU2VjdXJpdHlPcmlnaW5SZWYgV0tOb3RpZmljYXRpb25H ZXRTZWN1cml0eU9yaWdpbihXS05vdGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pOwogV0tfRVhQ T1JUIHVpbnQ2NF90IFdLTm90aWZpY2F0aW9uR2V0SUQoV0tOb3RpZmljYXRpb25SZWYgbm90aWZp Y2F0aW9uKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb24uY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmNwcAppbmRleCAw NWY4YjcxNWU3MDIyMjBkNTc0OTNiOGIwOTYyMjRjZDYxYjA4NDY5Li43YmI3NDQzMmM4ZWJmM2M0 NDNmZmJiNzI5NDNkMjY3MjMyNjBjNWVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbi5jcHAKQEAgLTMzLDIx ICszMywxMiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViTm90aWZpY2F0aW9uOjpXZWJO b3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCB1aW50 NjRfdCBub3RpZmljYXRpb25JRCkKK1dlYk5vdGlmaWNhdGlvbjo6V2ViTm90aWZpY2F0aW9uKGNv bnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBvcmln aW5JZGVudGlmaWVyLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKICAgICA6IG1fdGl0bGUodGl0 bGUpCiAgICAgLCBtX2JvZHkoYm9keSkKKyAgICAsIG1fb3JpZ2luKFdlYlNlY3VyaXR5T3JpZ2lu OjpjcmVhdGUob3JpZ2luSWRlbnRpZmllcikpCiAgICAgLCBtX25vdGlmaWNhdGlvbklEKG5vdGlm aWNhdGlvbklEKQogewogfQogCi12b2lkIFdlYk5vdGlmaWNhdGlvbjo6ZW5jb2RlKENvcmVJUEM6 OkFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QKLXsKLSAgICBlbmNvZGVyLT5lbmNvZGUo Q29yZUlQQzo6SW4obV90aXRsZSwgbV9ib2R5LCBtX25vdGlmaWNhdGlvbklEKSk7Ci19Ci0KLWJv b2wgV2ViTm90aWZpY2F0aW9uOjpkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBkZWNv ZGVyLCBXZWJOb3RpZmljYXRpb24mIG5vdGlmaWNhdGlvbikKLXsKLSAgICByZXR1cm4gZGVjb2Rl ci0+ZGVjb2RlKENvcmVJUEM6Ok91dChub3RpZmljYXRpb24ubV90aXRsZSwgbm90aWZpY2F0aW9u Lm1fYm9keSwgbm90aWZpY2F0aW9uLm1fbm90aWZpY2F0aW9uSUQpKTsKLX0KLQogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZp Y2F0aW9ucy9XZWJOb3RpZmljYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3Rp ZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbi5oCmluZGV4IDczMGQzOWQ3ZTU4NDVmMjAzNDcyNzI1 Y2U5MjdjMzk0NmRkZjlhNzUuLjBiODlhMGFhYmMwNjE0NWUxMDk5ODNlOGI2ZjNmMzgzNjc2Yzc0 MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dl Yk5vdGlmaWNhdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRp b25zL1dlYk5vdGlmaWNhdGlvbi5oCkBAIC0yNyw3ICsyNyw5IEBACiAjZGVmaW5lIFdlYk5vdGlm aWNhdGlvbl9oCiAKICNpbmNsdWRlICJBUElPYmplY3QuaCIKKyNpbmNsdWRlICJXZWJTZWN1cml0 eU9yaWdpbi5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Jl ZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgQ29y ZUlQQyB7CkBAIC0zOCwzMiArNDAsMzAgQEAgY2xhc3MgQXJndW1lbnRFbmNvZGVyOwogfSAvLyBu YW1lc3BhY2UgQ29yZUlQQwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKLSAgICAKKwogY2xhc3MgV2Vi Tm90aWZpY2F0aW9uIDogcHVibGljIEFQSU9iamVjdCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNv bnN0IFR5cGUgQVBJVHlwZSA9IFR5cGVOb3RpZmljYXRpb247CiAgICAgCi0gICAgc3RhdGljIFBh c3NSZWZQdHI8V2ViTm90aWZpY2F0aW9uPiBjcmVhdGUoY29uc3QgU3RyaW5nJiB0aXRsZSwgY29u c3QgU3RyaW5nJiBib2R5LCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKKyAgICBzdGF0aWMgUGFz c1JlZlB0cjxXZWJOb3RpZmljYXRpb24+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25z dCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllciwgdWludDY0X3Qg bm90aWZpY2F0aW9uSUQpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYk5v dGlmaWNhdGlvbih0aXRsZSwgYm9keSwgbm90aWZpY2F0aW9uSUQpKTsKKyAgICAgICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBXZWJOb3RpZmljYXRpb24odGl0bGUsIGJvZHksIG9yaWdpbklkZW50aWZp ZXIsIG5vdGlmaWNhdGlvbklEKSk7CiAgICAgfQogICAgIAogICAgIGNvbnN0IFN0cmluZyYgdGl0 bGUoKSBjb25zdCB7IHJldHVybiBtX3RpdGxlOyB9Ci0gICAgCiAgICAgY29uc3QgU3RyaW5nJiBi b2R5KCkgY29uc3QgeyByZXR1cm4gbV9ib2R5OyB9CisgICAgV2ViU2VjdXJpdHlPcmlnaW4qIG9y aWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fb3JpZ2luLmdldCgpOyB9CiAgICAgCiAgICAgdWludDY0 X3Qgbm90aWZpY2F0aW9uSUQoKSBjb25zdCB7IHJldHVybiBtX25vdGlmaWNhdGlvbklEOyB9CiAK LSAgICB2b2lkIGVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKSBjb25zdDsKLSAgICBz dGF0aWMgYm9vbCBkZWNvZGUoQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiwgV2ViTm90aWZpY2F0 aW9uJik7Ci0KIHByaXZhdGU6Ci0gICAgV2ViTm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0 bGUsIGNvbnN0IFN0cmluZyYgYm9keSwgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOworICAgIFdl Yk5vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNv bnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllciwgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpOwog CiAgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBBUElUeXBlOyB9CiAgICAg CiAgICAgU3RyaW5nIG1fdGl0bGU7CiAgICAgU3RyaW5nIG1fYm9keTsKKyAgICBSZWZQdHI8V2Vi U2VjdXJpdHlPcmlnaW4+IG1fb3JpZ2luOwogICAgIHVpbnQ2NF90IG1fbm90aWZpY2F0aW9uSUQ7 CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9u cy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5LmNwcAppbmRleCA1 NTM2NzI4MzgxY2I4OGQ1MGIyNGZjY2RlODVlYTlmM2ZkOWQ3MDY1Li4zYWUzZDdhYmZmYmVhNzhl NjYxYjI4NDdiNTlhZGFmMTVlOTg0OWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1h bmFnZXJQcm94eS5jcHAKQEAgLTY4LDE0ICs2OCwxNCBAQCB2b2lkIFdlYk5vdGlmaWNhdGlvbk1h bmFnZXJQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNv bgogICAgIGRpZFJlY2VpdmVTeW5jV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5TWVzc2FnZShj b25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cywgcmVwbHkpOwogfQogCi12b2lkIFdlYk5v dGlmaWNhdGlvbk1hbmFnZXJQcm94eTo6c2hvdyhjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBT dHJpbmcmIGJvZHksIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKQordm9pZCBXZWJOb3RpZmljYXRp b25NYW5hZ2VyUHJveHk6OnNob3coY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBi b2R5LCBjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIHVpbnQ2NF90IG5vdGlmaWNhdGlv bklEKQogewogICAgIGlmICghaXNOb3RpZmljYXRpb25JRFZhbGlkKG5vdGlmaWNhdGlvbklEKSkK ICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIG1fcHJvdmlkZXIuYWRkTm90aWZpY2F0aW9uTWFu YWdlcih0aGlzKTsKIAotICAgIFJlZlB0cjxXZWJOb3RpZmljYXRpb24+IG5vdGlmaWNhdGlvbiA9 IFdlYk5vdGlmaWNhdGlvbjo6Y3JlYXRlKHRpdGxlLCBib2R5LCBub3RpZmljYXRpb25JRCk7Cisg ICAgUmVmUHRyPFdlYk5vdGlmaWNhdGlvbj4gbm90aWZpY2F0aW9uID0gV2ViTm90aWZpY2F0aW9u OjpjcmVhdGUodGl0bGUsIGJvZHksIG9yaWdpbklkZW50aWZpZXIsIG5vdGlmaWNhdGlvbklEKTsK ICAgICBtX25vdGlmaWNhdGlvbnMuc2V0KG5vdGlmaWNhdGlvbklELCBub3RpZmljYXRpb24pOwog ICAgIG1fcHJvdmlkZXIuc2hvdyhub3RpZmljYXRpb24uZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFu YWdlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJO b3RpZmljYXRpb25NYW5hZ2VyUHJveHkuaAppbmRleCBhYzcwZWJiZDIwZTQ4YTc4YmJmMTJlY2Q1 YTA1ZTIzOGNiM2I1MjhiLi41N2UxMDhiZTIyYmVhNzBlZWYxMmE0NWM2NjliMDcyMjk3NGYxYjJj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJO b3RpZmljYXRpb25NYW5hZ2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Tm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkuaApAQCAtNzEsNyArNzEs NyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNXZWJOb3RpZmljYXRpb25NYW5h Z2VyUHJveHlNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQs IENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIE93blB0cjxDb3JlSVBDOjpBcmd1bWVudEVuY29k ZXI+Jik7CiAgICAgCiAgICAgLy8gTWVzc2FnZSBoYW5kbGVycwotICAgIHZvaWQgc2hvdyhjb25z dCBXVEY6OlN0cmluZyYgdGl0bGUsIGNvbnN0IFdURjo6U3RyaW5nJiBib2R5LCB1aW50NjRfdCBu b3RpZmljYXRpb25JRCk7CisgICAgdm9pZCBzaG93KGNvbnN0IFdURjo6U3RyaW5nJiB0aXRsZSwg Y29uc3QgV1RGOjpTdHJpbmcmIGJvZHksIGNvbnN0IFdURjo6U3RyaW5nJiBvcmlnaW5JZGVudGlm aWVyLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBjYW5jZWwodWludDY0X3Qg bm90aWZpY2F0aW9uSUQpOwogICAgIHZvaWQgZGlkRGVzdHJveU5vdGlmaWNhdGlvbih1aW50NjRf dCBub3RpZmljYXRpb25JRCk7CiAgICAgdm9pZCBub3RpZmljYXRpb25QZXJtaXNzaW9uTGV2ZWwo Y29uc3QgV1RGOjpTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIHVpbnQ2NF90JiBwZXJtaXNzaW9u TGV2ZWwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlv bnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5Lm1l c3NhZ2VzLmluCmluZGV4IDQ2NjcxYjQyODRkYTQzNjBiMDA4MGMzYWRkZGQ1OTU1YjUxYTJmMjku LjRjNmJkYTk3Y2YxNmU0YTUwNTBjYmQ2NDU0YTc3MzkzYWUyNjZjMjAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFn ZXJQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZp Y2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkubWVzc2FnZXMuaW4KQEAgLTIxLDcg KzIxLDcgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogbWVzc2FnZXMgLT4gV2ViTm90aWZpY2F0aW9uTWFu YWdlclByb3h5IHsKLSAgICBTaG93KFdURjo6U3RyaW5nIHRpdGxlLCBXVEY6OlN0cmluZyBib2R5 LCB1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CisgICAgU2hvdyhXVEY6OlN0cmluZyB0aXRsZSwg V1RGOjpTdHJpbmcgYm9keSwgV1RGOjpTdHJpbmcgb3JpZ2luSWRlbnRpZmllciwgdWludDY0X3Qg bm90aWZpY2F0aW9uSUQpOwogICAgIENhbmNlbCh1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAg ICAgRGlkRGVzdHJveU5vdGlmaWNhdGlvbih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3Rp ZmljYXRpb25NYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0 aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyLmNwcAppbmRleCA5ZmNhY2ViYjc0OTE3ZDYyMGZm ZTg4YTIwYmJlMjBiY2Q0ZTY5NDgyLi44MTNlYzg1ODQ2ODIwYWY1NGEwMDkyMDVkZjkwMGQ2ZjZl ZDU2MTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05vdGlmaWNhdGlv bnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXIuY3BwCkBAIC0zMyw2ICsz Myw4IEBACiAjaW5jbHVkZSAiV2ViTm90aWZpY2F0aW9uLmgiCiAjaW5jbHVkZSAiV2ViTm90aWZp Y2F0aW9uTWFuYWdlclByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL05vdGlmaWNh dGlvbi5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oPgorI2lu Y2x1ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KICNlbmRpZgogCiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKQEAgLTcxLDcgKzczLDcgQEAgYm9vbCBXZWJOb3RpZmljYXRpb25NYW5hZ2Vy OjpzaG93KE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uLCBXZWJQYWdlKiBwYWdlKQogICAgIG1f bm90aWZpY2F0aW9uTWFwLnNldChub3RpZmljYXRpb24sIG5vdGlmaWNhdGlvbklEKTsKICAgICBt X25vdGlmaWNhdGlvbklETWFwLnNldChub3RpZmljYXRpb25JRCwgbm90aWZpY2F0aW9uKTsKICAg ICAKLSAgICBtX3Byb2Nlc3MtPmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViTm90aWZp Y2F0aW9uTWFuYWdlclByb3h5OjpTaG93KG5vdGlmaWNhdGlvbi0+Y29udGVudHMoKS50aXRsZSwg bm90aWZpY2F0aW9uLT5jb250ZW50cygpLmJvZHksIG5vdGlmaWNhdGlvbklEKSwgcGFnZS0+cGFn ZUlEKCkpOworICAgIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJO b3RpZmljYXRpb25NYW5hZ2VyUHJveHk6OlNob3cobm90aWZpY2F0aW9uLT5jb250ZW50cygpLnRp dGxlLCBub3RpZmljYXRpb24tPmNvbnRlbnRzKCkuYm9keSwgbm90aWZpY2F0aW9uLT5zY3JpcHRF eGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCktPmRhdGFiYXNlSWRlbnRpZmllcigp LCBub3RpZmljYXRpb25JRCksIHBhZ2UtPnBhZ2VJRCgpKTsKICNlbmRpZgogICAgIHJldHVybiB0 cnVlOwogfQo=