210406 2020-04-12 10:26:22 -0700 Refactor and tighten up the CSSVariableReferenceValue class 2020-04-12 12:34:17 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin andersca esprehn+autocc ews-watchlist glenn gyuyoung.kim kondapallykalyan macpherson menard pdr sam webkit-bug-importer oldest_to_newest 1640696 0 darin 2020-04-12 10:26:22 -0700 Refactor and tighten up the CSSVariableReferenceValue class 1640699 1 396230 darin 2020-04-12 10:36:10 -0700 Created attachment 396230 Patch 1640727 2 darin 2020-04-12 12:33:36 -0700 Committed r259988: <https://trac.webkit.org/changeset/259988> 1640728 3 webkit-bug-importer 2020-04-12 12:34:17 -0700 <rdar://problem/61680923> 396230 2020-04-12 10:36:10 -0700 2020-04-12 11:47:01 -0700 Patch bug-210406-20200412103609.patch text/plain 9219 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5OTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAzMGQ4YmVhNDIwNmYy ZGM4M2RiYWE1Mzc2NGY3NmQ3YTlkN2I5YS4uMGQzNzYxZmJkNjJlNDlhZmMxYzkwZDJmNGFiZDFj M2RjNTBiY2UzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA0LTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZWZhY3RvciBhbmQgdGlnaHRl biB1cCB0aGUgQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZSBjbGFzcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwNDA2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjc3MvQ1NTQ3VzdG9tUHJvcGVydHlW YWx1ZS5oOiBSZW1vdmUgdW5lZWRlZCBmb3J3YXJkIGRlY2xhcmF0aW9uIG9mCisgICAgICAgIENT U1ZhcmlhYmxlUmVmZXJlbmNlVmFsdWUsIHNpbmNlIGl0J3Mgbm90IHVzZWQgaGVyZS4gQWRkZWQg aW5jbGRlIG9mCisgICAgICAgIENTU1ZhcmlhYmxlRGF0YS5oIHNpbmNlIHRoZSB1c2Ugb2YgVmFy aWFudCBpbiB0aGlzIGNsYXNzIGRvZXMgcmVxdWlyZQorICAgICAgICB0aGF0IGhlYWRlciwgd2hp Y2ggd2Ugd2VyZSBnZXR0aW5nIGluZGlyZWN0bHkgYmVmb3JlIGZyb20KKyAgICAgICAgQ1NTVmFy aWFibGVSZWZlcmVuY2VWYWx1ZS5oIGluIHNvbWUgdHJhbnNsYXRpb24gdW5pdHMuCisKKyAgICAg ICAgKiBjc3MvQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlOjpDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlKTog TW92ZWQgaGVyZQorICAgICAgICBmcm9tIHRoZSBoZWFkZXIuCisgICAgICAgIChXZWJDb3JlOjpD U1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlOjpjcmVhdGUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OkNTU1ZhcmlhYmxlUmVmZXJlbmNlVmFsdWU6OmVxdWFscyBjb25zdCk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6Q1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZTo6Y3VzdG9tQ1NTVGV4dCBj b25zdCk6IFVzZSBub24tbnVsbCB0bworICAgICAgICBpbmRpY2F0ZSB0aGlzIGlzIG5vdCBzZXJp YWxpemVkLgorICAgICAgICAqIGNzcy9DU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlLmg6IFJlZHVj ZWQgaW5jbHVkZXMsIGlubGluaW5nLCBtYXJrZWQKKyAgICAgICAgY29uc3RydWN0b3IgZXhwbGlj aXQsIHJlbW92ZWQgdW5uZWVkZWQgbV9zZXJpYWxpemVkIGJvb2xlYW4uCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3R5bGUvU3R5bGVDdXN0b21Qcm9wZXJ0eURhdGEuaDogUmVtb3ZlIHVubmVlZGVk IGluY2x1ZGUKKyAgICAgICAgb2YgQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZS5oLCBub3QgdXNl ZCBoZXJlLgorCiAyMDIwLTA0LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bVEZDXSBBZGQgc3VwcG9ydCBmb3IgZml4ZWQgd2lkdGggY29sdW1ucwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0N1c3RvbVByb3BlcnR5VmFsdWUuaCBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDdXN0b21Qcm9wZXJ0eVZhbHVlLmgKaW5kZXggM2E1MmQw NDYxOGZkNjQzMjQ1MmIyZGRhODM0NzA0Mzk0OWEwODFjOC4uMTlkOWQ3ZDVlYjgzMDhmMGY1NjNj OTRhMmYxM2U2ZTk4N2Q4M2FhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0N1 c3RvbVByb3BlcnR5VmFsdWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ3VzdG9tUHJv cGVydHlWYWx1ZS5oCkBAIC0yNSwxOSArMjUsMTYgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpbmNs dWRlICJDU1NSZWdpc3RlcmVkQ3VzdG9tUHJvcGVydHkuaCIKICNpbmNsdWRlICJDU1NWYWx1ZS5o IgorI2luY2x1ZGUgIkNTU1ZhcmlhYmxlRGF0YS5oIgogI2luY2x1ZGUgIkNTU1ZhcmlhYmxlUmVm ZXJlbmNlVmFsdWUuaCIKICNpbmNsdWRlICJMZW5ndGguaCIKICNpbmNsdWRlICJTdHlsZUltYWdl LmgiCi0jaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WYXJpYW50Lmg+Ci0j aW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog Y2xhc3MgQ1NTUGFyc2VyVG9rZW47Ci1jbGFzcyBDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlOwog Y2xhc3MgUmVuZGVyU3R5bGU7CiAKIGNsYXNzIENTU0N1c3RvbVByb3BlcnR5VmFsdWUgZmluYWwg OiBwdWJsaWMgQ1NTVmFsdWUgewpAQCAtODUsOSArODIsOSBAQCBwdWJsaWM6CiAgICAgU3RyaW5n IGN1c3RvbUNTU1RleHQoKSBjb25zdDsKIAogICAgIGNvbnN0IEF0b21TdHJpbmcmIG5hbWUoKSBj b25zdCB7IHJldHVybiBtX25hbWU7IH0KLSAgICBib29sIGlzUmVzb2x2ZWQoKSBjb25zdCAgeyBy ZXR1cm4gIVdURjo6aG9sZHNfYWx0ZXJuYXRpdmU8UmVmPENTU1ZhcmlhYmxlUmVmZXJlbmNlVmFs dWU+PihtX3ZhbHVlKTsgfQotICAgIGJvb2wgaXNVbnNldCgpIGNvbnN0ICB7IHJldHVybiBXVEY6 OmhvbGRzX2FsdGVybmF0aXZlPENTU1ZhbHVlSUQ+KG1fdmFsdWUpICYmIFdURjo6Z2V0PENTU1Zh bHVlSUQ+KG1fdmFsdWUpID09IENTU1ZhbHVlVW5zZXQ7IH0KLSAgICBib29sIGlzSW52YWxpZCgp IGNvbnN0ICB7IHJldHVybiBXVEY6OmhvbGRzX2FsdGVybmF0aXZlPENTU1ZhbHVlSUQ+KG1fdmFs dWUpICYmIFdURjo6Z2V0PENTU1ZhbHVlSUQ+KG1fdmFsdWUpID09IENTU1ZhbHVlSW52YWxpZDsg fQorICAgIGJvb2wgaXNSZXNvbHZlZCgpIGNvbnN0IHsgcmV0dXJuICFXVEY6OmhvbGRzX2FsdGVy bmF0aXZlPFJlZjxDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlPj4obV92YWx1ZSk7IH0KKyAgICBi b29sIGlzVW5zZXQoKSBjb25zdCB7IHJldHVybiBXVEY6OmhvbGRzX2FsdGVybmF0aXZlPENTU1Zh bHVlSUQ+KG1fdmFsdWUpICYmIFdURjo6Z2V0PENTU1ZhbHVlSUQ+KG1fdmFsdWUpID09IENTU1Zh bHVlVW5zZXQ7IH0KKyAgICBib29sIGlzSW52YWxpZCgpIGNvbnN0IHsgcmV0dXJuIFdURjo6aG9s ZHNfYWx0ZXJuYXRpdmU8Q1NTVmFsdWVJRD4obV92YWx1ZSkgJiYgV1RGOjpnZXQ8Q1NTVmFsdWVJ RD4obV92YWx1ZSkgPT0gQ1NTVmFsdWVJbnZhbGlkOyB9CiAKICAgICBjb25zdCBWYXJpYW50VmFs dWUmIHZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV92YWx1ZTsgfQogCkBAIC0xMTAsNyArMTA3LDcg QEAgcHJpdmF0ZToKICAgICAgICAgLCBtX3N0cmluZ1ZhbHVlKG90aGVyLm1fc3RyaW5nVmFsdWUp CiAgICAgICAgICwgbV9zZXJpYWxpemVkKG90aGVyLm1fc2VyaWFsaXplZCkKICAgICB7Ci0gICAg ICAgIC8vIE5vIGNvcHkgY29uc3RydWN0b3IgZm9yIFJlZjxDU1NWYXJpYWJsZURhdGE+LCBzbyB3 ZSBoYXZlIHRvIGRvIHRoaXMgb3Vyc2VsdmVzCisgICAgICAgIC8vIE5vIGNvcHkgY29uc3RydWN0 b3IgZm9yIFJlZjw+LCBzbyB3ZSBoYXZlIHRvIGRvIHRoaXMgb3Vyc2VsdmVzCiAgICAgICAgIGF1 dG8gdmlzaXRvciA9IFdURjo6bWFrZVZpc2l0b3IoWyZdKGNvbnN0IFJlZjxDU1NWYXJpYWJsZVJl ZmVyZW5jZVZhbHVlPiYgdmFsdWUpIHsKICAgICAgICAgICAgIG1fdmFsdWUgPSB2YWx1ZS5jb3B5 UmVmKCk7CiAgICAgICAgIH0sIFsmXShjb25zdCBDU1NWYWx1ZUlEJiB2YWx1ZSkgewpAQCAtMTI5 LDcgKzEyNiw3IEBAIHByaXZhdGU6CiAgICAgVmFyaWFudFZhbHVlIG1fdmFsdWU7CiAgICAgCiAg ICAgbXV0YWJsZSBTdHJpbmcgbV9zdHJpbmdWYWx1ZTsKLSAgICBtdXRhYmxlIGJvb2wgbV9zZXJp YWxpemVkIHsgZmFsc2UgfTsKKyAgICBtdXRhYmxlIGJvb2wgbV9zZXJpYWxpemVkIHsgZmFsc2Ug fTsgLy8gRklYTUU6IFNob3VsZCB1c2UgbnVsbCBtX3N0cmluZ1ZhbHVlIGluc3RlYWQgb2YgYSBz ZXNwYXJhdGUgYm9vbGVhbi4KIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlLmNwcAppbmRleCBmOTc1 OWJlMGU4MDZhNmUzNWIxNmQ2OThiNjViYmEwZmRkNTc3ZWJiLi5jYzE1NjBiNWM0ODk3ZmYyNjIy N2Q5MTk3MjIwM2VlZmU2NTIxNTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT VmFyaWFibGVSZWZlcmVuY2VWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Zh cmlhYmxlUmVmZXJlbmNlVmFsdWUuY3BwCkBAIC0xLDUgKzEsNSBAQAogLy8gQ29weXJpZ2h0IDIw MTUgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0vLyBDb3B5cmln aHQgKEMpIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorLy8gQ29weXJpZ2h0 IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogLy8KIC8vIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogLy8gbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMzAsMjMgKzMwLDM4IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZS5oIgogCisjaW5j bHVkZSAiQ1NTVmFyaWFibGVEYXRhLmgiCiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNs dWRlICJTdHlsZUJ1aWxkZXIuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGJvb2wgcmVzb2x2ZVRva2VuUmFuZ2UoQ1NTUGFyc2Vy VG9rZW5SYW5nZSwgVmVjdG9yPENTU1BhcnNlclRva2VuPiYsIFN0eWxlOjpCdWlsZGVyU3RhdGUm KTsKKworQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZTo6Q1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1 ZShSZWY8Q1NTVmFyaWFibGVEYXRhPiYmIGRhdGEpCisgICAgOiBDU1NWYWx1ZShWYXJpYWJsZVJl ZmVyZW5jZUNsYXNzKQorICAgICwgbV9kYXRhKFdURk1vdmUoZGF0YSkpCit7Cit9CisKK1JlZjxD U1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlPiBDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlOjpjcmVh dGUoY29uc3QgQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UpCit7CisgICAgcmV0dXJuIGFkb3B0 UmVmKCpuZXcgQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZShDU1NWYXJpYWJsZURhdGE6OmNyZWF0 ZShyYW5nZSkpKTsKK30KKworYm9vbCBDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlOjplcXVhbHMo Y29uc3QgQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZSYgb3RoZXIpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fZGF0YS5nZXQoKSA9PSBvdGhlci5tX2RhdGEuZ2V0KCk7Cit9CisKIFN0cmluZyBDU1NW YXJpYWJsZVJlZmVyZW5jZVZhbHVlOjpjdXN0b21DU1NUZXh0KCkgY29uc3QKIHsKLSAgICBpZiAo IW1fc2VyaWFsaXplZCkgewotICAgICAgICBtX3NlcmlhbGl6ZWQgPSB0cnVlOworICAgIGlmICht X3N0cmluZ1ZhbHVlLmlzTnVsbCgpKQogICAgICAgICBtX3N0cmluZ1ZhbHVlID0gbV9kYXRhLT50 b2tlblJhbmdlKCkuc2VyaWFsaXplKCk7Ci0gICAgfQogICAgIHJldHVybiBtX3N0cmluZ1ZhbHVl OwogfQogCi1zdGF0aWMgYm9vbCByZXNvbHZlVG9rZW5SYW5nZShDU1NQYXJzZXJUb2tlblJhbmdl LCBWZWN0b3I8Q1NTUGFyc2VyVG9rZW4+JiwgU3R5bGU6OkJ1aWxkZXJTdGF0ZSYpOwotCiBzdGF0 aWMgYm9vbCByZXNvbHZlVmFyaWFibGVGYWxsYmFjayhDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdl LCBWZWN0b3I8Q1NTUGFyc2VyVG9rZW4+JiByZXN1bHQsIFN0eWxlOjpCdWlsZGVyU3RhdGUmIGJ1 aWxkZXJTdGF0ZSkKIHsKICAgICBpZiAocmFuZ2UuYXRFbmQoKSkKQEAgLTEwOCw5ICsxMjMsNyBA QCBzdGF0aWMgYm9vbCByZXNvbHZlVG9rZW5SYW5nZShDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdl LCBWZWN0b3I8Q1NTUGFyc2VyVG9rZW4+JgogUmVmUHRyPENTU1ZhcmlhYmxlRGF0YT4gQ1NTVmFy aWFibGVSZWZlcmVuY2VWYWx1ZTo6cmVzb2x2ZVZhcmlhYmxlUmVmZXJlbmNlcyhTdHlsZTo6QnVp bGRlclN0YXRlJiBidWlsZGVyU3RhdGUpIGNvbnN0CiB7CiAgICAgVmVjdG9yPENTU1BhcnNlclRv a2VuPiByZXNvbHZlZFRva2VuczsKLSAgICBDU1NQYXJzZXJUb2tlblJhbmdlIHJhbmdlID0gbV9k YXRhLT50b2tlblJhbmdlKCk7Ci0KLSAgICBpZiAoIXJlc29sdmVUb2tlblJhbmdlKHJhbmdlLCBy ZXNvbHZlZFRva2VucywgYnVpbGRlclN0YXRlKSkKKyAgICBpZiAoIXJlc29sdmVUb2tlblJhbmdl KG1fZGF0YS0+dG9rZW5SYW5nZSgpLCByZXNvbHZlZFRva2VucywgYnVpbGRlclN0YXRlKSkKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICByZXR1cm4gQ1NTVmFyaWFibGVEYXRhOjpjcmVh dGUocmVzb2x2ZWRUb2tlbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Zh cmlhYmxlUmVmZXJlbmNlVmFsdWUuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYXJpYWJsZVJl ZmVyZW5jZVZhbHVlLmgKaW5kZXggYzU2ZjNiZTMyNWJjMmUzNTZlOWNjYzYwOTQ0MzU4NWNkMWEx NTQ0OC4uMTYxNGI0Yzg3NjllYjgxMTQ3YmUxNGRhMWY1ZTg1MThjZjgyZDZiZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhcmlhYmxlUmVmZXJlbmNlVmFsdWUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZS5oCkBAIC0xLDUgKzEs NSBAQAogLy8gQ29weXJpZ2h0IDIwMTUgVGhlIENocm9taXVtIEF1dGhvcnMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCi0vLyBDb3B5cmlnaHQgKEMpIDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgorLy8gQ29weXJpZ2h0IChDKSAyMDE2LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogLy8KIC8vIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogLy8gbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMjksMTcg KzI5LDEyIEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5jbHVkZSAiQ1NTUGFyc2VyVG9rZW4uaCIK LSNpbmNsdWRlICJDU1NQYXJzZXJUb2tlblJhbmdlLmgiCiAjaW5jbHVkZSAiQ1NTVmFsdWUuaCIK LSNpbmNsdWRlICJDU1NWYXJpYWJsZURhdGEuaCIKLSNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgot I2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KLSNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBDU1NQYXJzZXJUb2tlblJhbmdlOworY2xh c3MgQ1NTVmFyaWFibGVEYXRhOwogCiBuYW1lc3BhY2UgU3R5bGUgewogY2xhc3MgQnVpbGRlclN0 YXRlOwpAQCAtNDcsMjYgKzQyLDE4IEBAIGNsYXNzIEJ1aWxkZXJTdGF0ZTsKIAogY2xhc3MgQ1NT VmFyaWFibGVSZWZlcmVuY2VWYWx1ZSA6IHB1YmxpYyBDU1NWYWx1ZSB7CiBwdWJsaWM6Ci0gICAg c3RhdGljIFJlZjxDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlPiBjcmVhdGUoY29uc3QgQ1NTUGFy c2VyVG9rZW5SYW5nZSYgcmFuZ2UpCi0gICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5l dyBDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlKENTU1ZhcmlhYmxlRGF0YTo6Y3JlYXRlKHJhbmdl KSkpOwotICAgIH0KKyAgICBzdGF0aWMgUmVmPENTU1ZhcmlhYmxlUmVmZXJlbmNlVmFsdWU+IGNy ZWF0ZShjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdlJik7CiAKLSAgICBib29sIGVxdWFscyhjb25z dCBDU1NWYXJpYWJsZVJlZmVyZW5jZVZhbHVlJiBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9kYXRh LmdldCgpID09IG90aGVyLm1fZGF0YS5nZXQoKTsgfQorICAgIGJvb2wgZXF1YWxzKGNvbnN0IENT U1ZhcmlhYmxlUmVmZXJlbmNlVmFsdWUmKSBjb25zdDsKICAgICBTdHJpbmcgY3VzdG9tQ1NTVGV4 dCgpIGNvbnN0OwogCiAgICAgUmVmUHRyPENTU1ZhcmlhYmxlRGF0YT4gcmVzb2x2ZVZhcmlhYmxl UmVmZXJlbmNlcyhTdHlsZTo6QnVpbGRlclN0YXRlJikgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAg Q1NTVmFyaWFibGVSZWZlcmVuY2VWYWx1ZShSZWY8Q1NTVmFyaWFibGVEYXRhPiYmIGRhdGEpCi0g ICAgICAgIDogQ1NTVmFsdWUoVmFyaWFibGVSZWZlcmVuY2VDbGFzcykKLSAgICAgICAgLCBtX2Rh dGEoV1RGTW92ZShkYXRhKSkKLSAgICB7Ci0gICAgfQorICAgIGV4cGxpY2l0IENTU1ZhcmlhYmxl UmVmZXJlbmNlVmFsdWUoUmVmPENTU1ZhcmlhYmxlRGF0YT4mJik7CiAKICAgICBSZWY8Q1NTVmFy aWFibGVEYXRhPiBtX2RhdGE7CiAgICAgbXV0YWJsZSBTdHJpbmcgbV9zdHJpbmdWYWx1ZTsKLSAg ICBtdXRhYmxlIGJvb2wgbV9zZXJpYWxpemVkIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T dHlsZUN1c3RvbVByb3BlcnR5RGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1N0eWxlQ3VzdG9tUHJvcGVydHlEYXRhLmgKaW5kZXggZWNjNzc4MjkzOTgxZTdjMmQ2NTY2YTVh MTdlMGYyMGJmNWUxMjE3OS4uYjE1YmNmMjUxNTg1YTMwYWIwMzQ4OTlmOWVmYTZiOTg5YzI2NDBl MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlQ3VzdG9t UHJvcGVydHlEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxl Q3VzdG9tUHJvcGVydHlEYXRhLmgKQEAgLTIyLDcgKzIyLDYgQEAKICNwcmFnbWEgb25jZQogCiAj aW5jbHVkZSAiQ1NTQ3VzdG9tUHJvcGVydHlWYWx1ZS5oIgotI2luY2x1ZGUgIkNTU1ZhcmlhYmxl UmVmZXJlbmNlVmFsdWUuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0 Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4K