115101 2013-04-24 05:18:23 -0700 [BlackBerry] Should check if it's cached resource before download 2013-04-26 06:58:12 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mawu mawu charles.wei commit-queue joenotcharles rwlbuis staikos oldest_to_newest 880446 0 mawu 2013-04-24 05:18:23 -0700 Since main resource maybe cached, if user want to save the resource, we don't need to initiate a fresh load again, but get the cached resource data out to save. 881073 1 199617 mawu 2013-04-24 21:15:46 -0700 Created attachment 199617 patch 881137 2 199629 mawu 2013-04-25 01:18:34 -0700 Created attachment 199629 add assert check 881836 3 199629 rwlbuis 2013-04-26 05:53:08 -0700 Comment on attachment 199629 add assert check Ok. 881868 4 199629 commit-queue 2013-04-26 06:58:10 -0700 Comment on attachment 199629 add assert check Clearing flags on attachment: 199629 Committed r149182: <http://trac.webkit.org/changeset/149182> 881869 5 commit-queue 2013-04-26 06:58:12 -0700 All reviewed patches have been landed. Closing bug. 199617 2013-04-24 21:15:46 -0700 2013-04-25 01:18:34 -0700 patch webkit.patch text/plain 5834 mawu RnJvbSA3ZjM2Y2E1OWViZTk2NzZmYmJlY2IwMTYyYjhlZGRjNGIyODM5NDNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ5IFd1IDxtYXJ5Lnd1QHRvcmNobW9iaWxlLmNvbS5jbj4K RGF0ZTogVGh1LCAyNSBBcHIgMjAxMyAxMjoxNDowMSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGRv d25sb2FkIGNhY2hlZCBtYWluUmVzb3VyY2UuCgotLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgIHwgICAxNiArKysrKysrCiAuLi4vV2ViQ29yZVN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcCB8ICAgNDkgKysrKysrKysrKysr KysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggOWU4YzA1NC4uNTA0MzAwMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDQt MjQgIE1hcnkgV3UgIDxtYXJ5Lnd1QHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gU2hvdWxkIGNoZWNrIGlmIGl0J3MgY2FjaGVkIHJlc291cmNlIGJlZm9yZSBkb3du bG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1 MTAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2lu Y2UgbWFpbiByZXNvdXJjZSBtYXliZSBjYWNoZWQsIGlmIHVzZXIgd2FudCB0byBzYXZlIHRoZSBy ZXNvdXJjZSwgd2UgZmlyc3QgY2hlY2sKKyAgICAgICAgaWYgaXQncyBjYWNoZWQuIElmIHllcywg ZG9uJ3QgbmVlZCB0byBpbml0aWF0ZSBhIGZyZXNoIGxvYWQgYWdhaW4sIGJ1dCBnZXQgdGhlCisg ICAgICAgIGNhY2hlZCByZXNvdXJjZSBkYXRhIG91dCB0byBzYXZlLgorCisgICAgICAgIFJJTSBi dWcjIDMyNDAwMworCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tC ZXJyeTo6Y29udmVydE1haW5SZXNvdXJjZUxvYWRUb0Rvd25sb2FkKToKKwogMjAxMy0wNC0yNCAg TmltYSBHaGFuYXZhdGlhbiAgPG5naGFuYXZhdGlhbkBibGFja2JlcnJ5LmNvbT4KIAogICAgICAg ICBbQmxhY2tCZXJyeV0gRG8gbm90IGNsZWFyIGZvY3VzIG9uIGEgbm9kZSB3aGVuIHRhcHBpbmcg b24gZm9ybSBjb250cm9scwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5 LmNwcAppbmRleCA1NDRlNzc1Li5mY2I2ZmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRCbGFja0JlcnJ5LmNwcApAQCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgIlBsdWdpbkRh dGFiYXNlLmgiCiAjaW5jbHVkZSAiUGx1Z2luVmlldy5oIgogI2luY2x1ZGUgIlByb2dyZXNzVHJh Y2tlci5oIgorI2luY2x1ZGUgIlJlc291cmNlQnVmZmVyLmgiCiAjaW5jbHVkZSAiU2NvcGVQb2lu dGVyLmgiCiAjaWYgRU5BQkxFKEJMQUNLQkVSUllfQ1JFREVOVElBTF9QRVJTSVNUKQogI2luY2x1 ZGUgIlNldHRpbmdzLmgiCkBAIC02OSw3ICs3MCw5IEBACiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBs YXRmb3JtTG9nLmg+CiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtTWVzc2FnZUNsaWVudC5o PgogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybVNjcmVlbi5oPgorI2luY2x1ZGUgPEJsYWNr QmVycnlQbGF0Zm9ybVN0cmluZ0J1aWxkZXIuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9B UElDYXN0Lmg+CisjaW5jbHVkZSA8bmV0d29yay9EYXRhU3RyZWFtLmg+CiAjaW5jbHVkZSA8bmV0 d29yay9GaWx0ZXJTdHJlYW0uaD4KICNpbmNsdWRlIDxuZXR3b3JrL05ldHdvcmtSZXF1ZXN0Lmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvQmFzZTY0Lmg+CkBAIC0xMTg3LDIxICsxMTkwLDQzIEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5OjpzdGFydERvd25sb2FkKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYgcmVxdWVzdCwKICAgICBtX3dlYlBhZ2VQcml2YXRlLT5sb2FkKHJlcXVlc3Qu dXJsKCkuc3RyaW5nKCksIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5U3RyaW5n KCksICJHRVQiLCBOZXR3b3JrUmVxdWVzdDo6VXNlUHJvdG9jb2xDYWNoZVBvbGljeSwgMCwgMCwg MCwgMCwgZmFsc2UsIGZhbHNlLCB0cnVlLCAiIiwgc3VnZ2VzdGVkTmFtZSk7CiB9CiAKLXZvaWQg RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Ojpjb252ZXJ0TWFpblJlc291cmNlTG9hZFRvRG93 bmxvYWQoRG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHIpCit2b2lkIEZyYW1lTG9hZGVy Q2xpZW50QmxhY2tCZXJyeTo6Y29udmVydE1haW5SZXNvdXJjZUxvYWRUb0Rvd25sb2FkKERvY3Vt ZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIHsKLSAgICBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6RmlsdGVyU3RyZWFtKiBzdHJlYW0gPSBOZXR3b3JrTWFuYWdlcjo6aW5zdGFuY2Uo KS0+c3RyZWFtRm9ySGFuZGxlKGRvY3VtZW50TG9hZGVyLT5tYWluUmVzb3VyY2VMb2FkZXIoKS0+ aGFuZGxlKCkpOwotICAgIC8vIFRoZXJlIGFyZSBjYXNlcyB3aGVyZSB0aGVyZSB3b24ndCBoYXZl IGEgRmlsdGVyU3RyZWFtCi0gICAgLy8gYXNzb2NpYXRlZCB3aXRoIGEgUmVzb3VyY2VIYW5kbGUu IEZvciBpbnN0YW5jZSwgQmxvYiBvYmplY3RzCi0gICAgLy8gaGF2ZSB0aGVpciBvd24gUmVzb3Vy Y2VIYW5kbGUgY2xhc3Mgd2hpY2ggd29uJ3QgY2FsbCBzdGFydEpvYgotICAgIC8vIHRvIGRvIHRo ZSBwcm9wZXIgc2V0dXAuIERvIGl0IGhlcmUuCi0gICAgaWYgKCFzdHJlYW0pIHsKLSAgICAgICAg aW50IHBsYXllcklkID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4o bV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+cGxheWVySWQoKTsKLSAgICAgICAgTmV0d29y a01hbmFnZXI6Omluc3RhbmNlKCktPnN0YXJ0Sm9iKHBsYXllcklkLCBkb2N1bWVudExvYWRlci0+ bWFpblJlc291cmNlTG9hZGVyKCktPmhhbmRsZSgpLCByZXF1ZXN0LCBtX2ZyYW1lLCBmYWxzZSk7 Ci0gICAgICAgIHN0cmVhbSA9IE5ldHdvcmtNYW5hZ2VyOjppbnN0YW5jZSgpLT5zdHJlYW1Gb3JI YW5kbGUoZG9jdW1lbnRMb2FkZXItPm1haW5SZXNvdXJjZUxvYWRlcigpLT5oYW5kbGUoKSk7Cisg ICAgQVNTRVJUKGRvY3VtZW50TG9hZGVyKTsKKyAgICBSZXNvdXJjZUJ1ZmZlciogYnVmZiA9IGRv Y3VtZW50TG9hZGVyLT5tYWluUmVzb3VyY2VEYXRhKCkuZ2V0KCk7CisKKyAgICBpZiAoIWJ1ZmYp IHsKKyAgICAgICAgLy8gSWYgbm8gY2FjaGVkLCBsaWtlIHBvbGljeURvd25sb2FkIHJlc291cmNl IHdoaWNoIGRvbid0IGdvIHJlbmRlciBhdCBhbGwsIGp1c3QgZGlyZWN0IHRvIGRvd25sb2FkU3Ry ZWFtLgorICAgICAgICBSZXNvdXJjZUhhbmRsZSogaGFuZGxlID0gZG9jdW1lbnRMb2FkZXItPm1h aW5SZXNvdXJjZUxvYWRlcigpLT5oYW5kbGUoKTsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZv cm06OkZpbHRlclN0cmVhbSogc3RyZWFtID0gTmV0d29ya01hbmFnZXI6Omluc3RhbmNlKCktPnN0 cmVhbUZvckhhbmRsZShoYW5kbGUpOworICAgICAgICAvLyBUaGVyZSBhcmUgY2FzZXMgd2hlcmUg dGhlcmUgd29uJ3QgaGF2ZSBhIEZpbHRlclN0cmVhbQorICAgICAgICAvLyBhc3NvY2lhdGVkIHdp dGggYSBSZXNvdXJjZUhhbmRsZS4gRm9yIGluc3RhbmNlLCBCbG9iIG9iamVjdHMKKyAgICAgICAg Ly8gaGF2ZSB0aGVpciBvd24gUmVzb3VyY2VIYW5kbGUgY2xhc3Mgd2hpY2ggd29uJ3QgY2FsbCBz dGFydEpvYgorICAgICAgICAvLyB0byBkbyB0aGUgcHJvcGVyIHNldHVwLiBEbyBpdCBoZXJlLgor ICAgICAgICBpZiAoIXN0cmVhbSkgeworICAgICAgICAgICAgaW50IHBsYXllcklkID0gc3RhdGlj X2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4obV9mcmFtZS0+bG9hZGVyKCktPmNs aWVudCgpKS0+cGxheWVySWQoKTsKKyAgICAgICAgICAgIE5ldHdvcmtNYW5hZ2VyOjppbnN0YW5j ZSgpLT5zdGFydEpvYihwbGF5ZXJJZCwgaGFuZGxlLCByZXF1ZXN0LCBtX2ZyYW1lLCBmYWxzZSk7 CisgICAgICAgICAgICBzdHJlYW0gPSBOZXR3b3JrTWFuYWdlcjo6aW5zdGFuY2UoKS0+c3RyZWFt Rm9ySGFuZGxlKGhhbmRsZSk7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUKHN0cmVhbSk7CisK KyAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9jbGllbnQtPmRvd25sb2FkUmVxdWVzdGVkKHN0 cmVhbSwgcmVzcG9uc2Uuc3VnZ2VzdGVkRmlsZW5hbWUoKSk7CisgICAgICAgIHJldHVybjsKICAg ICB9Ci0gICAgQVNTRVJUKHN0cmVhbSk7CiAKLSAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVu dC0+ZG93bmxvYWRSZXF1ZXN0ZWQoc3RyZWFtLCByLnN1Z2dlc3RlZEZpbGVuYW1lKCkpOworICAg IC8vIEZvciBtYWluIHBhZ2UgcmVzb3VyY2Ugd2hpY2ggaGFzIGNhY2hlZCwgZ2V0IGZyb20gY2Fj aGVkIHJlc291cmNlLgorICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmdCdWlsZGVyIHVy bDsKKyAgICBTVEFUSUNfTE9DQUxfU1RSSU5HKHNfY3JlYXRlLCAiZGF0YToiKTsKKyAgICB1cmwu YXBwZW5kKHNfY3JlYXRlKTsKKyAgICB1cmwuYXBwZW5kKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT dHJpbmc6OmZyb21VdGY4KHJlc3BvbnNlLm1pbWVUeXBlKCkudXRmOCgpLmRhdGEoKSkpOworICAg IFNUQVRJQ19MT0NBTF9TVFJJTkcoc19iYXNlNjQsICI7YmFzZTY0LCIpOworICAgIHVybC5hcHBl bmQoc19iYXNlNjQpOworICAgIHVybC5hcHBlbmQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmlu Zzo6ZnJvbVV0ZjgoYmFzZTY0RW5jb2RlKENTdHJpbmcoYnVmZi0+ZGF0YSgpLCBidWZmLT5zaXpl KCkpKS51dGY4KCkuZGF0YSgpKSk7CisgICAgTmV0d29ya1JlcXVlc3QgcmVxOworICAgIHJlcS5z ZXRSZXF1ZXN0VXJsKHVybC5zdHJpbmcoKSwgQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6 ZnJvbUFzY2lpKCJHRVQiKSk7CisgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkRhdGFTdHJlYW0g KnN0cmVhbSA9IG5ldyBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6RGF0YVN0cmVhbShyZXEpOworICAg IG1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5kb3dubG9hZFJlcXVlc3RlZChzdHJlYW0sIHJl c3BvbnNlLnN1Z2dlc3RlZEZpbGVuYW1lKCkpOworICAgIHN0cmVhbS0+c3RyZWFtT3BlbigpOwog fQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGlzcGF0Y2hEaWRSZWNlaXZl SWNvbigpCi0tIAoxLjcuOS41Cgo= 199629 2013-04-25 01:18:34 -0700 2013-04-26 06:58:10 -0700 add assert check webkit.patch text/plain 5978 mawu RnJvbSBjYzk0ZDRmYTI0MDllMmQ2MGY1MDQ3ZjIzNmUwOGJjMDBlNzRkMmQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ5IFd1IDxtYXJ5Lnd1QHRvcmNobW9iaWxlLmNvbS5jbj4K RGF0ZTogVGh1LCAyNSBBcHIgMjAxMyAxMjoxNDowMSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGRv d25sb2FkIGNhY2hlZCBtYWluUmVzb3VyY2UuCgotLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgIHwgICAxNiArKysrKysKIC4uLi9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnkuY3BwIHwgICA1MiArKysrKysrKysrKysr KystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCA5ZThjMDU0Li41ZjU4NjZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wNC0y NCAgTWFyeSBXdSAgPG1hcnkud3VAdG9yY2htb2JpbGUuY29tLmNuPgorCisgICAgICAgIFtCbGFj a0JlcnJ5XSBTaG91bGQgY2hlY2sgaWYgaXQncyBjYWNoZWQgcmVzb3VyY2UgYmVmb3JlIGRvd25s b2FkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUx MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW5j ZSBtYWluIHJlc291cmNlIG1heWJlIGNhY2hlZCwgaWYgdXNlciB3YW50IHRvIHNhdmUgdGhlIHJl c291cmNlLCB3ZSBmaXJzdCBjaGVjaworICAgICAgICBpZiBpdCdzIGNhY2hlZC4gSWYgeWVzLCBk b24ndCBuZWVkIHRvIGluaXRpYXRlIGEgZnJlc2ggbG9hZCBhZ2FpbiwgYnV0IGdldCB0aGUKKyAg ICAgICAgY2FjaGVkIHJlc291cmNlIGRhdGEgb3V0IHRvIHNhdmUuCisKKyAgICAgICAgUklNIGJ1 ZyMgMzI0MDAzLCBpbnRlcm5hbGx5IHJldmlld2VkIGJ5IENoYXJsZXMgV2VpLgorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6Y29udmVydE1haW5SZXNv dXJjZUxvYWRUb0Rvd25sb2FkKToKKwogMjAxMy0wNC0yNCAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkBibGFja2JlcnJ5LmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRG8gbm90 IGNsZWFyIGZvY3VzIG9uIGEgbm9kZSB3aGVuIHRhcHBpbmcgb24gZm9ybSBjb250cm9scwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29y ZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAppbmRleCA1NDRlNzc1Li5k NzFiZTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5LmNwcApA QCAtNTAsNiArNTAsNyBAQAogI2luY2x1ZGUgIlBsdWdpbkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAi UGx1Z2luVmlldy5oIgogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgorI2luY2x1ZGUgIlJl c291cmNlQnVmZmVyLmgiCiAjaW5jbHVkZSAiU2NvcGVQb2ludGVyLmgiCiAjaWYgRU5BQkxFKEJM QUNLQkVSUllfQ1JFREVOVElBTF9QRVJTSVNUKQogI2luY2x1ZGUgIlNldHRpbmdzLmgiCkBAIC02 OSw3ICs3MCw5IEBACiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3JtTG9nLmg+CiAjaW5jbHVk ZSA8QmxhY2tCZXJyeVBsYXRmb3JtTWVzc2FnZUNsaWVudC5oPgogI2luY2x1ZGUgPEJsYWNrQmVy cnlQbGF0Zm9ybVNjcmVlbi5oPgorI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybVN0cmluZ0J1 aWxkZXIuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9BUElDYXN0Lmg+CisjaW5jbHVkZSA8 bmV0d29yay9EYXRhU3RyZWFtLmg+CiAjaW5jbHVkZSA8bmV0d29yay9GaWx0ZXJTdHJlYW0uaD4K ICNpbmNsdWRlIDxuZXR3b3JrL05ldHdvcmtSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv QmFzZTY0Lmg+CkBAIC0xMTg3LDIxICsxMTkwLDQ0IEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRC bGFja0JlcnJ5OjpzdGFydERvd25sb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwK ICAgICBtX3dlYlBhZ2VQcml2YXRlLT5sb2FkKHJlcXVlc3QudXJsKCkuc3RyaW5nKCksIEJsYWNr QmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmVtcHR5U3RyaW5nKCksICJHRVQiLCBOZXR3b3JrUmVx dWVzdDo6VXNlUHJvdG9jb2xDYWNoZVBvbGljeSwgMCwgMCwgMCwgMCwgZmFsc2UsIGZhbHNlLCB0 cnVlLCAiIiwgc3VnZ2VzdGVkTmFtZSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5Ojpjb252ZXJ0TWFpblJlc291cmNlTG9hZFRvRG93bmxvYWQoRG9jdW1lbnRMb2FkZXIq IGRvY3VtZW50TG9hZGVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJl c291cmNlUmVzcG9uc2UmIHIpCi17Ci0gICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkZpbHRlclN0 cmVhbSogc3RyZWFtID0gTmV0d29ya01hbmFnZXI6Omluc3RhbmNlKCktPnN0cmVhbUZvckhhbmRs ZShkb2N1bWVudExvYWRlci0+bWFpblJlc291cmNlTG9hZGVyKCktPmhhbmRsZSgpKTsKLSAgICAv LyBUaGVyZSBhcmUgY2FzZXMgd2hlcmUgdGhlcmUgd29uJ3QgaGF2ZSBhIEZpbHRlclN0cmVhbQot ICAgIC8vIGFzc29jaWF0ZWQgd2l0aCBhIFJlc291cmNlSGFuZGxlLiBGb3IgaW5zdGFuY2UsIEJs b2Igb2JqZWN0cwotICAgIC8vIGhhdmUgdGhlaXIgb3duIFJlc291cmNlSGFuZGxlIGNsYXNzIHdo aWNoIHdvbid0IGNhbGwgc3RhcnRKb2IKLSAgICAvLyB0byBkbyB0aGUgcHJvcGVyIHNldHVwLiBE byBpdCBoZXJlLgotICAgIGlmICghc3RyZWFtKSB7Ci0gICAgICAgIGludCBwbGF5ZXJJZCA9IHN0 YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KG1fZnJhbWUtPmxvYWRlcigp LT5jbGllbnQoKSktPnBsYXllcklkKCk7Ci0gICAgICAgIE5ldHdvcmtNYW5hZ2VyOjppbnN0YW5j ZSgpLT5zdGFydEpvYihwbGF5ZXJJZCwgZG9jdW1lbnRMb2FkZXItPm1haW5SZXNvdXJjZUxvYWRl cigpLT5oYW5kbGUoKSwgcmVxdWVzdCwgbV9mcmFtZSwgZmFsc2UpOwotICAgICAgICBzdHJlYW0g PSBOZXR3b3JrTWFuYWdlcjo6aW5zdGFuY2UoKS0+c3RyZWFtRm9ySGFuZGxlKGRvY3VtZW50TG9h ZGVyLT5tYWluUmVzb3VyY2VMb2FkZXIoKS0+aGFuZGxlKCkpOwordm9pZCBGcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnk6OmNvbnZlcnRNYWluUmVzb3VyY2VMb2FkVG9Eb3dubG9hZChEb2N1bWVu dExvYWRlciogZG9jdW1lbnRMb2FkZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwg Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCit7CisgICAgQVNTRVJUKGRvY3VtZW50 TG9hZGVyKTsKKyAgICBSZXNvdXJjZUJ1ZmZlciogYnVmZiA9IGRvY3VtZW50TG9hZGVyLT5tYWlu UmVzb3VyY2VEYXRhKCkuZ2V0KCk7CisKKyAgICBpZiAoIWJ1ZmYpIHsKKyAgICAgICAgLy8gSWYg bm8gY2FjaGVkLCBsaWtlIHBvbGljeURvd25sb2FkIHJlc291cmNlIHdoaWNoIGRvbid0IGdvIHJl bmRlciBhdCBhbGwsIGp1c3QgZGlyZWN0IHRvIGRvd25sb2FkU3RyZWFtLgorICAgICAgICBBU1NF UlQoZG9jdW1lbnRMb2FkZXItPm1haW5SZXNvdXJjZUxvYWRlcigpICYmIGRvY3VtZW50TG9hZGVy LT5tYWluUmVzb3VyY2VMb2FkZXIoKS0+aGFuZGxlKCkpOworICAgICAgICBSZXNvdXJjZUhhbmRs ZSogaGFuZGxlID0gZG9jdW1lbnRMb2FkZXItPm1haW5SZXNvdXJjZUxvYWRlcigpLT5oYW5kbGUo KTsKKyAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkZpbHRlclN0cmVhbSogc3RyZWFtID0g TmV0d29ya01hbmFnZXI6Omluc3RhbmNlKCktPnN0cmVhbUZvckhhbmRsZShoYW5kbGUpOworICAg ICAgICAvLyBUaGVyZSBhcmUgY2FzZXMgd2hlcmUgdGhlcmUgd29uJ3QgaGF2ZSBhIEZpbHRlclN0 cmVhbQorICAgICAgICAvLyBhc3NvY2lhdGVkIHdpdGggYSBSZXNvdXJjZUhhbmRsZS4gRm9yIGlu c3RhbmNlLCBCbG9iIG9iamVjdHMKKyAgICAgICAgLy8gaGF2ZSB0aGVpciBvd24gUmVzb3VyY2VI YW5kbGUgY2xhc3Mgd2hpY2ggd29uJ3QgY2FsbCBzdGFydEpvYgorICAgICAgICAvLyB0byBkbyB0 aGUgcHJvcGVyIHNldHVwLiBEbyBpdCBoZXJlLgorICAgICAgICBpZiAoIXN0cmVhbSkgeworICAg ICAgICAgICAgaW50IHBsYXllcklkID0gc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFj a0JlcnJ5Kj4obV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpKS0+cGxheWVySWQoKTsKKyAgICAg ICAgICAgIE5ldHdvcmtNYW5hZ2VyOjppbnN0YW5jZSgpLT5zdGFydEpvYihwbGF5ZXJJZCwgaGFu ZGxlLCByZXF1ZXN0LCBtX2ZyYW1lLCBmYWxzZSk7CisgICAgICAgICAgICBzdHJlYW0gPSBOZXR3 b3JrTWFuYWdlcjo6aW5zdGFuY2UoKS0+c3RyZWFtRm9ySGFuZGxlKGhhbmRsZSk7CisgICAgICAg IH0KKyAgICAgICAgQVNTRVJUKHN0cmVhbSk7CisKKyAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+ bV9jbGllbnQtPmRvd25sb2FkUmVxdWVzdGVkKHN0cmVhbSwgcmVzcG9uc2Uuc3VnZ2VzdGVkRmls ZW5hbWUoKSk7CisgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgQVNTRVJUKHN0cmVhbSk7CiAK LSAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX2NsaWVudC0+ZG93bmxvYWRSZXF1ZXN0ZWQoc3RyZWFt LCByLnN1Z2dlc3RlZEZpbGVuYW1lKCkpOworICAgIC8vIEZvciBtYWluIHBhZ2UgcmVzb3VyY2Ug d2hpY2ggaGFzIGNhY2hlZCwgZ2V0IGZyb20gY2FjaGVkIHJlc291cmNlLgorICAgIEJsYWNrQmVy cnk6OlBsYXRmb3JtOjpTdHJpbmdCdWlsZGVyIHVybDsKKyAgICBTVEFUSUNfTE9DQUxfU1RSSU5H KHNfY3JlYXRlLCAiZGF0YToiKTsKKyAgICB1cmwuYXBwZW5kKHNfY3JlYXRlKTsKKyAgICB1cmwu YXBwZW5kKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc6OmZyb21VdGY4KHJlc3BvbnNlLm1p bWVUeXBlKCkudXRmOCgpLmRhdGEoKSkpOworICAgIFNUQVRJQ19MT0NBTF9TVFJJTkcoc19iYXNl NjQsICI7YmFzZTY0LCIpOworICAgIHVybC5hcHBlbmQoc19iYXNlNjQpOworICAgIHVybC5hcHBl bmQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZnJvbVV0ZjgoYmFzZTY0RW5jb2RlKENT dHJpbmcoYnVmZi0+ZGF0YSgpLCBidWZmLT5zaXplKCkpKS51dGY4KCkuZGF0YSgpKSk7CisgICAg TmV0d29ya1JlcXVlc3QgcmVxOworICAgIHJlcS5zZXRSZXF1ZXN0VXJsKHVybC5zdHJpbmcoKSwg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZzo6ZnJvbUFzY2lpKCJHRVQiKSk7CisgICAgQmxh Y2tCZXJyeTo6UGxhdGZvcm06OkRhdGFTdHJlYW0gKnN0cmVhbSA9IG5ldyBCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6RGF0YVN0cmVhbShyZXEpOworICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50 LT5kb3dubG9hZFJlcXVlc3RlZChzdHJlYW0sIHJlc3BvbnNlLnN1Z2dlc3RlZEZpbGVuYW1lKCkp OworICAgIHN0cmVhbS0+c3RyZWFtT3BlbigpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 QmxhY2tCZXJyeTo6ZGlzcGF0Y2hEaWRSZWNlaXZlSWNvbigpCi0tIAoxLjcuOS41Cgo=