192572 2018-12-10 15:12:16 -0800 Rename "forced style recalc" to "full style rebuild" 2018-12-10 15:57:24 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1486765 0 koivisto 2018-12-10 15:12:16 -0800 No one knows what "forced" means in this context. 1486771 1 357006 koivisto 2018-12-10 15:25:59 -0800 Created attachment 357006 patch 1486782 2 357006 commit-queue 2018-12-10 15:56:38 -0800 Comment on attachment 357006 patch Clearing flags on attachment: 357006 Committed r239057: <https://trac.webkit.org/changeset/239057> 1486783 3 commit-queue 2018-12-10 15:56:40 -0800 All reviewed patches have been landed. Closing bug. 1486784 4 webkit-bug-importer 2018-12-10 15:57:24 -0800 <rdar://problem/46611683> 357006 2018-12-10 15:25:59 -0800 2018-12-10 15:56:38 -0800 patch rename-forced.patch text/plain 11254 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzOTA0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDE4LTEyLTEwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgImZvcmNlZCBzdHls ZSByZWNhbGMiIHRvICJmdWxsIHN0eWxlIHJlYnVpbGQiCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI1NzIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgb2xkIG5hbWUgaXMgY29uZnVzaW5nLgorCisg ICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpoYXNWYWxpZFN0eWxlRm9yUHJvcGVydHkpOgorICAgICAgICAqIGRvbS9Eb2N1bWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2NoZWR1bGVTdHlsZVJlYnVpbGQp OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNjaGVkdWxlU3R5bGVSZWNhbGMpOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnVuc2NoZWR1bGVTdHlsZVJlY2FsYyk6CisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudDo6aGFzUGVuZGluZ1N0eWxlUmVidWlsZCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVzb2x2ZVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpuZWVkc1N0eWxlUmVjYWxjIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRv Y3VtZW50Ojp1cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMpOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OmludmFsaWRhdGVNYXRjaGVkUHJvcGVydGllc0NhY2hlQW5kRm9y Y2VTdHlsZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6c2V0RGVzaWduTW9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6d2Via2l0RGlkRXhpdEZ1bGxTY3JlZW5G b3JFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRBbmltYXRpbmdGdWxs U2NyZWVuKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpzZXRGdWxsc2NyZWVuQ29udHJv bHNIaWRkZW4pOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNjaGVkdWxlRm9yY2VkU3R5 bGVSZWNhbGMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Omhhc1BlbmRp bmdGb3JjZWRTdHlsZVJlY2FsYyBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogZG9tL0RvY3Vt ZW50Lmg6CisgICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxl bWVudDo6bmVlZHNTdHlsZUludmFsaWRhdGlvbiBjb25zdCk6CisgICAgICAgICogcGFnZS9QYWdl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnVwZGF0ZVN0eWxlQWZ0ZXJDaGFuZ2VJbkVu dmlyb25tZW50KToKKyAgICAgICAgKiBzdHlsZS9TdHlsZVNjb3BlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlOjpTY29wZTo6dXBkYXRlQWN0aXZlU3R5bGVTaGVldHMpOgorCiAyMDE4LTEy LTEwICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dMaWJdIEZpbGVTeXN0ZW06Om1vdmVGaWxlKCkgc2hvdWxkIGZhbGwgYmFjayB0byBjb3B5 aW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcAkocmV2aXNpb24gMjM5MDQ0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0MzQsNyAr MjQzNCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNWYWxpZFN0eWxlRm9yUHJvcGUKIHsKICAg ICBpZiAoZWxlbWVudC5zdHlsZVZhbGlkaXR5KCkgIT0gU3R5bGU6OlZhbGlkaXR5OjpWYWxpZCkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGlmIChlbGVtZW50LmRvY3VtZW50KCkuaGFzUGVu ZGluZ0ZvcmNlZFN0eWxlUmVjYWxjKCkpCisgICAgaWYgKGVsZW1lbnQuZG9jdW1lbnQoKS5oYXNQ ZW5kaW5nRnVsbFN0eWxlUmVidWlsZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYg KCFlbGVtZW50LmRvY3VtZW50KCkuY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkpCiAgICAgICAgIHJl dHVybiB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAyMzkwNDQp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NzgwLDkgKzE3ODAsOSBAQCBSZWY8VHJlZVdhbGtlcj4gRG9jdW1lbnQ6OmNyZWF0ZVRyZWVXYWxr CiAgICAgcmV0dXJuIFRyZWVXYWxrZXI6OmNyZWF0ZShyb290LCB3aGF0VG9TaG93LCBXVEZNb3Zl KGZpbHRlcikpOwogfQogCi12b2lkIERvY3VtZW50OjpzY2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxj KCkKK3ZvaWQgRG9jdW1lbnQ6OnNjaGVkdWxlRnVsbFN0eWxlUmVidWlsZCgpCiB7Ci0gICAgbV9w ZW5kaW5nU3R5bGVSZWNhbGNTaG91bGRGb3JjZSA9IHRydWU7CisgICAgbV9uZWVkc0Z1bGxTdHls ZVJlYnVpbGQgPSB0cnVlOwogICAgIHNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKIH0KIApAQCAtMTc5 Myw3ICsxNzkzLDcgQEAgdm9pZCBEb2N1bWVudDo6c2NoZWR1bGVTdHlsZVJlY2FsYygpCiAgICAg aWYgKG1fc3R5bGVSZWNhbGNUaW1lci5pc0FjdGl2ZSgpIHx8IHBhZ2VDYWNoZVN0YXRlKCkgIT0g Tm90SW5QYWdlQ2FjaGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFTU0VSVChjaGlsZE5lZWRz U3R5bGVSZWNhbGMoKSB8fCBtX3BlbmRpbmdTdHlsZVJlY2FsY1Nob3VsZEZvcmNlKTsKKyAgICBB U1NFUlQoY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgfHwgbV9uZWVkc0Z1bGxTdHlsZVJlYnVpbGQp OwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBpZiAoV0tJc09ic2VydmluZ1N0eWxl UmVjYWxjU2NoZWR1bGluZygpKSB7CkBAIC0xODI2LDcgKzE4MjYsNyBAQCB2b2lkIERvY3VtZW50 Ojp1bnNjaGVkdWxlU3R5bGVSZWNhbGMoKQogICAgIEFTU0VSVCghY2hpbGROZWVkc1N0eWxlUmVj YWxjKCkpOwogCiAgICAgbV9zdHlsZVJlY2FsY1RpbWVyLnN0b3AoKTsKLSAgICBtX3BlbmRpbmdT dHlsZVJlY2FsY1Nob3VsZEZvcmNlID0gZmFsc2U7CisgICAgbV9uZWVkc0Z1bGxTdHlsZVJlYnVp bGQgPSBmYWxzZTsKIH0KIAogYm9vbCBEb2N1bWVudDo6aGFzUGVuZGluZ1N0eWxlUmVjYWxjKCkg Y29uc3QKQEAgLTE4MzQsOSArMTgzNCw5IEBAIGJvb2wgRG9jdW1lbnQ6Omhhc1BlbmRpbmdTdHls ZVJlY2FsYygpIGMKICAgICByZXR1cm4gbmVlZHNTdHlsZVJlY2FsYygpICYmICFtX2luU3R5bGVS ZWNhbGM7CiB9CiAKLWJvb2wgRG9jdW1lbnQ6Omhhc1BlbmRpbmdGb3JjZWRTdHlsZVJlY2FsYygp IGNvbnN0Citib29sIERvY3VtZW50OjpoYXNQZW5kaW5nRnVsbFN0eWxlUmVidWlsZCgpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIGhhc1BlbmRpbmdTdHlsZVJlY2FsYygpICYmIG1fcGVuZGluZ1N0eWxl UmVjYWxjU2hvdWxkRm9yY2U7CisgICAgcmV0dXJuIGhhc1BlbmRpbmdTdHlsZVJlY2FsYygpICYm IG1fbmVlZHNGdWxsU3R5bGVSZWJ1aWxkOwogfQogCiB2b2lkIERvY3VtZW50OjpyZXNvbHZlU3R5 bGUoUmVzb2x2ZVN0eWxlVHlwZSB0eXBlKQpAQCAtMTg5Miw3ICsxODkyLDcgQEAgdm9pZCBEb2N1 bWVudDo6cmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZQogCiAgICAgICAgIG1faW5TdHlsZVJlY2Fs YyA9IHRydWU7CiAKLSAgICAgICAgaWYgKG1fcGVuZGluZ1N0eWxlUmVjYWxjU2hvdWxkRm9yY2Up CisgICAgICAgIGlmIChtX25lZWRzRnVsbFN0eWxlUmVidWlsZCkKICAgICAgICAgICAgIHR5cGUg PSBSZXNvbHZlU3R5bGVUeXBlOjpSZWJ1aWxkOwogCiAgICAgICAgIGlmICh0eXBlID09IFJlc29s dmVTdHlsZVR5cGU6OlJlYnVpbGQpIHsKQEAgLTE5OTIsNyArMTk5Miw3IEBAIGJvb2wgRG9jdW1l bnQ6Om5lZWRzU3R5bGVSZWNhbGMoKSBjb25zdAogICAgIGlmIChwYWdlQ2FjaGVTdGF0ZSgpICE9 IE5vdEluUGFnZUNhY2hlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9wZW5k aW5nU3R5bGVSZWNhbGNTaG91bGRGb3JjZSkKKyAgICBpZiAobV9uZWVkc0Z1bGxTdHlsZVJlYnVp bGQpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgaWYgKGNoaWxkTmVlZHNTdHlsZVJlY2Fs YygpKQpAQCAtMjA5OSw3ICsyMDk5LDcgQEAgdm9pZCBEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWdu b3JlUGVuZGluZwogICAgICAgICBtX2lnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cyA9IHRydWU7CiAg ICAgICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBqdXN0IGludmFsaWRhdGUgZWxlbWVudHMgd2l0 aCBtaXNzaW5nIHN0eWxlcy4KICAgICAgICAgaWYgKG1faGFzTm9kZXNXaXRoTWlzc2luZ1N0eWxl KQotICAgICAgICAgICAgc2NoZWR1bGVGb3JjZWRTdHlsZVJlY2FsYygpOworICAgICAgICAgICAg c2NoZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCk7CiAgICAgfQogCiAgICAgdXBkYXRlTGF5b3V0KCk7 CkBAIC0yMzAwLDcgKzIzMDAsNyBAQCB2b2lkIERvY3VtZW50OjppbnZhbGlkYXRlTWF0Y2hlZFBy b3BlcnRpCiAgICAgICAgIHJlc29sdmVyLT5pbnZhbGlkYXRlTWF0Y2hlZFByb3BlcnRpZXNDYWNo ZSgpOwogICAgIGlmIChwYWdlQ2FjaGVTdGF0ZSgpICE9IE5vdEluUGFnZUNhY2hlIHx8ICFyZW5k ZXJWaWV3KCkpCiAgICAgICAgIHJldHVybjsKLSAgICBzY2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxj KCk7CisgICAgc2NoZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCk7CiB9CiAKIHZvaWQgRG9jdW1lbnQ6 OmRpZENsZWFyU3R5bGVSZXNvbHZlcigpCkBAIC01NDY0LDcgKzU0NjQsNyBAQCB2b2lkIERvY3Vt ZW50OjpzZXREZXNpZ25Nb2RlKEluaGVyaXRlZEJvCiB7CiAgICAgbV9kZXNpZ25Nb2RlID0gdmFs dWU7CiAgICAgZm9yIChGcmFtZSogZnJhbWUgPSBtX2ZyYW1lOyBmcmFtZSAmJiBmcmFtZS0+ZG9j dW1lbnQoKTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dChtX2ZyYW1lKSkKLSAg ICAgICAgZnJhbWUtPmRvY3VtZW50KCktPnNjaGVkdWxlRm9yY2VkU3R5bGVSZWNhbGMoKTsKKyAg ICAgICAgZnJhbWUtPmRvY3VtZW50KCktPnNjaGVkdWxlRnVsbFN0eWxlUmVidWlsZCgpOwogfQog CiBTdHJpbmcgRG9jdW1lbnQ6OmRlc2lnbk1vZGUoKSBjb25zdApAQCAtNjU4Nyw3ICs2NTg3LDcg QEAgdm9pZCBEb2N1bWVudDo6d2Via2l0RGlkRXhpdEZ1bGxTY3JlZW5GbwogICAgIHVud3JhcEZ1 bGxTY3JlZW5SZW5kZXJlcihtX2Z1bGxTY3JlZW5SZW5kZXJlci5nZXQoKSwgbV9mdWxsU2NyZWVu RWxlbWVudC5nZXQoKSk7CiAKICAgICBtX2Z1bGxTY3JlZW5FbGVtZW50ID0gbnVsbHB0cjsKLSAg ICBzY2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxjKCk7CisgICAgc2NoZWR1bGVGdWxsU3R5bGVSZWJ1 aWxkKCk7CiAKICAgICAvLyBXaGVuIHdlYmtpdENhbmNlbEZ1bGxTY3JlZW4gaXMgY2FsbGVkLCB3 ZSBjYWxsIHdlYmtpdEV4aXRGdWxsU2NyZWVuIG9uIHRoZSB0b3BEb2N1bWVudCgpLiBUaGF0CiAg ICAgLy8gbWVhbnMgdGhhdCB0aGUgZXZlbnRzIHdpbGwgYmUgcXVldWVkIHRoZXJlLiBTbyBpZiB3 ZSBoYXZlIG5vIGV2ZW50cyBoZXJlLCBzdGFydCB0aGUgdGltZXIgb24KQEAgLTY2OTAsNyArNjY5 MCw3IEBAIHZvaWQgRG9jdW1lbnQ6OnNldEFuaW1hdGluZ0Z1bGxTY3JlZW4oYm8KIAogICAgIGlm IChtX2Z1bGxTY3JlZW5FbGVtZW50ICYmIG1fZnVsbFNjcmVlbkVsZW1lbnQtPmlzRGVzY2VuZGFu dE9mKCp0aGlzKSkgewogICAgICAgICBtX2Z1bGxTY3JlZW5FbGVtZW50LT5pbnZhbGlkYXRlU3R5 bGVGb3JTdWJ0cmVlKCk7Ci0gICAgICAgIHNjaGVkdWxlRm9yY2VkU3R5bGVSZWNhbGMoKTsKKyAg ICAgICAgc2NoZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCk7CiAgICAgfQogfQogCkBAIC02NzA3LDcg KzY3MDcsNyBAQCB2b2lkIERvY3VtZW50OjpzZXRGdWxsc2NyZWVuQ29udHJvbHNIaWRkCiAKICAg ICBpZiAobV9mdWxsU2NyZWVuRWxlbWVudCAmJiBtX2Z1bGxTY3JlZW5FbGVtZW50LT5pc0Rlc2Nl bmRhbnRPZigqdGhpcykpIHsKICAgICAgICAgbV9mdWxsU2NyZWVuRWxlbWVudC0+aW52YWxpZGF0 ZVN0eWxlRm9yU3VidHJlZSgpOwotICAgICAgICBzY2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxjKCk7 CisgICAgICAgIHNjaGVkdWxlRnVsbFN0eWxlUmVidWlsZCgpOwogICAgIH0KIH0KIApJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmgJKHJldmlzaW9uIDIzOTA0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC03ODIsMTEgKzc4MiwxMSBAQCBwdWJsaWM6 CiAgICAgRWxlbWVudCogY3NzVGFyZ2V0KCkgY29uc3QgeyByZXR1cm4gbV9jc3NUYXJnZXQ7IH0K ICAgICBzdGF0aWMgcHRyZGlmZl90IGNzc1RhcmdldE1lbW9yeU9mZnNldCgpIHsgcmV0dXJuIE9C SkVDVF9PRkZTRVRPRihEb2N1bWVudCwgbV9jc3NUYXJnZXQpOyB9CiAKLSAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHNjaGVkdWxlRm9yY2VkU3R5bGVSZWNhbGMoKTsKKyAgICBXRUJDT1JFX0VYUE9S VCB2b2lkIHNjaGVkdWxlRnVsbFN0eWxlUmVidWlsZCgpOwogICAgIHZvaWQgc2NoZWR1bGVTdHls ZVJlY2FsYygpOwogICAgIHZvaWQgdW5zY2hlZHVsZVN0eWxlUmVjYWxjKCk7CiAgICAgYm9vbCBo YXNQZW5kaW5nU3R5bGVSZWNhbGMoKSBjb25zdDsKLSAgICBib29sIGhhc1BlbmRpbmdGb3JjZWRT dHlsZVJlY2FsYygpIGNvbnN0OworICAgIGJvb2wgaGFzUGVuZGluZ0Z1bGxTdHlsZVJlYnVpbGQo KSBjb25zdDsKIAogICAgIHZvaWQgcmVnaXN0ZXJOb2RlTGlzdEZvckludmFsaWRhdGlvbihMaXZl Tm9kZUxpc3QmKTsKICAgICB2b2lkIHVucmVnaXN0ZXJOb2RlTGlzdEZvckludmFsaWRhdGlvbihM aXZlTm9kZUxpc3QmKTsKQEAgLTE5OTMsNyArMTk5Myw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X3Zpc3VhbGx5T3JkZXJlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2JQYXJzaW5nIHsgZmFsc2Ug fTsgLy8gRklYTUU6IHJlbmFtZQogCi0gICAgYm9vbCBtX3BlbmRpbmdTdHlsZVJlY2FsY1Nob3Vs ZEZvcmNlIHsgZmFsc2UgfTsKKyAgICBib29sIG1fbmVlZHNGdWxsU3R5bGVSZWJ1aWxkIHsgZmFs c2UgfTsKICAgICBib29sIG1faW5TdHlsZVJlY2FsYyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2Ns b3NlQWZ0ZXJTdHlsZVJlY2FsYyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2luUmVuZGVyVHJlZVVw ZGF0ZSB7IGZhbHNlIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCShyZXZpc2lvbiAyMzkw NDQpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI5OTksNyArMjk5OSw3IEBAIGJvb2wgRWxlbWVudDo6bmVlZHNTdHlsZUludmFsaWRhdGlvbigp IGMKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChzdHlsZVZhbGlkaXR5KCkgPj0gU3R5 bGU6OlZhbGlkaXR5OjpTdWJ0cmVlSW52YWxpZCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IGlmIChkb2N1bWVudCgpLmhhc1BlbmRpbmdGb3JjZWRTdHlsZVJlY2FsYygpKQorICAgIGlmIChk b2N1bWVudCgpLmhhc1BlbmRpbmdGdWxsU3R5bGVSZWJ1aWxkKCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIHJldHVybiB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCShyZXZpc2lv biAyMzkwNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01NDgsNyArNTQ4LDcgQEAgdm9pZCBQYWdlOjp1cGRhdGVTdHlsZUFmdGVyQ2hhbmdlSW5F bnZpcgogCiAgICAgICAgIGlmIChTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyID0gZG9jdW1l bnQtPnN0eWxlU2NvcGUoKS5yZXNvbHZlcklmRXhpc3RzKCkpCiAgICAgICAgICAgICBzdHlsZVJl c29sdmVyLT5pbnZhbGlkYXRlTWF0Y2hlZFByb3BlcnRpZXNDYWNoZSgpOwotICAgICAgICBkb2N1 bWVudC0+c2NoZWR1bGVGb3JjZWRTdHlsZVJlY2FsYygpOworICAgICAgICBkb2N1bWVudC0+c2No ZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCk7CiAgICAgICAgIGRvY3VtZW50LT5zdHlsZVNjb3BlKCku ZGlkQ2hhbmdlU3R5bGVTaGVldEVudmlyb25tZW50KCk7CiAgICAgfQogfQpJbmRleDogU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvc3R5bGUvU3R5bGVTY29wZS5jcHAJKHJldmlzaW9uIDIzOTA0NCkKKysrIFNvdXJjZS9XZWJD b3JlL3N0eWxlL1N0eWxlU2NvcGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NzgsNyArNDc4LDcg QEAgdm9pZCBTY29wZTo6dXBkYXRlQWN0aXZlU3R5bGVTaGVldHMoVXBkYQogICAgICAgICAvLyBD cmFzaCBzdGFja3MgaW5kaWNhdGUgd2UgY2FuIGdldCBoZXJlIHdoZW4gYSByZXNvdXJjZSBsb2Fk IGZhaWxzIHN5bmNocm9ub3VzbHkgKGZvciBleGFtcGxlIGR1ZSB0byBjb250ZW50IGJsb2NraW5n KS4KICAgICAgICAgLy8gRklYTUU6IFRoZXNlIGtpbmQgb2YgY2FzZXMgc2hvdWxkIGJlIGVsaW1p bmF0ZWQgYW5kIHRoaXMgcGF0aCByZXBsYWNlZCBieSBhbiBhc3NlcnQuCiAgICAgICAgIG1fcGVu ZGluZ1VwZGF0ZSA9IFVwZGF0ZVR5cGU6OkNvbnRlbnRzT3JJbnRlcnByZXRhdGlvbjsKLSAgICAg ICAgbV9kb2N1bWVudC5zY2hlZHVsZUZvcmNlZFN0eWxlUmVjYWxjKCk7CisgICAgICAgIG1fZG9j dW1lbnQuc2NoZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTUxNSw3ICs1MTUsNyBAQCB2b2lkIFNjb3BlOjp1cGRhdGVBY3RpdmVTdHlsZVNoZWV0 cyhVcGRhCiAgICAgICAgICAgICAgICAgc2hhZG93Q2hpbGQuaW52YWxpZGF0ZVN0eWxlRm9yU3Vi dHJlZSgpOwogICAgICAgICAgICAgaW52YWxpZGF0ZUhvc3RBbmRTbG90dGVkU3R5bGVJZk5lZWRl ZCgqbV9zaGFkb3dSb290LCByZXNvbHZlcigpKTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICBtX2RvY3VtZW50LnNjaGVkdWxlRm9yY2VkU3R5bGVSZWNhbGMoKTsKKyAgICAgICAgICAgIG1f ZG9jdW1lbnQuc2NoZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCk7CiAgICAgfQogfQogCkluZGV4OiBT b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzkwNTUpCisrKyBTb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAor MjAxOC0xMi0xMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAg UmVuYW1lICJmb3JjZWQgc3R5bGUgcmVjYWxjIiB0byAiZnVsbCBzdHlsZSByZWJ1aWxkIgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNTcyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dl YkhUTUxWaWV3Lm1tOgorICAgICAgICAoLVtXZWJIVE1MVmlldyBzZXROZWVkc1RvQXBwbHlTdHls ZXM6XSk6CisKIDIwMTgtMTItMTAgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFttYWNPU10gTVNIQ3JlYXRlTUlHU2VydmVyU291cmNlIGludm9jYXRpb24gZG9lcyBu b3QgaGFuZGxlIHNlbmQvcmVjZWl2ZSByaWdodHMgY29ycmVjdGx5CkluZGV4OiBTb3VyY2UvV2Vi S2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHJldmlzaW9uIDIzOTA0 NCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0JKHdv cmtpbmcgY29weSkKQEAgLTM4ODEsNyArMzg4MSw3IEBAIC0gKHZvaWQpc2V0TmVlZHNUb0FwcGx5 U3R5bGVzOiAoQk9PTClmbGEKICAgICBpZiAoRnJhbWUqIGZyYW1lID0gY29yZShbc2VsZiBfZnJh bWVdKSkgewogICAgICAgICBpZiAoZnJhbWUtPmRvY3VtZW50KCkgJiYgZnJhbWUtPmRvY3VtZW50 KCktPnBhZ2VDYWNoZVN0YXRlKCkgIT0gRG9jdW1lbnQ6Ok5vdEluUGFnZUNhY2hlKQogICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+c2NoZWR1bGVGb3JjZWRT dHlsZVJlY2FsYygpOworICAgICAgICBmcmFtZS0+ZG9jdW1lbnQoKS0+c2NoZWR1bGVGdWxsU3R5 bGVSZWJ1aWxkKCk7CiAgICAgfQogfQogCg==