125177 2013-12-03 12:31:27 -0800 [GTK][WK2] Clean up WorkQueueGtk 2013-12-05 00:44:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cgarcia mrobinson oldest_to_newest 956055 0 zan 2013-12-03 12:31:27 -0800 [GTK][WK2] Clean up WorkQueueGtk 956059 1 218327 zan 2013-12-03 12:46:50 -0800 Created attachment 218327 Patch 956292 2 218327 cgarcia 2013-12-03 23:49:39 -0800 Comment on attachment 218327 Patch Excellent! thanks 956799 3 218327 zan 2013-12-05 00:44:52 -0800 Comment on attachment 218327 Patch Clearing flags on attachment: 218327 Committed r160162: <http://trac.webkit.org/changeset/160162> 956800 4 zan 2013-12-05 00:44:57 -0800 All reviewed patches have been landed. Closing bug. 218327 2013-12-03 12:46:50 -0800 2013-12-05 00:44:51 -0800 Patch bug-125177-20131203124649.patch text/plain 10373 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTIxMmM3ZTY2Mzg0ZTEz ZDIyZjNmNGIxZTVlODVhNjE5NjkwMmVjMy4uNDNkNTZhYTY1MjM0ZTg3M2E0N2VmOGFlNGNlMDQy NWUxODcwZjEyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTEyLTAzICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVtXSzJdIENs ZWFuIHVwIFdvcmtRdWV1ZUd0aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI1MTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ2xlYW4gdXAgdGhlIEdUSyBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgV29ya1F1 ZXVlIGNsYXNzIGEgYml0LgorICAgICAgICAtIHJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyIGRv ZXNuJ3QgdGFrZSBhIGNvbmRpdGlvbiBhcmd1bWVudCBhbnltb3JlIC0tIEdfSU9fSU4gd2FzIHRo ZSBvbmx5IGNvbmRpdGlvbiBldmVyIHBhc3NlZCBpbnRvCisgICAgICAgIHRoYXQgbWV0aG9kIHNv IHRoYXQgaXMgbm93IHRoZSBoYXJkLWNvZGVkIGRlZmF1bHQuCisgICAgICAgIC0gQ2xlYW4gdXAg dGhlIGRlY2xhcmF0aW9ucyBvZiBHVEstc3BlY2lmaWMgYml0cyBpbiB0aGUgV29ya1F1ZXVlIGhl YWRlciBmaWxlLiBTb2NrZXRFdmVudFNvdXJjZUl0ZXJhdG9yIHR5cGVkZWYgaXMgcmVtb3ZlZAor ICAgICAgICBhbmQgYXV0byB3aWxsIGJlIHVzZWQgaW5zdGVhZC4KKyAgICAgICAgLSBXb3JrUXVl dWU6OmRpc3BhdGNoT25UZXJtaW5hdGlvbiBhbmQgV29ya1F1ZXVlOjpTb2NrZXRFdmVudFNvdXJj ZTo6cGVyZm9ybVdvcmtPblRlcm1pbmF0aW9uIG1ldGhvZHMgd2VyZSB1bnVzZWQgYW5kIG5vdyBy ZW1vdmVkLgorICAgICAgICAtIFdvcmtRdWV1ZTo6U29ja2V0RXZlbnRTb3VyY2UgZG9lc24ndCBl eHBlY3QgYSBHSU8gY29uZGl0aW9uIGFueW1vcmUsIGFuZCBXb3JrUXVldWU6OlNvY2tldEV2ZW50 U291cmNlOjpjaGVja0NvbmRpdGlvbiBpcyByZW1vdmVkLgorICAgICAgICBHX0lPX0lOIGNvbmRp dGlvbiB3YXMgdGhlIG9ubHkgb25lIHVzZWQgaXMgbm93IGhhcmQtY29kZWQgaW50byB0aGUgY2hl Y2sgaW4gV29ya1F1ZXVlOjpTb2NrZXRFdmVudFNvdXJjZTo6ZXZlbnRDYWxsYmFjay4KKyAgICAg ICAgLSBSZW1vdmVkIGFuIHVubmVjZXNzYXJ5IG5vbi1udWxsIGFzc2VydGlvbiBmb3IgdGhlIGhl YXAtYWxsb2NhdGVkIFNvY2tldEV2ZW50U291cmNlLgorICAgICAgICAtIFJlbW92ZWQgYSB0ZWNo bmljYWxseSBkdXBsaWNhdGVkIGFzc2VydGlvbiB0aGF0IGEgZmlsZSBkZXNjcmlwdG9yIGlzIGFs cmVhZHkgcHJlc2VudCBpbiB0aGUgZXZlbnQgc291cmNlcyBtYXAuIE1vdmVkIHRoZQorICAgICAg ICBhc3NlcnRpb24gYmVmb3JlIHRoZSBIYXNoTWFwOjpmaW5kKCkgY2FsbC4KKyAgICAgICAgLSBS ZW1vdmVkIHR3byB1bm5lY2Vzc2FyeSBhc3NlcnRpb25zIHRoYXQgbm9uLW51bGwgdmFsdWVzIGFy ZSBiZWluZyByZXR1cm5lZCBieSBnX2lkbGVfc291cmNlX25ldygpIGFuZCBnX3RpbWVvdXRfc291 cmNlX25ldygpLgorICAgICAgICBCb3RoIGZ1bmN0aW9ucyBhcmUgZ3VhcmFudGVlZCB0byByZXR1 cm4gbm9uLW51bGwgdmFsdWVzLgorCisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy91bml4L0Nv bm5lY3Rpb25Vbml4LmNwcDoKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246Om9wZW4pOgor ICAgICAgICAqIFBsYXRmb3JtL1dvcmtRdWV1ZS5oOgorICAgICAgICAqIFBsYXRmb3JtL2d0ay9X b3JrUXVldWVHdGsuY3BwOgorICAgICAgICAoV29ya1F1ZXVlOjpTb2NrZXRFdmVudFNvdXJjZTo6 U29ja2V0RXZlbnRTb3VyY2UpOgorICAgICAgICAoV29ya1F1ZXVlOjpTb2NrZXRFdmVudFNvdXJj ZTo6ZXZlbnRDYWxsYmFjayk6CisgICAgICAgIChXb3JrUXVldWU6OnJlZ2lzdGVyU29ja2V0RXZl bnRIYW5kbGVyKToKKyAgICAgICAgKFdvcmtRdWV1ZTo6dW5yZWdpc3RlclNvY2tldEV2ZW50SGFu ZGxlcik6CisgICAgICAgIChXb3JrUXVldWU6OmRpc3BhdGNoKToKKyAgICAgICAgKFdvcmtRdWV1 ZTo6ZGlzcGF0Y2hBZnRlckRlbGF5KToKKwogMjAxMy0xMi0wMyAgTGFzemxvIFZpZGFjcyAgPGxh Y0BpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgRml4IEVGTCBidWlsZCBlcnJvciBpbiBXSzIg KDE1OTk2NSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5p eC9Db25uZWN0aW9uVW5peC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3Vu aXgvQ29ubmVjdGlvblVuaXguY3BwCmluZGV4IDRmYWM0MTdmMDFmMWFkMjcxODE4MzU4ODRjMDg5 NzYyNjIyOGEyMjEuLjI5MDNlMzY1NWIzZTliNTU4NmI2MTY4NTA5NjFjMTc2MmUzN2Q3N2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9u VW5peC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5l Y3Rpb25Vbml4LmNwcApAQCAtMzc4LDcgKzM3OCw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6b3Blbigp CiAKICAgICBtX2lzQ29ubmVjdGVkID0gdHJ1ZTsKICNpZiBQTEFURk9STShHVEspCi0gICAgbV9j b25uZWN0aW9uUXVldWUtPnJlZ2lzdGVyU29ja2V0RXZlbnRIYW5kbGVyKG1fc29ja2V0RGVzY3Jp cHRvciwgR19JT19JTiwgV1RGOjpiaW5kKCZDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyLCB0 aGlzKSwgV1RGOjpiaW5kKCZDb25uZWN0aW9uOjpjb25uZWN0aW9uRGlkQ2xvc2UsIHRoaXMpKTsK KyAgICBtX2Nvbm5lY3Rpb25RdWV1ZS0+cmVnaXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIobV9zb2Nr ZXREZXNjcmlwdG9yLCBXVEY6OmJpbmQoJkNvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIsIHRo aXMpLCBXVEY6OmJpbmQoJkNvbm5lY3Rpb246OmNvbm5lY3Rpb25EaWRDbG9zZSwgdGhpcykpOwog I2VsaWYgUExBVEZPUk0oRUZMKQogICAgIG1fY29ubmVjdGlvblF1ZXVlLT5yZWdpc3RlclNvY2tl dEV2ZW50SGFuZGxlcihtX3NvY2tldERlc2NyaXB0b3IsIFdURjo6YmluZCgmQ29ubmVjdGlvbjo6 cmVhZHlSZWFkSGFuZGxlciwgdGhpcykpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9Xb3JrUXVldWUuaCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL1dvcmtR dWV1ZS5oCmluZGV4IDRiOTUxOWM3ODI0MTk3NDdjMzRiMjZhYWEzMThlNGY5MDVhMmMyMDYuLjc4 MTFiNTgzNDZhMWJhMzBkM2NlZTc4ZGYyN2FiYWZjYmQwYWIyY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL1dvcmtRdWV1ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtL1dvcmtRdWV1ZS5oCkBAIC02NCw5ICs2NCw4IEBAIHB1YmxpYzoKICNpZiBPUyhEQVJXSU4p CiAgICAgZGlzcGF0Y2hfcXVldWVfdCBkaXNwYXRjaFF1ZXVlKCkgY29uc3QgeyByZXR1cm4gbV9k aXNwYXRjaFF1ZXVlOyB9CiAjZWxpZiBQTEFURk9STShHVEspCi0gICAgdm9pZCByZWdpc3RlclNv Y2tldEV2ZW50SGFuZGxlcihpbnQsIGludCwgY29uc3QgRnVuY3Rpb248dm9pZCgpPiYgZnVuY3Rp b24sIGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGNsb3NlRnVuY3Rpb24pOworICAgIHZvaWQgcmVn aXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIoaW50LCBjb25zdCBGdW5jdGlvbjx2b2lkKCk+JiwgY29u c3QgRnVuY3Rpb248dm9pZCgpPiYpOwogICAgIHZvaWQgdW5yZWdpc3RlclNvY2tldEV2ZW50SGFu ZGxlcihpbnQpOwotICAgIHZvaWQgZGlzcGF0Y2hPblRlcm1pbmF0aW9uKFdlYktpdDo6UGxhdGZv cm1Qcm9jZXNzSWRlbnRpZmllciwgY29uc3QgRnVuY3Rpb248dm9pZCgpPiYpOwogI2VsaWYgUExB VEZPUk0oRUZMKQogICAgIHZvaWQgcmVnaXN0ZXJTb2NrZXRFdmVudEhhbmRsZXIoaW50LCBjb25z dCBGdW5jdGlvbjx2b2lkKCk+Jik7CiAgICAgdm9pZCB1bnJlZ2lzdGVyU29ja2V0RXZlbnRIYW5k bGVyKGludCk7CkBAIC04Miw2ICs4MSw5IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIHZvaWQgZXhl Y3V0ZUZ1bmN0aW9uKHZvaWQqKTsKICAgICBkaXNwYXRjaF9xdWV1ZV90IG1fZGlzcGF0Y2hRdWV1 ZTsKICNlbGlmIFBMQVRGT1JNKEdUSykKKyAgICBjbGFzcyBFdmVudFNvdXJjZTsKKyAgICBjbGFz cyBTb2NrZXRFdmVudFNvdXJjZTsKKwogICAgIHN0YXRpYyB2b2lkIHN0YXJ0V29ya1F1ZXVlVGhy ZWFkKFdvcmtRdWV1ZSopOwogICAgIHZvaWQgd29ya1F1ZXVlVGhyZWFkQm9keSgpOwogICAgIHZv aWQgZGlzcGF0Y2hPblNvdXJjZShHU291cmNlKiwgY29uc3QgRnVuY3Rpb248dm9pZCgpPiYsIEdT b3VyY2VGdW5jKTsKQEAgLTkxLDEwICs5Myw3IEBAIHByaXZhdGU6CiAgICAgTXV0ZXggbV9ldmVu dExvb3BMb2NrOwogICAgIEdSZWZQdHI8R01haW5Mb29wPiBtX2V2ZW50TG9vcDsKICAgICBNdXRl eCBtX2V2ZW50U291cmNlc0xvY2s7Ci0gICAgY2xhc3MgRXZlbnRTb3VyY2U7Ci0gICAgY2xhc3Mg U29ja2V0RXZlbnRTb3VyY2U7CiAgICAgSGFzaE1hcDxpbnQsIFZlY3RvcjxTb2NrZXRFdmVudFNv dXJjZSo+PiBtX2V2ZW50U291cmNlczsKLSAgICB0eXBlZGVmIEhhc2hNYXA8aW50LCBWZWN0b3I8 U29ja2V0RXZlbnRTb3VyY2UqPj46Oml0ZXJhdG9yIFNvY2tldEV2ZW50U291cmNlSXRlcmF0b3I7 CiAjZWxpZiBQTEFURk9STShFRkwpCiAgICAgUmVmUHRyPERpc3BhdGNoUXVldWU+IG1fZGlzcGF0 Y2hRdWV1ZTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vZ3Rr L1dvcmtRdWV1ZUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvV29ya1F1ZXVl R3RrLmNwcAppbmRleCA0MzcxMWI4YzY1ZWNhYzI0MDQyMGFhOWRlN2M0ZDU1MGM1YjE4ZGY1Li5k MWQ0ZjkxZDExZjBmNzIwMjk5Y2UzMzQ0MGVjMWM2MzhlYmI4OWFiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9QbGF0Zm9ybS9ndGsvV29ya1F1ZXVlR3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9ndGsvV29ya1F1ZXVlR3RrLmNwcApAQCAtNTYsMTMgKzU2LDYgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gRkFMU0U7CiAgICAgfQogCi0gICAgc3RhdGljIGdib29sZWFu IHBlcmZvcm1Xb3JrT25UZXJtaW5hdGlvbihHUGlkLCBnaW50LCBFdmVudFNvdXJjZSogZXZlbnRT b3VyY2UpCi0gICAgewotICAgICAgICBBU1NFUlQoZXZlbnRTb3VyY2UpOwotICAgICAgICBldmVu dFNvdXJjZS0+cGVyZm9ybVdvcmsoKTsKLSAgICAgICAgcmV0dXJuIEZBTFNFOwotICAgIH0KLQog ICAgIHN0YXRpYyB2b2lkIGRlbGV0ZUV2ZW50U291cmNlKEV2ZW50U291cmNlKiBldmVudFNvdXJj ZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChldmVudFNvdXJjZSk7CkBAIC03Niw5ICs2OSw4IEBA IHByaXZhdGU6CiAKIGNsYXNzIFdvcmtRdWV1ZTo6U29ja2V0RXZlbnRTb3VyY2UgOiBwdWJsaWMg V29ya1F1ZXVlOjpFdmVudFNvdXJjZSB7CiBwdWJsaWM6Ci0gICAgU29ja2V0RXZlbnRTb3VyY2Uo Y29uc3QgRnVuY3Rpb248dm9pZCgpPiYgZnVuY3Rpb24sIFdvcmtRdWV1ZSogd29ya1F1ZXVlLCBp bnQgY29uZGl0aW9uLCBHQ2FuY2VsbGFibGUqIGNhbmNlbGxhYmxlLCBjb25zdCBGdW5jdGlvbjx2 b2lkKCk+JiBjbG9zZUZ1bmN0aW9uKQorICAgIFNvY2tldEV2ZW50U291cmNlKGNvbnN0IEZ1bmN0 aW9uPHZvaWQoKT4mIGZ1bmN0aW9uLCBXb3JrUXVldWUqIHdvcmtRdWV1ZSwgR0NhbmNlbGxhYmxl KiBjYW5jZWxsYWJsZSwgY29uc3QgRnVuY3Rpb248dm9pZCgpPiYgY2xvc2VGdW5jdGlvbikKICAg ICAgICAgOiBFdmVudFNvdXJjZShmdW5jdGlvbiwgd29ya1F1ZXVlKQotICAgICAgICAsIG1fY29u ZGl0aW9uKGNvbmRpdGlvbikKICAgICAgICAgLCBtX2NhbmNlbGxhYmxlKGNhbmNlbGxhYmxlKQog ICAgICAgICAsIG1fY2xvc2VGdW5jdGlvbihjbG9zZUZ1bmN0aW9uKQogICAgIHsKQEAgLTk1LDEy ICs4Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9jbG9zZUZ1bmN0aW9uKCk7CiAgICAgfQogCi0g ICAgYm9vbCBjaGVja0NvbmRpdGlvbihHSU9Db25kaXRpb24gY29uZGl0aW9uKSBjb25zdAotICAg IHsKLSAgICAgICAgcmV0dXJuIGNvbmRpdGlvbiAmIG1fY29uZGl0aW9uOwotICAgIH0KLQotICAg IHN0YXRpYyBnYm9vbGVhbiBldmVudENhbGxiYWNrKEdTb2NrZXQqLCBHSU9Db25kaXRpb24gY29u ZGl0aW9uLCBTb2NrZXRFdmVudFNvdXJjZSogZXZlbnRTb3VyY2UpCisgICAgc3RhdGljIGdib29s ZWFuIGV2ZW50Q2FsbGJhY2soR1NvY2tldCogc29ja2V0LCBHSU9Db25kaXRpb24gY29uZGl0aW9u LCBTb2NrZXRFdmVudFNvdXJjZSogZXZlbnRTb3VyY2UpCiAgICAgewogICAgICAgICBBU1NFUlQo ZXZlbnRTb3VyY2UpOwogCkBAIC0xMDksNyArOTYsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICBy ZXR1cm4gRkFMU0U7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoZXZlbnRTb3VyY2UtPmNoZWNr Q29uZGl0aW9uKGNvbmRpdGlvbikpIHsKKyAgICAgICAgaWYgKGNvbmRpdGlvbiAmIEdfSU9fSU4p IHsKICAgICAgICAgICAgIGV2ZW50U291cmNlLT5wZXJmb3JtV29yaygpOwogICAgICAgICAgICAg cmV0dXJuIFRSVUU7CiAgICAgICAgIH0KQEAgLTExOSw3ICsxMDYsNiBAQCBwdWJsaWM6CiAgICAg fQogCiBwcml2YXRlOgotICAgIGludCBtX2NvbmRpdGlvbjsKICAgICBHQ2FuY2VsbGFibGUqIG1f Y2FuY2VsbGFibGU7CiAgICAgRnVuY3Rpb248dm9pZCgpPiBtX2Nsb3NlRnVuY3Rpb247CiB9OwpA QCAtMTczLDE1ICsxNTksMTQgQEAgdm9pZCBXb3JrUXVldWU6OndvcmtRdWV1ZVRocmVhZEJvZHko KQogICAgIGdfbWFpbl9sb29wX3J1bihtX2V2ZW50TG9vcC5nZXQoKSk7CiB9CiAKLXZvaWQgV29y a1F1ZXVlOjpyZWdpc3RlclNvY2tldEV2ZW50SGFuZGxlcihpbnQgZmlsZURlc2NyaXB0b3IsIGlu dCBjb25kaXRpb24sIGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGZ1bmN0aW9uLCBjb25zdCBGdW5j dGlvbjx2b2lkKCk+JiBjbG9zZUZ1bmN0aW9uKQordm9pZCBXb3JrUXVldWU6OnJlZ2lzdGVyU29j a2V0RXZlbnRIYW5kbGVyKGludCBmaWxlRGVzY3JpcHRvciwgY29uc3QgRnVuY3Rpb248dm9pZCgp PiYgZnVuY3Rpb24sIGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4mIGNsb3NlRnVuY3Rpb24pCiB7CiAg ICAgR1JlZlB0cjxHU29ja2V0PiBzb2NrZXQgPSBhZG9wdEdSZWYoZ19zb2NrZXRfbmV3X2Zyb21f ZmQoZmlsZURlc2NyaXB0b3IsIDApKTsKICAgICBBU1NFUlQoc29ja2V0KTsKICAgICBHUmVmUHRy PEdDYW5jZWxsYWJsZT4gY2FuY2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXco KSk7Ci0gICAgR1JlZlB0cjxHU291cmNlPiBkaXNwYXRjaFNvdXJjZSA9IGFkb3B0R1JlZihnX3Nv Y2tldF9jcmVhdGVfc291cmNlKHNvY2tldC5nZXQoKSwgc3RhdGljX2Nhc3Q8R0lPQ29uZGl0aW9u Pihjb25kaXRpb24pLCBjYW5jZWxsYWJsZS5nZXQoKSkpOworICAgIEdSZWZQdHI8R1NvdXJjZT4g ZGlzcGF0Y2hTb3VyY2UgPSBhZG9wdEdSZWYoZ19zb2NrZXRfY3JlYXRlX3NvdXJjZShzb2NrZXQu Z2V0KCksIEdfSU9fSU4sIGNhbmNlbGxhYmxlLmdldCgpKSk7CiAgICAgQVNTRVJUKGRpc3BhdGNo U291cmNlKTsKLSAgICBTb2NrZXRFdmVudFNvdXJjZSogZXZlbnRTb3VyY2UgPSBuZXcgU29ja2V0 RXZlbnRTb3VyY2UoZnVuY3Rpb24sIHRoaXMsIGNvbmRpdGlvbiwgY2FuY2VsbGFibGUuZ2V0KCks IGNsb3NlRnVuY3Rpb24pOwotICAgIEFTU0VSVChldmVudFNvdXJjZSk7CisgICAgU29ja2V0RXZl bnRTb3VyY2UqIGV2ZW50U291cmNlID0gbmV3IFNvY2tldEV2ZW50U291cmNlKGZ1bmN0aW9uLCB0 aGlzLCBjYW5jZWxsYWJsZS5nZXQoKSwgY2xvc2VGdW5jdGlvbik7CiAKICAgICBnX3NvdXJjZV9z ZXRfY2FsbGJhY2soZGlzcGF0Y2hTb3VyY2UuZ2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJj ZUZ1bmM+KCZXb3JrUXVldWU6OlNvY2tldEV2ZW50U291cmNlOjpldmVudENhbGxiYWNrKSwKICAg ICAgICAgZXZlbnRTb3VyY2UsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KCZXb3Jr UXVldWU6OkV2ZW50U291cmNlOjpkZWxldGVFdmVudFNvdXJjZSkpOwpAQCAtMTkwLDcgKzE3NSw3 IEBAIHZvaWQgV29ya1F1ZXVlOjpyZWdpc3RlclNvY2tldEV2ZW50SGFuZGxlcihpbnQgZmlsZURl c2NyaXB0b3IsIGludCBjb25kaXRpb24sIGNvCiAgICAgewogICAgICAgICBNdXRleExvY2tlciBs b2NrZXIobV9ldmVudFNvdXJjZXNMb2NrKTsKICAgICAgICAgVmVjdG9yPFNvY2tldEV2ZW50U291 cmNlKj4gc291cmNlczsKLSAgICAgICAgU29ja2V0RXZlbnRTb3VyY2VJdGVyYXRvciBpdCA9IG1f ZXZlbnRTb3VyY2VzLmZpbmQoZmlsZURlc2NyaXB0b3IpOworICAgICAgICBhdXRvIGl0ID0gbV9l dmVudFNvdXJjZXMuZmluZChmaWxlRGVzY3JpcHRvcik7CiAgICAgICAgIGlmIChpdCAhPSBtX2V2 ZW50U291cmNlcy5lbmQoKSkKICAgICAgICAgICAgIHNvdXJjZXMgPSBpdC0+dmFsdWU7CiAKQEAg LTIwNyw5ICsxOTIsOCBAQCB2b2lkIFdvcmtRdWV1ZTo6dW5yZWdpc3RlclNvY2tldEV2ZW50SGFu ZGxlcihpbnQgZmlsZURlc2NyaXB0b3IpCiAKICAgICBNdXRleExvY2tlciBsb2NrZXIobV9ldmVu dFNvdXJjZXNMb2NrKTsKIAotICAgIFNvY2tldEV2ZW50U291cmNlSXRlcmF0b3IgaXQgPSBtX2V2 ZW50U291cmNlcy5maW5kKGZpbGVEZXNjcmlwdG9yKTsKLSAgICBBU1NFUlQoaXQgIT0gbV9ldmVu dFNvdXJjZXMuZW5kKCkpOwogICAgIEFTU0VSVChtX2V2ZW50U291cmNlcy5jb250YWlucyhmaWxl RGVzY3JpcHRvcikpOworICAgIGF1dG8gaXQgPSBtX2V2ZW50U291cmNlcy5maW5kKGZpbGVEZXNj cmlwdG9yKTsKIAogICAgIGlmIChpdCAhPSBtX2V2ZW50U291cmNlcy5lbmQoKSkgewogICAgICAg ICBWZWN0b3I8U29ja2V0RXZlbnRTb3VyY2UqPiBzb3VyY2VzID0gaXQtPnZhbHVlOwpAQCAtMjMx LDI0ICsyMTUsMTIgQEAgdm9pZCBXb3JrUXVldWU6OmRpc3BhdGNoT25Tb3VyY2UoR1NvdXJjZSog ZGlzcGF0Y2hTb3VyY2UsIGNvbnN0IEZ1bmN0aW9uPHZvaWQoKT4KIHZvaWQgV29ya1F1ZXVlOjpk aXNwYXRjaChjb25zdCBGdW5jdGlvbjx2b2lkKCk+JiBmdW5jdGlvbikKIHsKICAgICBHUmVmUHRy PEdTb3VyY2U+IGRpc3BhdGNoU291cmNlID0gYWRvcHRHUmVmKGdfaWRsZV9zb3VyY2VfbmV3KCkp OwotICAgIEFTU0VSVChkaXNwYXRjaFNvdXJjZSk7CiAgICAgZ19zb3VyY2Vfc2V0X3ByaW9yaXR5 KGRpc3BhdGNoU291cmNlLmdldCgpLCBHX1BSSU9SSVRZX0RFRkFVTFQpOwotCiAgICAgZGlzcGF0 Y2hPblNvdXJjZShkaXNwYXRjaFNvdXJjZS5nZXQoKSwgZnVuY3Rpb24sIHJlaW50ZXJwcmV0X2Nh c3Q8R1NvdXJjZUZ1bmM+KCZXb3JrUXVldWU6OkV2ZW50U291cmNlOjpwZXJmb3JtV29ya09uY2Up KTsKIH0KIAogdm9pZCBXb3JrUXVldWU6OmRpc3BhdGNoQWZ0ZXJEZWxheShjb25zdCBGdW5jdGlv bjx2b2lkKCk+JiBmdW5jdGlvbiwgZG91YmxlIGRlbGF5KQogewogICAgIEdSZWZQdHI8R1NvdXJj ZT4gZGlzcGF0Y2hTb3VyY2UgPSBhZG9wdEdSZWYoZ190aW1lb3V0X3NvdXJjZV9uZXcoc3RhdGlj X2Nhc3Q8Z3VpbnQ+KGRlbGF5ICogMTAwMCkpKTsKLSAgICBBU1NFUlQoZGlzcGF0Y2hTb3VyY2Up OwotCiAgICAgZGlzcGF0Y2hPblNvdXJjZShkaXNwYXRjaFNvdXJjZS5nZXQoKSwgZnVuY3Rpb24s IHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1bmM+KCZXb3JrUXVldWU6OkV2ZW50U291cmNlOjpw ZXJmb3JtV29ya09uY2UpKTsKIH0KLQotdm9pZCBXb3JrUXVldWU6OmRpc3BhdGNoT25UZXJtaW5h dGlvbihXZWJLaXQ6OlBsYXRmb3JtUHJvY2Vzc0lkZW50aWZpZXIgcHJvY2VzcywgY29uc3QgRnVu Y3Rpb248dm9pZCgpPiYgZnVuY3Rpb24pCi17Ci0gICAgR1JlZlB0cjxHU291cmNlPiBkaXNwYXRj aFNvdXJjZSA9IGFkb3B0R1JlZihnX2NoaWxkX3dhdGNoX3NvdXJjZV9uZXcocHJvY2VzcykpOwot ICAgIEFTU0VSVChkaXNwYXRjaFNvdXJjZSk7Ci0KLSAgICBkaXNwYXRjaE9uU291cmNlKGRpc3Bh dGNoU291cmNlLmdldCgpLCBmdW5jdGlvbiwgcmVpbnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4o JldvcmtRdWV1ZTo6RXZlbnRTb3VyY2U6OnBlcmZvcm1Xb3JrT25UZXJtaW5hdGlvbikpOwotfQo=