114587 2013-04-14 09:11:24 -0700 Move addParsedProperty/addParsedProperties to MutableStylePropertySet. 2013-04-14 09:42:34 -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 oldest_to_newest 875358 0 kling 2013-04-14 09:11:24 -0700 Move addParsedProperty/addParsedProperties to MutableStylePropertySet. 875363 1 197999 kling 2013-04-14 09:22:55 -0700 Created attachment 197999 Patch 875367 2 kling 2013-04-14 09:42:34 -0700 Committed r148400: <http://trac.webkit.org/changeset/148400> 197999 2013-04-14 09:22:55 -0700 2013-04-14 09:34:30 -0700 Patch bug-114587.diff text/plain 11954 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZGZhMjQyLi5iY2VmYTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQg QEAKIDIwMTMtMDQtMTQgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIE1vdmUgYWRkUGFyc2VkUHJvcGVydHkvYWRkUGFyc2VkUHJvcGVydGllcyB0byBNdXRhYmxl U3R5bGVQcm9wZXJ0eVNldC4KKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvMTE0NTg3Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCBDU1NQ YXJzZXIgbWV0aG9kcyB0aGF0IG11dGF0ZSBhbiBleGlzdGluZyBTdHlsZVByb3BlcnR5U2V0IG5v dyB0YWtlIGEgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQqCisgICAgICAgIGluc3RlYWQgb2YgYSBT dHlsZVByb3BlcnR5U2V0Ki4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6cGFyc2VDb2xvclZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlU2lt cGxlTGVuZ3RoVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VLZXl3b3JkVmFsdWUpOgor ICAgICAgICAoV2ViQ29yZTo6cGFyc2VUcmFuc2xhdGVUcmFuc2Zvcm1WYWx1ZSk6CisgICAgICAg IChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NT UGFyc2VyOjpwYXJzZURlY2xhcmF0aW9uKToKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmg6Cisg ICAgICAgIChDU1NQYXJzZXIpOgorICAgICAgICAqIGNzcy9TdHlsZVByb3BlcnR5U2V0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydHlTZXQ6OnNldFByb3BlcnR5KToKKyAgICAg ICAgKFdlYkNvcmU6Ok11dGFibGVTdHlsZVByb3BlcnR5U2V0OjphZGRQYXJzZWRQcm9wZXJ0aWVz KToKKyAgICAgICAgKFdlYkNvcmU6Ok11dGFibGVTdHlsZVByb3BlcnR5U2V0OjphZGRQYXJzZWRQ cm9wZXJ0eSk6CisgICAgICAgICogY3NzL1N0eWxlUHJvcGVydHlTZXQuaDoKKyAgICAgICAgKFN0 eWxlUHJvcGVydHlTZXQpOgorICAgICAgICAoTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQpOgorICAg ICAgICAqIGNzcy9WaWV3cG9ydFN0eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAgKFZpZXdwb3J0U3R5 bGVSZXNvbHZlcik6CisKKzIwMTMtMDQtMTQgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUu Y29tPgorCiAgICAgICAgIENTU1BhcnNlciBzaG91bGQgcmV0dXJuIEltbXV0YWJsZVN0eWxlUHJv cGVydHlTZXRzLgogICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xMTQ1ODU+CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1BhcnNlci5jcHAKaW5kZXggMzBlMTZlMC4uMjM5Y2QwNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1BhcnNlci5jcHAKQEAgLTUzNSw3ICs1MzUsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNDb2xv clByb3BlcnR5SUQoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlkKQogICAgIH0KIH0KIAotc3RhdGlj IGJvb2wgcGFyc2VDb2xvclZhbHVlKFN0eWxlUHJvcGVydHlTZXQqIGRlY2xhcmF0aW9uLCBDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5SWQsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9ydGFu dCwgQ1NTUGFyc2VyTW9kZSBjc3NQYXJzZXJNb2RlKQorc3RhdGljIGJvb2wgcGFyc2VDb2xvclZh bHVlKE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBkZWNsYXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBw cm9wZXJ0eUlkLCBjb25zdCBTdHJpbmcmIHN0cmluZywgYm9vbCBpbXBvcnRhbnQsIENTU1BhcnNl ck1vZGUgY3NzUGFyc2VyTW9kZSkKIHsKICAgICBBU1NFUlQoIXN0cmluZy5pc0VtcHR5KCkpOwog ICAgIGJvb2wgc3RyaWN0ID0gaXNTdHJpY3RQYXJzZXJNb2RlKGNzc1BhcnNlck1vZGUpOwpAQCAt NjMzLDcgKzYzMyw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBwYXJzZVNpbXBsZUxlbmd0aChjb25z dCBDaGFyYWN0ZXJUeXBlKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCYKICAgICByZXR1cm4gb2s7CiB9 CiAKLXN0YXRpYyBib29sIHBhcnNlU2ltcGxlTGVuZ3RoVmFsdWUoU3R5bGVQcm9wZXJ0eVNldCog ZGVjbGFyYXRpb24sIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCwgY29uc3QgU3RyaW5nJiBzdHJp bmcsIGJvb2wgaW1wb3J0YW50LCBDU1NQYXJzZXJNb2RlIGNzc1BhcnNlck1vZGUpCitzdGF0aWMg Ym9vbCBwYXJzZVNpbXBsZUxlbmd0aFZhbHVlKE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBkZWNs YXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlkLCBjb25zdCBTdHJpbmcmIHN0cmluZywg Ym9vbCBpbXBvcnRhbnQsIENTU1BhcnNlck1vZGUgY3NzUGFyc2VyTW9kZSkKIHsKICAgICBBU1NF UlQoIXN0cmluZy5pc0VtcHR5KCkpOwogICAgIGJvb2wgYWNjZXB0c05lZ2F0aXZlTnVtYmVyczsK QEAgLTExODksNyArMTE4OSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0tleXdvcmRQcm9wZXJ0 eUlEKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCkKICAgICB9CiB9CiAKLXN0YXRpYyBib29sIHBh cnNlS2V5d29yZFZhbHVlKFN0eWxlUHJvcGVydHlTZXQqIGRlY2xhcmF0aW9uLCBDU1NQcm9wZXJ0 eUlEIHByb3BlcnR5SWQsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9ydGFudCwgY29u c3QgQ1NTUGFyc2VyQ29udGV4dCYgcGFyc2VyQ29udGV4dCkKK3N0YXRpYyBib29sIHBhcnNlS2V5 d29yZFZhbHVlKE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBkZWNsYXJhdGlvbiwgQ1NTUHJvcGVy dHlJRCBwcm9wZXJ0eUlkLCBjb25zdCBTdHJpbmcmIHN0cmluZywgYm9vbCBpbXBvcnRhbnQsIGNv bnN0IENTU1BhcnNlckNvbnRleHQmIHBhcnNlckNvbnRleHQpCiB7CiAgICAgQVNTRVJUKCFzdHJp bmcuaXNFbXB0eSgpKTsKIApAQCAtMTI0Niw3ICsxMjQ2LDcgQEAgc3RhdGljIGJvb2wgcGFyc2VU cmFuc2Zvcm1Bcmd1bWVudHMoV2ViS2l0Q1NTVHJhbnNmb3JtVmFsdWUqIHRyYW5zZm9ybVZhbHVl LCBDaGEKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgcGFyc2VUcmFuc2xhdGVU cmFuc2Zvcm1WYWx1ZShTdHlsZVByb3BlcnR5U2V0KiBwcm9wZXJ0aWVzLCBDU1NQcm9wZXJ0eUlE IHByb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9ydGFudCkKK3N0YXRp YyBib29sIHBhcnNlVHJhbnNsYXRlVHJhbnNmb3JtVmFsdWUoTXV0YWJsZVN0eWxlUHJvcGVydHlT ZXQqIHByb3BlcnRpZXMsIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiBz dHJpbmcsIGJvb2wgaW1wb3J0YW50KQogewogICAgIGlmIChwcm9wZXJ0eUlEICE9IENTU1Byb3Bl cnR5V2Via2l0VHJhbnNmb3JtKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMzA0LDcgKzEz MDQsNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlTGlzdD4gQ1NTUGFyc2VyOjpwYXJzZUZvbnRGYWNl VmFsdWUoY29uc3QgQXRvbWljU3RyaW5nJiBzdHJpbgogfQogCiAjaWYgRU5BQkxFKENTU19WQVJJ QUJMRVMpCi1ib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShTdHlsZVByb3BlcnR5U2V0KiBkZWNs YXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHN0cmluZywg Ym9vbCBpbXBvcnRhbnQsIERvY3VtZW50KiBkb2N1bWVudCkKK2Jvb2wgQ1NTUGFyc2VyOjpwYXJz ZVZhbHVlKE11dGFibGVTdHlsZVByb3BlcnR5U2V0KiBkZWNsYXJhdGlvbiwgQ1NTUHJvcGVydHlJ RCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHN0cmluZywgYm9vbCBpbXBvcnRhbnQsIERvY3Vt ZW50KiBkb2N1bWVudCkKIHsKICAgICBBU1NFUlQoIXN0cmluZy5pc0VtcHR5KCkpOwogCkBAIC0x MzIyLDcgKzEzMjIsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShTdHlsZVByb3BlcnR5 U2V0KiBkZWNsYXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eQogfQogI2VuZGlmCiAKLWJv b2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKFN0eWxlUHJvcGVydHlTZXQqIGRlY2xhcmF0aW9uLCBD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9y dGFudCwgQ1NTUGFyc2VyTW9kZSBjc3NQYXJzZXJNb2RlLCBTdHlsZVNoZWV0Q29udGVudHMqIGNv bnRleHRTdHlsZVNoZWV0KQorYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoTXV0YWJsZVN0eWxl UHJvcGVydHlTZXQqIGRlY2xhcmF0aW9uLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGNvbnN0 IFN0cmluZyYgc3RyaW5nLCBib29sIGltcG9ydGFudCwgQ1NTUGFyc2VyTW9kZSBjc3NQYXJzZXJN b2RlLCBTdHlsZVNoZWV0Q29udGVudHMqIGNvbnRleHRTdHlsZVNoZWV0KQogewogICAgIEFTU0VS VCghc3RyaW5nLmlzRW1wdHkoKSk7CiAgICAgaWYgKHBhcnNlU2ltcGxlTGVuZ3RoVmFsdWUoZGVj bGFyYXRpb24sIHByb3BlcnR5SUQsIHN0cmluZywgaW1wb3J0YW50LCBjc3NQYXJzZXJNb2RlKSkK QEAgLTEzNDUsNyArMTM0NSw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKFN0eWxlUHJv cGVydHlTZXQqIGRlY2xhcmF0aW9uLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5CiAgICAgcmV0dXJu IHBhcnNlci5wYXJzZVZhbHVlKGRlY2xhcmF0aW9uLCBwcm9wZXJ0eUlELCBzdHJpbmcsIGltcG9y dGFudCwgY29udGV4dFN0eWxlU2hlZXQpOwogfQogCi1ib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1 ZShTdHlsZVByb3BlcnR5U2V0KiBkZWNsYXJhdGlvbiwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlE LCBjb25zdCBTdHJpbmcmIHN0cmluZywgYm9vbCBpbXBvcnRhbnQsIFN0eWxlU2hlZXRDb250ZW50 cyogY29udGV4dFN0eWxlU2hlZXQpCitib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShNdXRhYmxl U3R5bGVQcm9wZXJ0eVNldCogZGVjbGFyYXRpb24sIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwg Y29uc3QgU3RyaW5nJiBzdHJpbmcsIGJvb2wgaW1wb3J0YW50LCBTdHlsZVNoZWV0Q29udGVudHMq IGNvbnRleHRTdHlsZVNoZWV0KQogewogICAgIHNldFN0eWxlU2hlZXQoY29udGV4dFN0eWxlU2hl ZXQpOwogCkBAIC0xNDU1LDcgKzE0NTUsNyBAQCBQYXNzUmVmUHRyPEltbXV0YWJsZVN0eWxlUHJv cGVydHlTZXQ+IENTU1BhcnNlcjo6cGFyc2VEZWNsYXJhdGlvbihjb25zdCBTdHJpbmcmCiB9CiAK IAotYm9vbCBDU1NQYXJzZXI6OnBhcnNlRGVjbGFyYXRpb24oU3R5bGVQcm9wZXJ0eVNldCogZGVj bGFyYXRpb24sIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBQYXNzUmVmUHRyPENTU1J1bGVTb3VyY2VE YXRhPiBwcnBSdWxlU291cmNlRGF0YSwgU3R5bGVTaGVldENvbnRlbnRzKiBjb250ZXh0U3R5bGVT aGVldCkKK2Jvb2wgQ1NTUGFyc2VyOjpwYXJzZURlY2xhcmF0aW9uKE11dGFibGVTdHlsZVByb3Bl cnR5U2V0KiBkZWNsYXJhdGlvbiwgY29uc3QgU3RyaW5nJiBzdHJpbmcsIFBhc3NSZWZQdHI8Q1NT UnVsZVNvdXJjZURhdGE+IHBycFJ1bGVTb3VyY2VEYXRhLCBTdHlsZVNoZWV0Q29udGVudHMqIGNv bnRleHRTdHlsZVNoZWV0KQogewogICAgIC8vIExlbmd0aCBvZiB0aGUgIkAtd2Via2l0LWRlY2xz eyIgcHJlZml4LgogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBwcmVmaXhMZW5ndGggPSAxNTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuaAppbmRleCA2MmQxOTk5Li43OTgyNmRiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1BhcnNlci5oCkBAIC01Nyw4ICs1Nyw4IEBAIGNsYXNzIEVsZW1lbnQ7CiBjbGFzcyBJbW11dGFi bGVTdHlsZVByb3BlcnR5U2V0OwogY2xhc3MgTWVkaWFRdWVyeUV4cDsKIGNsYXNzIE1lZGlhUXVl cnlTZXQ7CitjbGFzcyBNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldDsKIGNsYXNzIFN0eWxlS2V5ZnJh bWU7Ci1jbGFzcyBTdHlsZVByb3BlcnR5U2V0OwogY2xhc3MgU3R5bGVQcm9wZXJ0eVNob3J0aGFu ZDsKIGNsYXNzIFN0eWxlUnVsZUJhc2U7CiBjbGFzcyBTdHlsZVJ1bGVLZXlmcmFtZXM7CkBAIC05 MiwxMiArOTIsMTIgQEAgcHVibGljOgogI2lmIEVOQUJMRShDU1MzX0NPTkRJVElPTkFMX1JVTEVT KQogICAgIGJvb2wgcGFyc2VTdXBwb3J0c0NvbmRpdGlvbihjb25zdCBTdHJpbmcmKTsKICNlbmRp ZgotICAgIHN0YXRpYyBib29sIHBhcnNlVmFsdWUoU3R5bGVQcm9wZXJ0eVNldCosIENTU1Byb3Bl cnR5SUQsIGNvbnN0IFN0cmluZyYsIGJvb2wgaW1wb3J0YW50LCBDU1NQYXJzZXJNb2RlLCBTdHls ZVNoZWV0Q29udGVudHMqKTsKKyAgICBzdGF0aWMgYm9vbCBwYXJzZVZhbHVlKE11dGFibGVTdHls ZVByb3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiwgYm9vbCBpbXBvcnRh bnQsIENTU1BhcnNlck1vZGUsIFN0eWxlU2hlZXRDb250ZW50cyopOwogICAgIHN0YXRpYyBib29s IHBhcnNlQ29sb3IoUkdCQTMyJiBjb2xvciwgY29uc3QgU3RyaW5nJiwgYm9vbCBzdHJpY3QgPSBm YWxzZSk7CiAgICAgc3RhdGljIGJvb2wgcGFyc2VTeXN0ZW1Db2xvcihSR0JBMzImIGNvbG9yLCBj b25zdCBTdHJpbmcmLCBEb2N1bWVudCopOwogICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ZhbHVl TGlzdD4gcGFyc2VGb250RmFjZVZhbHVlKGNvbnN0IEF0b21pY1N0cmluZyYpOwogICAgIFBhc3NS ZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHBhcnNlVmFsaWRQcmltaXRpdmUoaW50IGlkZW50LCBD U1NQYXJzZXJWYWx1ZSopOwotICAgIGJvb2wgcGFyc2VEZWNsYXJhdGlvbihTdHlsZVByb3BlcnR5 U2V0KiwgY29uc3QgU3RyaW5nJiwgUGFzc1JlZlB0cjxDU1NSdWxlU291cmNlRGF0YT4sIFN0eWxl U2hlZXRDb250ZW50cyogY29udGV4dFN0eWxlU2hlZXQpOworICAgIGJvb2wgcGFyc2VEZWNsYXJh dGlvbihNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCosIGNvbnN0IFN0cmluZyYsIFBhc3NSZWZQdHI8 Q1NTUnVsZVNvdXJjZURhdGE+LCBTdHlsZVNoZWV0Q29udGVudHMqIGNvbnRleHRTdHlsZVNoZWV0 KTsKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbW11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBwYXJz ZUlubGluZVN0eWxlRGVjbGFyYXRpb24oY29uc3QgU3RyaW5nJiwgRWxlbWVudCopOwogICAgIFBh c3NPd25QdHI8TWVkaWFRdWVyeT4gcGFyc2VNZWRpYVF1ZXJ5KGNvbnN0IFN0cmluZyYpOwogCkBA IC0xMTQsNyArMTE0LDcgQEAgcHVibGljOgogICAgIGJvb2wgcGFyc2VRdW90ZXMoQ1NTUHJvcGVy dHlJRCwgYm9vbCBpbXBvcnRhbnQpOwogCiAjaWYgRU5BQkxFKENTU19WQVJJQUJMRVMpCi0gICAg c3RhdGljIGJvb2wgcGFyc2VWYWx1ZShTdHlsZVByb3BlcnR5U2V0KiwgQ1NTUHJvcGVydHlJRCwg Y29uc3QgU3RyaW5nJiwgYm9vbCBpbXBvcnRhbnQsIERvY3VtZW50Kik7CisgICAgc3RhdGljIGJv b2wgcGFyc2VWYWx1ZShNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldCosIENTU1Byb3BlcnR5SUQsIGNv bnN0IFN0cmluZyYsIGJvb2wgaW1wb3J0YW50LCBEb2N1bWVudCopOwogICAgIGJvb2wgY3NzVmFy aWFibGVzRW5hYmxlZCgpIGNvbnN0OwogICAgIHZvaWQgc3RvcmVWYXJpYWJsZURlY2xhcmF0aW9u KGNvbnN0IENTU1BhcnNlclN0cmluZyYsIFBhc3NPd25QdHI8Q1NTUGFyc2VyVmFsdWVMaXN0Piwg Ym9vbCBpbXBvcnRhbnQpOwogI2VuZGlmCkBAIC01NDYsNyArNTQ2LDcgQEAgcHJpdmF0ZToKICAg ICBib29sIGlzR2VuZXJhdGVkSW1hZ2VWYWx1ZShDU1NQYXJzZXJWYWx1ZSopIGNvbnN0OwogICAg IGJvb2wgcGFyc2VHZW5lcmF0ZWRJbWFnZShDU1NQYXJzZXJWYWx1ZUxpc3QqLCBSZWZQdHI8Q1NT VmFsdWU+Jik7CiAKLSAgICBib29sIHBhcnNlVmFsdWUoU3R5bGVQcm9wZXJ0eVNldCosIENTU1By b3BlcnR5SUQsIGNvbnN0IFN0cmluZyYsIGJvb2wgaW1wb3J0YW50LCBTdHlsZVNoZWV0Q29udGVu dHMqIGNvbnRleHRTdHlsZVNoZWV0KTsKKyAgICBib29sIHBhcnNlVmFsdWUoTXV0YWJsZVN0eWxl UHJvcGVydHlTZXQqLCBDU1NQcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmLCBib29sIGltcG9ydGFu dCwgU3R5bGVTaGVldENvbnRlbnRzKiBjb250ZXh0U3R5bGVTaGVldCk7CiAgICAgUGFzc1JlZlB0 cjxJbW11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBwYXJzZURlY2xhcmF0aW9uKGNvbnN0IFN0cmlu ZyYsIFN0eWxlU2hlZXRDb250ZW50cyogY29udGV4dFN0eWxlU2hlZXQpOwogCiAgICAgZW51bSBT aXplUGFyYW1ldGVyVHlwZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQ cm9wZXJ0eVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5jcHAK aW5kZXggNDJjMmZiMi4uYzViMTdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUHJvcGVydHlTZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5 U2V0LmNwcApAQCAtNjg4LDcgKzY4OCw3IEBAIGJvb2wgU3R5bGVQcm9wZXJ0eVNldDo6c2V0UHJv cGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlELCBjb25zdCBTdHJpbmcmIHZhbHVlCiAKICAg ICAvLyBXaGVuIHJlcGxhY2luZyBhbiBleGlzdGluZyBwcm9wZXJ0eSB2YWx1ZSwgdGhpcyBtb3Zl cyB0aGUgcHJvcGVydHkgdG8gdGhlIGVuZCBvZiB0aGUgbGlzdC4KICAgICAvLyBGaXJlZm94IHBy ZXNlcnZlcyB0aGUgcG9zaXRpb24sIGFuZCBNU0lFIG1vdmVzIHRoZSBwcm9wZXJ0eSB0byB0aGUg YmVnaW5uaW5nLgotICAgIHJldHVybiBDU1NQYXJzZXI6OnBhcnNlVmFsdWUodGhpcywgcHJvcGVy dHlJRCwgdmFsdWUsIGltcG9ydGFudCwgY3NzUGFyc2VyTW9kZSgpLCBjb250ZXh0U3R5bGVTaGVl dCk7CisgICAgcmV0dXJuIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShzdGF0aWNfY2FzdDxNdXRhYmxl U3R5bGVQcm9wZXJ0eVNldCo+KHRoaXMpLCBwcm9wZXJ0eUlELCB2YWx1ZSwgaW1wb3J0YW50LCBj c3NQYXJzZXJNb2RlKCksIGNvbnRleHRTdHlsZVNoZWV0KTsKIH0KIAogdm9pZCBTdHlsZVByb3Bl cnR5U2V0OjpzZXRQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IHBycFZhbHVlLCBib29sIGltcG9ydGFudCkKQEAgLTc1OCwxNyArNzU4LDE1IEBA IHZvaWQgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OnBhcnNlRGVjbGFyYXRpb24oY29uc3QgU3Ry aW5nJiBzdHlsZURlY2xhcmF0aW9uLCBTCiAgICAgcGFyc2VyLnBhcnNlRGVjbGFyYXRpb24odGhp cywgc3R5bGVEZWNsYXJhdGlvbiwgMCwgY29udGV4dFN0eWxlU2hlZXQpOwogfQogCi12b2lkIFN0 eWxlUHJvcGVydHlTZXQ6OmFkZFBhcnNlZFByb3BlcnRpZXMoY29uc3QgVmVjdG9yPENTU1Byb3Bl cnR5PiYgcHJvcGVydGllcykKK3ZvaWQgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OmFkZFBhcnNl ZFByb3BlcnRpZXMoY29uc3QgVmVjdG9yPENTU1Byb3BlcnR5PiYgcHJvcGVydGllcykKIHsKLSAg ICBBU1NFUlQoaXNNdXRhYmxlKCkpOwogICAgIG11dGFibGVQcm9wZXJ0eVZlY3RvcigpLnJlc2Vy dmVDYXBhY2l0eShtdXRhYmxlUHJvcGVydHlWZWN0b3IoKS5zaXplKCkgKyBwcm9wZXJ0aWVzLnNp emUoKSk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHByb3BlcnRpZXMuc2l6ZSgpOyAr K2kpCiAgICAgICAgIGFkZFBhcnNlZFByb3BlcnR5KHByb3BlcnRpZXNbaV0pOwogfQogCi12b2lk IFN0eWxlUHJvcGVydHlTZXQ6OmFkZFBhcnNlZFByb3BlcnR5KGNvbnN0IENTU1Byb3BlcnR5JiBw cm9wZXJ0eSkKK3ZvaWQgTXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ6OmFkZFBhcnNlZFByb3BlcnR5 KGNvbnN0IENTU1Byb3BlcnR5JiBwcm9wZXJ0eSkKIHsKLSAgICBBU1NFUlQoaXNNdXRhYmxlKCkp OwogICAgIC8vIE9ubHkgYWRkIHByb3BlcnRpZXMgdGhhdCBoYXZlIG5vICFpbXBvcnRhbnQgY291 bnRlcnBhcnQgcHJlc2VudAogICAgIGlmICghcHJvcGVydHlJc0ltcG9ydGFudChwcm9wZXJ0eS5p ZCgpKSB8fCBwcm9wZXJ0eS5pc0ltcG9ydGFudCgpKQogICAgICAgICBzZXRQcm9wZXJ0eShwcm9w ZXJ0eSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5o IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUHJvcGVydHlTZXQuaAppbmRleCAzY2M5YjA5Li5i M2RlMDI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVQcm9wZXJ0eVNldC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVByb3BlcnR5U2V0LmgKQEAgLTExNyw5ICsx MTcsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCByZW1vdmVQcm9wZXJ0eShDU1NQcm9wZXJ0eUlELCBT dHJpbmcqIHJldHVyblRleHQgPSAwKTsKICAgICB2b2lkIHJlbW92ZVByZWZpeGVkT3JVbnByZWZp eGVkUHJvcGVydHkoQ1NTUHJvcGVydHlJRCk7CiAKLSAgICB2b2lkIGFkZFBhcnNlZFByb3BlcnRp ZXMoY29uc3QgVmVjdG9yPENTU1Byb3BlcnR5PiYpOwotICAgIHZvaWQgYWRkUGFyc2VkUHJvcGVy dHkoY29uc3QgQ1NTUHJvcGVydHkmKTsKLQogICAgIFBhc3NSZWZQdHI8U3R5bGVQcm9wZXJ0eVNl dD4gY29weUJsb2NrUHJvcGVydGllcygpIGNvbnN0OwogICAgIHZvaWQgcmVtb3ZlQmxvY2tQcm9w ZXJ0aWVzKCk7CiAgICAgYm9vbCByZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29uc3QgQ1NTUHJvcGVy dHlJRCogc2V0LCB1bnNpZ25lZCBsZW5ndGgpOwpAQCAtMjMyLDYgKzIyOSw5IEBAIHB1YmxpYzoK IAogICAgIE11dGFibGVTdHlsZVByb3BlcnR5U2V0KGNvbnN0IFN0eWxlUHJvcGVydHlTZXQmKTsK IAorICAgIHZvaWQgYWRkUGFyc2VkUHJvcGVydGllcyhjb25zdCBWZWN0b3I8Q1NTUHJvcGVydHk+ Jik7CisgICAgdm9pZCBhZGRQYXJzZWRQcm9wZXJ0eShjb25zdCBDU1NQcm9wZXJ0eSYpOworCiAg ICAgdm9pZCBjbGVhcigpOwogICAgIHZvaWQgcGFyc2VEZWNsYXJhdGlvbihjb25zdCBTdHJpbmcm IHN0eWxlRGVjbGFyYXRpb24sIFN0eWxlU2hlZXRDb250ZW50cyogY29udGV4dFN0eWxlU2hlZXQp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVy LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvVmlld3BvcnRTdHlsZVJlc29sdmVyLmgKaW5kZXggYjg1 ZTI1MC4uMzM1MDEyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1ZpZXdwb3J0U3R5 bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9WaWV3cG9ydFN0eWxlUmVzb2x2 ZXIuaApAQCAtNDEsOCArNDEsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIENTU1By aW1pdGl2ZVZhbHVlOwogY2xhc3MgRG9jdW1lbnQ7CitjbGFzcyBNdXRhYmxlU3R5bGVQcm9wZXJ0 eVNldDsKIGNsYXNzIFN0eWxlUnVsZVZpZXdwb3J0OwotY2xhc3MgU3R5bGVQcm9wZXJ0eVNldDsK IAogY2xhc3MgVmlld3BvcnRTdHlsZVJlc29sdmVyIDogcHVibGljIFJlZkNvdW50ZWQ8Vmlld3Bv cnRTdHlsZVJlc29sdmVyPiB7CiBwdWJsaWM6CkBAIC02NCw3ICs2NCw3IEBAIHByaXZhdGU6CiAg ICAgZmxvYXQgZ2V0Vmlld3BvcnRBcmd1bWVudFZhbHVlKENTU1Byb3BlcnR5SUQpIGNvbnN0Owog CiAgICAgRG9jdW1lbnQqIG1fZG9jdW1lbnQ7Ci0gICAgUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+ IG1fcHJvcGVydHlTZXQ7CisgICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBtX3By b3BlcnR5U2V0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=