140169 2015-01-06 20:22:28 -0800 Move 'content' CSS property to the new StyleBuilder 2015-01-06 23:13:11 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez benjamin commit-queue kling koivisto sam oldest_to_newest 1059306 0 cdumez 2015-01-06 20:22:28 -0800 Move 'content' CSS property to the new StyleBuilder 1059314 1 244135 cdumez 2015-01-06 20:45:55 -0800 Created attachment 244135 Patch 1059334 2 244135 commit-queue 2015-01-06 23:13:06 -0800 Comment on attachment 244135 Patch Clearing flags on attachment: 244135 Committed r178022: <http://trac.webkit.org/changeset/178022> 1059335 3 commit-queue 2015-01-06 23:13:11 -0800 All reviewed patches have been landed. Closing bug. 244135 2015-01-06 20:45:55 -0800 2015-01-06 23:13:06 -0800 Patch bug-140169-20150106204559.patch text/plain 13174 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4MDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjgwYmMyYTYyNjZmYTQ1 Y2I4MGQ0NWZhYTNjZmJiYjZlMmZjNDIyNi4uYWE1ZWViNjcyMmYxNWM1NDk2MTZiN2E4YTQwMDAz ZTNkODI1ZTQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE1LTAxLTA2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSAnY29udGVudCcgQ1NT IHByb3BlcnR5IHRvIHRoZSBuZXcgU3R5bGVCdWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDAxNjkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlICdjb250ZW50JyBDU1MgcHJvcGVydHkgdG8g dGhlIG5ldyBTdHlsZUJ1aWxkZXIuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5p bjoKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5pdGlhbENvbnRlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVyaXRDb250ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUNvbnRlbnQpOgorICAgICAg ICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2 ZXI6OmFwcGx5UHJvcGVydHkpOgorCisyMDE1LTAxLTA2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CisKICAgICAgICAgRHJvcCBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y29ubmVjdGlv bklEIGFuZCBjb25uZWN0aW9uUmV1c2VkIG1lbWJlcnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDE1OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0eU5hbWVzLmluCmluZGV4IGJmNjM5YTk1YjI2ZGVhNGU3MmFiZDIyNGZhYzdkNjVhMmI3OTJj ZTQuLmNkN2RiYTFjOTc1ZTNjNmU4ZGM5MTExZjVlMGRjOWE1Yzg0NTAzZjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBAIC0xOTcsNyArMTk3LDcgQEAgY2FwdGlvbi1z aWRlIFtJbmhlcml0ZWRdCiBjbGVhcgogY2xpcCBbQ3VzdG9tPUFsbF0KIC13ZWJraXQtY2xpcC1w YXRoIFtDb252ZXJ0ZXI9Q2xpcFBhdGhdCi1jb250ZW50IFtMZWdhY3lTdHlsZUJ1aWxkZXJdCitj b250ZW50IFtDdXN0b209QWxsXQogY291bnRlci1pbmNyZW1lbnQgW0N1c3RvbT1BbGxdCiBjb3Vu dGVyLXJlc2V0IFtDdXN0b209QWxsXQogY3Vyc29yIFtJbmhlcml0ZWQsIEN1c3RvbT1BbGxdCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXggNDQ3OTg2Yjc4ODM2NjIz Y2UzMjFmNDA0NzJmODMyZDAyNTdjNDIwYy4uNDhmYTQwMjNmNzNlMGE4ZTk4OTFjYTM3MmViNGUw NmUyMDZhNTNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1 c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaApAQCAt MjksNyArMjksMTAgQEAKIAogI2luY2x1ZGUgIkNTU0FzcGVjdFJhdGlvVmFsdWUuaCIKICNpbmNs dWRlICJDU1NDdXJzb3JJbWFnZVZhbHVlLmgiCisjaW5jbHVkZSAiQ1NTR3JhZGllbnRWYWx1ZS5o IgogI2luY2x1ZGUgIkNTU1NoYWRvd1ZhbHVlLmgiCisjaW5jbHVkZSAiQ291bnRlci5oIgorI2lu Y2x1ZGUgIkNvdW50ZXJDb250ZW50LmgiCiAjaW5jbHVkZSAiQ3Vyc29yTGlzdC5oIgogI2luY2x1 ZGUgIkVsZW1lbnRBbmNlc3Rvckl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAgLTM5 LDYgKzQyLDcgQEAKICNpbmNsdWRlICJTVkdFbGVtZW50LmgiCiAjaW5jbHVkZSAiU3R5bGVCdWls ZGVyQ29udmVydGVyLmgiCiAjaW5jbHVkZSAiU3R5bGVGb250U2l6ZUZ1bmN0aW9ucy5oIgorI2lu Y2x1ZGUgIlN0eWxlR2VuZXJhdGVkSW1hZ2UuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgi CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTU5LDYgKzYzLDcgQEAgcHVibGljOgogICAgIERF Q0xBUkVfUFJPUEVSVFlfQ1VTVE9NX0hBTkRMRVJTKEJveFNoYWRvdyk7CiAgICAgREVDTEFSRV9Q Uk9QRVJUWV9DVVNUT01fSEFORExFUlMoQ2xpcCk7CiAgICAgREVDTEFSRV9QUk9QRVJUWV9DVVNU T01fSEFORExFUlMoQ29sdW1uR2FwKTsKKyAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5E TEVSUyhDb250ZW50KTsKICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhDb3Vu dGVySW5jcmVtZW50KTsKICAgICBERUNMQVJFX1BST1BFUlRZX0NVU1RPTV9IQU5ETEVSUyhDb3Vu dGVyUmVzZXQpOwogICAgIERFQ0xBUkVfUFJPUEVSVFlfQ1VTVE9NX0hBTkRMRVJTKEN1cnNvcik7 CkBAIC0xMTU5LDYgKzExNjQsOTcgQEAgaW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjph cHBseVZhbHVlQ29sdW1uR2FwKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIKICAgICAgICAg c3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRDb2x1bW5HYXAoU3R5bGVCdWlsZGVyQ29udmVydGVy Ojpjb252ZXJ0Q29tcHV0ZWRMZW5ndGg8ZmxvYXQ+KHN0eWxlUmVzb2x2ZXIsIHZhbHVlKSk7CiB9 CiAKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsQ29udGVudChT dHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUo KS0+Y2xlYXJDb250ZW50KCk7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6 YXBwbHlJbmhlcml0Q29udGVudChTdHlsZVJlc29sdmVyJikKK3sKKyAgICAvLyBGSVhNRTogSW4g Q1NTMywgaXQgd2lsbCBiZSBwb3NzaWJsZSB0byBpbmhlcml0IGNvbnRlbnQuIEluIENTUzIgaXQg aXMgbm90LiBUaGlzCisgICAgLy8gbm90ZSBpcyBhIHJlbWluZGVyIHRoYXQgZXZlbnR1YWxseSAi aW5oZXJpdCIgbmVlZHMgdG8gYmUgc3VwcG9ydGVkLgorfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1 aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDb250ZW50KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2 ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKK3sKKyAgICBib29sIGRpZFNldCA9IGZhbHNlOworICAgIGZv ciAoYXV0byYgaXRlbSA6IGRvd25jYXN0PENTU1ZhbHVlTGlzdD4odmFsdWUpKSB7CisgICAgICAg IGlmIChpczxDU1NJbWFnZUdlbmVyYXRvclZhbHVlPihpdGVtLmdldCgpKSkgeworICAgICAgICAg ICAgaWYgKGlzPENTU0dyYWRpZW50VmFsdWU+KGl0ZW0uZ2V0KCkpKQorICAgICAgICAgICAgICAg IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0Q29udGVudChTdHlsZUdlbmVyYXRlZEltYWdlOjpj cmVhdGUoKmRvd25jYXN0PENTU0dyYWRpZW50VmFsdWU+KGl0ZW0uZ2V0KCkpLmdyYWRpZW50V2l0 aFN0eWxlc1Jlc29sdmVkKCZzdHlsZVJlc29sdmVyKSksIGRpZFNldCk7CisgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRDb250ZW50KFN0 eWxlR2VuZXJhdGVkSW1hZ2U6OmNyZWF0ZShkb3duY2FzdDxDU1NJbWFnZUdlbmVyYXRvclZhbHVl PihpdGVtLmdldCgpKSksIGRpZFNldCk7CisgICAgICAgICAgICBkaWRTZXQgPSB0cnVlOworI2lm IEVOQUJMRShDU1NfSU1BR0VfU0VUKQorICAgICAgICB9IGVsc2UgaWYgKGlzPENTU0ltYWdlU2V0 VmFsdWU+KGl0ZW0uZ2V0KCkpKSB7CisgICAgICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCkt PnNldENvbnRlbnQoc3R5bGVSZXNvbHZlci5zZXRPclBlbmRpbmdGcm9tVmFsdWUoQ1NTUHJvcGVy dHlDb250ZW50LCBkb3duY2FzdDxDU1NJbWFnZVNldFZhbHVlPihpdGVtLmdldCgpKSksIGRpZFNl dCk7CisgICAgICAgICAgICBkaWRTZXQgPSB0cnVlOworI2VuZGlmCisgICAgICAgIH0KKworICAg ICAgICBpZiAoaXM8Q1NTSW1hZ2VWYWx1ZT4oaXRlbS5nZXQoKSkpIHsKKyAgICAgICAgICAgIHN0 eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0Q29udGVudChzdHlsZVJlc29sdmVyLmNhY2hlZE9yUGVu ZGluZ0Zyb21WYWx1ZShDU1NQcm9wZXJ0eUNvbnRlbnQsIGRvd25jYXN0PENTU0ltYWdlVmFsdWU+ KGl0ZW0uZ2V0KCkpKSwgZGlkU2V0KTsKKyAgICAgICAgICAgIGRpZFNldCA9IHRydWU7CisgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmICghaXM8Q1NTUHJpbWl0 aXZlVmFsdWU+KGl0ZW0uZ2V0KCkpKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAg YXV0byYgY29udGVudFZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KGl0ZW0uZ2V0 KCkpOworICAgICAgICBpZiAoY29udGVudFZhbHVlLmlzU3RyaW5nKCkpIHsKKyAgICAgICAgICAg IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0Q29udGVudChjb250ZW50VmFsdWUuZ2V0U3RyaW5n VmFsdWUoKS5pbXBsKCksIGRpZFNldCk7CisgICAgICAgICAgICBkaWRTZXQgPSB0cnVlOworICAg ICAgICB9IGVsc2UgaWYgKGNvbnRlbnRWYWx1ZS5pc0F0dHIoKSkgeworICAgICAgICAgICAgLy8g RklYTUU6IENhbiBhIG5hbWVzcGFjZSBiZSBzcGVjaWZpZWQgZm9yIGFuIGF0dHIoZm9vKT8KKyAg ICAgICAgICAgIGlmIChzdHlsZVJlc29sdmVyLnN0eWxlKCktPnN0eWxlVHlwZSgpID09IE5PUFNF VURPKQorICAgICAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0VW5pcXVlKCk7 CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgc3R5bGVSZXNvbHZlci5wYXJlbnRT dHlsZSgpLT5zZXRVbmlxdWUoKTsKKyAgICAgICAgICAgIFF1YWxpZmllZE5hbWUgYXR0cihudWxs QXRvbSwgY29udGVudFZhbHVlLmdldFN0cmluZ1ZhbHVlKCkuaW1wbCgpLCBudWxsQXRvbSk7Cisg ICAgICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlID0gc3R5bGVSZXNvbHZlci5lbGVt ZW50KCktPmdldEF0dHJpYnV0ZShhdHRyKTsKKyAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5 bGUoKS0+c2V0Q29udGVudCh2YWx1ZS5pc051bGwoKSA/IGVtcHR5QXRvbSA6IHZhbHVlLmltcGwo KSwgZGlkU2V0KTsKKyAgICAgICAgICAgIGRpZFNldCA9IHRydWU7CisgICAgICAgICAgICAvLyBS ZWdpc3RlciB0aGUgZmFjdCB0aGF0IHRoZSBhdHRyaWJ1dGUgdmFsdWUgYWZmZWN0cyB0aGUgc3R5 bGUuCisgICAgICAgICAgICBzdHlsZVJlc29sdmVyLnJ1bGVTZXRzKCkuZmVhdHVyZXMoKS5hdHRy aWJ1dGVDYW5vbmljYWxMb2NhbE5hbWVzSW5SdWxlcy5hZGQoYXR0ci5sb2NhbE5hbWUoKS5pbXBs KCkpOworICAgICAgICAgICAgc3R5bGVSZXNvbHZlci5ydWxlU2V0cygpLmZlYXR1cmVzKCkuYXR0 cmlidXRlTG9jYWxOYW1lc0luUnVsZXMuYWRkKGF0dHIubG9jYWxOYW1lKCkuaW1wbCgpKTsKKyAg ICAgICAgfSBlbHNlIGlmIChjb250ZW50VmFsdWUuaXNDb3VudGVyKCkpIHsKKyAgICAgICAgICAg IENvdW50ZXIqIGNvdW50ZXJWYWx1ZSA9IGNvbnRlbnRWYWx1ZS5nZXRDb3VudGVyVmFsdWUoKTsK KyAgICAgICAgICAgIEVMaXN0U3R5bGVUeXBlIGxpc3RTdHlsZVR5cGUgPSBOb25lTGlzdFN0eWxl OworICAgICAgICAgICAgQ1NTVmFsdWVJRCBsaXN0U3R5bGVJZGVudCA9IGNvdW50ZXJWYWx1ZS0+ bGlzdFN0eWxlSWRlbnQoKTsKKyAgICAgICAgICAgIGlmIChsaXN0U3R5bGVJZGVudCAhPSBDU1NW YWx1ZU5vbmUpCisgICAgICAgICAgICAgICAgbGlzdFN0eWxlVHlwZSA9IHN0YXRpY19jYXN0PEVM aXN0U3R5bGVUeXBlPihsaXN0U3R5bGVJZGVudCAtIENTU1ZhbHVlRGlzYyk7CisgICAgICAgICAg ICBhdXRvIGNvdW50ZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPENvdW50ZXJDb250ZW50Pihjb3VudGVy VmFsdWUtPmlkZW50aWZpZXIoKSwgbGlzdFN0eWxlVHlwZSwgY291bnRlclZhbHVlLT5zZXBhcmF0 b3IoKSk7CisgICAgICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldENvbnRlbnQoV1RG Ojptb3ZlKGNvdW50ZXIpLCBkaWRTZXQpOworICAgICAgICAgICAgZGlkU2V0ID0gdHJ1ZTsKKyAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHN3aXRjaCAoY29udGVudFZhbHVlLmdldFZhbHVl SUQoKSkgeworICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZU9wZW5RdW90ZToKKyAgICAgICAgICAg ICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNldENvbnRlbnQoT1BFTl9RVU9URSwgZGlkU2V0 KTsKKyAgICAgICAgICAgICAgICBkaWRTZXQgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUNsb3NlUXVvdGU6CisgICAgICAgICAgICAgICAg c3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRDb250ZW50KENMT1NFX1FVT1RFLCBkaWRTZXQpOwor ICAgICAgICAgICAgICAgIGRpZFNldCA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9PcGVuUXVvdGU6CisgICAgICAgICAgICAgICAgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRDb250ZW50KE5PX09QRU5fUVVPVEUsIGRpZFNldCk7Cisg ICAgICAgICAgICAgICAgZGlkU2V0ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgIGNhc2UgQ1NTVmFsdWVOb0Nsb3NlUXVvdGU6CisgICAgICAgICAgICAgICAgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRDb250ZW50KE5PX0NMT1NFX1FVT1RFLCBkaWRTZXQpOwor ICAgICAgICAgICAgICAgIGRpZFNldCA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJlYWs7Cisg ICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIC8vIG5vcm1hbCBhbmQgbm9uZSBk byBub3QgaGF2ZSBhbnkgZWZmZWN0LgorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgfQorICAgICAgICB9CisgICAgfQorICAgIGlmICghZGlkU2V0KQorICAgICAgICBzdHlsZVJl c29sdmVyLnN0eWxlKCktPmNsZWFyQ29udGVudCgpOworfQorCiBpbmxpbmUgdm9pZCBTdHlsZUJ1 aWxkZXJDdXN0b206OmFwcGx5SW5pdGlhbFdlYmtpdEZvbnRWYXJpYW50TGlnYXR1cmVzKFN0eWxl UmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCiB7CiAgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNj cmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIuZm9udERlc2NyaXB0aW9uKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVSZXNvbHZlci5jcHAKaW5kZXggZDRkODc2ZTNhNmM0ZjU2M2YzODZiYTM2ZGIzYzJkNTRm M2JjYThjMi4uNmU2ZjVmMTBmM2FjZDE0OGMxZGJjOGQ3YTk3NmRhYmU0NmFhZTc3YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtMTk4MSwxMDAgKzE5ODEsNiBAQCB2b2lk IFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCwgQ1NTVmFsdWUq IHZhbHVlKQogICAgIC8vIFdoYXQgZm9sbG93cyBpcyBhIGxpc3QgdGhhdCBtYXBzIHRoZSBDU1Mg cHJvcGVydGllcyBpbnRvIHRoZWlyIGNvcnJlc3BvbmRpbmcgZnJvbnQtZW5kCiAgICAgLy8gUmVu ZGVyU3R5bGUgdmFsdWVzLgogICAgIHN3aXRjaCAoaWQpIHsKLSAgICAvLyBsaXN0cwotICAgIGNh c2UgQ1NTUHJvcGVydHlDb250ZW50OgotICAgICAgICAvLyBsaXN0IG9mIHN0cmluZywgdXJpLCBj b3VudGVyLCBhdHRyLCBpCi0gICAgICAgIHsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBJbiBDU1Mz LCBpdCB3aWxsIGJlIHBvc3NpYmxlIHRvIGluaGVyaXQgY29udGVudC4gSW4gQ1NTMiBpdCBpcyBu b3QuIFRoaXMKLSAgICAgICAgICAgIC8vIG5vdGUgaXMgYSByZW1pbmRlciB0aGF0IGV2ZW50dWFs bHkgImluaGVyaXQiIG5lZWRzIHRvIGJlIHN1cHBvcnRlZC4KLQotICAgICAgICAgICAgaWYgKGlz SW5pdGlhbCkgewotICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPmNsZWFyQ29udGVudCgp OwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAg aWYgKCFpczxDU1NWYWx1ZUxpc3Q+KCp2YWx1ZSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwot Ci0gICAgICAgICAgICBib29sIGRpZFNldCA9IGZhbHNlOwotICAgICAgICAgICAgZm9yIChhdXRv JiBpdGVtIDogZG93bmNhc3Q8Q1NTVmFsdWVMaXN0PigqdmFsdWUpKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKGlzPENTU0ltYWdlR2VuZXJhdG9yVmFsdWU+KGl0ZW0uZ2V0KCkpKSB7Ci0gICAgICAg ICAgICAgICAgICAgIGlmIChpczxDU1NHcmFkaWVudFZhbHVlPihpdGVtLmdldCgpKSkKLSAgICAg ICAgICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldENvbnRlbnQoU3R5bGVHZW5lcmF0 ZWRJbWFnZTo6Y3JlYXRlKCpkb3duY2FzdDxDU1NHcmFkaWVudFZhbHVlPihpdGVtLmdldCgpKS5n cmFkaWVudFdpdGhTdHlsZXNSZXNvbHZlZCh0aGlzKSksIGRpZFNldCk7Ci0gICAgICAgICAgICAg ICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldENv bnRlbnQoU3R5bGVHZW5lcmF0ZWRJbWFnZTo6Y3JlYXRlKGRvd25jYXN0PENTU0ltYWdlR2VuZXJh dG9yVmFsdWU+KGl0ZW0uZ2V0KCkpKSwgZGlkU2V0KTsKLSAgICAgICAgICAgICAgICAgICAgZGlk U2V0ID0gdHJ1ZTsKLSNpZiBFTkFCTEUoQ1NTX0lNQUdFX1NFVCkKLSAgICAgICAgICAgICAgICB9 IGVsc2UgaWYgKGlzPENTU0ltYWdlU2V0VmFsdWU+KGl0ZW0uZ2V0KCkpKSB7Ci0gICAgICAgICAg ICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNldENvbnRlbnQoc2V0T3JQZW5kaW5nRnJvbVZhbHVl KENTU1Byb3BlcnR5Q29udGVudCwgZG93bmNhc3Q8Q1NTSW1hZ2VTZXRWYWx1ZT4oaXRlbS5nZXQo KSkpLCBkaWRTZXQpOwotICAgICAgICAgICAgICAgICAgICBkaWRTZXQgPSB0cnVlOwotI2VuZGlm Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgaWYgKGlzPENTU0ltYWdlVmFs dWU+KGl0ZW0uZ2V0KCkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIHN0YXRlLnN0eWxlKCktPnNl dENvbnRlbnQoY2FjaGVkT3JQZW5kaW5nRnJvbVZhbHVlKENTU1Byb3BlcnR5Q29udGVudCwgZG93 bmNhc3Q8Q1NTSW1hZ2VWYWx1ZT4oaXRlbS5nZXQoKSkpLCBkaWRTZXQpOwotICAgICAgICAgICAg ICAgICAgICBkaWRTZXQgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICBpZiAoIWlzPENTU1ByaW1pdGl2ZVZh bHVlPihpdGVtLmdldCgpKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAg ICAgICAgICAgICBhdXRvJiBjb250ZW50VmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1 ZT4oaXRlbS5nZXQoKSk7Ci0KLSAgICAgICAgICAgICAgICBpZiAoY29udGVudFZhbHVlLmlzU3Ry aW5nKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0Q29udGVudChj b250ZW50VmFsdWUuZ2V0U3RyaW5nVmFsdWUoKS5pbXBsKCksIGRpZFNldCk7Ci0gICAgICAgICAg ICAgICAgICAgIGRpZFNldCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChjb250 ZW50VmFsdWUuaXNBdHRyKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IENhbiBh IG5hbWVzcGFjZSBiZSBzcGVjaWZpZWQgZm9yIGFuIGF0dHIoZm9vKT8KLSAgICAgICAgICAgICAg ICAgICAgaWYgKHN0YXRlLnN0eWxlKCktPnN0eWxlVHlwZSgpID09IE5PUFNFVURPKQotICAgICAg ICAgICAgICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0VW5pcXVlKCk7Ci0gICAgICAgICAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRlLnBhcmVudFN0eWxl KCktPnNldFVuaXF1ZSgpOwotICAgICAgICAgICAgICAgICAgICBRdWFsaWZpZWROYW1lIGF0dHIo bnVsbEF0b20sIGNvbnRlbnRWYWx1ZS5nZXRTdHJpbmdWYWx1ZSgpLmltcGwoKSwgbnVsbEF0b20p OwotICAgICAgICAgICAgICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcmIHZhbHVlID0gc3RhdGUu ZWxlbWVudCgpLT5nZXRBdHRyaWJ1dGUoYXR0cik7Ci0gICAgICAgICAgICAgICAgICAgIHN0YXRl LnN0eWxlKCktPnNldENvbnRlbnQodmFsdWUuaXNOdWxsKCkgPyBlbXB0eUF0b20gOiB2YWx1ZS5p bXBsKCksIGRpZFNldCk7Ci0gICAgICAgICAgICAgICAgICAgIGRpZFNldCA9IHRydWU7Ci0gICAg ICAgICAgICAgICAgICAgIC8vIFJlZ2lzdGVyIHRoZSBmYWN0IHRoYXQgdGhlIGF0dHJpYnV0ZSB2 YWx1ZSBhZmZlY3RzIHRoZSBzdHlsZS4KLSAgICAgICAgICAgICAgICAgICAgbV9ydWxlU2V0cy5m ZWF0dXJlcygpLmF0dHJpYnV0ZUNhbm9uaWNhbExvY2FsTmFtZXNJblJ1bGVzLmFkZChhdHRyLmxv Y2FsTmFtZSgpLmltcGwoKSk7Ci0gICAgICAgICAgICAgICAgICAgIG1fcnVsZVNldHMuZmVhdHVy ZXMoKS5hdHRyaWJ1dGVMb2NhbE5hbWVzSW5SdWxlcy5hZGQoYXR0ci5sb2NhbE5hbWUoKS5pbXBs KCkpOwotICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoY29udGVudFZhbHVlLmlzQ291bnRlcigp KSB7Ci0gICAgICAgICAgICAgICAgICAgIENvdW50ZXIqIGNvdW50ZXJWYWx1ZSA9IGNvbnRlbnRW YWx1ZS5nZXRDb3VudGVyVmFsdWUoKTsKLSAgICAgICAgICAgICAgICAgICAgRUxpc3RTdHlsZVR5 cGUgbGlzdFN0eWxlVHlwZSA9IE5vbmVMaXN0U3R5bGU7Ci0gICAgICAgICAgICAgICAgICAgIENT U1ZhbHVlSUQgbGlzdFN0eWxlSWRlbnQgPSBjb3VudGVyVmFsdWUtPmxpc3RTdHlsZUlkZW50KCk7 Ci0gICAgICAgICAgICAgICAgICAgIGlmIChsaXN0U3R5bGVJZGVudCAhPSBDU1NWYWx1ZU5vbmUp Ci0gICAgICAgICAgICAgICAgICAgICAgICBsaXN0U3R5bGVUeXBlID0gc3RhdGljX2Nhc3Q8RUxp c3RTdHlsZVR5cGU+KGxpc3RTdHlsZUlkZW50IC0gQ1NTVmFsdWVEaXNjKTsKLSAgICAgICAgICAg ICAgICAgICAgYXV0byBjb3VudGVyID0gc3RkOjptYWtlX3VuaXF1ZTxDb3VudGVyQ29udGVudD4o Y291bnRlclZhbHVlLT5pZGVudGlmaWVyKCksIGxpc3RTdHlsZVR5cGUsIGNvdW50ZXJWYWx1ZS0+ c2VwYXJhdG9yKCkpOwotICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRDb250 ZW50KFdURjo6bW92ZShjb3VudGVyKSwgZGlkU2V0KTsKLSAgICAgICAgICAgICAgICAgICAgZGlk U2V0ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAg ICBzd2l0Y2ggKGNvbnRlbnRWYWx1ZS5nZXRWYWx1ZUlEKCkpIHsKLSAgICAgICAgICAgICAgICAg ICAgY2FzZSBDU1NWYWx1ZU9wZW5RdW90ZToKLSAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRl LnN0eWxlKCktPnNldENvbnRlbnQoT1BFTl9RVU9URSwgZGlkU2V0KTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGRpZFNldCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUNsb3NlUXVvdGU6Ci0gICAgICAgICAg ICAgICAgICAgICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRDb250ZW50KENMT1NFX1FVT1RFLCBkaWRT ZXQpOwotICAgICAgICAgICAgICAgICAgICAgICAgZGlkU2V0ID0gdHJ1ZTsKLSAgICAgICAgICAg ICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICBjYXNlIENTU1ZhbHVlTm9P cGVuUXVvdGU6Ci0gICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRDb250 ZW50KE5PX09QRU5fUVVPVEUsIGRpZFNldCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBkaWRT ZXQgPSB0cnVlOwotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAg ICAgICAgIGNhc2UgQ1NTVmFsdWVOb0Nsb3NlUXVvdGU6Ci0gICAgICAgICAgICAgICAgICAgICAg ICBzdGF0ZS5zdHlsZSgpLT5zZXRDb250ZW50KE5PX0NMT1NFX1FVT1RFLCBkaWRTZXQpOwotICAg ICAgICAgICAgICAgICAgICAgICAgZGlkU2V0ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAg ICAgICAgICAgLy8gbm9ybWFsIGFuZCBub25lIGRvIG5vdCBoYXZlIGFueSBlZmZlY3QuCi0gICAg ICAgICAgICAgICAgICAgICAgICB7IH0KLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmICghZGlkU2V0KQotICAgICAg ICAgICAgICAgIHN0YXRlLnN0eWxlKCktPmNsZWFyQ29udGVudCgpOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9CiAgICAgLy8gU2hvcnRoYW5kIHByb3BlcnRpZXMuCiAgICAgY2FzZSBD U1NQcm9wZXJ0eUZvbnQ6CiAgICAgICAgIGlmIChpc0luaGVyaXQpIHsKQEAgLTIzNzEsNiArMjI3 Nyw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIGlk LCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUNsZWFyOgogICAgIGNhc2Ug Q1NTUHJvcGVydHlDbGlwOgogICAgIGNhc2UgQ1NTUHJvcGVydHlDb2xvcjoKKyAgICBjYXNlIENT U1Byb3BlcnR5Q29udGVudDoKICAgICBjYXNlIENTU1Byb3BlcnR5Q291bnRlckluY3JlbWVudDoK ICAgICBjYXNlIENTU1Byb3BlcnR5Q291bnRlclJlc2V0OgogICAgIGNhc2UgQ1NTUHJvcGVydHlD dXJzb3I6Cg==