80206 2012-03-02 21:37:44 -0800 Add support for notification replaceId in Mac WebKit and WK2 2012-03-05 10:34:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.7 RESOLVED FIXED InRadar P2 Normal --- 1 jonlee jonlee webkit-bug-importer oldest_to_newest 570111 0 jonlee 2012-03-02 21:37:44 -0800 <rdar://problem/10965574> 570123 1 129997 jonlee 2012-03-02 23:51:51 -0800 Created attachment 129997 Patch 570826 2 jonlee 2012-03-05 10:34:24 -0800 Committed r109766: <http://trac.webkit.org/changeset/109766> 129997 2012-03-02 23:51:51 -0800 2012-03-04 17:02:09 -0800 Patch bug-80206-20120302235250.patch text/plain 14509 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggNGFlNWM2OTA3 Yzg1MWRkYjg0Yjc0YWNjN2ZmOTMzODIxZWFlNTA2OS4uYTA5OGQ3YzIzMmFhY2VlMGE3ZmFlYmVi YWY2NzliNzMyN2M2MjVjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEy LTAzLTAyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc3VwcG9y dCBmb3Igbm90aWZpY2F0aW9uIHJlcGxhY2VJZCBpbiBNYWMgV2ViS2l0IGFuZCBXSzIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMjA2CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xMDk2NTU3ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViTm90aWZpY2F0aW9uLmg6IEFkZCByZXBs YWNlSUQgbWV0aG9kLgorICAgICAgICAqIFdlYlZpZXcvV2ViTm90aWZpY2F0aW9uLm1tOgorICAg ICAgICAoLVtXZWJOb3RpZmljYXRpb24gcmVwbGFjZUlEXSk6CisKIDIwMTItMDMtMDEgIE5pa29s YXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEwOTI1NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3NWQxOTE3MmRhM2Q2MmI2ZjQy ZGU2ZmQzM2QwNGI5MDU3MjFkMjgxLi5jMzc1OTY2YzNmNjA5NjZlN2FlNDg2NDY0MjA2NTFlZmE5 YmY4Y2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTItMDMtMDIgIEpvbiBMZWUg IDxqb25sZWVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBub3RpZmljYXRp b24gcmVwbGFjZUlkIGluIE1hYyBXZWJLaXQgYW5kIFdLMgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODAyMDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzEwOTY1NTc0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmNwcDogQWRkIFdLIEFQSS4KKyAg ICAgICAgKFdLTm90aWZpY2F0aW9uQ29weVJlcGxhY2VJRCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9DL1dLTm90aWZpY2F0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlv bnMvV2ViTm90aWZpY2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9u OjpXZWJOb3RpZmljYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dl Yk5vdGlmaWNhdGlvbi5oOiBBZGQgcmVwbGFjZUlEIG1lbWJlci4KKyAgICAgICAgKFdlYktpdDo6 V2ViTm90aWZpY2F0aW9uOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJOb3RpZmljYXRp b246OnJlcGxhY2VJRCk6CisgICAgICAgIChXZWJOb3RpZmljYXRpb24pOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eTo6c2hvdyk6CisgICAg ICAgICogVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5 Lmg6CisgICAgICAgIChXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnNob3dOb3RpZmljYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbjogQWRkIHJlcGxhY2VJRCB0byB0aGUgc2hvd05vdGlmaWNhdGlvbiBtZXNz YWdlLgorICAgICAgICAqIFdlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25N YW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0aW9uTWFuYWdlcjo6c2hv dyk6CisKIDIwMTItMDMtMDIgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIE1vdmUgbnNTdHJpbmdGcm9tV2ViQ29yZVN0cmluZyBvdXQgb2YgUGFnZUNsaWVudEltcGwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViTm90aWZpY2F0aW9uLmgg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk5vdGlmaWNhdGlvbi5oCmluZGV4IGMwNGIy YWQwNzJlNGNmMTQzMmQ4MTAzODRiYjJmZTQ5OWYyYTJkN2MuLjhlY2MxMDY4Njc0ZWM0OTgzMTZk NjM2NDIzMTNiMDllMGIxMjQ2YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViTm90aWZpY2F0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJO b3RpZmljYXRpb24uaApAQCAtMzYsNiArMzYsNyBAQAogCiAtIChOU1N0cmluZyAqKXRpdGxlOwog LSAoTlNTdHJpbmcgKilib2R5OworLSAoTlNTdHJpbmcgKilyZXBsYWNlSUQ7CiAtIChXZWJTZWN1 cml0eU9yaWdpbiAqKW9yaWdpbjsKIC0gKHVpbnQ2NF90KW5vdGlmaWNhdGlvbklEOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk5vdGlmaWNhdGlvbi5tbSBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViTm90aWZpY2F0aW9uLm1tCmluZGV4IGJiZDAyNDhm NjE5ZDc1OGZkMzBlYjJhNDUwYTVlMWMyYTE2NGNkNjguLjU1NzMzMmNiYTFiMDgyOTljMzM0ZTFh MjUyNjg2NDNkNjAxNGVlMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcv V2ViTm90aWZpY2F0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViTm90 aWZpY2F0aW9uLm1tCkBAIC0xMDEsNiArMTAxLDE2IEBAIE5vdGlmaWNhdGlvbiogY29yZShXZWJO b3RpZmljYXRpb24gKm5vdGlmaWNhdGlvbikKICNlbmRpZgogfQogCistIChOU1N0cmluZyAqKXJl cGxhY2VJRAoreworI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQorICAgIEFTU0VSVChjb3JlKHNl bGYpKTsKKyAgICByZXR1cm4gY29yZShzZWxmKS0+cmVwbGFjZUlkKCk7CisjZWxzZQorICAgIHJl dHVybiBuaWw7CisjZW5kaWYKK30KKwogLSAoV2ViU2VjdXJpdHlPcmlnaW4gKilvcmlnaW4KIHsK ICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS05vdGlmaWNhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tOb3RpZmljYXRpb24uY3BwCmluZGV4IDYzNGFhOTgyNDg3NzU0NWZkMzA5N2Ni OWM1YzNmZTQ4YmM3MDg0ZWIuLjVkZmNiYmEyOWZiMzNkODMwMzUyMmUxM2YwNGE4NGIwMDA2YTE5 NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS05vdGlmaWNh dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0 aW9uLmNwcApAQCAtNTIsNiArNTIsMTEgQEAgV0tTdHJpbmdSZWYgV0tOb3RpZmljYXRpb25Db3B5 SWNvblVSTChXS05vdGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pCiAgICAgcmV0dXJuIHRvQ29w aWVkQVBJKHRvSW1wbChub3RpZmljYXRpb24pLT5pY29uVVJMKCkpOwogfQogCitXS1N0cmluZ1Jl ZiBXS05vdGlmaWNhdGlvbkNvcHlSZXBsYWNlSUQoV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0 aW9uKQoreworICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+cmVw bGFjZUlEKCkpOworfQorCiBXS1NlY3VyaXR5T3JpZ2luUmVmIFdLTm90aWZpY2F0aW9uR2V0U2Vj dXJpdHlPcmlnaW4oV0tOb3RpZmljYXRpb25SZWYgbm90aWZpY2F0aW9uKQogewogICAgIHJldHVy biB0b0FQSSh0b0ltcGwobm90aWZpY2F0aW9uKS0+b3JpZ2luKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLTm90aWZpY2F0aW9uLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tOb3RpZmljYXRpb24uaAppbmRleCA3YzI3MjM4OTZiOGUw YzQwNjRkODI4YjQ4MGUzMDU5MjYyMzk4OWE4Li4xMWVhOTcyNzUzN2UwM2RlYjM4MGFhYWZiOTg4 MmNmMmI2MWRkZWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tOb3RpZmljYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tO b3RpZmljYXRpb24uaApAQCAtMzcsNiArMzcsNyBAQCBXS19FWFBPUlQgV0tUeXBlSUQgV0tOb3Rp ZmljYXRpb25HZXRUeXBlSUQoKTsKIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS05vdGlmaWNhdGlv bkNvcHlUaXRsZShXS05vdGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24pOwogV0tfRVhQT1JUIFdL U3RyaW5nUmVmIFdLTm90aWZpY2F0aW9uQ29weUJvZHkoV0tOb3RpZmljYXRpb25SZWYgbm90aWZp Y2F0aW9uKTsKIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS05vdGlmaWNhdGlvbkNvcHlJY29uVVJM KFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlvbik7CitXS19FWFBPUlQgV0tTdHJpbmdSZWYg V0tOb3RpZmljYXRpb25Db3B5UmVwbGFjZUlEKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlv bik7CiBXS19FWFBPUlQgV0tTZWN1cml0eU9yaWdpblJlZiBXS05vdGlmaWNhdGlvbkdldFNlY3Vy aXR5T3JpZ2luKFdLTm90aWZpY2F0aW9uUmVmIG5vdGlmaWNhdGlvbik7CiBXS19FWFBPUlQgdWlu dDY0X3QgV0tOb3RpZmljYXRpb25HZXRJRChXS05vdGlmaWNhdGlvblJlZiBub3RpZmljYXRpb24p OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9X ZWJOb3RpZmljYXRpb24uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlv bnMvV2ViTm90aWZpY2F0aW9uLmNwcAppbmRleCBkNmIyMDkyODYzNTU5NzI3YjI0MGI5ZGE3NjRh MzgxY2FjOWNhZWNlLi45OWJhMGVkZTFiMDk5ZDlkOTFkNjNlMjlhZjhjNDU5MDdkZWExNDAxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3Rp ZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25z L1dlYk5vdGlmaWNhdGlvbi5jcHAKQEAgLTMzLDEwICszMywxMSBAQAogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKIAotV2ViTm90aWZpY2F0aW9uOjpXZWJOb3RpZmljYXRpb24oY29uc3QgU3RyaW5nJiB0 aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0 cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKK1dlYk5vdGlmaWNh dGlvbjo6V2ViTm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0cmluZyYg Ym9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHJlcGxhY2VJRCwgY29u c3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKQogICAgIDog bV90aXRsZSh0aXRsZSkKICAgICAsIG1fYm9keShib2R5KQogICAgICwgbV9pY29uVVJMKGljb25V UkwpCisgICAgLCBtX3JlcGxhY2VJRChyZXBsYWNlSUQpCiAgICAgLCBtX29yaWdpbihXZWJTZWN1 cml0eU9yaWdpbjo6Y3JlYXRlRnJvbVN0cmluZyhvcmlnaW5TdHJpbmcpKQogICAgICwgbV9ub3Rp ZmljYXRpb25JRChub3RpZmljYXRpb25JRCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbi5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmgKaW5kZXggNGE2ZmM3 ZTQ5MjM4Mzk0OTJmNGRkM2IzN2U1MWQ3NDk3OGY3N2RkYy4uMTliZGE0MDUwZDA3N2FkMzc3ZDJj NGNlMTMwNjgzZjljYzFkZjIxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uLmgKQEAgLTQ1LDI2ICs0NSwyOCBA QCBjbGFzcyBXZWJOb3RpZmljYXRpb24gOiBwdWJsaWMgQVBJT2JqZWN0IHsKIHB1YmxpYzoKICAg ICBzdGF0aWMgY29uc3QgVHlwZSBBUElUeXBlID0gVHlwZU5vdGlmaWNhdGlvbjsKICAgICAKLSAg ICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJOb3RpZmljYXRpb24+IGNyZWF0ZShjb25zdCBTdHJpbmcm IHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3Qg U3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKQorICAgIHN0YXRp YyBQYXNzUmVmUHRyPFdlYk5vdGlmaWNhdGlvbj4gY3JlYXRlKGNvbnN0IFN0cmluZyYgdGl0bGUs IGNvbnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcm IHJlcGxhY2VJRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNh dGlvbklEKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJOb3RpZmljYXRp b24odGl0bGUsIGJvZHksIGljb25VUkwsIG9yaWdpblN0cmluZywgbm90aWZpY2F0aW9uSUQpKTsK KyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJOb3RpZmljYXRpb24odGl0bGUsIGJvZHks IGljb25VUkwsIHJlcGxhY2VJRCwgb3JpZ2luU3RyaW5nLCBub3RpZmljYXRpb25JRCkpOwogICAg IH0KICAgICAKICAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkgY29uc3QgeyByZXR1cm4gbV90aXRs ZTsgfQogICAgIGNvbnN0IFN0cmluZyYgYm9keSgpIGNvbnN0IHsgcmV0dXJuIG1fYm9keTsgfQog ICAgIGNvbnN0IFN0cmluZyYgaWNvblVSTCgpIGNvbnN0IHsgcmV0dXJuIG1faWNvblVSTDsgfQor ICAgIGNvbnN0IFN0cmluZyYgcmVwbGFjZUlEKCkgY29uc3QgeyByZXR1cm4gbV9yZXBsYWNlSUQ7 IH0KICAgICBXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9vcmln aW4uZ2V0KCk7IH0KICAgICAKICAgICB1aW50NjRfdCBub3RpZmljYXRpb25JRCgpIGNvbnN0IHsg cmV0dXJuIG1fbm90aWZpY2F0aW9uSUQ7IH0KIAogcHJpdmF0ZToKLSAgICBXZWJOb3RpZmljYXRp b24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcm IGljb25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRp b25JRCk7CisgICAgV2ViTm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0 cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHJlcGxhY2VJ RCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKTsK IAogICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1cm4gQVBJVHlwZTsgfQogICAg IAogICAgIFN0cmluZyBtX3RpdGxlOwogICAgIFN0cmluZyBtX2JvZHk7CiAgICAgU3RyaW5nIG1f aWNvblVSTDsKKyAgICBTdHJpbmcgbV9yZXBsYWNlSUQ7CiAgICAgUmVmUHRyPFdlYlNlY3VyaXR5 T3JpZ2luPiBtX29yaWdpbjsKICAgICB1aW50NjRfdCBtX25vdGlmaWNhdGlvbklEOwogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlm aWNhdGlvbk1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZp Y2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkuY3BwCmluZGV4IDBjMDg1MGJlZTJj ODQ1NmVjMTM2NTc4NzA1ZWJhNDRiZjVhMTUzMDcuLjI3YTg4OWUyNjI0ZWQzYTZlNDhhOTIzODJj MTBiMmI2ZGVjMTlhNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Ob3Rp ZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5 LmNwcApAQCAtNzcsMTIgKzc3LDEyIEBAIHZvaWQgV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5 OjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0CiAgICAgZGlk UmVjZWl2ZVdlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVz c2FnZUlELCBhcmd1bWVudHMpOwogfQogCi12b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94 eTo6c2hvdyhXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFN0 cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIG9yaWdpblN0 cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCit2b2lkIFdlYk5vdGlmaWNhdGlvbk1hbmFn ZXJQcm94eTo6c2hvdyhXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNv bnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHJl cGxhY2VJRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlv bklEKQogewogICAgIGlmICghaXNOb3RpZmljYXRpb25JRFZhbGlkKG5vdGlmaWNhdGlvbklEKSkK ICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIFJlZlB0cjxXZWJOb3RpZmljYXRpb24+IG5vdGlm aWNhdGlvbiA9IFdlYk5vdGlmaWNhdGlvbjo6Y3JlYXRlKHRpdGxlLCBib2R5LCBpY29uVVJMLCBv cmlnaW5TdHJpbmcsIG5vdGlmaWNhdGlvbklEKTsKKyAgICBSZWZQdHI8V2ViTm90aWZpY2F0aW9u PiBub3RpZmljYXRpb24gPSBXZWJOb3RpZmljYXRpb246OmNyZWF0ZSh0aXRsZSwgYm9keSwgaWNv blVSTCwgcmVwbGFjZUlELCBvcmlnaW5TdHJpbmcsIG5vdGlmaWNhdGlvbklEKTsKICAgICBtX25v dGlmaWNhdGlvbnMuc2V0KG5vdGlmaWNhdGlvbklELCBub3RpZmljYXRpb24pOwogICAgIG1fcHJv dmlkZXIuc2hvdyhwYWdlLCBub3RpZmljYXRpb24uZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL05vdGlmaWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdl clByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3Rp ZmljYXRpb25NYW5hZ2VyUHJveHkuaAppbmRleCBkNjJiOWYyOGZiZmI4YzgyYTAyNDUzMDIzMWQw MjBiMmExNTM1ZGUxLi5mZGVlZWIzNmY4ODM2MDQwNTg3NDgzODI3ZGMyZDNiOTVhMzllY2ExIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3Rp ZmljYXRpb25NYW5hZ2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTm90 aWZpY2F0aW9ucy9XZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHkuaApAQCAtNjAsNyArNjAsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBpbml0aWFsaXplUHJvdmlkZXIoY29uc3QgV0tOb3RpZmljYXRp b25Qcm92aWRlciopOwogICAgIHZvaWQgcG9wdWxhdGVDb3B5T2ZOb3RpZmljYXRpb25QZXJtaXNz aW9ucyhIYXNoTWFwPFN0cmluZywgYm9vbD4mKTsKIAotICAgIHZvaWQgc2hvdyhXZWJQYWdlUHJv eHkqLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHksIGNvbnN0IFN0cmlu ZyYgaWNvblVSTCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNh dGlvbklEKTsKKyAgICB2b2lkIHNob3coV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiB0aXRs ZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcmIGljb25VUkwsIGNvbnN0IFN0cmlu ZyYgcmVwbGFjZUlELCBjb25zdCBTdHJpbmcmIG9yaWdpblN0cmluZywgdWludDY0X3Qgbm90aWZp Y2F0aW9uSUQpOwogCiAgICAgdm9pZCBwcm92aWRlckRpZFNob3dOb3RpZmljYXRpb24odWludDY0 X3Qgbm90aWZpY2F0aW9uSUQpOwogICAgIHZvaWQgcHJvdmlkZXJEaWRDbGlja05vdGlmaWNhdGlv bih1aW50NjRfdCBub3RpZmljYXRpb25JRCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCmluZGV4IGNkNzU3ZGQ2ODIzNDBkMjgyNzEwNTI5MTdiN2I5M2RkMWY4NjE2 YmEuLjI2YWVkY2NiNzhhOTQ0YzczNWJmOTZlOTkxZWEyNGJhNGMwNjQ1MzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0zNDE5LDkgKzM0MTksOSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qg cmVxdWVzdElELCBjb25zdCBTdHJpbgogICAgICAgICByZXF1ZXN0LT5kZW55KCk7CiB9CiAKLXZv aWQgV2ViUGFnZVByb3h5OjpzaG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNv bnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIG9y aWdpblN0cmluZywgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCit2b2lkIFdlYlBhZ2VQcm94eTo6 c2hvd05vdGlmaWNhdGlvbihjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGJvZHks IGNvbnN0IFN0cmluZyYgaWNvblVSTCwgY29uc3QgU3RyaW5nJiByZXBsYWNlSUQsIGNvbnN0IFN0 cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRpb25JRCkKIHsKLSAgICBtX3By b2Nlc3MtPmNvbnRleHQoKS0+bm90aWZpY2F0aW9uTWFuYWdlclByb3h5KCktPnNob3codGhpcywg dGl0bGUsIGJvZHksIGljb25VUkwsIG9yaWdpblN0cmluZywgbm90aWZpY2F0aW9uSUQpOworICAg IG1fcHJvY2Vzcy0+Y29udGV4dCgpLT5ub3RpZmljYXRpb25NYW5hZ2VyUHJveHkoKS0+c2hvdyh0 aGlzLCB0aXRsZSwgYm9keSwgaWNvblVSTCwgcmVwbGFjZUlELCBvcmlnaW5TdHJpbmcsIG5vdGlm aWNhdGlvbklEKTsKIH0KIAogZmxvYXQgV2ViUGFnZVByb3h5OjpoZWFkZXJIZWlnaHQoV2ViRnJh bWVQcm94eSogZnJhbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5k ZXggM2Y3NmUzYWVhZmRjMTk2NmYyMzlhODRhZTVjNDE5NTExZmM2ZWY5NS4uY2M2MWRlN2VmZTlh NjQ5ODliOGJmZmVmMzEwZTdiNGZiMWUzZDNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaApAQCAtNzMwLDcgKzczMCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZWF0 dGFjaFRvV2ViUHJvY2Vzc1dpdGhJdGVtKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qKTsKIAogICAg IHZvaWQgcmVxdWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3Qgbm90aWZpY2F0aW9u SUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nKTsKLSAgICB2b2lkIHNob3dOb3RpZmljYXRp b24oY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgU3RyaW5nJiBib2R5LCBjb25zdCBTdHJpbmcm IGljb25VUkwsIGNvbnN0IFN0cmluZyYgb3JpZ2luU3RyaW5nLCB1aW50NjRfdCBub3RpZmljYXRp b25JRCk7CisgICAgdm9pZCBzaG93Tm90aWZpY2F0aW9uKGNvbnN0IFN0cmluZyYgdGl0bGUsIGNv bnN0IFN0cmluZyYgYm9keSwgY29uc3QgU3RyaW5nJiBpY29uVVJMLCBjb25zdCBTdHJpbmcmIHJl cGxhY2VJRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5TdHJpbmcsIHVpbnQ2NF90IG5vdGlmaWNhdGlv bklEKTsKICAgICAKICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICB2b2lkIHBhZ2VE aWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCBjYjBjNjI5 ZTZhMDRkNjZlYTg4NTE0MzUwN2Y4NmZmOWI2NzM1YjkwLi5hN2U4YzE5ZjE5ZTllNTg3ZDNlODMx MzljNjc4ZjYwMDNlNDhmYzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTIwOCw3ICsyMDgsNyBAQCBtZXNzYWdlcyAtPiBX ZWJQYWdlUHJveHkgewogICAgIAogICAgICMgTm90aWZpY2F0aW9uIG1lc3NhZ2VzCiAgICAgUmVx dWVzdE5vdGlmaWNhdGlvblBlcm1pc3Npb24odWludDY0X3QgcmVxdWVzdElELCBXVEY6OlN0cmlu ZyBvcmlnaW5JZGVudGlmaWVyKQotICAgIFNob3dOb3RpZmljYXRpb24oV1RGOjpTdHJpbmcgdGl0 bGUsIFdURjo6U3RyaW5nIGJvZHksIFdURjo6U3RyaW5nIGljb25VUkwsIFdURjo6U3RyaW5nIG9y aWdpbklkZW50aWZpZXIsIHVpbnQ2NF90IG5vdGlmaWNhdGlvbklEKQorICAgIFNob3dOb3RpZmlj YXRpb24oV1RGOjpTdHJpbmcgdGl0bGUsIFdURjo6U3RyaW5nIGJvZHksIFdURjo6U3RyaW5nIGlj b25VUkwsIFdURjo6U3RyaW5nIHJlcGxhY2VJRCwgV1RGOjpTdHJpbmcgb3JpZ2luSWRlbnRpZmll ciwgdWludDY0X3Qgbm90aWZpY2F0aW9uSUQpCiAKICAgICAjIFNwZWxsaW5nIGFuZCBncmFtbWFy IG1lc3NhZ2VzCiAjaWYgVVNFKFVOSUZJRURfVEVYVF9DSEVDS0lORykgIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5vdGlmaWNhdGlvbk1h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Ob3RpZmljYXRpb25zL1dlYk5v dGlmaWNhdGlvbk1hbmFnZXIuY3BwCmluZGV4IDkwYTdmNDAyMThiNzM1OGE2NzhiZjRlY2Q3NTY5 ZGZlNGVhOTVjNzguLmEyNDlhMTM5ZTEyYmM5ODViNTgxMWYxYTgyMTJjMGFhZGU2N2JmNDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTm90aWZpY2F0aW9ucy9XZWJOb3Rp ZmljYXRpb25NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05vdGlm aWNhdGlvbnMvV2ViTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKQEAgLTExNyw3ICsxMTcsNyBAQCBi b29sIFdlYk5vdGlmaWNhdGlvbk1hbmFnZXI6OnNob3coTm90aWZpY2F0aW9uKiBub3RpZmljYXRp b24sIFdlYlBhZ2UqIHBhZ2UpCiAgICAgTm90aWZpY2F0aW9uQ29udGV4dE1hcDo6aXRlcmF0b3Ig aXQgPSBtX25vdGlmaWNhdGlvbkNvbnRleHRNYXAuYWRkKG5vdGlmaWNhdGlvbi0+c2NyaXB0RXhl Y3V0aW9uQ29udGV4dCgpLCBWZWN0b3I8dWludDY0X3Q+KCkpLmZpcnN0OwogICAgIGl0LT5zZWNv bmQuYXBwZW5kKG5vdGlmaWNhdGlvbklEKTsKICAgICAKLSAgICBtX3Byb2Nlc3MtPmNvbm5lY3Rp b24oKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTaG93Tm90aWZpY2F0aW9uKG5vdGlm aWNhdGlvbi0+Y29udGVudHMoKS50aXRsZSwgbm90aWZpY2F0aW9uLT5jb250ZW50cygpLmJvZHks IG5vdGlmaWNhdGlvbi0+aWNvblVSTCgpLnN0cmluZygpLCBub3RpZmljYXRpb24tPnNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+dG9TdHJpbmcoKSwgbm90aWZpY2F0 aW9uSUQpLCBwYWdlLT5wYWdlSUQoKSk7CisgICAgbV9wcm9jZXNzLT5jb25uZWN0aW9uKCktPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2hvd05vdGlmaWNhdGlvbihub3RpZmljYXRpb24t PmNvbnRlbnRzKCkudGl0bGUsIG5vdGlmaWNhdGlvbi0+Y29udGVudHMoKS5ib2R5LCBub3RpZmlj YXRpb24tPmljb25VUkwoKS5zdHJpbmcoKSwgbm90aWZpY2F0aW9uLT5yZXBsYWNlSWQoKSwgbm90 aWZpY2F0aW9uLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3JpZ2luKCktPnRv U3RyaW5nKCksIG5vdGlmaWNhdGlvbklEKSwgcGFnZS0+cGFnZUlEKCkpOwogICAgIHJldHVybiB0 cnVlOwogI2Vsc2UKICAgICByZXR1cm4gZmFsc2U7Cg==