222655 2021-03-03 07:49:54 -0800 Style updates should be done by rendering update 2021-03-04 09:38:02 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=201019 P2 Normal --- 1 koivisto webkit-unassigned aboxhall apinheiro cdumez cfleizach changseok cmarcelo dmazzoni esprehn+autocc ews-watchlist glenn gyuyoung.kim jcraig jdiggs kangil.han kondapallykalyan mifenton pdr samuel_white simon.fraser oldest_to_newest 1735272 0 koivisto 2021-03-03 07:49:54 -0800 Remove Document::m_styleRecalcTimer 1735283 1 422087 koivisto 2021-03-03 08:14:17 -0800 Created attachment 422087 wip 1735773 2 koivisto 2021-03-04 04:01:48 -0800 Looks like this would regress comp PLT. I think this is because style updates trigger resource loads (for background images, fonts and similar) and those get delayed when we wait until the next rendering update. 1735865 3 simon.fraser 2021-03-04 09:38:02 -0800 I did this in bug 201019, and found that we rely on tree style recalc timer to trigger work. 422087 2021-03-03 08:14:17 -0800 2021-03-03 08:31:08 -0800 wip remove-style-recalc-timer.patch text/plain 12937 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4 IGRiYjFjNGRhYzAyNC4uYTY2ZWMwOGE4NGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKQEAgLTE0MCw3ICsxNDAsNyBAQCBzdGF0aWMgYm9v bCByZW5kZXJlck5lZWRzRGVmZXJyZWRVcGRhdGUoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJl cikKIHsKICAgICBBU1NFUlQoIXJlbmRlcmVyLmJlaW5nRGVzdHJveWVkKCkpOwogICAgIGF1dG8m IGRvY3VtZW50ID0gcmVuZGVyZXIuZG9jdW1lbnQoKTsKLSAgICByZXR1cm4gcmVuZGVyZXIubmVl ZHNMYXlvdXQoKSB8fCBkb2N1bWVudC5uZWVkc1N0eWxlUmVjYWxjKCkgfHwgZG9jdW1lbnQuaW5S ZW5kZXJUcmVlVXBkYXRlKCkgfHwgKGRvY3VtZW50LnZpZXcoKSAmJiBkb2N1bWVudC52aWV3KCkt PmxheW91dENvbnRleHQoKS5pc0luUmVuZGVyVHJlZUxheW91dCgpKTsKKyAgICByZXR1cm4gcmVu ZGVyZXIubmVlZHNMYXlvdXQoKSB8fCBkb2N1bWVudC5uZWVkc1N0eWxlVXBkYXRlKCkgfHwgZG9j dW1lbnQuaW5SZW5kZXJUcmVlVXBkYXRlKCkgfHwgKGRvY3VtZW50LnZpZXcoKSAmJiBkb2N1bWVu dC52aWV3KCktPmxheW91dENvbnRleHQoKS5pc0luUmVuZGVyVHJlZUxheW91dCgpKTsKIH0KIAog c3RhdGljIGJvb2wgbm9kZUFuZFJlbmRlcmVyQXJlVmFsaWQoTm9kZSogbm9kZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCmluZGV4IGIyYWYwMTFhZjlkYS4uYWU3ZjIwYjk0NGE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTYxMiw3ICs2MTIsNiBAQCBEb2N1bWVudDo6RG9jdW1lbnQoRnJh bWUqIGZyYW1lLCBjb25zdCBTZXR0aW5ncyYgc2V0dGluZ3MsIGNvbnN0IFVSTCYgdXJsLCBEb2N1 bQogICAgICwgbV9leHRlbnNpb25TdHlsZVNoZWV0cyhtYWtlVW5pcXVlPEV4dGVuc2lvblN0eWxl U2hlZXRzPigqdGhpcykpCiAgICAgLCBtX3Zpc2l0ZWRMaW5rU3RhdGUobWFrZVVuaXF1ZTxWaXNp dGVkTGlua1N0YXRlPigqdGhpcykpCiAgICAgLCBtX21hcmtlcnMobWFrZVVuaXF1ZTxEb2N1bWVu dE1hcmtlckNvbnRyb2xsZXI+KCp0aGlzKSkKLSAgICAsIG1fc3R5bGVSZWNhbGNUaW1lcihbdGhp c10geyB1cGRhdGVTdHlsZUlmTmVlZGVkKCk7IH0pCiAjaWYgIUxPR19ESVNBQkxFRAogICAgICwg bV9kb2N1bWVudENyZWF0aW9uVGltZShNb25vdG9uaWNUaW1lOjpub3coKSkKICNlbmRpZgpAQCAt MTkzMywzOSArMTkzMiwzMSBAQCBSZWY8VHJlZVdhbGtlcj4gRG9jdW1lbnQ6OmNyZWF0ZVRyZWVX YWxrZXIoTm9kZSYgcm9vdCwgdW5zaWduZWQgbG9uZyB3aGF0VG9TaG93LAogdm9pZCBEb2N1bWVu dDo6c2NoZWR1bGVGdWxsU3R5bGVSZWJ1aWxkKCkKIHsKICAgICBtX25lZWRzRnVsbFN0eWxlUmVi dWlsZCA9IHRydWU7Ci0gICAgc2NoZWR1bGVTdHlsZVJlY2FsYygpOworICAgIHNjaGVkdWxlU3R5 bGVVcGRhdGUoKTsKIH0KIAotdm9pZCBEb2N1bWVudDo6c2NoZWR1bGVTdHlsZVJlY2FsYygpCit2 b2lkIERvY3VtZW50OjpzY2hlZHVsZVN0eWxlVXBkYXRlKCkKIHsKICAgICBBU1NFUlQoIW1fcmVu ZGVyVmlldyB8fCAhaW5IaXRUZXN0aW5nKCkpOwogCi0gICAgaWYgKG1fc3R5bGVSZWNhbGNUaW1l ci5pc0FjdGl2ZSgpIHx8IGJhY2tGb3J3YXJkQ2FjaGVTdGF0ZSgpICE9IE5vdEluQmFja0Zvcndh cmRDYWNoZSkKKyAgICBpZiAoYmFja0ZvcndhcmRDYWNoZVN0YXRlKCkgIT0gTm90SW5CYWNrRm9y d2FyZENhY2hlKQogICAgICAgICByZXR1cm47CiAKICAgICBBU1NFUlQoY2hpbGROZWVkc1N0eWxl UmVjYWxjKCkgfHwgbV9uZWVkc0Z1bGxTdHlsZVJlYnVpbGQpOwogCi0gICAgbV9zdHlsZVJlY2Fs Y1RpbWVyLnN0YXJ0T25lU2hvdCgwX3MpOworICAgIHNjaGVkdWxlUmVuZGVyaW5nVXBkYXRlKHsg fSk7CiAKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFNjaGVkdWxlU3R5bGVSZWNh bGN1bGF0aW9uKCp0aGlzKTsKIH0KIAotdm9pZCBEb2N1bWVudDo6dW5zY2hlZHVsZVN0eWxlUmVj YWxjKCkKLXsKLSAgICBBU1NFUlQoIWNoaWxkTmVlZHNTdHlsZVJlY2FsYygpKTsKLQotICAgIG1f c3R5bGVSZWNhbGNUaW1lci5zdG9wKCk7Ci0gICAgbV9uZWVkc0Z1bGxTdHlsZVJlYnVpbGQgPSBm YWxzZTsKLX0KLQotYm9vbCBEb2N1bWVudDo6aGFzUGVuZGluZ1N0eWxlUmVjYWxjKCkgY29uc3QK K2Jvb2wgRG9jdW1lbnQ6Omhhc1BlbmRpbmdTdHlsZVVwZGF0ZSgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIG5lZWRzU3R5bGVSZWNhbGMoKSAmJiAhbV9pblN0eWxlUmVjYWxjOworICAgIHJldHVybiBu ZWVkc1N0eWxlVXBkYXRlKCkgJiYgIW1faW5TdHlsZVJlY2FsYzsKIH0KIAogYm9vbCBEb2N1bWVu dDo6aGFzUGVuZGluZ0Z1bGxTdHlsZVJlYnVpbGQoKSBjb25zdAogewotICAgIHJldHVybiBoYXNQ ZW5kaW5nU3R5bGVSZWNhbGMoKSAmJiBtX25lZWRzRnVsbFN0eWxlUmVidWlsZDsKKyAgICByZXR1 cm4gaGFzUGVuZGluZ1N0eWxlVXBkYXRlKCkgJiYgbV9uZWVkc0Z1bGxTdHlsZVJlYnVpbGQ7CiB9 CiAKIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZVJlbmRlclRyZWUoc3RkOjp1bmlxdWVfcHRyPGNvbnN0 IFN0eWxlOjpVcGRhdGU+IHN0eWxlVXBkYXRlKQpAQCAtMjAzMCw4ICsyMDIxLDEwIEBAIHZvaWQg RG9jdW1lbnQ6OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGVUeXBlIHR5cGUpCiAKICAgICAgICAg bV9pblN0eWxlUmVjYWxjID0gdHJ1ZTsKIAotICAgICAgICBpZiAobV9uZWVkc0Z1bGxTdHlsZVJl YnVpbGQpCisgICAgICAgIGlmIChtX25lZWRzRnVsbFN0eWxlUmVidWlsZCkgewogICAgICAgICAg ICAgdHlwZSA9IFJlc29sdmVTdHlsZVR5cGU6OlJlYnVpbGQ7CisgICAgICAgICAgICBtX25lZWRz RnVsbFN0eWxlUmVidWlsZCA9IGZhbHNlOworICAgICAgICB9CiAKICAgICAgICAgaWYgKHR5cGUg PT0gUmVzb2x2ZVN0eWxlVHlwZTo6UmVidWlsZCkgewogICAgICAgICAgICAgLy8gVGhpcyBtYXkg Z2V0IHNldCBhZ2FpbiBkdXJpbmcgc3R5bGUgcmVzb2x2ZS4KQEAgLTIwNjAsNyArMjA1Myw2IEBA IHZvaWQgRG9jdW1lbnQ6OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGVUeXBlIHR5cGUpCiAKICAg ICAgICAgc2V0SGFzVmFsaWRTdHlsZSgpOwogICAgICAgICBjbGVhckNoaWxkTmVlZHNTdHlsZVJl Y2FsYygpOwotICAgICAgICB1bnNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKIAogICAgICAgICBtX2lu U3R5bGVSZWNhbGMgPSBmYWxzZTsKIApAQCAtMjEwOSw3ICsyMTAxLDcgQEAgdm9pZCBEb2N1bWVu dDo6dXBkYXRlVGV4dFJlbmRlcmVyKFRleHQmIHRleHQsIHVuc2lnbmVkIG9mZnNldE9mUmVwbGFj ZWRUZXh0LCB1bnMKICAgICBzY2hlZHVsZVJlbmRlcmluZ1VwZGF0ZSh7IH0pOwogfQogCi1ib29s IERvY3VtZW50OjpuZWVkc1N0eWxlUmVjYWxjKCkgY29uc3QKK2Jvb2wgRG9jdW1lbnQ6Om5lZWRz U3R5bGVVcGRhdGUoKSBjb25zdAogewogICAgIGlmIChiYWNrRm9yd2FyZENhY2hlU3RhdGUoKSAh PSBOb3RJbkJhY2tGb3J3YXJkQ2FjaGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTIxNTAs MTQgKzIxNDIsMTQgQEAgYm9vbCBEb2N1bWVudDo6dXBkYXRlU3R5bGVJZk5lZWRlZCgpCiAKICAg ICAgICAgc3R5bGVTY29wZSgpLmZsdXNoUGVuZGluZ1VwZGF0ZSgpOwogCi0gICAgICAgIGlmICgh bmVlZHNTdHlsZVJlY2FsYygpKQorICAgICAgICBpZiAoIW5lZWRzU3R5bGVVcGRhdGUoKSkKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZ KQogICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNTY29wZSBvYnNlcnZpbmdT Y29wZSgqdGhpcyk7CiAjZW5kaWYKLSAgICAvLyBUaGUgZWFybHkgZXhpdCBhYm92ZSBmb3IgIW5l ZWRzU3R5bGVSZWNhbGMoKSBpcyBuZWVkZWQgd2hlbiB1cGRhdGVXaWRnZXRQb3NpdGlvbnMoKSBp cyBjYWxsZWQgaW4gcnVuT3JTY2hlZHVsZUFzeW5jaHJvbm91c1Rhc2tzKCkuCisgICAgLy8gVGhl IGVhcmx5IGV4aXQgYWJvdmUgZm9yICFuZWVkc1N0eWxlVXBkYXRlKCkgaXMgbmVlZGVkIHdoZW4g dXBkYXRlV2lkZ2V0UG9zaXRpb25zKCkgaXMgY2FsbGVkIGluIHJ1bk9yU2NoZWR1bGVBc3luY2hy b25vdXNUYXNrcygpLgogICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJ T04oaXNTYWZlVG9VcGRhdGVTdHlsZU9yTGF5b3V0KCp0aGlzKSk7CiAgICAgcmVzb2x2ZVN0eWxl KCk7CiAgICAgcmV0dXJuIHRydWU7CkBAIC0yNTM4LDggKzI1MzAsNiBAQCB2b2lkIERvY3VtZW50 OjpkZXN0cm95UmVuZGVyVHJlZSgpCiAKICAgICBjbGVhckNoaWxkTmVlZHNTdHlsZVJlY2FsYygp OwogCi0gICAgdW5zY2hlZHVsZVN0eWxlUmVjYWxjKCk7Ci0KICAgICAvLyBGSVhNRTogUmVuZGVy T2JqZWN0Ojp2aWV3KCkgdXNlcyBtX3JlbmRlclZpZXcgYW5kIHdlIGNhbid0IG51bGwgaXQgYmVm b3JlIGRlc3RydWN0aW9uIGlzIGNvbXBsZXRlZAogICAgIHsKICAgICAgICAgUmVuZGVyVHJlZUJ1 aWxkZXIgYnVpbGRlcigqbV9yZW5kZXJWaWV3KTsKQEAgLTU0NDIsNyArNTQzMiw2IEBAIHZvaWQg RG9jdW1lbnQ6OnNldEJhY2tGb3J3YXJkQ2FjaGVTdGF0ZShCYWNrRm9yd2FyZENhY2hlU3RhdGUg c3RhdGUpCiAKICAgICAgICAgc3R5bGVTY29wZSgpLmNsZWFyUmVzb2x2ZXIoKTsKICAgICAgICAg Y2xlYXJTZWxlY3RvclF1ZXJ5Q2FjaGUoKTsKLSAgICAgICAgbV9zdHlsZVJlY2FsY1RpbWVyLnN0 b3AoKTsKIAogICAgICAgICBjbGVhclNoYXJlZE9iamVjdFBvb2woKTsKIApAQCAtNTQ1Myw3ICs1 NDQyLDcgQEAgdm9pZCBEb2N1bWVudDo6c2V0QmFja0ZvcndhcmRDYWNoZVN0YXRlKEJhY2tGb3J3 YXJkQ2FjaGVTdGF0ZSBzdGF0ZSkKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBOb3RJbkJhY2tG b3J3YXJkQ2FjaGU6CiAgICAgICAgIGlmIChjaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSkKLSAgICAg ICAgICAgIHNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKKyAgICAgICAgICAgIHNjaGVkdWxlU3R5bGVV cGRhdGUoKTsKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKICAgICAgICAgaWYgKG1faWRi Q29ubmVjdGlvblByb3h5KQogICAgICAgICAgICAgbV9pZGJDb25uZWN0aW9uUHJveHktPnNldENv bnRleHRTdXNwZW5kZWQoKnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgZmFsc2UpOwpAQCAtNzgy NCw3ICs3ODEzLDcgQEAgdm9pZCBEb2N1bWVudDo6dXBkYXRlSW50ZXJzZWN0aW9uT2JzZXJ2YXRp b25zKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYm9vbCBuZWVkc0xheW91dCA9IGZyYW1lVmll dy0+bGF5b3V0Q29udGV4dCgpLmlzTGF5b3V0UGVuZGluZygpIHx8IChyZW5kZXJWaWV3KCkgJiYg cmVuZGVyVmlldygpLT5uZWVkc0xheW91dCgpKTsKLSAgICBpZiAobmVlZHNMYXlvdXQgfHwgaGFz UGVuZGluZ1N0eWxlUmVjYWxjKCkpCisgICAgaWYgKG5lZWRzTGF5b3V0IHx8IGhhc1BlbmRpbmdT dHlsZVVwZGF0ZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBWZWN0b3I8V2Vha1B0cjxJbnRl cnNlY3Rpb25PYnNlcnZlcj4+IGludGVyc2VjdGlvbk9ic2VydmVyc1dpdGhQZW5kaW5nTm90aWZp Y2F0aW9uczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggNDU3NDc4Y2UwMWUxLi5iZmUyZjYyNzc3 Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC01OTIsNyArNTkyLDcgQEAgcHVibGljOgogICAg IGVudW0gY2xhc3MgUmVzb2x2ZVN0eWxlVHlwZSB7IE5vcm1hbCwgUmVidWlsZCB9OwogICAgIHZv aWQgcmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgPSBSZXNvbHZlU3R5bGVUeXBlOjpOb3Jt YWwpOwogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgdXBkYXRlU3R5bGVJZk5lZWRlZCgpOwotICAg IGJvb2wgbmVlZHNTdHlsZVJlY2FsYygpIGNvbnN0OworICAgIGJvb2wgbmVlZHNTdHlsZVVwZGF0 ZSgpIGNvbnN0OwogICAgIHVuc2lnbmVkIGxhc3RTdHlsZVVwZGF0ZVNpemVGb3JUZXN0aW5nKCkg Y29uc3QgeyByZXR1cm4gbV9sYXN0U3R5bGVVcGRhdGVTaXplRm9yVGVzdGluZzsgfQogCiAgICAg V0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVMYXlvdXQoKTsKQEAgLTc4OSw5ICs3ODksOCBAQCBw dWJsaWM6CiAgICAgc3RhdGljIHB0cmRpZmZfdCBjc3NUYXJnZXRNZW1vcnlPZmZzZXQoKSB7IHJl dHVybiBPQkpFQ1RfT0ZGU0VUT0YoRG9jdW1lbnQsIG1fY3NzVGFyZ2V0KTsgfQogCiAgICAgV0VC Q09SRV9FWFBPUlQgdm9pZCBzY2hlZHVsZUZ1bGxTdHlsZVJlYnVpbGQoKTsKLSAgICB2b2lkIHNj aGVkdWxlU3R5bGVSZWNhbGMoKTsKLSAgICB2b2lkIHVuc2NoZWR1bGVTdHlsZVJlY2FsYygpOwot ICAgIGJvb2wgaGFzUGVuZGluZ1N0eWxlUmVjYWxjKCkgY29uc3Q7CisgICAgdm9pZCBzY2hlZHVs ZVN0eWxlVXBkYXRlKCk7CisgICAgYm9vbCBoYXNQZW5kaW5nU3R5bGVVcGRhdGUoKSBjb25zdDsK ICAgICBib29sIGhhc1BlbmRpbmdGdWxsU3R5bGVSZWJ1aWxkKCkgY29uc3Q7CiAKICAgICB2b2lk IHJlZ2lzdGVyTm9kZUxpc3RGb3JJbnZhbGlkYXRpb24oTGl2ZU5vZGVMaXN0Jik7CkBAIC0xNjMx LDYgKzE2MzAsNyBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBJZ25vcmVPcGVuc0R1cmlu Z1VubG9hZENvdW50SW5jcmVtZW50ZXI7CiAgICAgZnJpZW5kIGNsYXNzIElnbm9yZURlc3RydWN0 aXZlV3JpdGVDb3VudEluY3JlbWVudGVyOwogCisKICAgICB2b2lkIHVwZGF0ZVRpdGxlRWxlbWVu dChFbGVtZW50JiBjaGFuZ2luZ1RpdGxlRWxlbWVudCk7CiAgICAgdm9pZCB3aWxsRGV0YWNoUGFn ZSgpIGZpbmFsOwogICAgIHZvaWQgZnJhbWVEZXN0cm95ZWQoKSBmaW5hbDsKQEAgLTE2MzksNiAr MTYzOSw3IEBAIHByaXZhdGU6CiAKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyKCkgY29uc3Qg PSBkZWxldGU7CiAgICAgdm9pZCBzZXRSZW5kZXJlcihSZW5kZXJPYmplY3QqKSA9IGRlbGV0ZTsK KyAgICBib29sIG5lZWRzU3R5bGVSZWNhbGMoKSA9IGRlbGV0ZTsKIAogICAgIHZvaWQgY3JlYXRl UmVuZGVyVHJlZSgpOwogICAgIHZvaWQgZGV0YWNoUGFyc2VyKCk7CkBAIC0xODAxLDggKzE4MDIs NiBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0cjxBWE9iamVjdENhY2hlPiBtX2F4T2Jq ZWN0Q2FjaGU7CiAgICAgY29uc3Qgc3RkOjp1bmlxdWVfcHRyPERvY3VtZW50TWFya2VyQ29udHJv bGxlcj4gbV9tYXJrZXJzOwogICAgIAotICAgIFRpbWVyIG1fc3R5bGVSZWNhbGNUaW1lcjsKLQog ICAgIHN0ZDo6dW5pcXVlX3B0cjxTdHlsZTo6VXBkYXRlPiBtX3BlbmRpbmdSZW5kZXJUcmVlVGV4 dFVwZGF0ZTsKIAogICAgIEVsZW1lbnQqIG1fY3NzVGFyZ2V0IHsgbnVsbHB0ciB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCmluZGV4IDFmYzQyNjVlNWY3NC4uZDI1NDczMjczYjk0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCkBAIC0zMzc1LDcgKzMzNzUsNyBAQCBjb25zdCBSZW5kZXJTdHlsZSogRWxl bWVudDo6cmVzb2x2ZUNvbXB1dGVkU3R5bGUoUmVzb2x2ZUNvbXB1dGVkU3R5bGVNb2RlIG1vZGUp CiAKIGJvb2wgRWxlbWVudDo6aGFzVmFsaWRTdHlsZSgpIGNvbnN0CiB7Ci0gICAgaWYgKCFkb2N1 bWVudCgpLm5lZWRzU3R5bGVSZWNhbGMoKSkKKyAgICBpZiAoIWRvY3VtZW50KCkubmVlZHNTdHls ZVVwZGF0ZSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIGlmIChkb2N1bWVudCgpLmhh c1BlbmRpbmdGdWxsU3R5bGVSZWJ1aWxkKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggYmYyZWQxYmQz OWE4Li43MTllOGViZmZlZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTc4OSw3ICs3ODksNyBAQCBO b2RlOjpFZGl0YWJpbGl0eSBOb2RlOjpjb21wdXRlRWRpdGFiaWxpdHkoVXNlclNlbGVjdEFsbFRy ZWF0bWVudCB0cmVhdG1lbnQsIFNobwogICAgIGlmIChkb2N1bWVudCgpLmZyYW1lKCkgJiYgZG9j dW1lbnQoKS5mcmFtZSgpLT5wYWdlKCkgJiYgZG9jdW1lbnQoKS5mcmFtZSgpLT5wYWdlKCktPmlz RWRpdGFibGUoKSkKICAgICAgICAgcmV0dXJuIEVkaXRhYmlsaXR5OjpDYW5FZGl0UmljaGx5Owog Ci0gICAgaWYgKHNob3VsZFVwZGF0ZVN0eWxlID09IFNob3VsZFVwZGF0ZVN0eWxlOjpVcGRhdGUg JiYgZG9jdW1lbnQoKS5uZWVkc1N0eWxlUmVjYWxjKCkpIHsKKyAgICBpZiAoc2hvdWxkVXBkYXRl U3R5bGUgPT0gU2hvdWxkVXBkYXRlU3R5bGU6OlVwZGF0ZSAmJiBkb2N1bWVudCgpLm5lZWRzU3R5 bGVVcGRhdGUoKSkgewogICAgICAgICBpZiAoIWRvY3VtZW50KCkudXNlc1N0eWxlQmFzZWRFZGl0 YWJpbGl0eSgpKQogICAgICAgICAgICAgcmV0dXJuIEhUTUxFbGVtZW50OjplZGl0YWJpbGl0eUZy b21Db250ZW50RWRpdGFibGVBdHRyKCp0aGlzKTsKICAgICAgICAgZG9jdW1lbnQoKS51cGRhdGVT dHlsZUlmTmVlZGVkKCk7CkBAIC04NzMsNyArODczLDcgQEAgaW5saW5lIHZvaWQgTm9kZTo6dXBk YXRlQW5jZXN0b3JzRm9yU3R5bGVSZWNhbGMoKQogICAgIGlmICghZG9jdW1lbnRFbGVtZW50LT5j aGlsZE5lZWRzU3R5bGVSZWNhbGMoKSAmJiAhZG9jdW1lbnRFbGVtZW50LT5uZWVkc1N0eWxlUmVj YWxjKCkpCiAgICAgICAgIHJldHVybjsKICAgICBkb2N1bWVudCgpLnNldENoaWxkTmVlZHNTdHls ZVJlY2FsYygpOwotICAgIGRvY3VtZW50KCkuc2NoZWR1bGVTdHlsZVJlY2FsYygpOworICAgIGRv Y3VtZW50KCkuc2NoZWR1bGVTdHlsZVVwZGF0ZSgpOwogfQogCiB2b2lkIE5vZGU6OmludmFsaWRh dGVTdHlsZShTdHlsZTo6VmFsaWRpdHkgdmFsaWRpdHksIFN0eWxlOjpJbnZhbGlkYXRpb25Nb2Rl IG1vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IGQ5 M2IxMTY0ZWNjYy4uOTExNjNkZjU3NDRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcApAQCAtNDMwLDcgKzQzMCw3IEBAIHZvaWQgRnJhbWVTZWxlY3Rpb246OnNl dFNlbGVjdGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24sIE9wdGlvblNldDxT CiAgICAgbV9zZWxlY3Rpb25SZXZlYWxJbnRlbnQgPSBpbnRlbnQ7CiAgICAgbV9wZW5kaW5nU2Vs ZWN0aW9uVXBkYXRlID0gdHJ1ZTsKIAotICAgIGlmIChwcm90ZWN0ZWREb2N1bWVudC0+aGFzUGVu ZGluZ1N0eWxlUmVjYWxjKCkpCisgICAgaWYgKHByb3RlY3RlZERvY3VtZW50LT5oYXNQZW5kaW5n U3R5bGVVcGRhdGUoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBmcmFtZVZpZXcgPSBw cm90ZWN0ZWREb2N1bWVudC0+dmlldygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MUGx1Z0luRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5F bGVtZW50LmNwcAppbmRleCA5ZTZiM2IyYTFhZmYuLmJmODVkNjA3Zjk3ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKQEAgLTQ2MCw3ICs0NjAsNyBAQCBib29s IEhUTUxQbHVnSW5FbGVtZW50Ojppc1JlcGxhY2VtZW50T2JzY3VyZWQoKQogICAgIEhpdFRlc3RS ZXN1bHQgcmVzdWx0OwogICAgIEhpdFRlc3RMb2NhdGlvbiBsb2NhdGlvbiB7IExheW91dFBvaW50 IHsgdmlld1JlY3QuY2VudGVyKCkgfSB9OwogICAgIEFTU0VSVCghcmVuZGVyVmlldy0+bmVlZHNM YXlvdXQoKSk7Ci0gICAgQVNTRVJUKCFyZW5kZXJWaWV3LT5kb2N1bWVudCgpLm5lZWRzU3R5bGVS ZWNhbGMoKSk7CisgICAgQVNTRVJUKCFyZW5kZXJWaWV3LT5kb2N1bWVudCgpLm5lZWRzU3R5bGVV cGRhdGUoKSk7CiAgICAgYm9vbCBoaXQgPSB0b3BEb2N1bWVudC0+aGl0VGVzdChoaXRUeXBlLCBs b2NhdGlvbiwgcmVzdWx0KTsKICAgICBpZiAoIWhpdCB8fCByZXN1bHQuaW5uZXJOb2RlKCkgIT0g JnBsdWdpblJlbmRlcmVyLmZyYW1lT3duZXJFbGVtZW50KCkpCiAgICAgICAgIHJldHVybiB0cnVl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDY5YWNmYjBkMWI2Yi4uYTRmYTEzZjU1 NDRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC01NTM5LDcgKzU1MzksNyBAQCBU ZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFRleHRTdHJlYW0mIHRzLCBjb25zdCBGcmFtZVZpZXcmIHZp ZXcpCiB2b2lkIEZyYW1lVmlldzo6ZGlkRmluaXNoUHJvaGliaXRpbmdTY3JvbGxpbmdXaGVuQ2hh bmdpbmdDb250ZW50U2l6ZSgpCiB7CiAgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0gZnJhbWUoKS5k b2N1bWVudCgpKSB7Ci0gICAgICAgIGlmICghZG9jdW1lbnQtPm5lZWRzU3R5bGVSZWNhbGMoKSAm JiAhbmVlZHNMYXlvdXQoKSAmJiAhbGF5b3V0Q29udGV4dCgpLmlzSW5MYXlvdXQoKSkKKyAgICAg ICAgaWYgKCFkb2N1bWVudC0+bmVlZHNTdHlsZVVwZGF0ZSgpICYmICFuZWVkc0xheW91dCgpICYm ICFsYXlvdXRDb250ZXh0KCkuaXNJbkxheW91dCgpKQogICAgICAgICAgICAgdXBkYXRlU2Nyb2xs YmFycyhzY3JvbGxQb3NpdGlvbigpKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9uZWVk c0RlZmVycmVkU2Nyb2xsYmFyc1VwZGF0ZSA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9DdXN0b21QYWludEltYWdlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0N1c3RvbVBhaW50SW1hZ2UuY3BwCmluZGV4IDgzZmQ1OTg5 YjgzZi4uOWYyYjE0MjUxYTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9DdXN0b21QYWludEltYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9DdXN0b21QYWludEltYWdlLmNwcApAQCAtMTI0LDcgKzEyNCw3IEBAIEltYWdl RHJhd1Jlc3VsdCBDdXN0b21QYWludEltYWdlOjpkb0N1c3RvbVBhaW50KEdyYXBoaWNzQ29udGV4 dCYgZGVzdENvbnRleHQsIGNvCiAgICAgICAgIHJldHVybiBJbWFnZURyYXdSZXN1bHQ6OkRpZE5v dGhpbmc7CiAKICAgICBBU1NFUlQoIW1fZWxlbWVudC0+bmVlZHNMYXlvdXQoKSk7Ci0gICAgQVNT RVJUKCFtX2VsZW1lbnQtPmVsZW1lbnQoKS0+ZG9jdW1lbnQoKS5uZWVkc1N0eWxlUmVjYWxjKCkp OworICAgIEFTU0VSVCghbV9lbGVtZW50LT5lbGVtZW50KCktPmRvY3VtZW50KCkubmVlZHNTdHls ZVVwZGF0ZSgpKTsKIAogICAgIEpTQ1NTUGFpbnRDYWxsYmFjayYgY2FsbGJhY2sgPSBzdGF0aWNf Y2FzdDxKU0NTU1BhaW50Q2FsbGJhY2smPihtX3BhaW50RGVmaW5pdGlvbi0+cGFpbnRDYWxsYmFj ay5nZXQoKSk7CiAgICAgYXV0byogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCA9IGNhbGxiYWNrLnNj cmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1h Z2UuY3BwCmluZGV4IDcxMjRlNzNkZTFmOC4uOGMwYjkxNDdjYmFjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIFJlbmRl ckltYWdlOjppbWFnZUNoYW5nZWQoV3JhcHBlZEltYWdlUHRyIG5ld0ltYWdlLCBjb25zdCBJbnRS ZWN0KiByZWN0KQogCiAgICAgLy8gU2V0IGltYWdlIGRpbWVuc2lvbnMsIHRha2luZyBpbnRvIGFj Y291bnQgdGhlIHNpemUgb2YgdGhlIGFsdCB0ZXh0LgogICAgIGlmIChpbWFnZVJlc291cmNlKCku ZXJyb3JPY2N1cnJlZCgpKSB7Ci0gICAgICAgIGlmICghbV9hbHRUZXh0LmlzRW1wdHkoKSAmJiBk b2N1bWVudCgpLmhhc1BlbmRpbmdTdHlsZVJlY2FsYygpKSB7CisgICAgICAgIGlmICghbV9hbHRU ZXh0LmlzRW1wdHkoKSAmJiBkb2N1bWVudCgpLmhhc1BlbmRpbmdTdHlsZVVwZGF0ZSgpKSB7CiAg ICAgICAgICAgICBBU1NFUlQoZWxlbWVudCgpKTsKICAgICAgICAgICAgIGlmIChlbGVtZW50KCkp IHsKICAgICAgICAgICAgICAgICBtX25lZWRzVG9TZXRTaXplRm9yQWx0VGV4dCA9IHRydWU7Cg==