56887 2011-03-22 18:27:51 -0700 Add asynchronous load decision call to WebKit2 IconDatabase 2011-03-23 10:26:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 beidson beidson oldest_to_newest 371892 0 beidson 2011-03-22 18:27:51 -0700 Add asynchronous load decision call to WebKit2 IconDatabase 371893 1 86555 beidson 2011-03-22 18:31:52 -0700 Created attachment 86555 Patch 372230 2 86555 sam 2011-03-23 10:08:05 -0700 Comment on attachment 86555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86555&action=review > Source/WebKit2/UIProcess/WebIconDatabase.cpp:97 > + m_webContext->process()->send(Messages::WebIconDatabaseProxy::ReceivedIconLoadDecision((int)WebCore::IconLoadNo, callbackID), 0); Please use a static_cast. 372241 3 beidson 2011-03-23 10:26:39 -0700 Committed r81782: <http://trac.webkit.org/changeset/81782> 86555 2011-03-22 18:31:52 -0700 2011-03-23 10:08:05 -0700 Patch bug-56887-20110322183150.patch text/plain 11739 beidson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNzQwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDMtMjIgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBhc3luY2hyb25vdXMgbG9hZCBkZWNpc2lvbiBjYWxsIHRv IFdlYktpdDIgSWNvbkRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01Njg4NworCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisg ICAgICAgIENsZWFyIHRoZSBjYWxsYmFjayB3aGVuIGl0J3MgbWFkZToKKyAgICAgICAgKiBsb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6 OmNvbnRpbnVlSWNvbkxvYWRXaXRoRGVjaXNpb24pOgorCisgICAgICAgIERvbid0IGxvYWQgaWNv bnMgd2hlbiB1c2luZyBuZXctc3R5bGUgaWNvbiBkYXRhYmFzZSBpZiBpbiBwcml2YXRlIGJyb3dz aW5nOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6Y29udGludWVJY29uTG9hZFdpdGhEZWNpc2lvbik6CisgICAgICAgIAor ICAgICAgICBFbmhhbmNlIHRoZSBJY29uRGF0YWJhc2UgY2FsbGJhY2tzIHRvIGhhdmUgYW4gSUQg YW5kIGluaGVyaXQgZnJvbSBhIGNvbW1vbiBiYXNlOgorICAgICAgICAqIGxvYWRlci9pY29uL0lj b25EYXRhYmFzZUJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbGxiYWNrQmFzZTo6fkNhbGxi YWNrQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWxsYmFja0Jhc2U6OmNhbGxiYWNrSUQpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FsbGJhY2tCYXNlOjpDYWxsYmFja0Jhc2UpOgorICAgICAgICAo V2ViQ29yZTo6Q2FsbGJhY2tCYXNlOjpjb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkNhbGxi YWNrQmFzZTo6Z2VuZXJhdGVDYWxsYmFja0lEKToKKyAgICAgICAgKFdlYkNvcmU6OkVudW1DYWxs YmFjazo6cGVyZm9ybUNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkVudW1DYWxsYmFjazo6 RW51bUNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Ok9iamVjdENhbGxiYWNrOjpwZXJmb3Jt Q2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6T2JqZWN0Q2FsbGJhY2s6Ok9iamVjdENhbGxi YWNrKToKKwogMjAxMS0wMy0yMiAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAJKHJldmlzaW9uIDgxNzE4KQorKysgU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODU4 LDYgKzg1OCw4IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmdldEljb25Mb2FkRGVjaXNpb24KIAog dm9pZCBEb2N1bWVudExvYWRlcjo6Y29udGludWVJY29uTG9hZFdpdGhEZWNpc2lvbihJY29uTG9h ZERlY2lzaW9uIGRlY2lzaW9uKQogeworICAgIEFTU0VSVChtX2ljb25Mb2FkRGVjaXNpb25DYWxs YmFjayk7CisgICAgbV9pY29uTG9hZERlY2lzaW9uQ2FsbGJhY2sgPSAwOwogICAgIGlmIChtX2Zy YW1lKQogICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+Y29udGludWVJY29uTG9hZFdpdGhEZWNp c2lvbihkZWNpc2lvbik7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAJKHJldmlzaW9uIDgxNzE4KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzQzLDYgKzc0MywxMCBAQCB2b2lkIEZyYW1lTG9hZGVy Ojpjb250aW51ZUljb25Mb2FkV2l0aERlCiB7CiAgICAgQVNTRVJUKGljb25Mb2FkRGVjaXNpb24g IT0gSWNvbkxvYWRVbmtub3duKTsKICAgICAKKyAgICAvLyAgRklYTUUgKDxyZGFyOi8vcHJvYmxl bS85MTY4NjA1PikgLSBXZSBzaG91bGQgc3VwcG9ydCBpbi1tZW1vcnktb25seSBwcml2YXRlIGJy b3dzaW5nIGljb25zIGluIGFzeW5jaHJvbm91cyBpY29uIGRhdGFiYXNlIG1vZGUuCisgICAgaWYg KGljb25EYXRhYmFzZSgpLnN1cHBvcnRzQXN5bmNocm9ub3VzTW9kZSgpICYmIG1fZnJhbWUtPnBh Z2UoKS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKQorICAgICAgICByZXR1 cm47CisgICAgICAgIAogICAgIGlmIChpY29uTG9hZERlY2lzaW9uID09IEljb25Mb2FkTm8pIHsK ICAgICAgICAgS1VSTCB1cmwoaWNvblVSTCgpKTsKICAgICAgICAgU3RyaW5nIHVybFN0cmluZyh1 cmwuc3RyaW5nKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlQmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25E YXRhYmFzZUJhc2UuaAkocmV2aXNpb24gODE3MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv aWNvbi9JY29uRGF0YWJhc2VCYXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDggKzQ1LDM2IEBA IGVudW0gSWNvbkxvYWREZWNpc2lvbiB7CiAgICAgSWNvbkxvYWRVbmtub3duCiB9OwogCitjbGFz cyBDYWxsYmFja0Jhc2UgOiBwdWJsaWMgUmVmQ291bnRlZDxDYWxsYmFja0Jhc2U+IHsKK3B1Ymxp YzoKKyAgICB2aXJ0dWFsIH5DYWxsYmFja0Jhc2UoKQorICAgIHsKKyAgICB9CisKKyAgICB1aW50 NjRfdCBjYWxsYmFja0lEKCkgY29uc3QgeyByZXR1cm4gbV9jYWxsYmFja0lEOyB9CisKK3Byb3Rl Y3RlZDoKKyAgICBDYWxsYmFja0Jhc2Uodm9pZCogY29udGV4dCkKKyAgICAgICAgOiBtX2NvbnRl eHQoY29udGV4dCkKKyAgICAgICAgLCBtX2NhbGxiYWNrSUQoZ2VuZXJhdGVDYWxsYmFja0lEKCkp CisgICAgeworICAgIH0KKworICAgIHZvaWQqIGNvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2Nv bnRleHQ7IH0KKworcHJpdmF0ZToKKyAgICBzdGF0aWMgdWludDY0X3QgZ2VuZXJhdGVDYWxsYmFj a0lEKCkKKyAgICB7CisgICAgICAgIHN0YXRpYyB1aW50NjRfdCB1bmlxdWVDYWxsYmFja0lEID0g MTsKKyAgICAgICAgcmV0dXJuIHVuaXF1ZUNhbGxiYWNrSUQrKzsKKyAgICB9CisKKyAgICB2b2lk KiBtX2NvbnRleHQ7CisgICAgdWludDY0X3QgbV9jYWxsYmFja0lEOworfTsKKwogdGVtcGxhdGU8 dHlwZW5hbWUgRW51bVR5cGU+IAotY2xhc3MgRW51bUNhbGxiYWNrIDogcHVibGljIFJlZkNvdW50 ZWQ8RW51bUNhbGxiYWNrPEVudW1UeXBlPiA+IHsKK2NsYXNzIEVudW1DYWxsYmFjayA6IHB1Ymxp YyBDYWxsYmFja0Jhc2UgewogcHVibGljOgogICAgIHR5cGVkZWYgdm9pZCAoKkNhbGxiYWNrRnVu Y3Rpb24pKEVudW1UeXBlLCB2b2lkKik7CiAKQEAgLTYzLDcgKzkxLDcgQEAgcHVibGljOgogICAg IHZvaWQgcGVyZm9ybUNhbGxiYWNrKEVudW1UeXBlIHJlc3VsdCkKICAgICB7CiAgICAgICAgIEFT U0VSVChtX2NhbGxiYWNrKTsKLSAgICAgICAgbV9jYWxsYmFjayhyZXN1bHQsIG1fY29udGV4dCk7 CisgICAgICAgIG1fY2FsbGJhY2socmVzdWx0LCBjb250ZXh0KCkpOwogICAgICAgICBtX2NhbGxi YWNrID0gMDsKICAgICB9CiAgICAgCkBAIC03NSwxNyArMTAzLDE2IEBAIHB1YmxpYzoKIAogcHJp dmF0ZToKICAgICBFbnVtQ2FsbGJhY2sodm9pZCogY29udGV4dCwgQ2FsbGJhY2tGdW5jdGlvbiBj YWxsYmFjaykKLSAgICAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKKyAgICAgICAgOiBDYWxsYmFj a0Jhc2UoY29udGV4dCkKICAgICAgICAgLCBtX2NhbGxiYWNrKGNhbGxiYWNrKQogICAgIHsKICAg ICB9CiAKLSAgICB2b2lkKiBtX2NvbnRleHQ7CiAgICAgQ2FsbGJhY2tGdW5jdGlvbiBtX2NhbGxi YWNrOwogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgT2JqZWN0VHlwZT4gCi1jbGFzcyBPYmplY3RD YWxsYmFjayA6IHB1YmxpYyBSZWZDb3VudGVkPE9iamVjdENhbGxiYWNrPE9iamVjdFR5cGU+ID4g eworY2xhc3MgT2JqZWN0Q2FsbGJhY2sgOiBwdWJsaWMgQ2FsbGJhY2tCYXNlIHsKIHB1YmxpYzoK ICAgICB0eXBlZGVmIHZvaWQgKCpDYWxsYmFja0Z1bmN0aW9uKShPYmplY3RUeXBlLCB2b2lkKik7 CiAKQEAgLTEwMiw3ICsxMjksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwZXJmb3JtQ2FsbGJhY2so T2JqZWN0VHlwZSByZXN1bHQpCiAgICAgewogICAgICAgICBBU1NFUlQobV9jYWxsYmFjayk7Ci0g ICAgICAgIG1fY2FsbGJhY2socmVzdWx0LCBtX2NvbnRleHQpOworICAgICAgICBtX2NhbGxiYWNr KHJlc3VsdCwgY29udGV4dCgpKTsKICAgICAgICAgbV9jYWxsYmFjayA9IDA7CiAgICAgfQogICAg IApAQCAtMTE0LDEyICsxNDEsMTEgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIE9iamVjdENh bGxiYWNrKHZvaWQqIGNvbnRleHQsIENhbGxiYWNrRnVuY3Rpb24gY2FsbGJhY2spCi0gICAgICAg IDogbV9jb250ZXh0KGNvbnRleHQpCisgICAgICAgIDogQ2FsbGJhY2tCYXNlKGNvbnRleHQpCiAg ICAgICAgICwgbV9jYWxsYmFjayhjYWxsYmFjaykKICAgICB7CiAgICAgfQogCi0gICAgdm9pZCog bV9jb250ZXh0OwogICAgIENhbGxiYWNrRnVuY3Rpb24gbV9jYWxsYmFjazsKIH07CiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cJKHJldmlzaW9uIDgxNzQwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDMtMjIgIEJyYWR5IEVpZHNvbiAg PGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBhc3luY2hyb25vdXMgbG9hZCBkZWNpc2lvbiBjYWxsIHRvIFdlYktp dDIgSWNvbkRhdGFiYXNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01Njg4NworCisgICAgICAgICogVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkljb25EYXRhYmFzZTo6Z2V0TG9hZERlY2lzaW9uRm9ySWNv blVSTCk6IEluIHRoZSBmdXR1cmUsIGdldCB0aGUgYWN0dWFsIGxvYWQgZGVjaXNpb24gZnJvbSB0 aGUgZGF0YWJhc2UuCisgICAgICAgICAgRm9yIG5vdywgYWx3YXlzIG1lc3NhZ2UgIkljb25Mb2Fk Tm8iIGJhY2sgdG8gdGhlIFdlYlByb2Nlc3MuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkljb25E YXRhYmFzZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UubWVzc2FnZXMu aW46CisgICAgICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvSWNvbkRhdGFiYXNlL1dlYkljb25E YXRhYmFzZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSWNvbkRhdGFiYXNlUHJveHk6 OmxvYWREZWNpc2lvbkZvckljb25VUkwpOiBNZXNzYWdlIHRoZSBVSVByb2Nlc3MgZm9yIHRoZSBs b2FkIGRlY2lzaW9uLgorICAgICAgICAoV2ViS2l0OjpXZWJJY29uRGF0YWJhc2VQcm94eTo6cmVj ZWl2ZWRJY29uTG9hZERlY2lzaW9uKTogQ2FsbGJhY2sgaW50byBXZWJDb3JlIHdpdGggdGhlIHJl Y2VpdmVkIGxvYWQgZGVjaXNpb24uCisgICAgICAgICogV2ViUHJvY2Vzcy9JY29uRGF0YWJhc2Uv V2ViSWNvbkRhdGFiYXNlUHJveHkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL0ljb25EYXRhYmFz ZS9XZWJJY29uRGF0YWJhc2VQcm94eS5tZXNzYWdlcy5pbjoKKwogMjAxMS0wMy0yMSAgU3RlcGhh bmllIExld2lzICA8c2xld2lzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBGcmFzZXIuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRhdGFi YXNlLmNwcAkocmV2aXNpb24gODE3MjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi SWNvbkRhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsOCBAQAogI2luY2x1 ZGUgIldlYkljb25EYXRhYmFzZS5oIgogCiAjaW5jbHVkZSAiRGF0YVJlZmVyZW5jZS5oIgorI2lu Y2x1ZGUgIldlYkNvbnRleHQuaCIKKyNpbmNsdWRlICJXZWJJY29uRGF0YWJhc2VQcm94eU1lc3Nh Z2VzLmgiCiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJL aXQgewpAQCAtODUsNiArODcsMTYgQEAgdm9pZCBXZWJJY29uRGF0YWJhc2U6OnN5bmNocm9ub3Vz TG9hZERlYwogICAgIGxvYWREZWNpc2lvbiA9IChpbnQpV2ViQ29yZTo6SWNvbkxvYWRObzsKIH0K IAordm9pZCBXZWJJY29uRGF0YWJhc2U6OmdldExvYWREZWNpc2lvbkZvckljb25VUkwoY29uc3Qg U3RyaW5nJiBpY29uVVJMLCB1aW50NjRfdCBjYWxsYmFja0lEKQoreworICAgIGlmICghbV93ZWJD b250ZXh0KQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBGSVhNRTogSG9va3VwIHRvIHRoZSBy ZWFsIEljb25EYXRhYmFzZSBpbXBsZW1lbnRhdGlvbi4KKyAgICAKKyAgICBtX3dlYkNvbnRleHQt PnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViSWNvbkRhdGFiYXNlUHJveHk6OlJlY2VpdmVk SWNvbkxvYWREZWNpc2lvbigoaW50KVdlYkNvcmU6Okljb25Mb2FkTm8sIGNhbGxiYWNrSUQpLCAw KTsKK30KKwogdm9pZCBXZWJJY29uRGF0YWJhc2U6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6 OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENv cmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlcikKIHsKICAgICBkaWRSZWNlaXZlV2ViSWNv bkRhdGFiYXNlTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIpOwpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuaAkocmV2aXNpb24gODE3 MjMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNlLmgJKHdvcmtp bmcgY29weSkKQEAgLTY0LDYgKzY0LDggQEAgcHVibGljOgogICAgIHZvaWQgc3luY2hyb25vdXNJ Y29uVVJMRm9yUGFnZVVSTChjb25zdCBTdHJpbmcmLCBTdHJpbmcmKTsKICAgICB2b2lkIHN5bmNo cm9ub3VzSWNvbkRhdGFLbm93bkZvckljb25VUkwoY29uc3QgU3RyaW5nJiwgYm9vbCYpIGNvbnN0 OwogICAgIHZvaWQgc3luY2hyb25vdXNMb2FkRGVjaXNpb25Gb3JJY29uVVJMKGNvbnN0IFN0cmlu ZyYsIGludCYpIGNvbnN0OworICAgIAorICAgIHZvaWQgZ2V0TG9hZERlY2lzaW9uRm9ySWNvblVS TChjb25zdCBTdHJpbmcmLCB1aW50NjRfdCBjYWxsYmFja0lEKTsKIAogICAgIHZvaWQgZGlkUmVj ZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29y ZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CiAgICAgQ29yZUlQQzo6U3luY1JlcGx5TW9kZSBkaWRS ZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJ RCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiwgQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKik7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNlLm1lc3NhZ2Vz LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJh c2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDgxNzIzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkljb25EYXRhYmFzZS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMzAsNCAr MzAsNiBAQCBtZXNzYWdlcyAtPiBXZWJJY29uRGF0YWJhc2UgewogICAgIFN5bmNocm9ub3VzSWNv blVSTEZvclBhZ2VVUkwoV1RGOjpTdHJpbmcgcGFnZVVSTCkgLT4gKFdURjo6U3RyaW5nIGljb25V UkwpCiAgICAgU3luY2hyb25vdXNJY29uRGF0YUtub3duRm9ySWNvblVSTChXVEY6OlN0cmluZyBp Y29uVVJMKSAtPiAoYm9vbCBkYXRhS25vd24pCiAgICAgU3luY2hyb25vdXNMb2FkRGVjaXNpb25G b3JJY29uVVJMKFdURjo6U3RyaW5nIGljb25VUkwpIC0+IChpbnQgbG9hZERlY2lzaW9uKQorICAg IAorICAgIEdldExvYWREZWNpc2lvbkZvckljb25VUkwoV1RGOjpTdHJpbmcgaWNvblVSTCwgdWlu dDY0X3QgY2FsbGJhY2tJRCkKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSWNv bkRhdGFiYXNlL1dlYkljb25EYXRhYmFzZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL0ljb25EYXRhYmFzZS9XZWJJY29uRGF0YWJhc2VQcm94eS5jcHAJ KHJldmlzaW9uIDgxNzIzKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JY29uRGF0YWJh c2UvV2ViSWNvbkRhdGFiYXNlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEsNiArMTEx LDE3IEBAIGJvb2wgV2ViSWNvbkRhdGFiYXNlUHJveHk6OnN1cHBvcnRzQXN5bmMKIAogdm9pZCBX ZWJJY29uRGF0YWJhc2VQcm94eTo6bG9hZERlY2lzaW9uRm9ySWNvblVSTChjb25zdCBTdHJpbmcm IGljb25VUkwsIFBhc3NSZWZQdHI8V2ViQ29yZTo6SWNvbkxvYWREZWNpc2lvbkNhbGxiYWNrPiBj YWxsYmFjaykKIHsKKyAgICB1aW50NjRfdCBpZCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7Cisg ICAgbV9pY29uTG9hZERlY2lzaW9uQ2FsbGJhY2tzLmFkZChpZCwgY2FsbGJhY2spOworICAgIAor ICAgIG1fcHJvY2Vzcy0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJJY29uRGF0YWJh c2U6OkdldExvYWREZWNpc2lvbkZvckljb25VUkwoaWNvblVSTCwgaWQpLCAwKTsKK30KKwordm9p ZCBXZWJJY29uRGF0YWJhc2VQcm94eTo6cmVjZWl2ZWRJY29uTG9hZERlY2lzaW9uKGludCBkZWNp c2lvbiwgdWludDY0X3QgY2FsbGJhY2tJRCkKK3sKKyAgICBSZWZQdHI8V2ViQ29yZTo6SWNvbkxv YWREZWNpc2lvbkNhbGxiYWNrPiBjYWxsYmFjayA9IG1faWNvbkxvYWREZWNpc2lvbkNhbGxiYWNr cy50YWtlKGNhbGxiYWNrSUQpOworICAgIGlmIChjYWxsYmFjaykKKyAgICAgICAgY2FsbGJhY2st PnBlcmZvcm1DYWxsYmFjayhzdGF0aWNfY2FzdDxXZWJDb3JlOjpJY29uTG9hZERlY2lzaW9uPihk ZWNpc2lvbikpOwogfQogCiB2b2lkIFdlYkljb25EYXRhYmFzZVByb3h5OjppY29uRGF0YUZvcklj b25VUkwoY29uc3QgU3RyaW5nJiBpY29uVVJMLCBQYXNzUmVmUHRyPFdlYkNvcmU6Okljb25EYXRh Q2FsbGJhY2s+IGNhbGxiYWNrKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JY29u RGF0YWJhc2UvV2ViSWNvbkRhdGFiYXNlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0ljb25EYXRhYmFzZS9XZWJJY29uRGF0YWJhc2VQcm94eS5oCShyZXZp c2lvbiA4MTcwNykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSWNvbkRhdGFiYXNlL1dl Ykljb25EYXRhYmFzZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAog I2luY2x1ZGUgPFdlYkNvcmUvSWNvbkRhdGFiYXNlQmFzZS5oPgogCisjaW5jbHVkZSA8d3RmL0hh c2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQ dHIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CkBAIC02Niw2ICs2Nyw3IEBAIHB1YmxpYzoK ICAgICAvLyBBc3luY2hyb25vdXMgY2FsbHMgd2Ugc2hvdWxkIHVzZSB0byByZXBsYWNlIHRoZSBh Ym92ZSB3aGVuIHN1cHBvcnRlZC4KICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNBc3luY2hyb25v dXNNb2RlKCk7CiAgICAgdmlydHVhbCB2b2lkIGxvYWREZWNpc2lvbkZvckljb25VUkwoY29uc3Qg U3RyaW5nJiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpJY29uTG9hZERlY2lzaW9uQ2FsbGJhY2s+KTsK KyAgICB2b2lkIHJlY2VpdmVkSWNvbkxvYWREZWNpc2lvbihpbnQgZGVjaXNpb24sIHVpbnQ2NF90 IGNhbGxiYWNrSUQpOwogICAgIHZpcnR1YWwgdm9pZCBpY29uRGF0YUZvckljb25VUkwoY29uc3Qg U3RyaW5nJiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpJY29uRGF0YUNhbGxiYWNrPik7CiAgICAgICAg IAogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJ UEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CkBAIC03OCw2ICs4MCw4 IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1faXNFbmFibGVkOwogICAgIFdlYlByb2Nlc3MqIG1f cHJvY2VzczsKKyAgICAKKyAgICBIYXNoTWFwPHVpbnQ2NF90LCBSZWZQdHI8V2ViQ29yZTo6SWNv bkxvYWREZWNpc2lvbkNhbGxiYWNrPiA+IG1faWNvbkxvYWREZWNpc2lvbkNhbGxiYWNrczsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JY29uRGF0YWJhc2UvV2ViSWNvbkRhdGFiYXNlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JY29uRGF0YWJhc2UvV2ViSWNvbkRhdGFi YXNlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDgxNzA3KQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JY29uRGF0YWJhc2UvV2ViSWNvbkRhdGFiYXNlUHJveHkubWVzc2FnZXMuaW4J KHdvcmtpbmcgY29weSkKQEAgLTIyLDQgKzIyLDUgQEAKIAogbWVzc2FnZXMgLT4gV2ViSWNvbkRh dGFiYXNlUHJveHkgewogICAgIFVSTEltcG9ydEZpbmlzaGVkKCkKKyAgICBSZWNlaXZlZEljb25M b2FkRGVjaXNpb24oaW50IGxvYWREZWNpc2lvbiwgdWludDY0X3QgY2FsbGJhY2tJRCkKIH0K