195463 2019-03-08 09:18:43 -0800 [ContentChangeObserver] Add StartedDOMTimerExecution and StartedStyleRecalc 2019-03-08 13:11:48 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1514019 0 zalan 2019-03-08 09:18:43 -0800 This is in preparation for explicit isObservingContentChanges() 1514020 1 webkit-bug-importer 2019-03-08 09:20:57 -0800 <rdar://problem/48714762> 1514026 2 364020 zalan 2019-03-08 09:27:02 -0800 Created attachment 364020 Patch 1514122 3 364020 simon.fraser 2019-03-08 12:01:13 -0800 Comment on attachment 364020 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364020&action=review > Source/WebCore/page/ios/ContentChangeObserver.h:166 > + bool m_isObservingPendingStyleRecalc { false }; m_isWaitingForStyleRecalc 1514134 4 364050 zalan 2019-03-08 12:32:26 -0800 Created attachment 364050 Patch 1514147 5 364050 commit-queue 2019-03-08 13:11:46 -0800 Comment on attachment 364050 Patch Clearing flags on attachment: 364050 Committed r242654: <https://trac.webkit.org/changeset/242654> 1514148 6 commit-queue 2019-03-08 13:11:48 -0800 All reviewed patches have been landed. Closing bug. 364020 2019-03-08 09:27:02 -0800 2019-03-08 12:32:25 -0800 Patch bug-195463-20190308092701.patch text/plain 6338 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA5OTljMDA0MDEzNGE0 MjE2YjlkMzg4ZDdhZDg2OTM5ZTU2YjBjZi4uODM4NmU5MjhiNGM4MzUxNjAxZjFlYzA2N2MyYjVh NzNlYzk3M2U5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gQWRkIFN0YXJ0ZWRET01UaW1lckV4ZWN1dGlvbiBhbmQgU3RhcnRlZFN0eWxlUmVjYWxj CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU0NjMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4NzE0NzYyPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGlu dHJvZHVjaW5nIG1faXNPYnNlcnZpbmdDb250ZW50Q2hhbmdlcyBmbGFnIHRvIHRyYWNrIG9ic2Vy dmluZyBzdGF0ZSBhY3Jvc3MgZXZlbnRzICh0b3VjaFN0YXJ0IC0+IG1vdXNlTW92ZWQpLgorCisg ICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlkU3RhcnQpOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdHlsZVJlY2FsY0RpZFN0 YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNh bGNEaWRGaW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpz ZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl bnRDaGFuZ2VPYnNlcnZlcjo6YWRqdXN0T2JzZXJ2ZWRTdGF0ZSk6CisgICAgICAgICogcGFnZS9p b3MvQ29udGVudENoYW5nZU9ic2VydmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hh bmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2aW5nUGVuZGluZ1N0eWxlUmVjYWxjIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdTdHlsZVJlY2Fs YyBjb25zdCk6IERlbGV0ZWQuCisKIDIwMTktMDMtMDggIFphbiBEb2JlcnNlayAgPHpkb2JlcnNl a0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEdMQ29udGV4dEVHTDogZGVzaXJlZCBFR0wgY29uZmln IHNob3VsZCBzZWFyY2ggZm9yIDgtYml0IGNvbXBvbmVudHMgYnkgZGVmYXVsdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAKaW5kZXggNTg5 MTI1ZjA5ZDA5YzE5NGFhMzZkMDc1NGE3MTI0ZWVhMDFkNjFmMi4uZDBlMTJhZWMzMzExYzc2ZWYz Njg5ODQ3NGRhNGYyZDBjNWJmM2FiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9p b3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lv cy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwCkBAIC05NSw2ICs5NSw3IEBAIHZvaWQgQ29udGVu dENoYW5nZU9ic2VydmVyOjpkb21UaW1lckV4ZWN1dGVEaWRTdGFydChjb25zdCBET01UaW1lciYg dGltZXIpCiAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8 ICJzdGFydE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZTogc3RhcnQgb2JzZXJ2aW5nICgiIDw8ICZ0 aW1lciA8PCAiKSB0aW1lciBjYWxsYmFjay4iKTsKIAogICAgIG1fZG9tVGltZXJJc0JlaW5nRXhl Y3V0ZWQgPSB0cnVlOworICAgIGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OlN0YXJ0ZWRET01U aW1lckV4ZWN1dGlvbik7CiB9CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpkb21UaW1l ckV4ZWN1dGVEaWRGaW5pc2goY29uc3QgRE9NVGltZXImIHRpbWVyKQpAQCAtMTExLDI0ICsxMTIs MjQgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmRvbVRpbWVyRXhlY3V0ZURpZEZpbmlz aChjb25zdCBET01UaW1lciYgdGltZXIpCiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpz dHlsZVJlY2FsY0RpZFN0YXJ0KCkKIHsKLSAgICBpZiAoIWlzT2JzZXJ2aW5nU3R5bGVSZWNhbGMo KSkKKyAgICBpZiAoIWlzT2JzZXJ2aW5nUGVuZGluZ1N0eWxlUmVjYWxjKCkpCiAgICAgICAgIHJl dHVybjsKICAgICBpZiAoaGFzVmlzaWJsZUNoYW5nZVN0YXRlKCkpCiAgICAgICAgIHJldHVybjsK ICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAic3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsYzog c3RhcnQgb2JzZXJ2aW5nIHN0eWxlIHJlY2FsYy4iKTsKIAogICAgIG1fc3R5bGVSZWNhbGNJc0Jl aW5nRXhlY3V0ZWQgPSB0cnVlOworICAgIGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OlN0YXJ0 ZWRTdHlsZVJlY2FsYyk7CiB9CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdHlsZVJl Y2FsY0RpZEZpbmlzaCgpCiB7Ci0gICAgaWYgKCFpc09ic2VydmluZ1N0eWxlUmVjYWxjKCkpCisg ICAgaWYgKCFpc09ic2VydmluZ1BlbmRpbmdTdHlsZVJlY2FsYygpKQogICAgICAgICByZXR1cm47 CiAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYzog c3RvcCBvYnNlcnZpbmcgc3R5bGUgcmVjYWxjIik7CiAKICAgICBtX3N0eWxlUmVjYWxjSXNCZWlu Z0V4ZWN1dGVkID0gZmFsc2U7Ci0gICAgc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhm YWxzZSk7Ci0gICAgYWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudDo6U3R5bGVSZWNhbGNGaW5pc2hl ZCk7CisgICAgYWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudDo6RW5kZWRTdHlsZVJlY2FsYyk7CiB9 CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpjYW5jZWxQZW5kaW5nQWN0aXZpdGllcygp CkBAIC0yMTAsNyArMjExLDcgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldFNob3Vs ZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoYm9vbCBzaG91bGRPYnNlcnZlKQogewogICAgIGlmIChz aG91bGRPYnNlcnZlKQogICAgICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAiV2FpdCB1bnRp bCBuZXh0IHN0eWxlIHJlY2FsYyBmaXJlcy4iKTsKLSAgICBtX2lzT2JzZXJ2aW5nU3R5bGVSZWNh bGMgPSBzaG91bGRPYnNlcnZlOworICAgIG1faXNPYnNlcnZpbmdQZW5kaW5nU3R5bGVSZWNhbGMg PSBzaG91bGRPYnNlcnZlOwogfQogCiBib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6aGFzRGV0 ZXJtaW5hdGVTdGF0ZSgpIGNvbnN0CkBAIC0yNTcsNiArMjU4LDEwIEBAIHZvaWQgQ29udGVudENo YW5nZU9ic2VydmVyOjphZGp1c3RPYnNlcnZlZFN0YXRlKEV2ZW50IGV2ZW50KQogICAgICAgICBz ZXRTaG91bGRPYnNlcnZlRE9NVGltZXJTY2hlZHVsaW5nKHRydWUpOwogICAgICAgICBtX2lzTW91 c2VNb3ZlZFByZWNlZGVkQnlUb3VjaCA9IGZhbHNlOwogICAgICAgICBicmVhazsKKyAgICBjYXNl IEV2ZW50OjpTdGFydGVkRE9NVGltZXJFeGVjdXRpb246CisgICAgY2FzZSBFdmVudDo6U3RhcnRl ZFN0eWxlUmVjYWxjOgorICAgICAgICBBU1NFUlQob2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkgPT0g V0tDb250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug RXZlbnQ6OkVuZGVkVG91Y2hTdGFydEV2ZW50RGlzcGF0Y2hpbmc6CiAgICAgY2FzZSBFdmVudDo6 RW5kZWRNb3VzZU1vdmVkRXZlbnREaXNwYXRjaGluZzoKICAgICAgICAgc2V0U2hvdWxkT2JzZXJ2 ZURPTVRpbWVyU2NoZWR1bGluZyhmYWxzZSk7CkBAIC0yNjcsOCArMjcyLDEwIEBAIHZvaWQgQ29u dGVudENoYW5nZU9ic2VydmVyOjphZGp1c3RPYnNlcnZlZFN0YXRlKEV2ZW50IGV2ZW50KQogICAg ICAgICBBU1NFUlQoIWhhc1Zpc2libGVDaGFuZ2VTdGF0ZSgpKTsKICAgICAgICAgc2V0SGFzSW5k ZXRlcm1pbmF0ZVN0YXRlKCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgRXZlbnQ6OkVuZGVk U3R5bGVSZWNhbGM6CisgICAgICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoZmFs c2UpOworICAgICAgICBGQUxMVEhST1VHSDsKICAgICBjYXNlIEV2ZW50OjpSZW1vdmVkRE9NVGlt ZXI6Ci0gICAgY2FzZSBFdmVudDo6U3R5bGVSZWNhbGNGaW5pc2hlZDoKICAgICBjYXNlIEV2ZW50 OjpFbmRlZERPTVRpbWVyRXhlY3V0aW9uOgogICAgIGNhc2UgRXZlbnQ6OkVuZGVkRml4ZWRPYnNl cnZhdGlvblRpbWVXaW5kb3c6CiAgICAgICAgIC8vIERlbW90ZSB0byAibm8gY2hhbmdlIiB3aGVu IHRoZXJlJ3Mgbm8gcGVuZGluZyBhY3Rpdml0eSBhbnltb3JlLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRleCA0ODA2MjY3ZWFhYTIwMzcw MDFlYTFlNjEzMjdkNzYyMjNkNDEzNDljLi4xMzk4YTRkYmI0ZWQyZmMzMjBlYWY2ZGVlYzMzYjRi NjFlYTFjZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hh bmdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdl T2JzZXJ2ZXIuaApAQCAtMTIxLDcgKzEyMSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzdHlsZVJl Y2FsY0RpZFN0YXJ0KCk7CiAgICAgdm9pZCBzdHlsZVJlY2FsY0RpZEZpbmlzaCgpOwogICAgIHZv aWQgc2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sKTsKLSAgICBib29sIGlzT2Jz ZXJ2aW5nU3R5bGVSZWNhbGMoKSBjb25zdCB7IHJldHVybiBtX2lzT2JzZXJ2aW5nU3R5bGVSZWNh bGM7IH0KKyAgICBib29sIGlzT2JzZXJ2aW5nUGVuZGluZ1N0eWxlUmVjYWxjKCkgY29uc3QgeyBy ZXR1cm4gbV9pc09ic2VydmluZ1BlbmRpbmdTdHlsZVJlY2FsYzsgfQogCiAgICAgYm9vbCBpc09i c2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9tb3VzZU1vdmVkRXZlbnRJ c0JlaW5nRGlzcGF0Y2hlZCB8fCBtX3RvdWNoRXZlbnRJc0JlaW5nRGlzcGF0Y2hlZCB8fCBtX2Rv bVRpbWVySXNCZWluZ0V4ZWN1dGVkIHx8IG1fc3R5bGVSZWNhbGNJc0JlaW5nRXhlY3V0ZWQgfHwg bV9jb250ZW50T2JzZXJ2YXRpb25UaW1lci5pc0FjdGl2ZSgpOyB9CiAKQEAgLTE0OSwxMSArMTQ5 LDEzIEBAIHByaXZhdGU6CiAgICAgICAgIEVuZGVkTW91c2VNb3ZlZEV2ZW50RGlzcGF0Y2hpbmcs CiAgICAgICAgIEluc3RhbGxlZERPTVRpbWVyLAogICAgICAgICBSZW1vdmVkRE9NVGltZXIsCisg ICAgICAgIFN0YXJ0ZWRET01UaW1lckV4ZWN1dGlvbiwKICAgICAgICAgRW5kZWRET01UaW1lckV4 ZWN1dGlvbiwKLSAgICAgICAgU3R5bGVSZWNhbGNGaW5pc2hlZCwKLSAgICAgICAgQ29udGVudFZp c2liaWxpdHlDaGFuZ2VkLAorICAgICAgICBTdGFydGVkU3R5bGVSZWNhbGMsCisgICAgICAgIEVu ZGVkU3R5bGVSZWNhbGMsCiAgICAgICAgIFN0YXJ0ZWRGaXhlZE9ic2VydmF0aW9uVGltZVdpbmRv dywKLSAgICAgICAgRW5kZWRGaXhlZE9ic2VydmF0aW9uVGltZVdpbmRvdworICAgICAgICBFbmRl ZEZpeGVkT2JzZXJ2YXRpb25UaW1lV2luZG93LAorICAgICAgICBDb250ZW50VmlzaWJpbGl0eUNo YW5nZWQKICAgICB9OwogICAgIHZvaWQgYWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudCk7CiAKQEAg LTE2MSw3ICsxNjMsNyBAQCBwcml2YXRlOgogICAgIFRpbWVyIG1fY29udGVudE9ic2VydmF0aW9u VGltZXI7CiAgICAgSGFzaFNldDxjb25zdCBET01UaW1lcio+IG1fRE9NVGltZXJMaXN0OwogICAg IGJvb2wgbV90b3VjaEV2ZW50SXNCZWluZ0Rpc3BhdGNoZWQgeyBmYWxzZSB9OwotICAgIGJvb2wg bV9pc09ic2VydmluZ1N0eWxlUmVjYWxjIHsgZmFsc2UgfTsKKyAgICBib29sIG1faXNPYnNlcnZp bmdQZW5kaW5nU3R5bGVSZWNhbGMgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9zdHlsZVJlY2FsY0lz QmVpbmdFeGVjdXRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2lzT2JzZXJ2aW5nRE9NVGltZXJT Y2hlZHVsaW5nIHsgZmFsc2UgfTsKICAgICBib29sIG1fZG9tVGltZXJJc0JlaW5nRXhlY3V0ZWQg eyBmYWxzZSB9Owo= 364050 2019-03-08 12:32:26 -0800 2019-03-08 13:11:46 -0800 Patch bug-195463-20190308123225.patch text/plain 6267 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Q1ODM3ZGIxZDM4MDEz ZWM0YmM0Mjk2ZTI4YWI2Yjg2NDA2YWRjZC4uMmY5N2VjOGJjZDYxMmY2N2ZmZGUyYjFjNDU1ZmU4 YmQxZTVjOTRiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gQWRkIFN0YXJ0ZWRET01UaW1lckV4ZWN1dGlvbiBhbmQgU3RhcnRlZFN0eWxlUmVjYWxj CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU0NjMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ4NzE0NzYyPgorCisgICAgICAgIFJldmlld2VkIGJ5 IFNpbW9uIEZyYXNlci4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBpbnRy b2R1Y2luZyBtX2lzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMgZmxhZyB0byB0cmFjayBvYnNlcnZp bmcgc3RhdGUgYWNyb3NzIGV2ZW50cyAodG91Y2hTdGFydCAtPiBtb3VzZU1vdmVkKS4KKworICAg ICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmRvbVRpbWVyRXhlY3V0ZURpZFN0YXJ0KToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRTdGFy dCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0eWxlUmVjYWxj RGlkRmluaXNoKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2V0 U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OmFkanVzdE9ic2VydmVkU3RhdGUpOgorICAgICAgICAqIHBhZ2UvaW9z L0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5n ZU9ic2VydmVyOjppc09ic2VydmluZ1BlbmRpbmdTdHlsZVJlY2FsYyBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2aW5nU3R5bGVSZWNhbGMg Y29uc3QpOiBEZWxldGVkLgorCiAyMDE5LTAzLTA4ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFj aEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IEFPTSBhY2Nlc3NpYmxlY2xpY2sgZG9lcyBub3Qg d29yayBvbiBpT1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdl T2JzZXJ2ZXIuY3BwCmluZGV4IDYxMmQxOWJhOTQ2N2RkNTYxMDY3NTMyYmJhZjg4NDYwNzI0NDA0 ZDYuLjcyYjhkNmFmZDI3NWRhOGM3YTIxZWJlZjIzZmIzOTA2NGViYzIwYzggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcApAQCAtOTQs NiArOTQsNyBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlk U3RhcnQoY29uc3QgRE9NVGltZXImIHRpbWVyKQogICAgIExPR19XSVRIX1NUUkVBTShDb250ZW50 T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAic3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6IHN0 YXJ0IG9ic2VydmluZyAoIiA8PCAmdGltZXIgPDwgIikgdGltZXIgY2FsbGJhY2suIik7CiAKICAg ICBtX2RvbVRpbWVySXNCZWluZ0V4ZWN1dGVkID0gdHJ1ZTsKKyAgICBhZGp1c3RPYnNlcnZlZFN0 YXRlKEV2ZW50OjpTdGFydGVkRE9NVGltZXJFeGVjdXRpb24pOwogfQogCiB2b2lkIENvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6ZG9tVGltZXJFeGVjdXRlRGlkRmluaXNoKGNvbnN0IERPTVRpbWVyJiB0 aW1lcikKQEAgLTExMCwyNCArMTExLDI0IEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpk b21UaW1lckV4ZWN1dGVEaWRGaW5pc2goY29uc3QgRE9NVGltZXImIHRpbWVyKQogCiB2b2lkIENv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRTdGFydCgpCiB7Ci0gICAgaWYgKCFp c09ic2VydmluZ1N0eWxlUmVjYWxjKCkpCisgICAgaWYgKCFpc1dhaXRpbmdGb3JTdHlsZVJlY2Fs YygpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKGhhc1Zpc2libGVDaGFuZ2VTdGF0ZSgpKQog ICAgICAgICByZXR1cm47CiAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0YXJ0T2JzZXJ2 aW5nU3R5bGVSZWNhbGM6IHN0YXJ0IG9ic2VydmluZyBzdHlsZSByZWNhbGMuIik7CiAKICAgICBt X3N0eWxlUmVjYWxjSXNCZWluZ0V4ZWN1dGVkID0gdHJ1ZTsKKyAgICBhZGp1c3RPYnNlcnZlZFN0 YXRlKEV2ZW50OjpTdGFydGVkU3R5bGVSZWNhbGMpOwogfQogCiB2b2lkIENvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6c3R5bGVSZWNhbGNEaWRGaW5pc2goKQogewotICAgIGlmICghaXNPYnNlcnZpbmdT dHlsZVJlY2FsYygpKQorICAgIGlmICghaXNXYWl0aW5nRm9yU3R5bGVSZWNhbGMoKSkKICAgICAg ICAgcmV0dXJuOwogICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdG9wT2JzZXJ2aW5nU3R5 bGVSZWNhbGM6IHN0b3Agb2JzZXJ2aW5nIHN0eWxlIHJlY2FsYyIpOwogCiAgICAgbV9zdHlsZVJl Y2FsY0lzQmVpbmdFeGVjdXRlZCA9IGZhbHNlOwotICAgIHNldFNob3VsZE9ic2VydmVOZXh0U3R5 bGVSZWNhbGMoZmFsc2UpOwotICAgIGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OlN0eWxlUmVj YWxjRmluaXNoZWQpOworICAgIGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQ6OkVuZGVkU3R5bGVS ZWNhbGMpOwogfQogCiB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y2FuY2VsUGVuZGluZ0Fj dGl2aXRpZXMoKQpAQCAtMjA5LDcgKzIxMCw3IEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVy OjpzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxjKGJvb2wgc2hvdWxkT2JzZXJ2ZSkKIHsK ICAgICBpZiAoc2hvdWxkT2JzZXJ2ZSkKICAgICAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwg IldhaXQgdW50aWwgbmV4dCBzdHlsZSByZWNhbGMgZmlyZXMuIik7Ci0gICAgbV9pc09ic2Vydmlu Z1N0eWxlUmVjYWxjID0gc2hvdWxkT2JzZXJ2ZTsKKyAgICBtX2lzV2FpdGluZ0ZvclN0eWxlUmVj YWxjID0gc2hvdWxkT2JzZXJ2ZTsKIH0KIAogYm9vbCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6Omhh c0RldGVybWluYXRlU3RhdGUoKSBjb25zdApAQCAtMjU2LDYgKzI1NywxMCBAQCB2b2lkIENvbnRl bnRDaGFuZ2VPYnNlcnZlcjo6YWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudCBldmVudCkKICAgICAg ICAgc2V0U2hvdWxkT2JzZXJ2ZURPTVRpbWVyU2NoZWR1bGluZyh0cnVlKTsKICAgICAgICAgbV9p c01vdXNlTW92ZWRQcmVjZWRlZEJ5VG91Y2ggPSBmYWxzZTsKICAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBFdmVudDo6U3RhcnRlZERPTVRpbWVyRXhlY3V0aW9uOgorICAgIGNhc2UgRXZlbnQ6OlN0 YXJ0ZWRTdHlsZVJlY2FsYzoKKyAgICAgICAgQVNTRVJUKG9ic2VydmVkQ29udGVudENoYW5nZSgp ID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOworICAgICAgICBicmVhazsKICAgICBj YXNlIEV2ZW50OjpFbmRlZFRvdWNoU3RhcnRFdmVudERpc3BhdGNoaW5nOgogICAgIGNhc2UgRXZl bnQ6OkVuZGVkTW91c2VNb3ZlZEV2ZW50RGlzcGF0Y2hpbmc6CiAgICAgICAgIHNldFNob3VsZE9i c2VydmVET01UaW1lclNjaGVkdWxpbmcoZmFsc2UpOwpAQCAtMjY2LDggKzI3MSwxMCBAQCB2b2lk IENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRqdXN0T2JzZXJ2ZWRTdGF0ZShFdmVudCBldmVudCkK ICAgICAgICAgQVNTRVJUKCFoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSk7CiAgICAgICAgIHNldEhh c0luZGV0ZXJtaW5hdGVTdGF0ZSgpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEV2ZW50OjpF bmRlZFN0eWxlUmVjYWxjOgorICAgICAgICBzZXRTaG91bGRPYnNlcnZlTmV4dFN0eWxlUmVjYWxj KGZhbHNlKTsKKyAgICAgICAgRkFMTFRIUk9VR0g7CiAgICAgY2FzZSBFdmVudDo6UmVtb3ZlZERP TVRpbWVyOgotICAgIGNhc2UgRXZlbnQ6OlN0eWxlUmVjYWxjRmluaXNoZWQ6CiAgICAgY2FzZSBF dmVudDo6RW5kZWRET01UaW1lckV4ZWN1dGlvbjoKICAgICBjYXNlIEV2ZW50OjpFbmRlZEZpeGVk T2JzZXJ2YXRpb25UaW1lV2luZG93OgogICAgICAgICAvLyBEZW1vdGUgdG8gIm5vIGNoYW5nZSIg d2hlbiB0aGVyZSdzIG5vIHBlbmRpbmcgYWN0aXZpdHkgYW55bW9yZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKaW5kZXggNjcyZmYxOTFiNzU3 NGQwMGY3NjkxYTBlNWU2NjdlMDBjOTVhNTRiYy4uNzEyNjAzYjMyYjBiN2QyZjNkNmEwYmViNmFk MGQ0MTRiYzJlOWUzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVu dENoYW5nZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLmgKQEAgLTExNyw3ICsxMTcsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc3R5 bGVSZWNhbGNEaWRTdGFydCgpOwogICAgIHZvaWQgc3R5bGVSZWNhbGNEaWRGaW5pc2goKTsKICAg ICB2b2lkIHNldFNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoYm9vbCk7Ci0gICAgYm9vbCBp c09ic2VydmluZ1N0eWxlUmVjYWxjKCkgY29uc3QgeyByZXR1cm4gbV9pc09ic2VydmluZ1N0eWxl UmVjYWxjOyB9CisgICAgYm9vbCBpc1dhaXRpbmdGb3JTdHlsZVJlY2FsYygpIGNvbnN0IHsgcmV0 dXJuIG1faXNXYWl0aW5nRm9yU3R5bGVSZWNhbGM7IH0KIAogICAgIGJvb2wgaXNPYnNlcnZpbmdD b250ZW50Q2hhbmdlcygpIGNvbnN0IHsgcmV0dXJuIG1fbW91c2VNb3ZlZEV2ZW50SXNCZWluZ0Rp c3BhdGNoZWQgfHwgbV90b3VjaEV2ZW50SXNCZWluZ0Rpc3BhdGNoZWQgfHwgbV9kb21UaW1lcklz QmVpbmdFeGVjdXRlZCB8fCBtX3N0eWxlUmVjYWxjSXNCZWluZ0V4ZWN1dGVkIHx8IG1fY29udGVu dE9ic2VydmF0aW9uVGltZXIuaXNBY3RpdmUoKTsgfQogCkBAIC0xNDUsMTEgKzE0NSwxMyBAQCBw cml2YXRlOgogICAgICAgICBFbmRlZE1vdXNlTW92ZWRFdmVudERpc3BhdGNoaW5nLAogICAgICAg ICBJbnN0YWxsZWRET01UaW1lciwKICAgICAgICAgUmVtb3ZlZERPTVRpbWVyLAorICAgICAgICBT dGFydGVkRE9NVGltZXJFeGVjdXRpb24sCiAgICAgICAgIEVuZGVkRE9NVGltZXJFeGVjdXRpb24s Ci0gICAgICAgIFN0eWxlUmVjYWxjRmluaXNoZWQsCi0gICAgICAgIENvbnRlbnRWaXNpYmlsaXR5 Q2hhbmdlZCwKKyAgICAgICAgU3RhcnRlZFN0eWxlUmVjYWxjLAorICAgICAgICBFbmRlZFN0eWxl UmVjYWxjLAogICAgICAgICBTdGFydGVkRml4ZWRPYnNlcnZhdGlvblRpbWVXaW5kb3csCi0gICAg ICAgIEVuZGVkRml4ZWRPYnNlcnZhdGlvblRpbWVXaW5kb3cKKyAgICAgICAgRW5kZWRGaXhlZE9i c2VydmF0aW9uVGltZVdpbmRvdywKKyAgICAgICAgQ29udGVudFZpc2liaWxpdHlDaGFuZ2VkCiAg ICAgfTsKICAgICB2b2lkIGFkanVzdE9ic2VydmVkU3RhdGUoRXZlbnQpOwogCkBAIC0xNTcsNyAr MTU5LDcgQEAgcHJpdmF0ZToKICAgICBUaW1lciBtX2NvbnRlbnRPYnNlcnZhdGlvblRpbWVyOwog ICAgIEhhc2hTZXQ8Y29uc3QgRE9NVGltZXIqPiBtX0RPTVRpbWVyTGlzdDsKICAgICBib29sIG1f dG91Y2hFdmVudElzQmVpbmdEaXNwYXRjaGVkIHsgZmFsc2UgfTsKLSAgICBib29sIG1faXNPYnNl cnZpbmdTdHlsZVJlY2FsYyB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzV2FpdGluZ0ZvclN0eWxl UmVjYWxjIHsgZmFsc2UgfTsKICAgICBib29sIG1fc3R5bGVSZWNhbGNJc0JlaW5nRXhlY3V0ZWQg eyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZyB7IGZh bHNlIH07CiAgICAgYm9vbCBtX2RvbVRpbWVySXNCZWluZ0V4ZWN1dGVkIHsgZmFsc2UgfTsK