105751 2012-12-25 20:11:45 -0800 Convert WebKeyValueStorageManager and WebMediaCacheManager to MessageReceiver 2012-12-26 14:11:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam eric.carlson feature-media-reviews ossy webkit.review.bot oldest_to_newest 797219 0 sam 2012-12-25 20:11:45 -0800 Convert WebKeyValueStorageManager and WebMediaCacheManager to MessageReceiver 797220 1 180724 sam 2012-12-25 20:13:57 -0800 Created attachment 180724 Patch 797333 2 sam 2012-12-26 10:02:46 -0800 Committed r138479: <http://trac.webkit.org/changeset/138479> 797381 3 ossy 2012-12-26 14:11:36 -0800 (In reply to comment #2) > Committed r138479: <http://trac.webkit.org/changeset/138479> And a buildfix landed in https://trac.webkit.org/changeset/138485 180724 2012-12-25 20:13:57 -0800 2012-12-26 04:42:24 -0800 Patch bug-105751-20121225231109.patch text/plain 14136 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzODQ3MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDEyLTEyLTI1ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29udmVydCBXZWJLZXlWYWx1ZVN0b3Jh Z2VNYW5hZ2VyIGFuZCBXZWJNZWRpYUNhY2hlTWFuYWdlciB0byBNZXNzYWdlUmVjZWl2ZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNTc1MQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OldlYktleVZhbHVlU3RvcmFnZU1h bmFnZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkaXNw YXRjaERpZEdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJL ZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpnZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKToKKyAgICAg ICAgKFdlYktpdDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmllc0Zvck9y aWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0 ZUFsbEVudHJpZXMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvS2V5VmFsdWVTdG9yYWdlL1dlYktl eVZhbHVlU3RvcmFnZU1hbmFnZXIuaDoKKyAgICAgICAgKFdlYktleVZhbHVlU3RvcmFnZU1hbmFn ZXIpOiBSZW1vdmUgdW51c2VkIG1fb3JpZ2luc0xvYWRlZCBtZW1iZXIgdmFyaWFibGUuCisgICAg ICAgICogV2ViUHJvY2Vzcy9NZWRpYUNhY2hlL1dlYk1lZGlhQ2FjaGVNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViTWVkaWFDYWNoZU1hbmFnZXI6OldlYk1lZGlhQ2FjaGVNYW5hZ2Vy KToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFDYWNoZU1hbmFnZXI6OmdldEhvc3RuYW1lc1dp dGhNZWRpYUNhY2hlKToKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFDYWNoZU1hbmFnZXI6OmNs ZWFyQ2FjaGVGb3JIb3N0bmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhQ2FjaGVNYW5h Z2VyOjpjbGVhckNhY2hlRm9yQWxsSG9zdG5hbWVzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL01l ZGlhQ2FjaGUvV2ViTWVkaWFDYWNoZU1hbmFnZXIuaDoKKyAgICAgICAgKFdlYk1lZGlhQ2FjaGVN YW5hZ2VyKToKKyAgICAgICAgQ29udmVydCB0aGUgbWFuYWdlcnMgdG8gTWVzc2FnZVJlY2VpdmVy LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzczo6V2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6 OmluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6ZGlk UmVjZWl2ZU1lc3NhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5oOgorICAg ICAgICAoV2ViUHJvY2Vzcyk6CisgICAgICAgIEFkZCB0aGUgbmV3IG1hbmFnZXJzLgorCiAyMDEy LTEyLTI1ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IHRoZSBE YXRhYmFzZSBtYW5hZ2VyIGFzc2VydCwgYWdhaW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlByb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDEzODQ3MSkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MSw2ICsxNTEs OCBAQCBXZWJQcm9jZXNzOjpXZWJQcm9jZXNzKCkKICAgICAsIG1fYXBwbGljYXRpb25DYWNoZU1h bmFnZXIobmV3IFdlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyKHRoaXMpKQogICAgICwgbV9yZXNv dXJjZUNhY2hlTWFuYWdlcihuZXcgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXIodGhpcykpCiAgICAg LCBtX2Nvb2tpZU1hbmFnZXIobmV3IFdlYkNvb2tpZU1hbmFnZXIodGhpcykpCisgICAgLCBtX2tl eVZhbHVlU3RvcmFnZU1hbmFnZXIobmV3IFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXIodGhpcykp CisgICAgLCBtX21lZGlhQ2FjaGVNYW5hZ2VyKG5ldyBXZWJNZWRpYUNhY2hlTWFuYWdlcih0aGlz KSkKICAgICAsIG1fYXV0aGVudGljYXRpb25NYW5hZ2VyKG5ldyBBdXRoZW50aWNhdGlvbk1hbmFn ZXIodGhpcykpCiAjaWYgRU5BQkxFKFNRTF9EQVRBQkFTRSkKICAgICAsIG1fZGF0YWJhc2VNYW5h Z2VyKG5ldyBXZWJEYXRhYmFzZU1hbmFnZXIodGhpcykpCkBAIC0yNjAsNyArMjYyLDcgQEAgdm9p ZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2VzcyhjbwogICAgIG1faWNvbkRhdGFiYXNl UHJveHktPnNldEVuYWJsZWQocGFyYW1ldGVycy5pY29uRGF0YWJhc2VFbmFibGVkKTsKICNlbmRp ZgogCi0gICAgU3RvcmFnZVRyYWNrZXI6OmluaXRpYWxpemVUcmFja2VyKHBhcmFtZXRlcnMubG9j YWxTdG9yYWdlRGlyZWN0b3J5LCAmV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6c2hhcmVkKCkp OworICAgIFN0b3JhZ2VUcmFja2VyOjppbml0aWFsaXplVHJhY2tlcihwYXJhbWV0ZXJzLmxvY2Fs U3RvcmFnZURpcmVjdG9yeSwgbV9rZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyKTsKICAgICBtX2xvY2Fs U3RvcmFnZURpcmVjdG9yeSA9IHBhcmFtZXRlcnMubG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogCiAg ICAgaWYgKCFwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkuaXNFbXB0eSgpKQpA QCAtNjQ1LDE2ICs2NDcsNiBAQCB2b2lkIFdlYlByb2Nlc3M6OmRpZFJlY2VpdmVNZXNzYWdlKENv cmVJCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJ UEM6Ok1lc3NhZ2VDbGFzc1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI+KCkpIHsKLSAgICAgICAg V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6c2hhcmVkKCkuZGlkUmVjZWl2ZU1lc3NhZ2UoY29u bmVjdGlvbiwgbWVzc2FnZUlELCBkZWNvZGVyKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQot ICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzV2ViTWVkaWFDYWNoZU1h bmFnZXI+KCkpIHsKLSAgICAgICAgV2ViTWVkaWFDYWNoZU1hbmFnZXI6OnNoYXJlZCgpLmRpZFJl Y2VpdmVNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgZGVjb2Rlcik7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0KICAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFz c1dlYlBhZ2VHcm91cFByb3h5PigpKSB7CiAgICAgICAgIHVpbnQ2NF90IHBhZ2VHcm91cElEID0g ZGVjb2Rlci5kZXN0aW5hdGlvbklEKCk7CiAgICAgICAgIGlmICghcGFnZUdyb3VwSUQpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNpb24gMTM4NDY2KQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgJKHdvcmtpbmcgY29weSkK QEAgLTgyLDYgKzgyLDggQEAgY2xhc3MgV2ViQ29va2llTWFuYWdlcjsKIGNsYXNzIFdlYkZyYW1l OwogY2xhc3MgV2ViR2VvbG9jYXRpb25NYW5hZ2VyOwogY2xhc3MgV2ViSWNvbkRhdGFiYXNlUHJv eHk7CitjbGFzcyBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOworY2xhc3MgV2ViTWVkaWFDYWNo ZU1hbmFnZXI7CiBjbGFzcyBXZWJQYWdlOwogY2xhc3MgV2ViUGFnZUdyb3VwUHJveHk7CiBjbGFz cyBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjsKQEAgLTM4MCw2ICszODIsOCBAQCBwcml2YXRlOgog ICAgIFdlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyKiBtX2FwcGxpY2F0aW9uQ2FjaGVNYW5hZ2Vy OwogICAgIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyKiBtX3Jlc291cmNlQ2FjaGVNYW5hZ2VyOwog ICAgIFdlYkNvb2tpZU1hbmFnZXIqIG1fY29va2llTWFuYWdlcjsKKyAgICBXZWJLZXlWYWx1ZVN0 b3JhZ2VNYW5hZ2VyKiBtX2tleVZhbHVlU3RvcmFnZU1hbmFnZXI7CisgICAgV2ViTWVkaWFDYWNo ZU1hbmFnZXIqIG1fbWVkaWFDYWNoZU1hbmFnZXI7CiAgICAgQXV0aGVudGljYXRpb25NYW5hZ2Vy KiBtX2F1dGhlbnRpY2F0aW9uTWFuYWdlcjsKICNpZiBFTkFCTEUoU1FMX0RBVEFCQVNFKQogICAg IFdlYkRhdGFiYXNlTWFuYWdlciogbV9kYXRhYmFzZU1hbmFnZXI7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0tleVZhbHVlU3RvcmFnZS9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0tleVZhbHVlU3Rv cmFnZS9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcAkocmV2aXNpb24gMTM4NDY1KQorKysg U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDExICsyNiwxMCBAQAogI2luY2x1 ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXIuaCIKIAot I2luY2x1ZGUgIk1lc3NhZ2VJRC5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luRGF0YS5oIgor I2luY2x1ZGUgIldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJNZXNzYWdlcy5oIgogI2luY2x1ZGUg IldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2Vi UHJvY2Vzcy5oIgotCiAjaW5jbHVkZSA8V2ViQ29yZS9TZWN1cml0eU9yaWdpbi5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW5IYXNoLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TdG9y YWdlVHJhY2tlci5oPgpAQCAtMzksMTQgKzM4LDEwIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlciYgV2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6c2hhcmVkKCkKLXsKLSAgICBzdGF0aWMgV2ViS2V5VmFs dWVTdG9yYWdlTWFuYWdlciYgc2hhcmVkID0gKm5ldyBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy OwotICAgIHJldHVybiBzaGFyZWQ7Ci19Ci0KLVdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6Oldl YktleVZhbHVlU3RvcmFnZU1hbmFnZXIoKQorV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6V2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlcihXZWJQcm9jZXNzKiBwcm9jZXNzKQorICAgIDogbV9wcm9j ZXNzKHByb2Nlc3MpCiB7CisgICAgbV9wcm9jZXNzLT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn ZXM6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhp cyk7CiB9CiAKIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGlkUmVjZWl2ZU1lc3Nh Z2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1l c3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCkBAIC03NiwxNCArNzEs MTQgQEAgc3RhdGljIHZvaWQga2V5VmFsdWVTdG9yYWdlT3JpZ2luSWRlbnRpZgogICAgIH0KIH0K IAotc3RhdGljIHZvaWQgZGlzcGF0Y2hEaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKGNvbnN0 IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JiBpZGVudGlmaWVycywgdWludDY0X3QgY2FsbGJh Y2tJRCkKK3ZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGlzcGF0Y2hEaWRHZXRLZXlW YWx1ZVN0b3JhZ2VPcmlnaW5zKGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JiBpZGVu dGlmaWVycywgdWludDY0X3QgY2FsbGJhY2tJRCkKIHsKLSAgICBXZWJQcm9jZXNzOjpzaGFyZWQo KS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQ cm94eTo6RGlkR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyhpZGVudGlmaWVycywgY2FsbGJhY2tJ RCksIDApOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViS2V5VmFsdWVTdG9yYWdl TWFuYWdlclByb3h5OjpEaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKGlkZW50aWZpZXJzLCBj YWxsYmFja0lEKSwgMCk7CiB9CiAKIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6Z2V0 S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyh1aW50NjRfdCBjYWxsYmFja0lEKQogewotICAgIFdlYlBy b2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKFdlYlBy b2Nlc3M6OnNoYXJlZCgpKTsKKyAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNh YmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX3Byb2Nlc3MpOwogCiAgICAgaWYgKCFTdG9yYWdl VHJhY2tlcjo6dHJhY2tlcigpLm9yaWdpbnNMb2FkZWQoKSkgewogICAgICAgICBtX29yaWdpbnNS ZXF1ZXN0Q2FsbGJhY2tJRHMuYXBwZW5kKGNhbGxiYWNrSUQpOwpAQCAtMTE1LDcgKzExMCw3IEBA IHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGlzcGF0Y2gKIAogdm9pZCBXZWJLZXlW YWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKGNvbnN0IFNlY3VyaXR5 T3JpZ2luRGF0YSYgb3JpZ2luRGF0YSkKIHsKLSAgICBXZWJQcm9jZXNzOjpMb2NhbFRlcm1pbmF0 aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcihXZWJQcm9jZXNzOjpzaGFyZWQoKSk7Cisg ICAgQ2hpbGRQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNh YmxlcigqbV9wcm9jZXNzKTsKIAogICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4gb3JpZ2luID0g U2VjdXJpdHlPcmlnaW46OmNyZWF0ZShvcmlnaW5EYXRhLnByb3RvY29sLCBvcmlnaW5EYXRhLmhv c3QsIG9yaWdpbkRhdGEucG9ydCk7CiAgICAgaWYgKCFvcmlnaW4pCkBAIC0xMjYsNyArMTIxLDcg QEAgdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbgogCiB2b2lkIFdlYktl eVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbEVudHJpZXMoKQogewotICAgIFdlYlByb2Nl c3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKFdlYlByb2Nl c3M6OnNoYXJlZCgpKTsKKyAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxl ciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX3Byb2Nlc3MpOwogICAgIFN0b3JhZ2VUcmFja2VyOjp0 cmFja2VyKCkuZGVsZXRlQWxsT3JpZ2lucygpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0tleVZhbHVlU3RvcmFnZS9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlci5oCShyZXZpc2lvbiAxMzg0NjUpCisrKyBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0tleVZhbHVlU3RvcmFnZS9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDQzICsyNiwzOCBAQAogI2lmbmRlZiBXZWJLZXlWYWx1 ZVN0b3JhZ2VNYW5hZ2VyX2gKICNkZWZpbmUgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcl9oCiAK KyNpbmNsdWRlICJNZXNzYWdlUmVjZWl2ZXIuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1N0b3JhZ2VU cmFja2VyQ2xpZW50Lmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+Ci0jaW5jbHVkZSA8 d3RmL3RleHQvV1RGU3RyaW5nLmg+Ci0KLW5hbWVzcGFjZSBDb3JlSVBDIHsKLWNsYXNzIENvbm5l Y3Rpb247Ci1jbGFzcyBNZXNzYWdlRGVjb2RlcjsKLWNsYXNzIE1lc3NhZ2VJRDsKLX0KKyNpbmNs dWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJQcm9j ZXNzOwogc3RydWN0IFNlY3VyaXR5T3JpZ2luRGF0YTsKIAotY2xhc3MgV2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlciA6IHB1YmxpYyBXZWJDb3JlOjpTdG9yYWdlVHJhY2tlckNsaWVudCB7CitjbGFz cyBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyIDogcHVibGljIFdlYkNvcmU6OlN0b3JhZ2VUcmFj a2VyQ2xpZW50LCBwcml2YXRlIENvcmVJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiAgICAgV1RGX01B S0VfTk9OQ09QWUFCTEUoV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcik7Ci0KIHB1YmxpYzoKLSAg ICBzdGF0aWMgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlciYgc2hhcmVkKCk7Ci0KLSAgICB2b2lk IGRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdl SUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CisgICAgZXhwbGljaXQgV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlcihXZWJQcm9jZXNzKik7CiAKIHByaXZhdGU6Ci0gICAgV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlcigpOwotICAgIAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQ Qzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29k ZXImKSBPVkVSUklERTsKKyAgICB2b2lkIGRpZFJlY2VpdmVXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3Jl SVBDOjpNZXNzYWdlRGVjb2RlciYpOworCiAgICAgdm9pZCBnZXRLZXlWYWx1ZVN0b3JhZ2VPcmln aW5zKHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogICAgIHZvaWQgZGVsZXRlRW50cmllc0Zvck9yaWdp bihjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmKTsKICAgICB2b2lkIGRlbGV0ZUFsbEVudHJpZXMo KTsKIAorICAgIHZvaWQgZGlzcGF0Y2hEaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKGNvbnN0 IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JiBpZGVudGlmaWVycywgdWludDY0X3QgY2FsbGJh Y2tJRCk7CisKICAgICAvLyBXZWJDb3JlOjpTdG9yYWdlVHJhY2tlckNsaWVudAogICAgIHZpcnR1 YWwgdm9pZCBkaXNwYXRjaERpZE1vZGlmeU9yaWdpbihjb25zdCBTdHJpbmcmKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZ09yaWdpbnMoKSBPVkVSUklERTsKIAot ICAgIHZvaWQgZGlkUmVjZWl2ZVdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJNZXNzYWdlKENvcmVJ UEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNv ZGVyJik7Ci0KICAgICBWZWN0b3I8dWludDY0X3Q+IG1fb3JpZ2luc1JlcXVlc3RDYWxsYmFja0lE czsKLSAgICBib29sIG1fb3JpZ2luc0xvYWRlZDsKKworICAgIFdlYlByb2Nlc3MqIG1fcHJvY2Vz czsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9NZWRpYUNhY2hlL1dlYk1lZGlhQ2FjaGVNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL01lZGlhQ2FjaGUvV2ViTWVkaWFDYWNoZU1hbmFn ZXIuY3BwCShyZXZpc2lvbiAxMzg0NjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL01l ZGlhQ2FjaGUvV2ViTWVkaWFDYWNoZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw4 ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViTWVkaWFDYWNoZU1h bmFnZXIuaCIKIAotI2luY2x1ZGUgIk1lc3NhZ2VJRC5oIgotI2luY2x1ZGUgIlNlY3VyaXR5T3Jp Z2luRGF0YS5oIgorI2luY2x1ZGUgIldlYk1lZGlhQ2FjaGVNYW5hZ2VyTWVzc2FnZXMuaCIKICNp bmNsdWRlICJXZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJX ZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MTWVkaWFFbGVtZW50Lmg+CkBAIC0z NiwxNCArMzUsMTAgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1XZWJNZWRpYUNhY2hlTWFuYWdlciYgV2ViTWVkaWFDYWNoZU1hbmFnZXI6OnNoYXJl ZCgpCi17Ci0gICAgc3RhdGljIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyJiBzaGFyZWQgPSAqbmV3IFdl Yk1lZGlhQ2FjaGVNYW5hZ2VyOwotICAgIHJldHVybiBzaGFyZWQ7Ci19Ci0KLVdlYk1lZGlhQ2Fj aGVNYW5hZ2VyOjpXZWJNZWRpYUNhY2hlTWFuYWdlcigpCitXZWJNZWRpYUNhY2hlTWFuYWdlcjo6 V2ViTWVkaWFDYWNoZU1hbmFnZXIoV2ViUHJvY2VzcyogcHJvY2VzcykKKyAgICA6IG1fcHJvY2Vz cyhwcm9jZXNzKQogeworICAgIG1fcHJvY2Vzcy0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJNZWRpYUNhY2hlTWFuYWdlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0aGlzKTsKIH0K IAogdm9pZCBXZWJNZWRpYUNhY2hlTWFuYWdlcjo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6 Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29y ZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCkBAIC01Myw3ICs0OCw3IEBAIHZvaWQgV2Vi TWVkaWFDYWNoZU1hbmFnZXI6OmRpZFJlY2VpdmVNZXMKIAogdm9pZCBXZWJNZWRpYUNhY2hlTWFu YWdlcjo6Z2V0SG9zdG5hbWVzV2l0aE1lZGlhQ2FjaGUodWludDY0X3QgY2FsbGJhY2tJRCkKIHsK LSAgICBXZWJQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNh YmxlcihXZWJQcm9jZXNzOjpzaGFyZWQoKSk7CisgICAgQ2hpbGRQcm9jZXNzOjpMb2NhbFRlcm1p bmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcigqbV9wcm9jZXNzKTsKIAogICAgIFZl Y3RvcjxTdHJpbmc+IG1lZGlhQ2FjaGVIb3N0bmFtZXM7CiAKQEAgLTYxLDEyICs1NiwxMiBAQCB2 b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyOjpnZXRIb3N0bmFtZXNXCiAgICAgSFRNTE1lZGlhRWxl bWVudDo6Z2V0U2l0ZXNJbk1lZGlhQ2FjaGUobWVkaWFDYWNoZUhvc3RuYW1lcyk7CiAjZW5kaWYK IAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6 V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTo6RGlkR2V0SG9zdG5hbWVzV2l0aE1lZGlhQ2FjaGUo bWVkaWFDYWNoZUhvc3RuYW1lcywgY2FsbGJhY2tJRCksIDApOworICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTo6RGlkR2V0SG9zdG5hbWVzV2l0 aE1lZGlhQ2FjaGUobWVkaWFDYWNoZUhvc3RuYW1lcywgY2FsbGJhY2tJRCksIDApOwogfQogCiB2 b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyOjpjbGVhckNhY2hlRm9ySG9zdG5hbWUoY29uc3QgU3Ry aW5nJiBob3N0bmFtZSkKIHsKLSAgICBXZWJQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJs ZXIgdGVybWluYXRpb25EaXNhYmxlcihXZWJQcm9jZXNzOjpzaGFyZWQoKSk7CisgICAgQ2hpbGRQ cm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcigqbV9w cm9jZXNzKTsKIAogI2lmIEVOQUJMRShWSURFTykKICAgICBIVE1MTWVkaWFFbGVtZW50OjpjbGVh ck1lZGlhQ2FjaGVGb3JTaXRlKGhvc3RuYW1lKTsKQEAgLTc1LDcgKzcwLDcgQEAgdm9pZCBXZWJN ZWRpYUNhY2hlTWFuYWdlcjo6Y2xlYXJDYWNoZUZvcgogCiB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5h Z2VyOjpjbGVhckNhY2hlRm9yQWxsSG9zdG5hbWVzKCkKIHsKLSAgICBXZWJQcm9jZXNzOjpMb2Nh bFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcihXZWJQcm9jZXNzOjpzaGFy ZWQoKSk7CisgICAgQ2hpbGRQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWlu YXRpb25EaXNhYmxlcigqbV9wcm9jZXNzKTsKIAogI2lmIEVOQUJMRShWSURFTykKICAgICBIVE1M TWVkaWFFbGVtZW50OjpjbGVhck1lZGlhQ2FjaGUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvTWVkaWFDYWNoZS9XZWJNZWRpYUNhY2hlTWFuYWdlci5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTWVkaWFDYWNoZS9XZWJNZWRpYUNhY2hlTWFuYWdl ci5oCShyZXZpc2lvbiAxMzg0NjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL01lZGlh Q2FjaGUvV2ViTWVkaWFDYWNoZU1hbmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsMzMgKzI2 LDI4IEBACiAjaWZuZGVmIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyX2gKICNkZWZpbmUgV2ViTWVkaWFD YWNoZU1hbmFnZXJfaAogCisjaW5jbHVkZSAiTWVzc2FnZVJlY2VpdmVyLmgiCisjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KLSNpbmNsdWRlIDx3 dGYvdGV4dC9XVEZTdHJpbmcuaD4KLQotbmFtZXNwYWNlIENvcmVJUEMgewotY2xhc3MgQ29ubmVj dGlvbjsKLWNsYXNzIE1lc3NhZ2VEZWNvZGVyOwotY2xhc3MgTWVzc2FnZUlEOwotfQogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIAotY2xhc3MgV2ViTWVkaWFDYWNoZU1hbmFnZXIgewotICAgIFdURl9N QUtFX05PTkNPUFlBQkxFKFdlYk1lZGlhQ2FjaGVNYW5hZ2VyKTsKK2NsYXNzIFdlYlByb2Nlc3M7 CiAKK2NsYXNzIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyIDogcHJpdmF0ZSBDb3JlSVBDOjpNZXNzYWdl UmVjZWl2ZXIgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFdlYk1lZGlhQ2FjaGVNYW5hZ2Vy KTsKIHB1YmxpYzoKLSAgICBzdGF0aWMgV2ViTWVkaWFDYWNoZU1hbmFnZXImIHNoYXJlZCgpOwot Ci0gICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQ Qzo6TWVzc2FnZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYpOworICAgIGV4cGxpY2l0IFdl Yk1lZGlhQ2FjaGVNYW5hZ2VyKFdlYlByb2Nlc3MqKTsKIAogcHJpdmF0ZToKLSAgICBXZWJNZWRp YUNhY2hlTWFuYWdlcigpOwotICAgIAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQ Qzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29k ZXImKSBPVkVSUklERTsKKyAgICB2b2lkIGRpZFJlY2VpdmVXZWJNZWRpYUNhY2hlTWFuYWdlck1l c3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6 TWVzc2FnZURlY29kZXImKTsKKwogICAgIHZvaWQgZ2V0SG9zdG5hbWVzV2l0aE1lZGlhQ2FjaGUo dWludDY0X3QgY2FsbGJhY2tJRCk7CiAgICAgdm9pZCBjbGVhckNhY2hlRm9ySG9zdG5hbWUoY29u c3QgU3RyaW5nJik7CiAgICAgdm9pZCBjbGVhckNhY2hlRm9yQWxsSG9zdG5hbWVzKCk7CiAKLSAg ICB2b2lkIGRpZFJlY2VpdmVXZWJNZWRpYUNhY2hlTWFuYWdlck1lc3NhZ2UoQ29yZUlQQzo6Q29u bmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImKTsK KyAgICBXZWJQcm9jZXNzKiBtX3Byb2Nlc3M7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK