114589 2013-04-14 10:26:42 -0700 Move property setting/removing functions to MutableStylePropertySet. 2013-04-14 10:48:00 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114568 1 kling kling commit-queue d-r esprehn+autocc fmalita kling macpherson menard mifenton pdr schenney oldest_to_newest 875373 0 kling 2013-04-14 10:26:42 -0700 Move property setting/removing functions to MutableStylePropertySet. 875375 1 198002 kling 2013-04-14 10:35:44 -0700 Created attachment 198002 Patch 875377 2 kling 2013-04-14 10:48:00 -0700 Committed r148403: <http://trac.webkit.org/changeset/148403> 198002 2013-04-14 10:35:44 -0700 2013-04-14 10:46:10 -0700 Patch bug-114589.diff text/plain 23166 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NWNkNDg2Li5jOTczYWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTEg QEAKIDIwMTMtMDQtMTQgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1vdmUgcHJvcGVydHkgc2V0dGluZy9yZW1vdmluZyBmdW5jdGlvbnMgdG8gTXV0YWJsZVN0 eWxlUHJvcGVydHlTZXQuCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzExNDU4OT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGFsbCBm dW5jdGlvbnMgZm9yIHNldHRpbmcvcmVtb3ZpbmcgcHJvcGVydGllcyBmcm9tIFN0eWxlUHJvcGVy dHlTZXQgdG8gTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQuCisgICAgICAgIEhhZCB0byBjaGFuZ2Ug U1ZHRWxlbWVudDo6YW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKCkgJiBmcmllbmRzIHRvIGhh bmQgb3V0IE11dGFibGVTdHlsZVByb3BlcnR5U2V0KgorICAgICAgICB3aGljaCB3YXMgYWx3YXlz IHRoZSBpbnRlcm5hbCB0eXBlIGFueXdheS4KKworICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnR5 U2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok11dGFibGVTdHlsZVByb3BlcnR5U2V0OjpyZW1v dmVTaG9ydGhhbmRQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpNdXRhYmxlU3R5bGVQcm9w ZXJ0eVNldDo6cmVtb3ZlUHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6TXV0YWJsZVN0eWxl UHJvcGVydHlTZXQ6OnJlbW92ZVByZWZpeGVkT3JVbnByZWZpeGVkUHJvcGVydHkpOgorICAgICAg ICAoV2ViQ29yZTo6TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OnNldFByb3BlcnR5KToKKyAgICAg ICAgKFdlYkNvcmU6Ok11dGFibGVTdHlsZVByb3BlcnR5U2V0OjphcHBlbmRQcmVmaXhpbmdWYXJp YW50UHJvcGVydHkpOgorICAgICAgICAoV2ViQ29yZTo6TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6 OnNldFByZWZpeGluZ1ZhcmlhbnRQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpNdXRhYmxl U3R5bGVQcm9wZXJ0eVNldDo6bWVyZ2VBbmRPdmVycmlkZU9uQ29uZmxpY3QpOgorICAgICAgICAo V2ViQ29yZTo6TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OnJlbW92ZUJsb2NrUHJvcGVydGllcyk6 CisgICAgICAgIChXZWJDb3JlOjpNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDo6cmVtb3ZlUHJvcGVy dGllc0luU2V0KToKKyAgICAgICAgKFdlYkNvcmU6Ok11dGFibGVTdHlsZVByb3BlcnR5U2V0Ojpm aW5kQ1NTUHJvcGVydHlXaXRoSUQpOgorICAgICAgICAoV2ViQ29yZTo6TXV0YWJsZVN0eWxlUHJv cGVydHlTZXQ6OnJlbW92ZUVxdWl2YWxlbnRQcm9wZXJ0aWVzKToKKyAgICAgICAgKiBjc3MvU3R5 bGVQcm9wZXJ0eVNldC5oOgorICAgICAgICAoU3R5bGVQcm9wZXJ0eVNldCk6CisgICAgICAgIChN dXRhYmxlU3R5bGVQcm9wZXJ0eVNldCk6CisgICAgICAgICogZWRpdGluZy9BcHBseVN0eWxlQ29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlSZWxh dGl2ZUZvbnRTdHlsZUNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVN0eWxlQ29tbWFu ZDo6cmVtb3ZlRW1iZWRkaW5nVXBUb0VuY2xvc2luZ0Jsb2NrKToKKyAgICAgICAgKFdlYkNvcmU6 OkFwcGx5U3R5bGVDb21tYW5kOjphcHBseUlubGluZVN0eWxlVG9Ob2RlUmFuZ2UpOgorICAgICAg ICAqIGVkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRpbmdT dHlsZTo6dHJpU3RhdGVPZlN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OnJlbW92ZVByb3BlcnRp ZXNJblN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OnJlY29uY2lsZVRleHREZWNvcmF0aW9uUHJv cGVydGllcyk6CisgICAgICAgICogc3ZnL1NWR0FuaW1hdGVFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmFwcGx5Q1NTUHJvcGVydHlUb1RhcmdldCk6CisgICAgICAgICogc3ZnL1NWR0Vs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxlbWVudDo6YW5pbWF0ZWRTTUlMU3R5 bGVQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnQ6OmVuc3VyZUFuaW1h dGVkU01JTFN0eWxlUHJvcGVydGllcyk6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuaDoKKyAg ICAgICAgKFNWR0VsZW1lbnQpOgorICAgICAgICAqIHN2Zy9TVkdFbGVtZW50UmFyZURhdGEuaDoK KyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnRSYXJlRGF0YTo6YW5pbWF0ZWRTTUlMU3R5bGVQ cm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnRSYXJlRGF0YTo6ZW5zdXJl QW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKToKKyAgICAgICAgKFNWR0VsZW1lbnRSYXJlRGF0 YSk6CisKKzIwMTMtMDQtMTQgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCiAg ICAgICAgIEVkaXRpbmdTdHlsZSBzaG91bGQgaGF2ZSBhIE11dGFibGVTdHlsZVByb3BlcnR5U2V0 IGludGVybmFsbHkuCiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzExNDU4OD4KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuY3BwCmluZGV4IDc4M2E0ZDAuLmVmMzQyMWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2V0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHAKQEAgLTU4OSw5ICs1ODks OCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBTdHlsZVByb3BlcnR5U2V0OjpnZXRQcm9wZXJ0eUNT U1ZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAgIHJldHVybiBwcm9wZXJ0eUF0KGZvdW5k UHJvcGVydHlJbmRleCkudmFsdWUoKTsKIH0KIAotYm9vbCBTdHlsZVByb3BlcnR5U2V0OjpyZW1v dmVTaG9ydGhhbmRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpCitib29sIE11dGFi bGVTdHlsZVByb3BlcnR5U2V0OjpyZW1vdmVTaG9ydGhhbmRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlE IHByb3BlcnR5SUQpCiB7Ci0gICAgQVNTRVJUKGlzTXV0YWJsZSgpKTsKICAgICBTdHlsZVByb3Bl cnR5U2hvcnRoYW5kIHNob3J0aGFuZCA9IHNob3J0aGFuZEZvclByb3BlcnR5KHByb3BlcnR5SUQp OwogICAgIGlmICghc2hvcnRoYW5kLmxlbmd0aCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBA IC02MDYsOSArNjA1LDggQEAgYm9vbCBTdHlsZVByb3BlcnR5U2V0OjpyZW1vdmVTaG9ydGhhbmRQ cm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpCiAgICAgcmV0dXJuIHJlbW92ZVByb3Bl cnRpZXNJblNldChzaG9ydGhhbmRQcmVmaXhpbmdWYXJpYW50LnByb3BlcnRpZXMoKSwgc2hvcnRo YW5kUHJlZml4aW5nVmFyaWFudC5sZW5ndGgoKSk7CiB9CiAKLWJvb2wgU3R5bGVQcm9wZXJ0eVNl dDo6cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBTdHJpbmcqIHJldHVy blRleHQpCitib29sIE11dGFibGVTdHlsZVByb3BlcnR5U2V0OjpyZW1vdmVQcm9wZXJ0eShDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5SUQsIFN0cmluZyogcmV0dXJuVGV4dCkKIHsKLSAgICBBU1NFUlQo aXNNdXRhYmxlKCkpOwogICAgIGlmIChyZW1vdmVTaG9ydGhhbmRQcm9wZXJ0eShwcm9wZXJ0eUlE KSkgewogICAgICAgICAvLyBGSVhNRTogUmV0dXJuIGFuIGVxdWl2YWxlbnQgc2hvcnRoYW5kIHdo ZW4gcG9zc2libGUuCiAgICAgICAgIGlmIChyZXR1cm5UZXh0KQpAQCAtNjM1LDcgKzYzMyw3IEBA IGJvb2wgU3R5bGVQcm9wZXJ0eVNldDo6cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0eUlELCBTdHJpbmcqIHJldHVyblRlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgU3R5 bGVQcm9wZXJ0eVNldDo6cmVtb3ZlUHJlZml4ZWRPclVucHJlZml4ZWRQcm9wZXJ0eShDU1NQcm9w ZXJ0eUlEIHByb3BlcnR5SUQpCit2b2lkIE11dGFibGVTdHlsZVByb3BlcnR5U2V0OjpyZW1vdmVQ cmVmaXhlZE9yVW5wcmVmaXhlZFByb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKIHsK ICAgICBpbnQgZm91bmRQcm9wZXJ0eUluZGV4ID0gZmluZFByb3BlcnR5SW5kZXgocHJlZml4aW5n VmFyaWFudEZvclByb3BlcnR5SWQocHJvcGVydHlJRCkpOwogICAgIGlmIChmb3VuZFByb3BlcnR5 SW5kZXggPT0gLTEpCkBAIC02NzYsMTMgKzY3NCwxMiBAQCBib29sIFN0eWxlUHJvcGVydHlTZXQ6 OmlzUHJvcGVydHlJbXBsaWNpdChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpIGNvbnN0CiAgICAg cmV0dXJuIHByb3BlcnR5QXQoZm91bmRQcm9wZXJ0eUluZGV4KS5pc0ltcGxpY2l0KCk7CiB9CiAK LWJvb2wgU3R5bGVQcm9wZXJ0eVNldDo6c2V0UHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0 eUlELCBjb25zdCBTdHJpbmcmIHZhbHVlLCBib29sIGltcG9ydGFudCwgU3R5bGVTaGVldENvbnRl bnRzKiBjb250ZXh0U3R5bGVTaGVldCkKK2Jvb2wgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OnNl dFByb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwg Ym9vbCBpbXBvcnRhbnQsIFN0eWxlU2hlZXRDb250ZW50cyogY29udGV4dFN0eWxlU2hlZXQpCiB7 Ci0gICAgQVNTRVJUKGlzTXV0YWJsZSgpKTsKICAgICAvLyBTZXR0aW5nIHRoZSB2YWx1ZSB0byBh biBlbXB0eSBzdHJpbmcganVzdCByZW1vdmVzIHRoZSBwcm9wZXJ0eSBpbiBib3RoIElFIGFuZCBH ZWNrby4KICAgICAvLyBTZXR0aW5nIGl0IHRvIG51bGwgc2VlbXMgdG8gcHJvZHVjZSBsZXNzIGNv bnNpc3RlbnQgcmVzdWx0cywgYnV0IHdlIHRyZWF0IGl0IGp1c3QgdGhlIHNhbWUuCiAgICAgaWYg KHZhbHVlLmlzRW1wdHkoKSkgewotICAgICAgICByZW1vdmVQcm9wZXJ0eShwcm9wZXJ0eUlEKTsK KyAgICAgICAgc3RhdGljX2Nhc3Q8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQqPih0aGlzKS0+cmVt b3ZlUHJvcGVydHkocHJvcGVydHlJRCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApA QCAtNjkxLDkgKzY4OCw4IEBAIGJvb2wgU3R5bGVQcm9wZXJ0eVNldDo6c2V0UHJvcGVydHkoQ1NT UHJvcGVydHlJRCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHZhbHVlCiAgICAgcmV0dXJuIENT U1BhcnNlcjo6cGFyc2VWYWx1ZShzdGF0aWNfY2FzdDxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCo+ KHRoaXMpLCBwcm9wZXJ0eUlELCB2YWx1ZSwgaW1wb3J0YW50LCBjc3NQYXJzZXJNb2RlKCksIGNv bnRleHRTdHlsZVNoZWV0KTsKIH0KIAotdm9pZCBTdHlsZVByb3BlcnR5U2V0OjpzZXRQcm9wZXJ0 eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHBycFZhbHVl LCBib29sIGltcG9ydGFudCkKK3ZvaWQgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OnNldFByb3Bl cnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gcHJwVmFs dWUsIGJvb2wgaW1wb3J0YW50KQogewotICAgIEFTU0VSVChpc011dGFibGUoKSk7CiAgICAgU3R5 bGVQcm9wZXJ0eVNob3J0aGFuZCBzaG9ydGhhbmQgPSBzaG9ydGhhbmRGb3JQcm9wZXJ0eShwcm9w ZXJ0eUlEKTsKICAgICBpZiAoIXNob3J0aGFuZC5sZW5ndGgoKSkgewogICAgICAgICBzZXRQcm9w ZXJ0eShDU1NQcm9wZXJ0eShwcm9wZXJ0eUlELCBwcnBWYWx1ZSwgaW1wb3J0YW50KSk7CkBAIC03 MDcsMTEgKzcwMywxMCBAQCB2b2lkIFN0eWxlUHJvcGVydHlTZXQ6OnNldFByb3BlcnR5KENTU1By b3BlcnR5SUQgcHJvcGVydHlJRCwgUGFzc1JlZlB0cjxDU1NWYWx1ZQogICAgICAgICBtdXRhYmxl UHJvcGVydHlWZWN0b3IoKS5hcHBlbmQoQ1NTUHJvcGVydHkoc2hvcnRoYW5kLnByb3BlcnRpZXMo KVtpXSwgdmFsdWUsIGltcG9ydGFudCkpOwogfQogCi12b2lkIFN0eWxlUHJvcGVydHlTZXQ6OnNl dFByb3BlcnR5KGNvbnN0IENTU1Byb3BlcnR5JiBwcm9wZXJ0eSwgQ1NTUHJvcGVydHkqIHNsb3Qp Cit2b2lkIE11dGFibGVTdHlsZVByb3BlcnR5U2V0OjpzZXRQcm9wZXJ0eShjb25zdCBDU1NQcm9w ZXJ0eSYgcHJvcGVydHksIENTU1Byb3BlcnR5KiBzbG90KQogewotICAgIEFTU0VSVChpc011dGFi bGUoKSk7CiAgICAgaWYgKCFyZW1vdmVTaG9ydGhhbmRQcm9wZXJ0eShwcm9wZXJ0eS5pZCgpKSkg ewotICAgICAgICBDU1NQcm9wZXJ0eSogdG9SZXBsYWNlID0gc2xvdCA/IHNsb3QgOiBmaW5kTXV0 YWJsZUNTU1Byb3BlcnR5V2l0aElEKHByb3BlcnR5LmlkKCkpOworICAgICAgICBDU1NQcm9wZXJ0 eSogdG9SZXBsYWNlID0gc2xvdCA/IHNsb3QgOiBmaW5kQ1NTUHJvcGVydHlXaXRoSUQocHJvcGVy dHkuaWQoKSk7CiAgICAgICAgIGlmICh0b1JlcGxhY2UpIHsKICAgICAgICAgICAgICp0b1JlcGxh Y2UgPSBwcm9wZXJ0eTsKICAgICAgICAgICAgIHNldFByZWZpeGluZ1ZhcmlhbnRQcm9wZXJ0eShw cm9wZXJ0eSk7CkBAIC03MjEsNyArNzE2LDcgQEAgdm9pZCBTdHlsZVByb3BlcnR5U2V0OjpzZXRQ cm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eSYgcHJvcGVydHksIENTU1Byb3BlcnR5KiBzbG8KICAg ICBhcHBlbmRQcmVmaXhpbmdWYXJpYW50UHJvcGVydHkocHJvcGVydHkpOwogfQogCi12b2lkIFN0 eWxlUHJvcGVydHlTZXQ6OmFwcGVuZFByZWZpeGluZ1ZhcmlhbnRQcm9wZXJ0eShjb25zdCBDU1NQ cm9wZXJ0eSYgcHJvcGVydHkpCit2b2lkIE11dGFibGVTdHlsZVByb3BlcnR5U2V0OjphcHBlbmRQ cmVmaXhpbmdWYXJpYW50UHJvcGVydHkoY29uc3QgQ1NTUHJvcGVydHkmIHByb3BlcnR5KQogewog ICAgIG11dGFibGVQcm9wZXJ0eVZlY3RvcigpLmFwcGVuZChwcm9wZXJ0eSk7CiAgICAgQ1NTUHJv cGVydHlJRCBwcmVmaXhpbmdWYXJpYW50ID0gcHJlZml4aW5nVmFyaWFudEZvclByb3BlcnR5SWQo cHJvcGVydHkuaWQoKSk7CkBAIC03MzAsMTcgKzcyNSwxNiBAQCB2b2lkIFN0eWxlUHJvcGVydHlT ZXQ6OmFwcGVuZFByZWZpeGluZ1ZhcmlhbnRQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eSYgcHJv cGVydAogICAgIG11dGFibGVQcm9wZXJ0eVZlY3RvcigpLmFwcGVuZChDU1NQcm9wZXJ0eShwcmVm aXhpbmdWYXJpYW50LCBwcm9wZXJ0eS52YWx1ZSgpLCBwcm9wZXJ0eS5pc0ltcG9ydGFudCgpLCBw cm9wZXJ0eS5zaG9ydGhhbmRJRCgpLCBwcm9wZXJ0eS5tZXRhZGF0YSgpLm1faW1wbGljaXQpKTsK IH0KIAotdm9pZCBTdHlsZVByb3BlcnR5U2V0OjpzZXRQcmVmaXhpbmdWYXJpYW50UHJvcGVydHko Y29uc3QgQ1NTUHJvcGVydHkmIHByb3BlcnR5KQordm9pZCBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNl dDo6c2V0UHJlZml4aW5nVmFyaWFudFByb3BlcnR5KGNvbnN0IENTU1Byb3BlcnR5JiBwcm9wZXJ0 eSkKIHsKICAgICBDU1NQcm9wZXJ0eUlEIHByZWZpeGluZ1ZhcmlhbnQgPSBwcmVmaXhpbmdWYXJp YW50Rm9yUHJvcGVydHlJZChwcm9wZXJ0eS5pZCgpKTsKLSAgICBDU1NQcm9wZXJ0eSogdG9SZXBs YWNlID0gZmluZE11dGFibGVDU1NQcm9wZXJ0eVdpdGhJRChwcmVmaXhpbmdWYXJpYW50KTsKKyAg ICBDU1NQcm9wZXJ0eSogdG9SZXBsYWNlID0gZmluZENTU1Byb3BlcnR5V2l0aElEKHByZWZpeGlu Z1ZhcmlhbnQpOwogICAgIGlmICh0b1JlcGxhY2UpCiAgICAgICAgICp0b1JlcGxhY2UgPSBDU1NQ cm9wZXJ0eShwcmVmaXhpbmdWYXJpYW50LCBwcm9wZXJ0eS52YWx1ZSgpLCBwcm9wZXJ0eS5pc0lt cG9ydGFudCgpLCBwcm9wZXJ0eS5zaG9ydGhhbmRJRCgpLCBwcm9wZXJ0eS5tZXRhZGF0YSgpLm1f aW1wbGljaXQpOwogfQogCi1ib29sIFN0eWxlUHJvcGVydHlTZXQ6OnNldFByb3BlcnR5KENTU1By b3BlcnR5SUQgcHJvcGVydHlJRCwgaW50IGlkZW50aWZpZXIsIGJvb2wgaW1wb3J0YW50KQorYm9v bCBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDo6c2V0UHJvcGVydHkoQ1NTUHJvcGVydHlJRCBwcm9w ZXJ0eUlELCBpbnQgaWRlbnRpZmllciwgYm9vbCBpbXBvcnRhbnQpCiB7Ci0gICAgQVNTRVJUKGlz TXV0YWJsZSgpKTsKICAgICBzZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eShwcm9wZXJ0eUlELCBjc3NW YWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoaWRlbnRpZmllciksIGltcG9ydGFudCkp OwogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMTAzNiwxMyArMTAzMCwxMiBAQCBTdHJpbmcgU3R5 bGVQcm9wZXJ0eVNldDo6YXNUZXh0KCkgY29uc3QKICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5n KCk7CiB9CiAKLXZvaWQgU3R5bGVQcm9wZXJ0eVNldDo6bWVyZ2VBbmRPdmVycmlkZU9uQ29uZmxp Y3QoY29uc3QgU3R5bGVQcm9wZXJ0eVNldCogb3RoZXIpCit2b2lkIE11dGFibGVTdHlsZVByb3Bl cnR5U2V0OjptZXJnZUFuZE92ZXJyaWRlT25Db25mbGljdChjb25zdCBTdHlsZVByb3BlcnR5U2V0 KiBvdGhlcikKIHsKLSAgICBBU1NFUlQoaXNNdXRhYmxlKCkpOwogICAgIHVuc2lnbmVkIHNpemUg PSBvdGhlci0+cHJvcGVydHlDb3VudCgpOwogICAgIGZvciAodW5zaWduZWQgbiA9IDA7IG4gPCBz aXplOyArK24pIHsKICAgICAgICAgUHJvcGVydHlSZWZlcmVuY2UgdG9NZXJnZSA9IG90aGVyLT5w cm9wZXJ0eUF0KG4pOwotICAgICAgICBDU1NQcm9wZXJ0eSogb2xkID0gZmluZE11dGFibGVDU1NQ cm9wZXJ0eVdpdGhJRCh0b01lcmdlLmlkKCkpOworICAgICAgICBDU1NQcm9wZXJ0eSogb2xkID0g ZmluZENTU1Byb3BlcnR5V2l0aElEKHRvTWVyZ2UuaWQoKSk7CiAgICAgICAgIGlmIChvbGQpCiAg ICAgICAgICAgICBzZXRQcm9wZXJ0eSh0b01lcmdlLnRvQ1NTUHJvcGVydHkoKSwgb2xkKTsKICAg ICAgICAgZWxzZQpAQCAtMTExMSwxNCArMTEwNCwxMyBAQCBQYXNzUmVmUHRyPE11dGFibGVTdHls ZVByb3BlcnR5U2V0PiBTdHlsZVByb3BlcnR5U2V0Ojpjb3B5QmxvY2tQcm9wZXJ0aWVzKCkgY29u cwogICAgIHJldHVybiBjb3B5UHJvcGVydGllc0luU2V0KGJsb2NrUHJvcGVydGllcywgbnVtQmxv Y2tQcm9wZXJ0aWVzKTsKIH0KIAotdm9pZCBTdHlsZVByb3BlcnR5U2V0OjpyZW1vdmVCbG9ja1By b3BlcnRpZXMoKQordm9pZCBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDo6cmVtb3ZlQmxvY2tQcm9w ZXJ0aWVzKCkKIHsKICAgICByZW1vdmVQcm9wZXJ0aWVzSW5TZXQoYmxvY2tQcm9wZXJ0aWVzLCBu dW1CbG9ja1Byb3BlcnRpZXMpOwogfQogCi1ib29sIFN0eWxlUHJvcGVydHlTZXQ6OnJlbW92ZVBy b3BlcnRpZXNJblNldChjb25zdCBDU1NQcm9wZXJ0eUlEKiBzZXQsIHVuc2lnbmVkIGxlbmd0aCkK K2Jvb2wgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OnJlbW92ZVByb3BlcnRpZXNJblNldChjb25z dCBDU1NQcm9wZXJ0eUlEKiBzZXQsIHVuc2lnbmVkIGxlbmd0aCkKIHsKLSAgICBBU1NFUlQoaXNN dXRhYmxlKCkpOwogICAgIGlmIChtdXRhYmxlUHJvcGVydHlWZWN0b3IoKS5pc0VtcHR5KCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMTE1NSw5ICsxMTQ3LDggQEAgaW50IFN0eWxlUHJv cGVydHlTZXQ6OmZpbmRQcm9wZXJ0eUluZGV4KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkgY29u c3QKICAgICByZXR1cm4gLTE7CiB9CiAKLUNTU1Byb3BlcnR5KiBTdHlsZVByb3BlcnR5U2V0Ojpm aW5kTXV0YWJsZUNTU1Byb3BlcnR5V2l0aElEKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKK0NT U1Byb3BlcnR5KiBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDo6ZmluZENTU1Byb3BlcnR5V2l0aElE KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKIHsKLSAgICBBU1NFUlQoaXNNdXRhYmxlKCkpOwog ICAgIGludCBmb3VuZFByb3BlcnR5SW5kZXggPSBmaW5kUHJvcGVydHlJbmRleChwcm9wZXJ0eUlE KTsKICAgICBpZiAoZm91bmRQcm9wZXJ0eUluZGV4ID09IC0xKQogICAgICAgICByZXR1cm4gMDsK QEAgLTExNzIsOSArMTE2Myw4IEBAIGJvb2wgU3R5bGVQcm9wZXJ0eVNldDo6cHJvcGVydHlNYXRj aGVzKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwgY29uc3QgQ1NTVmFsdWUqCiAgICAgcmV0dXJu IHByb3BlcnR5QXQoZm91bmRQcm9wZXJ0eUluZGV4KS52YWx1ZSgpLT5lcXVhbHMoKnByb3BlcnR5 VmFsdWUpOwogfQogICAgIAotdm9pZCBTdHlsZVByb3BlcnR5U2V0OjpyZW1vdmVFcXVpdmFsZW50 UHJvcGVydGllcyhjb25zdCBTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSkKK3ZvaWQgTXV0YWJsZVN0 eWxlUHJvcGVydHlTZXQ6OnJlbW92ZUVxdWl2YWxlbnRQcm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJv cGVydHlTZXQqIHN0eWxlKQogewotICAgIEFTU0VSVChpc011dGFibGUoKSk7CiAgICAgVmVjdG9y PENTU1Byb3BlcnR5SUQ+IHByb3BlcnRpZXNUb1JlbW92ZTsKICAgICB1bnNpZ25lZCBzaXplID0g bXV0YWJsZVByb3BlcnR5VmVjdG9yKCkuc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBzaXplOyArK2kpIHsKQEAgLTExODcsOSArMTE3Nyw4IEBAIHZvaWQgU3R5bGVQcm9wZXJ0 eVNldDo6cmVtb3ZlRXF1aXZhbGVudFByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9wZXJ0eVNldCog c3R5bGUpCiAgICAgICAgIHJlbW92ZVByb3BlcnR5KHByb3BlcnRpZXNUb1JlbW92ZVtpXSk7CiB9 CiAKLXZvaWQgU3R5bGVQcm9wZXJ0eVNldDo6cmVtb3ZlRXF1aXZhbGVudFByb3BlcnRpZXMoY29u c3QgQ1NTU3R5bGVEZWNsYXJhdGlvbiogc3R5bGUpCit2b2lkIE11dGFibGVTdHlsZVByb3BlcnR5 U2V0OjpyZW1vdmVFcXVpdmFsZW50UHJvcGVydGllcyhjb25zdCBDU1NTdHlsZURlY2xhcmF0aW9u KiBzdHlsZSkKIHsKLSAgICBBU1NFUlQoaXNNdXRhYmxlKCkpOwogICAgIFZlY3RvcjxDU1NQcm9w ZXJ0eUlEPiBwcm9wZXJ0aWVzVG9SZW1vdmU7CiAgICAgdW5zaWduZWQgc2l6ZSA9IG11dGFibGVQ cm9wZXJ0eVZlY3RvcigpLnNpemUoKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6 ZTsgKytpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNl dC5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuaAppbmRleCA5MDZmZmEz Li4wMjBhNmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNl dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2V0LmgKQEAgLTEwNCwy NCArMTA0LDcgQEAgcHVibGljOgogICAgIENTU1Byb3BlcnR5SUQgZ2V0UHJvcGVydHlTaG9ydGhh bmQoQ1NTUHJvcGVydHlJRCkgY29uc3Q7CiAgICAgYm9vbCBpc1Byb3BlcnR5SW1wbGljaXQoQ1NT UHJvcGVydHlJRCkgY29uc3Q7CiAKLSAgICAvLyBUaGVzZSBleHBhbmQgc2hvcnRoYW5kIHByb3Bl cnRpZXMgaW50byBtdWx0aXBsZSBwcm9wZXJ0aWVzLgotICAgIGJvb2wgc2V0UHJvcGVydHkoQ1NT UHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgYm9vbCBpbXBvcnRhbnQgPSBmYWxzZSwg U3R5bGVTaGVldENvbnRlbnRzKiBjb250ZXh0U3R5bGVTaGVldCA9IDApOwotICAgIHZvaWQgc2V0 UHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgUGFzc1JlZlB0cjxDU1NWYWx1ZT4sIGJvb2wgaW1wb3J0 YW50ID0gZmFsc2UpOwotCi0gICAgLy8gVGhlc2UgZG8gbm90LiBGSVhNRTogVGhpcyBpcyB0b28g bWVzc3ksIHdlIGNhbiBkbyBiZXR0ZXIuCi0gICAgYm9vbCBzZXRQcm9wZXJ0eShDU1NQcm9wZXJ0 eUlELCBpbnQgaWRlbnRpZmllciwgYm9vbCBpbXBvcnRhbnQgPSBmYWxzZSk7Ci0gICAgdm9pZCBh cHBlbmRQcmVmaXhpbmdWYXJpYW50UHJvcGVydHkoY29uc3QgQ1NTUHJvcGVydHkmKTsKLSAgICB2 b2lkIHNldFByZWZpeGluZ1ZhcmlhbnRQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eSYpOwotICAg IHZvaWQgc2V0UHJvcGVydHkoY29uc3QgQ1NTUHJvcGVydHkmLCBDU1NQcm9wZXJ0eSogc2xvdCA9 IDApOwotICAgIAotICAgIGJvb2wgcmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgU3RyaW5n KiByZXR1cm5UZXh0ID0gMCk7Ci0gICAgdm9pZCByZW1vdmVQcmVmaXhlZE9yVW5wcmVmaXhlZFBy b3BlcnR5KENTU1Byb3BlcnR5SUQpOwotCiAgICAgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9w ZXJ0eVNldD4gY29weUJsb2NrUHJvcGVydGllcygpIGNvbnN0OwotICAgIHZvaWQgcmVtb3ZlQmxv Y2tQcm9wZXJ0aWVzKCk7Ci0gICAgYm9vbCByZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29uc3QgQ1NT UHJvcGVydHlJRCogc2V0LCB1bnNpZ25lZCBsZW5ndGgpOwotCi0gICAgdm9pZCBtZXJnZUFuZE92 ZXJyaWRlT25Db25mbGljdChjb25zdCBTdHlsZVByb3BlcnR5U2V0Kik7CiAKICAgICBDU1NQYXJz ZXJNb2RlIGNzc1BhcnNlck1vZGUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxDU1NQYXJz ZXJNb2RlPihtX2Nzc1BhcnNlck1vZGUpOyB9CiAKQEAgLTEzMCw5ICsxMTMsNiBAQCBwdWJsaWM6 CiAgICAgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gbXV0YWJsZUNvcHkoKSBj b25zdDsKICAgICBQYXNzUmVmUHRyPEltbXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IGltbXV0YWJs ZUNvcHlJZk5lZWRlZCgpIGNvbnN0OwogCi0gICAgdm9pZCByZW1vdmVFcXVpdmFsZW50UHJvcGVy dGllcyhjb25zdCBTdHlsZVByb3BlcnR5U2V0Kik7Ci0gICAgdm9pZCByZW1vdmVFcXVpdmFsZW50 UHJvcGVydGllcyhjb25zdCBDU1NTdHlsZURlY2xhcmF0aW9uKik7Ci0KICAgICBQYXNzUmVmUHRy PE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBjb3B5UHJvcGVydGllc0luU2V0KGNvbnN0IENTU1By b3BlcnR5SUQqIHNldCwgdW5zaWduZWQgbGVuZ3RoKSBjb25zdDsKICAgICAKICAgICBTdHJpbmcg YXNUZXh0KCkgY29uc3Q7CkBAIC0xNTQsNiArMTM0LDggQEAgcHVibGljOgogICAgIGNvbnN0IENT U1ZhbHVlKiogaW1tdXRhYmxlVmFsdWVBcnJheSgpIGNvbnN0OwogICAgIGNvbnN0IFN0eWxlUHJv cGVydHlNZXRhZGF0YSogaW1tdXRhYmxlTWV0YWRhdGFBcnJheSgpIGNvbnN0OwogCisgICAgYm9v bCBwcm9wZXJ0eU1hdGNoZXMoQ1NTUHJvcGVydHlJRCwgY29uc3QgQ1NTVmFsdWUqKSBjb25zdDsK KwogcHJvdGVjdGVkOgogICAgIFN0eWxlUHJvcGVydHlTZXQoQ1NTUGFyc2VyTW9kZSBjc3NQYXJz ZXJNb2RlKQogICAgICAgICA6IG1fY3NzUGFyc2VyTW9kZShjc3NQYXJzZXJNb2RlKQpAQCAtMTY5 LDYgKzE1MSw4IEBAIHByb3RlY3RlZDoKICAgICAgICAgLCBtX2FycmF5U2l6ZShpbW11dGFibGVB cnJheVNpemUpCiAgICAgeyB9CiAKKyAgICBpbnQgZmluZFByb3BlcnR5SW5kZXgoQ1NTUHJvcGVy dHlJRCkgY29uc3Q7CisKICAgICBWZWN0b3I8Q1NTUHJvcGVydHksIDQ+JiBtdXRhYmxlUHJvcGVy dHlWZWN0b3IoKTsKICAgICBjb25zdCBWZWN0b3I8Q1NTUHJvcGVydHksIDQ+JiBtdXRhYmxlUHJv cGVydHlWZWN0b3IoKSBjb25zdDsKIApAQCAtMTkwLDEyICsxNzQsNiBAQCBwcml2YXRlOgogICAg IFN0cmluZyBmb250VmFsdWUoKSBjb25zdDsKICAgICB2b2lkIGFwcGVuZEZvbnRMb25naGFuZFZh bHVlSWZFeHBsaWNpdChDU1NQcm9wZXJ0eUlELCBTdHJpbmdCdWlsZGVyJiByZXN1bHQsIFN0cmlu ZyYgdmFsdWUpIGNvbnN0OwogCi0gICAgYm9vbCByZW1vdmVTaG9ydGhhbmRQcm9wZXJ0eShDU1NQ cm9wZXJ0eUlEKTsKLSAgICBib29sIHByb3BlcnR5TWF0Y2hlcyhDU1NQcm9wZXJ0eUlELCBjb25z dCBDU1NWYWx1ZSopIGNvbnN0OwotCi0gICAgaW50IGZpbmRQcm9wZXJ0eUluZGV4KENTU1Byb3Bl cnR5SUQpIGNvbnN0OwotICAgIENTU1Byb3BlcnR5KiBmaW5kTXV0YWJsZUNTU1Byb3BlcnR5V2l0 aElEKENTU1Byb3BlcnR5SUQpOwotCiAgICAgZnJpZW5kIGNsYXNzIFByb3BlcnR5U2V0Q1NTU3R5 bGVEZWNsYXJhdGlvbjsKIH07CiAKQEAgLTIzMiw2ICsyMTAsMjUgQEAgcHVibGljOgogICAgIHZv aWQgYWRkUGFyc2VkUHJvcGVydGllcyhjb25zdCBWZWN0b3I8Q1NTUHJvcGVydHk+Jik7CiAgICAg dm9pZCBhZGRQYXJzZWRQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eSYpOwogCisgICAgLy8gVGhl c2UgZXhwYW5kIHNob3J0aGFuZCBwcm9wZXJ0aWVzIGludG8gbXVsdGlwbGUgcHJvcGVydGllcy4K KyAgICBib29sIHNldFByb3BlcnR5KENTU1Byb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgdmFsdWUs IGJvb2wgaW1wb3J0YW50ID0gZmFsc2UsIFN0eWxlU2hlZXRDb250ZW50cyogY29udGV4dFN0eWxl U2hlZXQgPSAwKTsKKyAgICB2b2lkIHNldFByb3BlcnR5KENTU1Byb3BlcnR5SUQsIFBhc3NSZWZQ dHI8Q1NTVmFsdWU+LCBib29sIGltcG9ydGFudCA9IGZhbHNlKTsKKworICAgIC8vIFRoZXNlIGRv IG5vdC4gRklYTUU6IFRoaXMgaXMgdG9vIG1lc3N5LCB3ZSBjYW4gZG8gYmV0dGVyLgorICAgIGJv b2wgc2V0UHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgaW50IGlkZW50aWZpZXIsIGJvb2wgaW1wb3J0 YW50ID0gZmFsc2UpOworICAgIHZvaWQgYXBwZW5kUHJlZml4aW5nVmFyaWFudFByb3BlcnR5KGNv bnN0IENTU1Byb3BlcnR5Jik7CisgICAgdm9pZCBzZXRQcmVmaXhpbmdWYXJpYW50UHJvcGVydHko Y29uc3QgQ1NTUHJvcGVydHkmKTsKKyAgICB2b2lkIHNldFByb3BlcnR5KGNvbnN0IENTU1Byb3Bl cnR5JiwgQ1NTUHJvcGVydHkqIHNsb3QgPSAwKTsKKworICAgIGJvb2wgcmVtb3ZlUHJvcGVydHko Q1NTUHJvcGVydHlJRCwgU3RyaW5nKiByZXR1cm5UZXh0ID0gMCk7CisgICAgdm9pZCByZW1vdmVQ cmVmaXhlZE9yVW5wcmVmaXhlZFByb3BlcnR5KENTU1Byb3BlcnR5SUQpOworICAgIHZvaWQgcmVt b3ZlQmxvY2tQcm9wZXJ0aWVzKCk7CisgICAgYm9vbCByZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29u c3QgQ1NTUHJvcGVydHlJRCogc2V0LCB1bnNpZ25lZCBsZW5ndGgpOworICAgIHZvaWQgcmVtb3Zl RXF1aXZhbGVudFByb3BlcnRpZXMoY29uc3QgU3R5bGVQcm9wZXJ0eVNldCopOworICAgIHZvaWQg cmVtb3ZlRXF1aXZhbGVudFByb3BlcnRpZXMoY29uc3QgQ1NTU3R5bGVEZWNsYXJhdGlvbiopOwor CisgICAgdm9pZCBtZXJnZUFuZE92ZXJyaWRlT25Db25mbGljdChjb25zdCBTdHlsZVByb3BlcnR5 U2V0Kik7CisKICAgICB2b2lkIGNsZWFyKCk7CiAgICAgdm9pZCBwYXJzZURlY2xhcmF0aW9uKGNv bnN0IFN0cmluZyYgc3R5bGVEZWNsYXJhdGlvbiwgU3R5bGVTaGVldENvbnRlbnRzKiBjb250ZXh0 U3R5bGVTaGVldCk7CiAKQEAgLTI0NCw3ICsyNDEsMTEgQEAgcHJpdmF0ZToKICAgICBNdXRhYmxl U3R5bGVQcm9wZXJ0eVNldChDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUpCiAgICAgICAgIDog U3R5bGVQcm9wZXJ0eVNldChjc3NQYXJzZXJNb2RlKQogICAgIHsgfQorCiAgICAgTXV0YWJsZVN0 eWxlUHJvcGVydHlTZXQoY29uc3QgQ1NTUHJvcGVydHkqIHByb3BlcnRpZXMsIHVuc2lnbmVkIGNv dW50KTsKKworICAgIGJvb2wgcmVtb3ZlU2hvcnRoYW5kUHJvcGVydHkoQ1NTUHJvcGVydHlJRCk7 CisgICAgQ1NTUHJvcGVydHkqIGZpbmRDU1NQcm9wZXJ0eVdpdGhJRChDU1NQcm9wZXJ0eUlEKTsK IH07CiAKIGlubGluZSBWZWN0b3I8Q1NTUHJvcGVydHksIDQ+JiBTdHlsZVByb3BlcnR5U2V0Ojpt dXRhYmxlUHJvcGVydHlWZWN0b3IoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9BcHBseVN0eWxlQ29tbWFuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5 bGVDb21tYW5kLmNwcAppbmRleCAzZWM1ZGJhLi44MGYzZmUzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0FwcGx5U3R5bGVDb21tYW5kLmNwcApAQCAtMzk0LDcgKzM5NCw3IEBAIHZvaWQg QXBwbHlTdHlsZUNvbW1hbmQ6OmFwcGx5UmVsYXRpdmVGb250U3R5bGVDaGFuZ2UoRWRpdGluZ1N0 eWxlKiBzdHlsZSkKICAgICAgICAgfQogICAgICAgICBsYXN0U3R5bGVkTm9kZSA9IG5vZGU7CiAK LSAgICAgICAgUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+IGlubGluZVN0eWxlID0gY29weVN0eWxl T3JDcmVhdGVFbXB0eShlbGVtZW50LT5pbmxpbmVTdHlsZSgpKTsKKyAgICAgICAgUmVmUHRyPE11 dGFibGVTdHlsZVByb3BlcnR5U2V0PiBpbmxpbmVTdHlsZSA9IGNvcHlTdHlsZU9yQ3JlYXRlRW1w dHkoZWxlbWVudC0+aW5saW5lU3R5bGUoKSk7CiAgICAgICAgIGZsb2F0IGN1cnJlbnRGb250U2l6 ZSA9IGNvbXB1dGVkRm9udFNpemUobm9kZSk7CiAgICAgICAgIGZsb2F0IGRlc2lyZWRGb250U2l6 ZSA9IG1heChNaW5pbXVtRm9udFNpemUsIHN0YXJ0aW5nRm9udFNpemVzLmdldChub2RlKSArIHN0 eWxlLT5mb250U2l6ZURlbHRhKCkpOwogICAgICAgICBSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlID0g aW5saW5lU3R5bGUtPmdldFByb3BlcnR5Q1NTVmFsdWUoQ1NTUHJvcGVydHlGb250U2l6ZSk7CkBA IC01MjEsNyArNTIxLDcgQEAgdm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6cmVtb3ZlRW1iZWRkaW5n VXBUb0VuY2xvc2luZ0Jsb2NrKE5vZGUqIG5vZGUsIE5vZGUqIHVuc3AKICAgICAgICAgICAgIC8v IG90aGVyIGF0dHJpYnV0ZXMsIGxpa2Ugd2UgKHNob3VsZCkgZG8gd2l0aCBCIGFuZCBJIGVsZW1l bnRzLgogICAgICAgICAgICAgcmVtb3ZlTm9kZUF0dHJpYnV0ZShlbGVtZW50LCBkaXJBdHRyKTsK ICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIFJlZlB0cjxTdHlsZVByb3BlcnR5U2V0PiBp bmxpbmVTdHlsZSA9IGNvcHlTdHlsZU9yQ3JlYXRlRW1wdHkoZWxlbWVudC0+aW5saW5lU3R5bGUo KSk7CisgICAgICAgICAgICBSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IGlubGluZVN0 eWxlID0gY29weVN0eWxlT3JDcmVhdGVFbXB0eShlbGVtZW50LT5pbmxpbmVTdHlsZSgpKTsKICAg ICAgICAgICAgIGlubGluZVN0eWxlLT5zZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eVVuaWNvZGVCaWRp LCBDU1NWYWx1ZU5vcm1hbCk7CiAgICAgICAgICAgICBpbmxpbmVTdHlsZS0+cmVtb3ZlUHJvcGVy dHkoQ1NTUHJvcGVydHlEaXJlY3Rpb24pOwogICAgICAgICAgICAgc2V0Tm9kZUF0dHJpYnV0ZShl bGVtZW50LCBzdHlsZUF0dHIsIGlubGluZVN0eWxlLT5hc1RleHQoKSk7CkBAIC03NjUsNyArNzY1 LDcgQEAgdm9pZCBBcHBseVN0eWxlQ29tbWFuZDo6YXBwbHlJbmxpbmVTdHlsZVRvTm9kZVJhbmdl KEVkaXRpbmdTdHlsZSogc3R5bGUsIFBhc3NSZWYKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIC8vIEFkZCB0byB0aGlzIGVsZW1lbnQncyBpbmxpbmUgc3R5bGUgYW5kIHNraXAg b3ZlciBpdHMgY29udGVudHMuCiAgICAgICAgICAgICBIVE1MRWxlbWVudCogZWxlbWVudCA9IHRv SFRNTEVsZW1lbnQobm9kZS5nZXQoKSk7Ci0gICAgICAgICAgICBSZWZQdHI8U3R5bGVQcm9wZXJ0 eVNldD4gaW5saW5lU3R5bGUgPSBjb3B5U3R5bGVPckNyZWF0ZUVtcHR5KGVsZW1lbnQtPmlubGlu ZVN0eWxlKCkpOworICAgICAgICAgICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBp bmxpbmVTdHlsZSA9IGNvcHlTdHlsZU9yQ3JlYXRlRW1wdHkoZWxlbWVudC0+aW5saW5lU3R5bGUo KSk7CiAgICAgICAgICAgICBpbmxpbmVTdHlsZS0+bWVyZ2VBbmRPdmVycmlkZU9uQ29uZmxpY3Qo c3R5bGUtPnN0eWxlKCkpOwogICAgICAgICAgICAgc2V0Tm9kZUF0dHJpYnV0ZShlbGVtZW50LCBz dHlsZUF0dHIsIGlubGluZVN0eWxlLT5hc1RleHQoKSk7CiAgICAgICAgICAgICBuZXh0ID0gTm9k ZVRyYXZlcnNhbDo6bmV4dFNraXBwaW5nQ2hpbGRyZW4obm9kZS5nZXQoKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKaW5kZXggNTA5OTI0Ny4uMGI4MWUwNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcApAQCAtNjUyLDcgKzY1Miw3IEBAIFRy aVN0YXRlIEVkaXRpbmdTdHlsZTo6dHJpU3RhdGVPZlN0eWxlKEVkaXRpbmdTdHlsZSogc3R5bGUp IGNvbnN0CiAKIFRyaVN0YXRlIEVkaXRpbmdTdHlsZTo6dHJpU3RhdGVPZlN0eWxlKENTU1N0eWxl RGVjbGFyYXRpb24qIHN0eWxlVG9Db21wYXJlLCBTaG91bGRJZ25vcmVUZXh0T25seVByb3BlcnRp ZXMgc2hvdWxkSWdub3JlVGV4dE9ubHlQcm9wZXJ0aWVzKSBjb25zdAogewotICAgIFJlZlB0cjxT dHlsZVByb3BlcnR5U2V0PiBkaWZmZXJlbmNlID0gZ2V0UHJvcGVydGllc05vdEluKG1fbXV0YWJs ZVN0eWxlLmdldCgpLCBzdHlsZVRvQ29tcGFyZSk7CisgICAgUmVmUHRyPE11dGFibGVTdHlsZVBy b3BlcnR5U2V0PiBkaWZmZXJlbmNlID0gZ2V0UHJvcGVydGllc05vdEluKG1fbXV0YWJsZVN0eWxl LmdldCgpLCBzdHlsZVRvQ29tcGFyZSk7CiAKICAgICBpZiAoc2hvdWxkSWdub3JlVGV4dE9ubHlQ cm9wZXJ0aWVzID09IElnbm9yZVRleHRPbmx5UHJvcGVydGllcykKICAgICAgICAgZGlmZmVyZW5j ZS0+cmVtb3ZlUHJvcGVydGllc0luU2V0KHRleHRPbmx5UHJvcGVydGllcywgV1RGX0FSUkFZX0xF TkdUSCh0ZXh0T25seVByb3BlcnRpZXMpKTsKQEAgLTExMjQsNyArMTEyNCw3IEBAIHZvaWQgRWRp dGluZ1N0eWxlOjptZXJnZVN0eWxlRnJvbVJ1bGVzRm9yU2VyaWFsaXphdGlvbihTdHlsZWRFbGVt ZW50KiBlbGVtZW50KQogICAgIG1fbXV0YWJsZVN0eWxlLT5tZXJnZUFuZE92ZXJyaWRlT25Db25m bGljdChmcm9tQ29tcHV0ZWRTdHlsZS5nZXQoKSk7CiB9CiAKLXN0YXRpYyB2b2lkIHJlbW92ZVBy b3BlcnRpZXNJblN0eWxlKFN0eWxlUHJvcGVydHlTZXQqIHN0eWxlVG9SZW1vdmVQcm9wZXJ0aWVz RnJvbSwgU3R5bGVQcm9wZXJ0eVNldCogc3R5bGUpCitzdGF0aWMgdm9pZCByZW1vdmVQcm9wZXJ0 aWVzSW5TdHlsZShNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCogc3R5bGVUb1JlbW92ZVByb3BlcnRp ZXNGcm9tLCBTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSkKIHsKICAgICB1bnNpZ25lZCBwcm9wZXJ0 eUNvdW50ID0gc3R5bGUtPnByb3BlcnR5Q291bnQoKTsKICAgICBWZWN0b3I8Q1NTUHJvcGVydHlJ RD4gcHJvcGVydGllc1RvUmVtb3ZlKHByb3BlcnR5Q291bnQpOwpAQCAtMTMxMSw3ICsxMzExLDcg QEAgV3JpdGluZ0RpcmVjdGlvbiBFZGl0aW5nU3R5bGU6OnRleHREaXJlY3Rpb25Gb3JTZWxlY3Rp b24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYKICAgICByZXR1cm4gZm91bmREaXJlY3Rpb247CiB9 CiAKLXN0YXRpYyB2b2lkIHJlY29uY2lsZVRleHREZWNvcmF0aW9uUHJvcGVydGllcyhTdHlsZVBy b3BlcnR5U2V0KiBzdHlsZSkKK3N0YXRpYyB2b2lkIHJlY29uY2lsZVRleHREZWNvcmF0aW9uUHJv cGVydGllcyhNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCogc3R5bGUpCiB7ICAgIAogICAgIFJlZlB0 cjxDU1NWYWx1ZT4gdGV4dERlY29yYXRpb25zSW5FZmZlY3QgPSBzdHlsZS0+Z2V0UHJvcGVydHlD U1NWYWx1ZShDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uc0luRWZmZWN0KTsKICAgICBS ZWZQdHI8Q1NTVmFsdWU+IHRleHREZWNvcmF0aW9uID0gc3R5bGUtPmdldFByb3BlcnR5Q1NTVmFs dWUoQ1NTUHJvcGVydHlUZXh0RGVjb3JhdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHQW5pbWF0ZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0FuaW1h dGVFbGVtZW50LmNwcAppbmRleCA0OGI1ZmQ2Li41NjM2MzEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHQW5pbWF0ZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdBbmltYXRlRWxlbWVudC5jcHAKQEAgLTIzOSw3ICsyMzksNyBAQCBzdGF0aWMgaW5saW5l IHZvaWQgYXBwbHlDU1NQcm9wZXJ0eVRvVGFyZ2V0KFNWR0VsZW1lbnQqIHRhcmdldEVsZW1lbnQs IENTU1Byb3BlcgogewogICAgIEFTU0VSVCghdGFyZ2V0RWxlbWVudC0+bV9kZWxldGlvbkhhc0Jl Z3VuKTsKIAotICAgIFN0eWxlUHJvcGVydHlTZXQqIHByb3BlcnR5U2V0ID0gdGFyZ2V0RWxlbWVu dC0+ZW5zdXJlQW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKCk7CisgICAgTXV0YWJsZVN0eWxl UHJvcGVydHlTZXQqIHByb3BlcnR5U2V0ID0gdGFyZ2V0RWxlbWVudC0+ZW5zdXJlQW5pbWF0ZWRT TUlMU3R5bGVQcm9wZXJ0aWVzKCk7CiAgICAgaWYgKCFwcm9wZXJ0eVNldC0+c2V0UHJvcGVydHko aWQsIHZhbHVlLCBmYWxzZSwgMCkpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0Vs ZW1lbnQuY3BwCmluZGV4IGVhZjhiYzkuLjAzNDg1OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVu dC5jcHAKQEAgLTU5NCwxNCArNTk0LDE0IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFNWR0Vs ZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKQogICAgIHJldHVybiBkb2N1bWVudCgpLT5z dHlsZVJlc29sdmVyKCktPnN0eWxlRm9yRWxlbWVudChjb3JyZXNwb25kaW5nRWxlbWVudCgpLCBz dHlsZSwgRGlzYWxsb3dTdHlsZVNoYXJpbmcpOwogfQogCi1TdHlsZVByb3BlcnR5U2V0KiBTVkdF bGVtZW50OjphbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKSBjb25zdAorTXV0YWJsZVN0eWxl UHJvcGVydHlTZXQqIFNWR0VsZW1lbnQ6OmFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGllcygpIGNv bnN0CiB7CiAgICAgaWYgKGhhc1NWR1JhcmVEYXRhKCkpCiAgICAgICAgIHJldHVybiBzdmdSYXJl RGF0YSgpLT5hbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKTsKICAgICByZXR1cm4gMDsKIH0K IAotU3R5bGVQcm9wZXJ0eVNldCogU1ZHRWxlbWVudDo6ZW5zdXJlQW5pbWF0ZWRTTUlMU3R5bGVQ cm9wZXJ0aWVzKCkKK011dGFibGVTdHlsZVByb3BlcnR5U2V0KiBTVkdFbGVtZW50OjplbnN1cmVB bmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKQogewogICAgIHJldHVybiBlbnN1cmVTVkdSYXJl RGF0YSgpLT5lbnN1cmVBbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcv U1ZHRWxlbWVudC5oCmluZGV4IGRiNzRjMjkuLmE4OTNkN2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1l bnQuaApAQCAtMTExLDggKzExMSw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzQW5pbWF0YWJsZUF0 dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Q7CiAjZW5kaWYKIAotICAgIFN0eWxl UHJvcGVydHlTZXQqIGFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGllcygpIGNvbnN0OwotICAgIFN0 eWxlUHJvcGVydHlTZXQqIGVuc3VyZUFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGllcygpOworICAg IE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBhbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKSBj b25zdDsKKyAgICBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCogZW5zdXJlQW5pbWF0ZWRTTUlMU3R5 bGVQcm9wZXJ0aWVzKCk7CiAgICAgdm9pZCBzZXRVc2VPdmVycmlkZUNvbXB1dGVkU3R5bGUoYm9v bCk7CiAKICAgICB2aXJ0dWFsIGJvb2wgaGF2ZUxvYWRlZFJlcXVpcmVkUmVzb3VyY2VzKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudFJhcmVEYXRhLmggYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudFJhcmVEYXRhLmgKaW5kZXggNTA1NDU0Yy4uZDUzZjQ3 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnRSYXJlRGF0YS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50UmFyZURhdGEuaApAQCAtNzUsOCArNzUs OCBAQCBwdWJsaWM6CiAgICAgQ1NTQ3Vyc29ySW1hZ2VWYWx1ZSogY3Vyc29ySW1hZ2VWYWx1ZSgp IGNvbnN0IHsgcmV0dXJuIG1fY3Vyc29ySW1hZ2VWYWx1ZTsgfQogICAgIHZvaWQgc2V0Q3Vyc29y SW1hZ2VWYWx1ZShDU1NDdXJzb3JJbWFnZVZhbHVlKiBjdXJzb3JJbWFnZVZhbHVlKSB7IG1fY3Vy c29ySW1hZ2VWYWx1ZSA9IGN1cnNvckltYWdlVmFsdWU7IH0KIAotICAgIFN0eWxlUHJvcGVydHlT ZXQqIGFuaW1hdGVkU01JTFN0eWxlUHJvcGVydGllcygpIGNvbnN0IHsgcmV0dXJuIG1fYW5pbWF0 ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzLmdldCgpOyB9Ci0gICAgU3R5bGVQcm9wZXJ0eVNldCogZW5z dXJlQW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKCkKKyAgICBNdXRhYmxlU3R5bGVQcm9wZXJ0 eVNldCogYW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKCkgY29uc3QgeyByZXR1cm4gbV9hbmlt YXRlZFNNSUxTdHlsZVByb3BlcnRpZXMuZ2V0KCk7IH0KKyAgICBNdXRhYmxlU3R5bGVQcm9wZXJ0 eVNldCogZW5zdXJlQW5pbWF0ZWRTTUlMU3R5bGVQcm9wZXJ0aWVzKCkKICAgICB7CiAgICAgICAg IGlmICghbV9hbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMpCiAgICAgICAgICAgICBtX2FuaW1h dGVkU01JTFN0eWxlUHJvcGVydGllcyA9IE11dGFibGVTdHlsZVByb3BlcnR5U2V0OjpjcmVhdGUo U1ZHQXR0cmlidXRlTW9kZSk7CkBAIC0xMTQsNyArMTE0LDcgQEAgcHJpdmF0ZToKICAgICBib29s IG1faW5zdGFuY2VzVXBkYXRlc0Jsb2NrZWQgOiAxOwogICAgIGJvb2wgbV91c2VPdmVycmlkZUNv bXB1dGVkU3R5bGUgOiAxOwogICAgIGJvb2wgbV9uZWVkc092ZXJyaWRlQ29tcHV0ZWRTdHlsZVVw ZGF0ZSA6IDE7Ci0gICAgUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+IG1fYW5pbWF0ZWRTTUlMU3R5 bGVQcm9wZXJ0aWVzOworICAgIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gbV9hbmlt YXRlZFNNSUxTdHlsZVByb3BlcnRpZXM7CiAgICAgUmVmUHRyPFJlbmRlclN0eWxlPiBtX292ZXJy aWRlQ29tcHV0ZWRTdHlsZTsKIH07CiAK