128403 2014-02-07 14:48:07 -0800 Make it possible for each web page to have different preferences 2014-02-07 15:21:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 978076 0 andersca 2014-02-07 14:48:07 -0800 Make it possible for each web page to have different preferences 978078 1 223500 andersca 2014-02-07 14:49:33 -0800 Created attachment 223500 Patch 978098 2 andersca 2014-02-07 15:21:28 -0800 Committed r163656: <http://trac.webkit.org/changeset/163656> 223500 2014-02-07 14:49:33 -0800 2014-02-07 15:11:38 -0800 Patch bug-128403-20140207144933.patch text/plain 13891 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTVkMjdlY2IwN2FlM2Iw M2Y4NTRjYzMxMzQ1ZDMwMTNlNTA5MWQ5NS4uYTZhMDRiYWY0NzAwN2ExYWJlZThhMTE2NjY5NzBi ODE0YzUzZDJiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDE0LTAyLTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSBmb3IgZWFjaCB3ZWIgcGFnZSB0byBoYXZlIGRpZmZlcmVudCBwcmVmZXJlbmNlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4NDAzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzQ3JlYXRlKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbnRleHQ6OmVuc3VyZU5ldHdvcmtQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29u dGV4dDo6Y3JlYXRlTmV3V2ViUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkljb25E YXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkljb25EYXRhYmFzZTo6c2V0RGF0YWJh c2VQYXRoKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZUdyb3VwOjpXZWJQYWdlR3JvdXApOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlR3JvdXA6On5XZWJQYWdlR3JvdXApOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3Jv dXA6OnNldFByZWZlcmVuY2VzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6On5XZWJQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OnNldFByZWZlcmVuY2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpwcmVmZXJlbmNlc0RpZENoYW5nZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjp+V2ViUHJlZmVyZW5jZXMpOgorICAgICAgICAo V2ViS2l0OjpXZWJQcmVmZXJlbmNlczo6YWRkUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy ZWZlcmVuY2VzOjpyZW1vdmVQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6 OnVwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjp1cGRhdGVQcml2YXRl QnJvd3NpbmdWYWx1ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjphbnlQYWdl c0FyZVVzaW5nUHJpdmF0ZUJyb3dzaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJlZmVy ZW5jZXMuaDoKKworMjAxNC0wMi0wNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCiAgICAgICAgIFNpbXBsaWZ5IFdlYlByZWZlcmVuY2VzIGNyZWF0aW9uIGluc2lkZSBX ZWJQYWdlR3JvdXAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEyODM5MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlcy5jcHAKaW5kZXggYjI0NTQwMmMzZGI4MDE3NzlmNzVjODRiYmE1ZDgzZTNiZmZjODc5 MS4uNjdmNDVkNWYzZGYxY2E0ZDM5ZDk2OGZiODY3MjJhOGJkN2IxNmUzMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcApAQCAtNDMsNyAr NDMsNyBAQCBXS1R5cGVJRCBXS1ByZWZlcmVuY2VzR2V0VHlwZUlEKCkKIAogV0tQcmVmZXJlbmNl c1JlZiBXS1ByZWZlcmVuY2VzQ3JlYXRlKCkKIHsKLSAgICBSZWZQdHI8V2ViUHJlZmVyZW5jZXM+ IHByZWZlcmVuY2VzID0gV2ViUHJlZmVyZW5jZXM6OmNyZWF0ZSgpOworICAgIFJlZlB0cjxXZWJQ cmVmZXJlbmNlcz4gcHJlZmVyZW5jZXMgPSBXZWJQcmVmZXJlbmNlczo6Y3JlYXRlKFN0cmluZygp KTsKICAgICByZXR1cm4gdG9BUEkocHJlZmVyZW5jZXMucmVsZWFzZSgpLmxlYWtSZWYoKSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAppbmRleCBmMWU3MGVkOTgx YmQ2MWY2ZTE0Y2ZiMzhhZmMxMDAyN2YyMWRhZTlhLi5jMTMyYjI5ODcxMTRjY2IxY2Y2NzhmNGMz ODEyZmQ3NjBlMDUzMWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3Bw CkBAIC0zNzcsNyArMzc3LDcgQEAgdm9pZCBXZWJDb250ZXh0OjplbnN1cmVOZXR3b3JrUHJvY2Vz cygpCiAKICAgICBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyBwYXJhbWV0ZXJzOwog Ci0gICAgcGFyYW1ldGVycy5wcml2YXRlQnJvd3NpbmdFbmFibGVkID0gV2ViUHJlZmVyZW5jZXM6 OmFueVBhZ2VHcm91cHNBcmVVc2luZ1ByaXZhdGVCcm93c2luZygpOworICAgIHBhcmFtZXRlcnMu cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCA9IFdlYlByZWZlcmVuY2VzOjphbnlQYWdlc0FyZVVzaW5n UHJpdmF0ZUJyb3dzaW5nKCk7CiAKICAgICBwYXJhbWV0ZXJzLmNhY2hlTW9kZWwgPSBtX2NhY2hl TW9kZWw7CiAKQEAgLTYxOSw3ICs2MTksNyBAQCBXZWJQcm9jZXNzUHJveHkmIFdlYkNvbnRleHQ6 OmNyZWF0ZU5ld1dlYlByb2Nlc3MoKQogICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBy b2Nlc3M6OlNldFFPUyh3ZWJQcm9jZXNzTGF0ZW5jeVFPUygpLCB3ZWJQcm9jZXNzVGhyb3VnaHB1 dFFPUygpKSwgMCk7CiAjZW5kaWYKIAotICAgIGlmIChXZWJQcmVmZXJlbmNlczo6YW55UGFnZUdy b3Vwc0FyZVVzaW5nUHJpdmF0ZUJyb3dzaW5nKCkpCisgICAgaWYgKFdlYlByZWZlcmVuY2VzOjph bnlQYWdlc0FyZVVzaW5nUHJpdmF0ZUJyb3dzaW5nKCkpCiAgICAgICAgIHByb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlByb2Nlc3M6OkVuc3VyZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oU2Vzc2lv blRyYWNrZXI6OmxlZ2FjeVByaXZhdGVTZXNzaW9uSUQpLCAwKTsKIAogICAgIG1fcHJvY2Vzc2Vz LmFwcGVuZChwcm9jZXNzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJJY29uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRh YmFzZS5jcHAKaW5kZXggOGVkNjEwYTI0MzQ2NzEyNTZkNWRhMzIxNDJiYmQ1ZWYyNDJhZTNkNS4u N2FkYWU4OTEyM2JiZDNhNTQ3NTkwZTA1NTc0ODZjZDFiM2RlZTI2ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAKQEAgLTc5LDcgKzc5LDcgQEAgdm9p ZCBXZWJJY29uRGF0YWJhc2U6OnNldERhdGFiYXNlUGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCiAK ICAgICAvLyBGSVhNRTogV2ViSWNvbkRhdGFiYXNlcyBhcmUgcGVyLVdlYkNvbnRleHQgYnV0IFdl YkNvbnRleHQncyBkb24ndCBoYXZlIHRoZWlyIG93biBub3Rpb24gb2YgdGhlIGN1cnJlbnQgcHJp dmF0ZSBicm93c2luZyBzZXR0aW5nLgogICAgIC8vIEFzIHdlIGNsZWFuIHVwIHByaXZhdGUgYnJv d3NpbmcgdGhyb3VnaG91dCB0aGUgc3RhY2sgd2UgbmVlZCB0byBjbGVhbiBpdCB1cCBoZXJlLgot ICAgIG1faWNvbkRhdGFiYXNlSW1wbC0+c2V0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChXZWJQcmVm ZXJlbmNlczo6YW55UGFnZUdyb3Vwc0FyZVVzaW5nUHJpdmF0ZUJyb3dzaW5nKCkpOworICAgIG1f aWNvbkRhdGFiYXNlSW1wbC0+c2V0UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChXZWJQcmVmZXJlbmNl czo6YW55UGFnZXNBcmVVc2luZ1ByaXZhdGVCcm93c2luZygpKTsKIAogICAgIGlmICghbV9pY29u RGF0YWJhc2VJbXBsLT5vcGVuKGRpcmVjdG9yeU5hbWUocGF0aCksIHBhdGhHZXRGaWxlTmFtZShw YXRoKSkpIHsKICAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gb3BlbiBXZWJLaXQyIGljb24g ZGF0YWJhc2Ugb24gZGlzayIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VHcm91cC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3Vw LmNwcAppbmRleCAzM2E4NTEzNzZhMDg4NzUzNGI4OWVlMWFhNTRmOTE4Y2UzOTg1NWRiLi4xN2Ex MjM4MGU2NTFkYzYzMDNlYzE3YzI4Y2M5ZmVlMjAwNTkyN2VjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcApAQCAtODYsMTMgKzg2LDExIEBAIFdlYlBhZ2VHcm91 cDo6V2ViUGFnZUdyb3VwKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgYm9vbCB2aXNpYmxlVG9J bmplY3RlZEJ1bmRsCiAgICAgOiBtX2RhdGEocGFnZUdyb3VwRGF0YShpZGVudGlmaWVyLCB2aXNp YmxlVG9JbmplY3RlZEJ1bmRsZSwgdmlzaWJsZVRvSGlzdG9yeUNsaWVudCkpCiAgICAgLCBtX3By ZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzOjpjcmVhdGUobV9kYXRhLmlkZW50aWZlcikpCiB7Ci0g ICAgbV9wcmVmZXJlbmNlcy0+YWRkUGFnZUdyb3VwKHRoaXMpOwogICAgIHdlYlBhZ2VHcm91cE1h cCgpLnNldChtX2RhdGEucGFnZUdyb3VwSUQsIHRoaXMpOwogfQogCiBXZWJQYWdlR3JvdXA6On5X ZWJQYWdlR3JvdXAoKQogewotICAgIG1fcHJlZmVyZW5jZXMtPnJlbW92ZVBhZ2VHcm91cCh0aGlz KTsKICAgICB3ZWJQYWdlR3JvdXBNYXAoKS5yZW1vdmUocGFnZUdyb3VwSUQoKSk7CiB9CiAKQEAg LTExMSwxNCArMTA5LDEwIEBAIHZvaWQgV2ViUGFnZUdyb3VwOjpzZXRQcmVmZXJlbmNlcyhXZWJQ cmVmZXJlbmNlcyogcHJlZmVyZW5jZXMpCiAgICAgaWYgKHByZWZlcmVuY2VzID09IG1fcHJlZmVy ZW5jZXMpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fcHJlZmVyZW5jZXMtPnJlbW92ZVBhZ2VH cm91cCh0aGlzKTsKICAgICBtX3ByZWZlcmVuY2VzID0gcHJlZmVyZW5jZXM7Ci0gICAgbV9wcmVm ZXJlbmNlcy0+YWRkUGFnZUdyb3VwKHRoaXMpOwogCiAgICAgZm9yIChhdXRvJiB3ZWJQYWdlUHJv eHkgOiBtX3BhZ2VzKQogICAgICAgICB3ZWJQYWdlUHJveHktPnNldFByZWZlcmVuY2VzKCptX3By ZWZlcmVuY2VzKTsKLQotICAgIHByZWZlcmVuY2VzRGlkQ2hhbmdlKCk7CiB9CiAKIFdlYlByZWZl cmVuY2VzJiBXZWJQYWdlR3JvdXA6OnByZWZlcmVuY2VzKCkgY29uc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggODkzODAxM2IxMWVlMThiYjQyNzI1NGE5 MDI1YzExOTI3ZjAyNjdiZS4uYmZmNmRhY2YyOGU4NzFmY2NhOTM4NjM3MDkxMDY1ODE2NzVmOTlm YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTM0Niw2 ICszNDYsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwYWdlQ2xp ZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIFdlYgogCiAgICAgV2ViQ29udGV4dDo6c3Rh dGlzdGljcygpLndrUGFnZUNvdW50Kys7CiAKKyAgICBtX3ByZWZlcmVuY2VzLT5hZGRQYWdlKCp0 aGlzKTsKICAgICBtX3BhZ2VHcm91cC0+YWRkUGFnZSh0aGlzKTsKIAogI2lmIEVOQUJMRShJTlNQ RUNUT1IpCkBAIC0zNzgsNiArMzc5LDcgQEAgV2ViUGFnZVByb3h5Ojp+V2ViUGFnZVByb3h5KCkK ICAgICBpZiAobV9oYXNTcGVsbERvY3VtZW50VGFnKQogICAgICAgICBUZXh0Q2hlY2tlcjo6Y2xv c2VTcGVsbERvY3VtZW50V2l0aFRhZyhtX3NwZWxsRG9jdW1lbnRUYWcpOwogCisgICAgbV9wcmVm ZXJlbmNlcy0+cmVtb3ZlUGFnZSgqdGhpcyk7CiAgICAgbV9wYWdlR3JvdXAtPnJlbW92ZVBhZ2Uo dGhpcyk7CiAKICNpZm5kZWYgTkRFQlVHCkBAIC00MDIsNiArNDA0LDE4IEBAIGJvb2wgV2ViUGFn ZVByb3h5Ojppc1ZhbGlkKCkgY29uc3QKICAgICByZXR1cm4gbV9pc1ZhbGlkOwogfQogCit2b2lk IFdlYlBhZ2VQcm94eTo6c2V0UHJlZmVyZW5jZXMoV2ViUHJlZmVyZW5jZXMmIHByZWZlcmVuY2Vz KQoreworICAgIGlmICgmcHJlZmVyZW5jZXMgPT0gJm1fcHJlZmVyZW5jZXMuZ2V0KCkpCisgICAg ICAgIHJldHVybjsKKworICAgIG1fcHJlZmVyZW5jZXMtPnJlbW92ZVBhZ2UoKnRoaXMpOworICAg IG1fcHJlZmVyZW5jZXMgPSBwcmVmZXJlbmNlczsKKyAgICBtX3ByZWZlcmVuY2VzLT5hZGRQYWdl KCp0aGlzKTsKKworICAgIHByZWZlcmVuY2VzRGlkQ2hhbmdlKCk7Cit9CisKIFBhc3NSZWZQdHI8 QVBJOjpBcnJheT4gV2ViUGFnZVByb3h5OjpyZWxhdGVkUGFnZXMoKSBjb25zdAogewogICAgIC8v IHBhZ2VzKCkgcmV0dXJucyBhIGxpc3Qgb2YgcGFnZXMgaW4gV2ViUHJvY2Vzcywgc28gdGhpcyBw YWdlIG1heSBvciBtYXkgbm90IGJlIGFtb25nIHRoZW0gLSBhIGNsaWVudCBjYW4gdXNlIGEgcmVm ZXJlbmNlIHRvIFdlYlBhZ2VQcm94eSBhZnRlciB0aGUgcGFnZSBoYXMgY2xvc2VkLgpAQCAtMjA2 MCw3ICsyMDc0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlkQ2hhbmdlKCkK ICAgICAgICAgcmV0dXJuOwogCiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9TRVJWRVIpCi0gICAgaWYg KG1fcGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLmRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSkKKyAg ICBpZiAobV9wcmVmZXJlbmNlcy0+ZGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCgpKQogICAgICAgICBp bnNwZWN0b3IoKS0+ZW5hYmxlUmVtb3RlSW5zcGVjdGlvbigpOwogI2VuZGlmCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBiNDkxMmMwMTE5YzNlZGVhNDYzYWYz ZGYxYWNmM2E1MzAyMTM5NzFlLi41Yjk5MjM2MDA1NTRjNTFjNjdjZTc0NTlmNTc4MDVhY2M3Mjhk NTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03MjksNyAr NzI5LDcgQEAgcHVibGljOgogICAgIFBsYXRmb3JtUHJvY2Vzc0lkZW50aWZpZXIgcHJvY2Vzc0lk ZW50aWZpZXIoKSBjb25zdDsKIAogICAgIFdlYlByZWZlcmVuY2VzJiBwcmVmZXJlbmNlcygpIHsg cmV0dXJuIG1fcHJlZmVyZW5jZXMuZ2V0KCk7IH0KLSAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdl YlByZWZlcmVuY2VzJiBwcmVmZXJlbmNlcykgeyBtX3ByZWZlcmVuY2VzID0gcHJlZmVyZW5jZXM7 IH0KKyAgICB2b2lkIHNldFByZWZlcmVuY2VzKFdlYlByZWZlcmVuY2VzJik7CiAKICAgICBXZWJQ YWdlR3JvdXAmIHBhZ2VHcm91cCgpIHsgcmV0dXJuIG1fcGFnZUdyb3VwLmdldCgpOyB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuY3BwCmluZGV4IDMwNzYyMjRl NGQzOWIyMDBhMmUxM2FmYjU5MzY1ZWNmMTBmMzQ3MDcuLjBmN2RhNzlmZDJmNjA1NTY5NTI5MTNh MzliZDhiODVkY2I4YTdkNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByZWZl cmVuY2VzLmNwcApAQCAtMzQsMTIgKzM0LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIC8vIEZJ WE1FOiBNYW5pcHVsYXRpbmcgdGhpcyB2YXJpYWJsZSBpcyBub3QgdGhyZWFkIHNhZmUuCiAvLyBJ bnN0ZWFkIG9mIHRyYWNraW5nIHByaXZhdGUgYnJvd3Npbmcgc3RhdGUgYXMgYSBib29sZWFuIHBy ZWZlcmVuY2UsIHdlIHNob3VsZCBsZXQgdGhlIGNsaWVudCBwcm92aWRlIHN0b3JhZ2Ugc2Vzc2lv bnMgZXhwbGljaXRseS4KLXN0YXRpYyB1bnNpZ25lZCBwcml2YXRlQnJvd3NpbmdQYWdlR3JvdXBD b3VudDsKLQotV2ViUHJlZmVyZW5jZXM6OldlYlByZWZlcmVuY2VzKCkKLXsKLSAgICBwbGF0Zm9y bUluaXRpYWxpemVTdG9yZSgpOwotfQorc3RhdGljIHVuc2lnbmVkIHByaXZhdGVCcm93c2luZ1Bh Z2VDb3VudDsKIAogV2ViUHJlZmVyZW5jZXM6OldlYlByZWZlcmVuY2VzKGNvbnN0IFN0cmluZyYg aWRlbnRpZmllcikKICAgICA6IG1faWRlbnRpZmllcihpZGVudGlmaWVyKQpAQCAtNTUsNyArNTAs NyBAQCBXZWJQcmVmZXJlbmNlczo6V2ViUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXMm IG90aGVyKQogCiBXZWJQcmVmZXJlbmNlczo6fldlYlByZWZlcmVuY2VzKCkKIHsKLSAgICBBU1NF UlQobV9wYWdlR3JvdXBzLmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKG1fcGFnZXMuaXNFbXB0eSgp KTsKIH0KIAogUGFzc1JlZlB0cjxXZWJQcmVmZXJlbmNlcz4gV2ViUHJlZmVyZW5jZXM6OmNvcHko KSBjb25zdApAQCAtNjMsMzAgKzU4LDM1IEBAIFBhc3NSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IFdl YlByZWZlcmVuY2VzOjpjb3B5KCkgY29uc3QKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlBy ZWZlcmVuY2VzKCp0aGlzKSk7CiB9CiAKLXZvaWQgV2ViUHJlZmVyZW5jZXM6OmFkZFBhZ2VHcm91 cChXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCkKK3ZvaWQgV2ViUHJlZmVyZW5jZXM6OmFkZFBhZ2Uo V2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCiB7Ci0gICAgYm9vbCBkaWRBZGRQYWdlR3JvdXAg PSBtX3BhZ2VHcm91cHMuYWRkKHBhZ2VHcm91cCkuaXNOZXdFbnRyeTsKLSAgICBpZiAoZGlkQWRk UGFnZUdyb3VwICYmIHByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkgewotICAgICAgICBpZiAoIXBy aXZhdGVCcm93c2luZ1BhZ2VHcm91cENvdW50KQorICAgIEFTU0VSVCghbV9wYWdlcy5jb250YWlu cygmd2ViUGFnZVByb3h5KSk7CisgICAgbV9wYWdlcy5hZGQoJndlYlBhZ2VQcm94eSk7CisKKyAg ICBpZiAocHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKSB7CisgICAgICAgIGlmICghcHJpdmF0ZUJy b3dzaW5nUGFnZUNvdW50KQogICAgICAgICAgICAgV2ViQ29udGV4dDo6d2lsbFN0YXJ0VXNpbmdQ cml2YXRlQnJvd3NpbmcoKTsKLSAgICAgICAgKytwcml2YXRlQnJvd3NpbmdQYWdlR3JvdXBDb3Vu dDsKKworICAgICAgICArK3ByaXZhdGVCcm93c2luZ1BhZ2VDb3VudDsKICAgICB9CiB9CiAKLXZv aWQgV2ViUHJlZmVyZW5jZXM6OnJlbW92ZVBhZ2VHcm91cChXZWJQYWdlR3JvdXAqIHBhZ2VHcm91 cCkKK3ZvaWQgV2ViUHJlZmVyZW5jZXM6OnJlbW92ZVBhZ2UoV2ViUGFnZVByb3h5JiB3ZWJQYWdl UHJveHkpCiB7Ci0gICAgYm9vbCBkaWRSZW1vdmVQYWdlR3JvdXAgPSBtX3BhZ2VHcm91cHMucmVt b3ZlKHBhZ2VHcm91cCk7Ci0gICAgaWYgKGRpZFJlbW92ZVBhZ2VHcm91cCAmJiBwcml2YXRlQnJv d3NpbmdFbmFibGVkKCkpIHsKLSAgICAgICAgLS1wcml2YXRlQnJvd3NpbmdQYWdlR3JvdXBDb3Vu dDsKLSAgICAgICAgaWYgKCFwcml2YXRlQnJvd3NpbmdQYWdlR3JvdXBDb3VudCkKKyAgICBBU1NF UlQobV9wYWdlcy5jb250YWlucygmd2ViUGFnZVByb3h5KSk7CisgICAgbV9wYWdlcy5yZW1vdmUo JndlYlBhZ2VQcm94eSk7CisKKyAgICBpZiAocHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKSB7Cisg ICAgICAgIC0tcHJpdmF0ZUJyb3dzaW5nUGFnZUNvdW50OworICAgICAgICBpZiAoIXByaXZhdGVC cm93c2luZ1BhZ2VDb3VudCkKICAgICAgICAgICAgIFdlYkNvbnRleHQ6OndpbGxTdG9wVXNpbmdQ cml2YXRlQnJvd3NpbmcoKTsKICAgICB9CiB9CiAKIHZvaWQgV2ViUHJlZmVyZW5jZXM6OnVwZGF0 ZSgpCiB7Ci0gICAgZm9yIChIYXNoU2V0PFdlYlBhZ2VHcm91cCo+OjppdGVyYXRvciBpdCA9IG1f cGFnZUdyb3Vwcy5iZWdpbigpLCBlbmQgPSBtX3BhZ2VHcm91cHMuZW5kKCk7IGl0ICE9IGVuZDsg KytpdCkKLSAgICAgICAgKCppdCktPnByZWZlcmVuY2VzRGlkQ2hhbmdlKCk7CisgICAgZm9yIChh dXRvJiB3ZWJQYWdlUHJveHkgOiBtX3BhZ2VzKQorICAgICAgICB3ZWJQYWdlUHJveHktPnByZWZl cmVuY2VzRGlkQ2hhbmdlKCk7CiB9CiAKIHZvaWQgV2ViUHJlZmVyZW5jZXM6OnVwZGF0ZVN0cmlu Z1ZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlKQpAQCAt MTI4LDIyICsxMjgsMjIgQEAgdm9pZCBXZWJQcmVmZXJlbmNlczo6dXBkYXRlUHJpdmF0ZUJyb3dz aW5nVmFsdWUoYm9vbCB2YWx1ZSkKIHsKICAgICBwbGF0Zm9ybVVwZGF0ZUJvb2xWYWx1ZUZvcktl eShXZWJQcmVmZXJlbmNlc0tleTo6cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZEtleSgpLCB2YWx1ZSk7 CiAKLSAgICB1bnNpZ25lZCBwYWdlR3JvdXBzQ2hhbmdlZCA9IG1fcGFnZUdyb3Vwcy5zaXplKCk7 Ci0gICAgaWYgKCFwYWdlR3JvdXBzQ2hhbmdlZCkKKyAgICB1bnNpZ25lZCBwYWdlc0NoYW5nZWQg PSBtX3BhZ2VzLnNpemUoKTsKKyAgICBpZiAoIXBhZ2VzQ2hhbmdlZCkKICAgICAgICAgcmV0dXJu OwogCiAgICAgaWYgKHZhbHVlKSB7Ci0gICAgICAgIGlmICghcHJpdmF0ZUJyb3dzaW5nUGFnZUdy b3VwQ291bnQpCisgICAgICAgIGlmICghcHJpdmF0ZUJyb3dzaW5nUGFnZUNvdW50KQogICAgICAg ICAgICAgV2ViQ29udGV4dDo6d2lsbFN0YXJ0VXNpbmdQcml2YXRlQnJvd3NpbmcoKTsKLSAgICAg ICAgcHJpdmF0ZUJyb3dzaW5nUGFnZUdyb3VwQ291bnQgKz0gcGFnZUdyb3Vwc0NoYW5nZWQ7Cisg ICAgICAgIHByaXZhdGVCcm93c2luZ1BhZ2VDb3VudCArPSBwYWdlc0NoYW5nZWQ7CiAgICAgfQog CiAgICAgdXBkYXRlKCk7IC8vIEZJWE1FOiBPbmx5IHNlbmQgb3ZlciB0aGUgY2hhbmdlZCBrZXkg YW5kIHZhbHVlLgogCiAgICAgaWYgKCF2YWx1ZSkgewotICAgICAgICBBU1NFUlQocHJpdmF0ZUJy b3dzaW5nUGFnZUdyb3VwQ291bnQgPj0gcGFnZUdyb3Vwc0NoYW5nZWQpOwotICAgICAgICBwcml2 YXRlQnJvd3NpbmdQYWdlR3JvdXBDb3VudCAtPSBwYWdlR3JvdXBzQ2hhbmdlZDsKLSAgICAgICAg aWYgKCFwcml2YXRlQnJvd3NpbmdQYWdlR3JvdXBDb3VudCkKKyAgICAgICAgQVNTRVJUKHByaXZh dGVCcm93c2luZ1BhZ2VDb3VudCA+PSBwYWdlc0NoYW5nZWQpOworICAgICAgICBwcml2YXRlQnJv d3NpbmdQYWdlQ291bnQgLT0gcGFnZXNDaGFuZ2VkOworICAgICAgICBpZiAoIXByaXZhdGVCcm93 c2luZ1BhZ2VDb3VudCkKICAgICAgICAgICAgIFdlYkNvbnRleHQ6OndpbGxTdG9wVXNpbmdQcml2 YXRlQnJvd3NpbmcoKTsKICAgICB9CiB9CkBAIC0xNjYsOSArMTY2LDkgQEAgRk9SX0VBQ0hfV0VC S0lUX1BSRUZFUkVOQ0UoREVGSU5FX1BSRUZFUkVOQ0VfR0VUVEVSX0FORF9TRVRURVJTKQogCiAj dW5kZWYgREVGSU5FX1BSRUZFUkVOQ0VfR0VUVEVSX0FORF9TRVRURVJTCiAKLWJvb2wgV2ViUHJl ZmVyZW5jZXM6OmFueVBhZ2VHcm91cHNBcmVVc2luZ1ByaXZhdGVCcm93c2luZygpCitib29sIFdl YlByZWZlcmVuY2VzOjphbnlQYWdlc0FyZVVzaW5nUHJpdmF0ZUJyb3dzaW5nKCkKIHsKLSAgICBy ZXR1cm4gcHJpdmF0ZUJyb3dzaW5nUGFnZUdyb3VwQ291bnQ7CisgICAgcmV0dXJuIHByaXZhdGVC cm93c2luZ1BhZ2VDb3VudDsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJlZmVyZW5jZXMuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oCmluZGV4IDViYWVlYmMwMDQwYWExZjFiNmUx OTQwYTUzZTIzNTFmMDA3ZTJiMGYuLmRkNWUyZDE1YzY2YWJlYjFlNGJiZGIxZWJiZDg5Y2I0ZDI5 OTQ4ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNl cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcmVmZXJlbmNlcy5oCkBAIC0z OSwxNCArMzksMTAgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNzIFdlYlBhZ2VHcm91 cDsKK2NsYXNzIFdlYlBhZ2VQcm94eTsKIAogY2xhc3MgV2ViUHJlZmVyZW5jZXMgOiBwdWJsaWMg QVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpQcmVmZXJlbmNlcz4gewogcHVibGlj OgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBjcmVhdGUoKQotICAgIHsK LSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQcmVmZXJlbmNlcyk7Ci0gICAgfQogICAg IHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByZWZlcmVuY2VzPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBp ZGVudGlmaWVyKQogICAgIHsKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQcmVmZXJl bmNlcyhpZGVudGlmaWVyKSk7CkBAIC01Niw4ICs1Miw4IEBAIHB1YmxpYzoKIAogICAgIFBhc3NS ZWZQdHI8V2ViUHJlZmVyZW5jZXM+IGNvcHkoKSBjb25zdDsKIAotICAgIHZvaWQgYWRkUGFnZUdy b3VwKFdlYlBhZ2VHcm91cCopOwotICAgIHZvaWQgcmVtb3ZlUGFnZUdyb3VwKFdlYlBhZ2VHcm91 cCopOworICAgIHZvaWQgYWRkUGFnZShXZWJQYWdlUHJveHkmKTsKKyAgICB2b2lkIHJlbW92ZVBh Z2UoV2ViUGFnZVByb3h5Jik7CiAKICAgICBjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9y ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RvcmU7IH0KIApAQCAtNzIsMTAgKzY4LDkgQEAgcHVibGlj OgogICAgIC8vIEV4cG9zZWQgZm9yIFdlYktpdFRlc3RSdW5uZXIgdXNlIG9ubHkuCiAgICAgdm9p ZCBmb3JjZVVwZGF0ZSgpIHsgdXBkYXRlKCk7IH0KIAotICAgIHN0YXRpYyBib29sIGFueVBhZ2VH cm91cHNBcmVVc2luZ1ByaXZhdGVCcm93c2luZygpOworICAgIHN0YXRpYyBib29sIGFueVBhZ2Vz QXJlVXNpbmdQcml2YXRlQnJvd3NpbmcoKTsKIAogcHJpdmF0ZToKLSAgICBXZWJQcmVmZXJlbmNl cygpOwogICAgIGV4cGxpY2l0IFdlYlByZWZlcmVuY2VzKGNvbnN0IFN0cmluZyYpOwogICAgIFdl YlByZWZlcmVuY2VzKGNvbnN0IFdlYlByZWZlcmVuY2VzJik7CiAKQEAgLTk2LDkgKzkxLDEwIEBA IHByaXZhdGU6CiAKICAgICB2b2lkIHVwZGF0ZVByaXZhdGVCcm93c2luZ1ZhbHVlKGJvb2wgdmFs dWUpOwogCi0gICAgSGFzaFNldDxXZWJQYWdlR3JvdXAqPiBtX3BhZ2VHcm91cHM7Ci0gICAgV2Vi UHJlZmVyZW5jZXNTdG9yZSBtX3N0b3JlOwogICAgIFN0cmluZyBtX2lkZW50aWZpZXI7CisgICAg V2ViUHJlZmVyZW5jZXNTdG9yZSBtX3N0b3JlOworCisgICAgSGFzaFNldDxXZWJQYWdlUHJveHkq PiBtX3BhZ2VzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==