114588 2013-04-14 09:39:51 -0700 EditingStyle should have a MutableStylePropertySet internally. 2013-04-14 10:32:00 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 114568 1 kling kling commit-queue esprehn+autocc kling macpherson menard mifenton oldest_to_newest 875366 0 kling 2013-04-14 09:39:51 -0700 EditingStyle should have a MutableStylePropertySet internally. 875368 1 198001 kling 2013-04-14 09:43:17 -0700 Created attachment 198001 Patch 875374 2 kling 2013-04-14 10:32:00 -0700 Committed r148402: <http://trac.webkit.org/changeset/148402> 198001 2013-04-14 09:43:17 -0700 2013-04-14 10:29:43 -0700 Patch bug-114588.diff text/plain 8945 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiY2VmYTg4Li44NDI4NjQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEg QEAKIDIwMTMtMDQtMTQgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIEVkaXRpbmdTdHlsZSBzaG91bGQgaGF2ZSBhIE11dGFibGVTdHlsZVByb3BlcnR5U2V0IGlu dGVybmFsbHkuCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzExNDU4OD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTd2l0Y2ggRWRpdGluZ1N0 eWxlOjptX211dGFibGVTdHlsZSB0byBhIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4u CisKKyAgICAgICAgKiBjc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZVByb3BlcnR5U2V0Ojpjb3B5QmxvY2tQcm9wZXJ0aWVzKToKKyAgICAgICAgKiBjc3Mv U3R5bGVQcm9wZXJ0eVNldC5oOgorICAgICAgICAoU3R5bGVQcm9wZXJ0eVNldCk6CisgICAgICAg ICogZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0 eWxlOjpzZXRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6Om1lcmdlU3R5 bGVGcm9tUnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVDaGFuZ2U6OlN0eWxlQ2hhbmdl KToKKyAgICAgICAgKFdlYkNvcmU6OnNldFRleHREZWNvcmF0aW9uUHJvcGVydHkpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVDaGFuZ2U6OmV4dHJhY3RUZXh0U3R5bGVzKToKKyAgICAgICAgKFdl YkNvcmU6OmRpZmZUZXh0RGVjb3JhdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0UHJvcGVy dGllc05vdEluKToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRpbmdTdHlsZS5oOgorICAgICAgICAo V2ViQ29yZTo6RWRpdGluZ1N0eWxlOjpzdHlsZSk6CisgICAgICAgIChFZGl0aW5nU3R5bGUpOgor ICAgICAgICAoU3R5bGVDaGFuZ2UpOgorCisyMDEzLTA0LTE0ICBBbmRyZWFzIEtsaW5nICA8YWts aW5nQGFwcGxlLmNvbT4KKwogICAgICAgICBNb3ZlIGFkZFBhcnNlZFByb3BlcnR5L2FkZFBhcnNl ZFByb3BlcnRpZXMgdG8gTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQuCiAgICAgICAgIDxodHRwOi8v d2Via2l0Lm9yZy9iLzExNDU4Nz4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUHJvcGVydHlTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQu Y3BwCmluZGV4IGM1YjE3YWEuLjc4M2E0ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVByb3BlcnR5U2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9w ZXJ0eVNldC5jcHAKQEAgLTExMDYsNyArMTEwNiw3IEBAIHZvaWQgTXV0YWJsZVN0eWxlUHJvcGVy dHlTZXQ6OmNsZWFyKCkKIAogY29uc3QgdW5zaWduZWQgbnVtQmxvY2tQcm9wZXJ0aWVzID0gV1RG X0FSUkFZX0xFTkdUSChibG9ja1Byb3BlcnRpZXMpOwogCi1QYXNzUmVmUHRyPFN0eWxlUHJvcGVy dHlTZXQ+IFN0eWxlUHJvcGVydHlTZXQ6OmNvcHlCbG9ja1Byb3BlcnRpZXMoKSBjb25zdAorUGFz c1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gU3R5bGVQcm9wZXJ0eVNldDo6Y29weUJs b2NrUHJvcGVydGllcygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGNvcHlQcm9wZXJ0aWVzSW5TZXQo YmxvY2tQcm9wZXJ0aWVzLCBudW1CbG9ja1Byb3BlcnRpZXMpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVByb3BlcnR5U2V0LmgKaW5kZXggYjNkZTAyOS4uOTA2ZmZhMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVQcm9wZXJ0eVNldC5oCkBAIC0xMTcsNyArMTE3LDcgQEAgcHVibGljOgogICAgIGJv b2wgcmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCwgU3RyaW5nKiByZXR1cm5UZXh0ID0gMCk7 CiAgICAgdm9pZCByZW1vdmVQcmVmaXhlZE9yVW5wcmVmaXhlZFByb3BlcnR5KENTU1Byb3BlcnR5 SUQpOwogCi0gICAgUGFzc1JlZlB0cjxTdHlsZVByb3BlcnR5U2V0PiBjb3B5QmxvY2tQcm9wZXJ0 aWVzKCkgY29uc3Q7CisgICAgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gY29w eUJsb2NrUHJvcGVydGllcygpIGNvbnN0OwogICAgIHZvaWQgcmVtb3ZlQmxvY2tQcm9wZXJ0aWVz KCk7CiAgICAgYm9vbCByZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29uc3QgQ1NTUHJvcGVydHlJRCog c2V0LCB1bnNpZ25lZCBsZW5ndGgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRpbmdTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHls ZS5jcHAKaW5kZXggZTM2NGExMS4uNTA5OTI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dGluZ1N0eWxlLmNwcApAQCAtMTA4LDcgKzEwOCw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPE11dGFi bGVTdHlsZVByb3BlcnR5U2V0PiBlZGl0aW5nU3R5bGVGcm9tQ29tcHV0ZWRTdHlsZShQYXNzUmVm CiAgICAgcmV0dXJuIGNvcHlFZGl0aW5nUHJvcGVydGllcyhzdHlsZS5nZXQoKSwgdHlwZSk7CiB9 CiAKLXN0YXRpYyBQYXNzUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+IGdldFByb3BlcnRpZXNOb3RJ bihTdHlsZVByb3BlcnR5U2V0KiBzdHlsZVdpdGhSZWR1bmRhbnRQcm9wZXJ0aWVzLCBDU1NTdHls ZURlY2xhcmF0aW9uKiBiYXNlU3R5bGUpOworc3RhdGljIFBhc3NSZWZQdHI8TXV0YWJsZVN0eWxl UHJvcGVydHlTZXQ+IGdldFByb3BlcnRpZXNOb3RJbihTdHlsZVByb3BlcnR5U2V0KiBzdHlsZVdp dGhSZWR1bmRhbnRQcm9wZXJ0aWVzLCBDU1NTdHlsZURlY2xhcmF0aW9uKiBiYXNlU3R5bGUpOwog ZW51bSBMZWdhY3lGb250U2l6ZU1vZGUgeyBBbHdheXNVc2VMZWdhY3lGb250U2l6ZSwgVXNlTGVn YWN5Rm9udFNpemVPbmx5SWZQaXhlbFZhbHVlc01hdGNoIH07CiBzdGF0aWMgaW50IGxlZ2FjeUZv bnRTaXplRnJvbUNTU1ZhbHVlKERvY3VtZW50KiwgQ1NTUHJpbWl0aXZlVmFsdWUqLCBib29sIHNo b3VsZFVzZUZpeGVkRm9udERlZmF1bHRTaXplLCBMZWdhY3lGb250U2l6ZU1vZGUpOwogc3RhdGlj IGJvb2wgaXNUcmFuc3BhcmVudENvbG9yVmFsdWUoQ1NTVmFsdWUqKTsKQEAgLTUyMyw3ICs1MjMs NyBAQCBib29sIEVkaXRpbmdTdHlsZTo6dGV4dERpcmVjdGlvbihXcml0aW5nRGlyZWN0aW9uJiB3 cml0aW5nRGlyZWN0aW9uKSBjb25zdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBFZGl0 aW5nU3R5bGU6OnNldFN0eWxlKFBhc3NSZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4gc3R5bGUpCit2 b2lkIEVkaXRpbmdTdHlsZTo6c2V0U3R5bGUoUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0 eVNldD4gc3R5bGUpCiB7CiAgICAgbV9tdXRhYmxlU3R5bGUgPSBzdHlsZTsKICAgICAvLyBGSVhN RTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gZmlndXJlIG91dCB3aGV0aGVyIG9yIG5vdCBmb250IGlz IGZpeGVkIHdpZHRoIGZvciBtdXRhYmxlIHN0eWxlLgpAQCAtMTA4OCw3ICsxMDg4LDcgQEAgc3Rh dGljIFBhc3NSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IHN0eWxlRnJvbU1hdGNoZWRS dWxlc0ZvckVsZW1lbnQoRWxlbWUKIAogdm9pZCBFZGl0aW5nU3R5bGU6Om1lcmdlU3R5bGVGcm9t UnVsZXMoU3R5bGVkRWxlbWVudCogZWxlbWVudCkKIHsKLSAgICBSZWZQdHI8U3R5bGVQcm9wZXJ0 eVNldD4gc3R5bGVGcm9tTWF0Y2hlZFJ1bGVzID0gc3R5bGVGcm9tTWF0Y2hlZFJ1bGVzRm9yRWxl bWVudChlbGVtZW50LAorICAgIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gc3R5bGVG cm9tTWF0Y2hlZFJ1bGVzID0gc3R5bGVGcm9tTWF0Y2hlZFJ1bGVzRm9yRWxlbWVudChlbGVtZW50 LAogICAgICAgICBTdHlsZVJlc29sdmVyOjpBdXRob3JDU1NSdWxlcyB8IFN0eWxlUmVzb2x2ZXI6 OkNyb3NzT3JpZ2luQ1NTUnVsZXMpOwogICAgIC8vIFN0eWxlcyBmcm9tIHRoZSBpbmxpbmUgc3R5 bGUgZGVjbGFyYXRpb24sIGhlbGQgaW4gdGhlIHZhcmlhYmxlICJzdHlsZSIsIHRha2UgcHJlY2Vk ZW5jZSAKICAgICAvLyBvdmVyIHRob3NlIGZyb20gbWF0Y2hlZCBydWxlcy4KQEAgLTEzNDIsNyAr MTM0Miw3IEBAIFN0eWxlQ2hhbmdlOjpTdHlsZUNoYW5nZShFZGl0aW5nU3R5bGUqIHN0eWxlLCBj b25zdCBQb3NpdGlvbiYgcG9zaXRpb24pCiAKICAgICBSZWZQdHI8Q1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uPiBjb21wdXRlZFN0eWxlID0gcG9zaXRpb24uY29tcHV0ZWRTdHlsZSgpOwogICAg IC8vIEZJWE1FOiB0YWtlIGNhcmUgb2YgYmFja2dyb3VuZC1jb2xvciBpbiBlZmZlY3QKLSAgICBS ZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4gbXV0YWJsZVN0eWxlID0gZ2V0UHJvcGVydGllc05vdElu KHN0eWxlLT5zdHlsZSgpLCBjb21wdXRlZFN0eWxlLmdldCgpKTsKKyAgICBSZWZQdHI8TXV0YWJs ZVN0eWxlUHJvcGVydHlTZXQ+IG11dGFibGVTdHlsZSA9IGdldFByb3BlcnRpZXNOb3RJbihzdHls ZS0+c3R5bGUoKSwgY29tcHV0ZWRTdHlsZS5nZXQoKSk7CiAKICAgICByZWNvbmNpbGVUZXh0RGVj b3JhdGlvblByb3BlcnRpZXMobXV0YWJsZVN0eWxlLmdldCgpKTsKICAgICBpZiAoIWRvY3VtZW50 LT5mcmFtZSgpLT5lZGl0b3IoKS0+c2hvdWxkU3R5bGVXaXRoQ1NTKCkpCkBAIC0xMzYxLDcgKzEz NjEsNyBAQCBTdHlsZUNoYW5nZTo6U3R5bGVDaGFuZ2UoRWRpdGluZ1N0eWxlKiBzdHlsZSwgY29u c3QgUG9zaXRpb24mIHBvc2l0aW9uKQogICAgIG1fY3NzU3R5bGUgPSBtdXRhYmxlU3R5bGUtPmFz VGV4dCgpLnN0cmlwV2hpdGVTcGFjZSgpOwogfQogCi1zdGF0aWMgdm9pZCBzZXRUZXh0RGVjb3Jh dGlvblByb3BlcnR5KFN0eWxlUHJvcGVydHlTZXQqIHN0eWxlLCBjb25zdCBDU1NWYWx1ZUxpc3Qq IG5ld1RleHREZWNvcmF0aW9uLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpCitzdGF0aWMgdm9p ZCBzZXRUZXh0RGVjb3JhdGlvblByb3BlcnR5KE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBzdHls ZSwgY29uc3QgQ1NTVmFsdWVMaXN0KiBuZXdUZXh0RGVjb3JhdGlvbiwgQ1NTUHJvcGVydHlJRCBw cm9wZXJ0eUlEKQogewogICAgIGlmIChuZXdUZXh0RGVjb3JhdGlvbi0+bGVuZ3RoKCkpCiAgICAg ICAgIHN0eWxlLT5zZXRQcm9wZXJ0eShwcm9wZXJ0eUlELCBuZXdUZXh0RGVjb3JhdGlvbi0+Y3Nz VGV4dCgpLCBzdHlsZS0+cHJvcGVydHlJc0ltcG9ydGFudChwcm9wZXJ0eUlEKSk7CkBAIC0xMzcy LDcgKzEzNzIsNyBAQCBzdGF0aWMgdm9pZCBzZXRUZXh0RGVjb3JhdGlvblByb3BlcnR5KFN0eWxl UHJvcGVydHlTZXQqIHN0eWxlLCBjb25zdCBDU1NWYWx1ZUxpcwogICAgIH0KIH0KIAotdm9pZCBT dHlsZUNoYW5nZTo6ZXh0cmFjdFRleHRTdHlsZXMoRG9jdW1lbnQqIGRvY3VtZW50LCBTdHlsZVBy b3BlcnR5U2V0KiBzdHlsZSwgYm9vbCBzaG91bGRVc2VGaXhlZEZvbnREZWZhdWx0U2l6ZSkKK3Zv aWQgU3R5bGVDaGFuZ2U6OmV4dHJhY3RUZXh0U3R5bGVzKERvY3VtZW50KiBkb2N1bWVudCwgTXV0 YWJsZVN0eWxlUHJvcGVydHlTZXQqIHN0eWxlLCBib29sIHNob3VsZFVzZUZpeGVkRm9udERlZmF1 bHRTaXplKQogewogICAgIEFTU0VSVChzdHlsZSk7CiAKQEAgLTE0MzcsNyArMTQzNyw3IEBAIHZv aWQgU3R5bGVDaGFuZ2U6OmV4dHJhY3RUZXh0U3R5bGVzKERvY3VtZW50KiBkb2N1bWVudCwgU3R5 bGVQcm9wZXJ0eVNldCogc3R5bGUsCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBkaWZmVGV4dERl Y29yYXRpb25zKFN0eWxlUHJvcGVydHlTZXQqIHN0eWxlLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnRJ RCwgQ1NTVmFsdWUqIHJlZlRleHREZWNvcmF0aW9uKQorc3RhdGljIHZvaWQgZGlmZlRleHREZWNv cmF0aW9ucyhNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCogc3R5bGUsIENTU1Byb3BlcnR5SUQgcHJv cGVydElELCBDU1NWYWx1ZSogcmVmVGV4dERlY29yYXRpb24pCiB7CiAgICAgUmVmUHRyPENTU1Zh bHVlPiB0ZXh0RGVjb3JhdGlvbiA9IHN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlKHByb3BlcnRJ RCk7CiAgICAgaWYgKCF0ZXh0RGVjb3JhdGlvbiB8fCAhdGV4dERlY29yYXRpb24tPmlzVmFsdWVM aXN0KCkgfHwgIXJlZlRleHREZWNvcmF0aW9uIHx8ICFyZWZUZXh0RGVjb3JhdGlvbi0+aXNWYWx1 ZUxpc3QoKSkKQEAgLTE0OTUsNyArMTQ5NSw3IEBAIHN0YXRpYyBib29sIGZvbnRXZWlnaHRJc0Jv bGQoU3R5bGVQcm9wZXJ0eVNldCogc3R5bGUpCiAgICAgcmV0dXJuIGZvbnRXZWlnaHRJc0JvbGQo Zm9udFdlaWdodC5nZXQoKSk7CiB9CiAKLVBhc3NSZWZQdHI8U3R5bGVQcm9wZXJ0eVNldD4gZ2V0 UHJvcGVydGllc05vdEluKFN0eWxlUHJvcGVydHlTZXQqIHN0eWxlV2l0aFJlZHVuZGFudFByb3Bl cnRpZXMsIENTU1N0eWxlRGVjbGFyYXRpb24qIGJhc2VTdHlsZSkKK1Bhc3NSZWZQdHI8TXV0YWJs ZVN0eWxlUHJvcGVydHlTZXQ+IGdldFByb3BlcnRpZXNOb3RJbihTdHlsZVByb3BlcnR5U2V0KiBz dHlsZVdpdGhSZWR1bmRhbnRQcm9wZXJ0aWVzLCBDU1NTdHlsZURlY2xhcmF0aW9uKiBiYXNlU3R5 bGUpCiB7CiAgICAgQVNTRVJUKHN0eWxlV2l0aFJlZHVuZGFudFByb3BlcnRpZXMpOwogICAgIEFT U0VSVChiYXNlU3R5bGUpOwpAQCAtMTUyMCw3ICsxNTIwLDcgQEAgUGFzc1JlZlB0cjxTdHlsZVBy b3BlcnR5U2V0PiBnZXRQcm9wZXJ0aWVzTm90SW4oU3R5bGVQcm9wZXJ0eVNldCogc3R5bGVXaXRo UmVkdW4KICAgICBpZiAoYmFzZVN0eWxlLT5nZXRQcm9wZXJ0eUNTU1ZhbHVlSW50ZXJuYWwoQ1NT UHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpICYmIGdldFJHQkFCYWNrZ3JvdW5kQ29sb3IocmVzdWx0 LmdldCgpKSA9PSBnZXRSR0JBQmFja2dyb3VuZENvbG9yKGJhc2VTdHlsZSkpCiAgICAgICAgIHJl c3VsdC0+cmVtb3ZlUHJvcGVydHkoQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IpOwogCi0gICAg cmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2UoKTsKIH0KIAogaW50IGdl dElkZW50aWZpZXJWYWx1ZShTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSwgQ1NTUHJvcGVydHlJRCBw cm9wZXJ0eUlEKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5 bGUuaCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgKaW5kZXggYjU2Njk3 MS4uZmFlYTg3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5 bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oCkBAIC01MCw2 ICs1MCw3IEBAIGNsYXNzIENTU1ZhbHVlOwogY2xhc3MgRG9jdW1lbnQ7CiBjbGFzcyBFbGVtZW50 OwogY2xhc3MgSFRNTEVsZW1lbnQ7CitjbGFzcyBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDsKIGNs YXNzIE5vZGU7CiBjbGFzcyBQb3NpdGlvbjsKIGNsYXNzIFF1YWxpZmllZE5hbWU7CkBAIC05OCwx MCArOTksMTAgQEAgcHVibGljOgogCiAgICAgfkVkaXRpbmdTdHlsZSgpOwogCi0gICAgU3R5bGVQ cm9wZXJ0eVNldCogc3R5bGUoKSB7IHJldHVybiBtX211dGFibGVTdHlsZS5nZXQoKTsgfQorICAg IE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSgpIHsgcmV0dXJuIG1fbXV0YWJsZVN0eWxl LmdldCgpOyB9CiAgICAgYm9vbCB0ZXh0RGlyZWN0aW9uKFdyaXRpbmdEaXJlY3Rpb24mKSBjb25z dDsKICAgICBib29sIGlzRW1wdHkoKSBjb25zdDsKLSAgICB2b2lkIHNldFN0eWxlKFBhc3NSZWZQ dHI8U3R5bGVQcm9wZXJ0eVNldD4pOworICAgIHZvaWQgc2V0U3R5bGUoUGFzc1JlZlB0cjxNdXRh YmxlU3R5bGVQcm9wZXJ0eVNldD4pOwogICAgIHZvaWQgb3ZlcnJpZGVXaXRoU3R5bGUoY29uc3Qg U3R5bGVQcm9wZXJ0eVNldCopOwogICAgIHZvaWQgY2xlYXIoKTsKICAgICBQYXNzUmVmUHRyPEVk aXRpbmdTdHlsZT4gY29weSgpIGNvbnN0OwpAQCAtMTYzLDcgKzE2NCw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBtZXJnZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQoU3R5bGVkRWxlbWVu dCosIENTU1Byb3BlcnR5T3ZlcnJpZGVNb2RlLCBQcm9wZXJ0aWVzVG9JbmNsdWRlKTsKICAgICB2 b2lkIG1lcmdlU3R5bGUoY29uc3QgU3R5bGVQcm9wZXJ0eVNldCosIENTU1Byb3BlcnR5T3ZlcnJp ZGVNb2RlKTsKIAotICAgIFJlZlB0cjxTdHlsZVByb3BlcnR5U2V0PiBtX211dGFibGVTdHlsZTsK KyAgICBSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IG1fbXV0YWJsZVN0eWxlOwogICAg IGJvb2wgbV9zaG91bGRVc2VGaXhlZERlZmF1bHRGb250U2l6ZTsKICAgICBmbG9hdCBtX2ZvbnRT aXplRGVsdGE7CiAKQEAgLTIxNyw3ICsyMTgsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAh KCp0aGlzID09IG90aGVyKTsKICAgICB9CiBwcml2YXRlOgotICAgIHZvaWQgZXh0cmFjdFRleHRT dHlsZXMoRG9jdW1lbnQqLCBTdHlsZVByb3BlcnR5U2V0KiwgYm9vbCBzaG91bGRVc2VGaXhlZEZv bnREZWZhdWx0U2l6ZSk7CisgICAgdm9pZCBleHRyYWN0VGV4dFN0eWxlcyhEb2N1bWVudCosIE11 dGFibGVTdHlsZVByb3BlcnR5U2V0KiwgYm9vbCBzaG91bGRVc2VGaXhlZEZvbnREZWZhdWx0U2l6 ZSk7CiAKICAgICBTdHJpbmcgbV9jc3NTdHlsZTsKICAgICBib29sIG1fYXBwbHlCb2xkOwo=