195198 2019-02-28 20:49:23 -0800 [ContentChangeObserver] Rename members and move implementation to header. 2019-03-01 11:23:57 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1511275 0 zalan 2019-02-28 20:49:23 -0800 ssia 1511276 1 webkit-bug-importer 2019-02-28 20:49:52 -0800 <rdar://problem/48499967> 1511277 2 363291 zalan 2019-02-28 20:52:23 -0800 Created attachment 363291 Patch This is about renaming. We still need to find better names for some of the functions. 1511479 3 zalan 2019-03-01 11:23:57 -0800 Committed r242275: <https://trac.webkit.org/changeset/242275> 363291 2019-02-28 20:52:23 -0800 2019-03-01 10:54:11 -0800 Patch Patch.txt text/plain 12336 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNDk3MGRmMGU5Ny4uZmNkNjJiMTgzNjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0OCBAQAorMjAxOS0wMi0yOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIFJlbmFtZSBtZW1iZXJzIGFuZCBtb3Zl IGltcGxlbWVudGF0aW9uIHRvIGhlYWRlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE5NTE5OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg0OTk5 Njc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw YWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29u dGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdET01UaW1l ckV4ZWN1dGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdGFy dE9ic2VydmluZ1N0eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6c3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjKToKKyAgICAgICAgKFdlYkNvcmU6OkNv bnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdlcyk6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdDb250ZW50 Q2hhbmdlcyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxl UmVjYWxjU2NvcGU6OlN0eWxlUmVjYWxjU2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dENoYW5nZU9ic2VydmVyOjpTdHlsZVJlY2FsY1Njb3BlOjp+U3R5bGVSZWNhbGNTY29wZSk6Cisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nU3R5 bGVSZXNvbHZlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6c3RvcE9ic2VydmluZ1N0eWxlUmVzb2x2ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9i c2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpD b250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjppc09ic2Vy dmluZ0RPTVRpbWVyU2NoZWR1bGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9i c2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmlzT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5n KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2V0 U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpjb3VudE9m T2JzZXJ2ZWRET01UaW1lcnMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENo YW5nZU9ic2VydmVyOjpjbGVhck9ic2VydmVkRE9NVGltZXJzKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y29udGFpbnNPYnNlcnZlZERPTVRpbWVy KTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaDoK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdE T01UaW1lclNjaGVkdWxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2Vy dmVyOjpzdG9wT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpjb250YWluc09i c2VydmVkRE9NVGltZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9i c2VydmVyOjpzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZyk6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsY1Nj aGVkdWxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjppc09i c2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpD b250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldFNob3VsZE9ic2VydmVTdHlsZVJlY2FsYyk6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNob3VsZE9ic2VydmVTdHlsZVJl Y2FsYyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6Omlz T2JzZXJ2aW5nQ29udGVudENoYW5nZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dENoYW5nZU9ic2VydmVyOjpjb3VudE9mT2JzZXJ2ZWRET01UaW1lcnMgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpjbGVhck9ic2VydmVkRE9NVGltZXJz KToKKwogMjAxOS0wMi0yOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVD aGFuZ2VTY29wZSBzaG91bGQgbm90IHNldCBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlIGRpcmVj dGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2Jz ZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVy LmNwcAppbmRleCAwMDZiZTg5ZmJkZS4uZGVjOWIwZTQzNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcApAQCAtNzIsNyArNzIsNyBA QCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1 dGUoY29uc3QgRE9NVGltZXImIHRpbWVyKQogICAgICAgICByZXR1cm47CiAgICAgTE9HX1dJVEhf U1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJzdGFydE9ic2VydmluZ0RPTVRp bWVyRXhlY3V0ZTogc3RhcnQgb2JzZXJ2aW5nICgiIDw8ICZ0aW1lciA8PCAiKSB0aW1lciBjYWxs YmFjay4iKTsKICAgICBzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpOwotICAg IG1fb2JzZXJ2aW5nQ29udGVudENoYW5nZXMgPSB0cnVlOworICAgIG1faXNPYnNlcnZpbmdDb250 ZW50Q2hhbmdlcyA9IHRydWU7CiB9CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdG9w T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKQEAgLTkzLDcg KzkzLDcgQEAgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdET01UaW1l ckV4ZWN1dGUoY29uc3QgRE9NVGltZXImIHRpbWVyKQogICAgIH0gZWxzZSBpZiAob2JzZXJ2ZWRD b250ZW50Q2hhbmdlID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpIHsKICAgICAgICAg Ly8gQW4gYXN5bmMgc3R5bGUgcmVjYWxjIGhhcyBiZWVuIHNjaGVkdWxlZC4gTGV0J3Mgb2JzZXJ2 ZSBpdC4KICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRlbnRPYnNlcnZhdGlvbiwgc3RyZWFt IDw8ICJzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlOiAoIiA8PCAmdGltZXIgPDwgIikgd2Fp dCB1bnRpbCBuZXh0IHN0eWxlIHJlY2FsYyBmaXJlcy4iKTsKLSAgICAgICAgc2V0U2hvdWxkT2Jz ZXJ2ZU5leHRTdHlsZVJlY2FsYyh0cnVlKTsKKyAgICAgICAgc2V0U2hvdWxkT2JzZXJ2ZVN0eWxl UmVjYWxjKHRydWUpOwogICAgIH0KIH0KIApAQCAtMTA1LDI2ICsxMDUsMjYgQEAgdm9pZCBDb250 ZW50Q2hhbmdlT2JzZXJ2ZXI6OmRpZFNjaGVkdWxlU3R5bGVSZWNhbGMoKQogICAgIHNldE9ic2Vy dmVkQ29udGVudENoYW5nZShXS0NvbnRlbnRJbmRldGVybWluYXRlQ2hhbmdlKTsKIH0KIAotdm9p ZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZXNvbHZlKCkKK3Zv aWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjKCkKIHsK LSAgICBpZiAoIXNob3VsZE9ic2VydmVOZXh0U3R5bGVSZWNhbGMoKSkKKyAgICBpZiAoIXNob3Vs ZE9ic2VydmVTdHlsZVJlY2FsYygpKQogICAgICAgICByZXR1cm47Ci0gICAgTE9HKENvbnRlbnRP YnNlcnZhdGlvbiwgInN0YXJ0T2JzZXJ2aW5nU3R5bGVSZXNvbHZlOiBzdGFydCBvYnNlcnZpbmcg c3R5bGUgcmVzb2x2ZS4iKTsKLSAgICBtX29ic2VydmluZ0NvbnRlbnRDaGFuZ2VzID0gdHJ1ZTsK KyAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAic3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsYzog c3RhcnQgb2JzZXJ2aW5nIHN0eWxlIHJlY2FsYy4iKTsKKyAgICBtX2lzT2JzZXJ2aW5nQ29udGVu dENoYW5nZXMgPSB0cnVlOwogfQogCi12b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9i c2VydmluZ1N0eWxlUmVzb2x2ZSgpCit2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9i c2VydmluZ1N0eWxlUmVjYWxjKCkKIHsKLSAgICBpZiAoIXNob3VsZE9ic2VydmVOZXh0U3R5bGVS ZWNhbGMoKSkKKyAgICBpZiAoIXNob3VsZE9ic2VydmVTdHlsZVJlY2FsYygpKQogICAgICAgICBy ZXR1cm47Ci0gICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJl c29sdmU6IHN0b3Agb2JzZXJ2aW5nIHN0eWxlIHJlc29sdmUiKTsKLSAgICBzZXRTaG91bGRPYnNl cnZlTmV4dFN0eWxlUmVjYWxjKGZhbHNlKTsKKyAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAi c3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjOiBzdG9wIG9ic2VydmluZyBzdHlsZSByZWNhbGMiKTsK KyAgICBzZXRTaG91bGRPYnNlcnZlU3R5bGVSZWNhbGMoZmFsc2UpOwogICAgIGF1dG8gaW5EZXRl cm1pbmVkU3RhdGUgPSBvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKSA9PSBXS0NvbnRlbnRWaXNpYmls aXR5Q2hhbmdlIHx8ICFjb3VudE9mT2JzZXJ2ZWRET01UaW1lcnMoKTsKICAgICBpZiAoIWluRGV0 ZXJtaW5lZFN0YXRlKSB7Ci0gICAgICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdG9wT2Jz ZXJ2aW5nU3R5bGVSZXNvbHZlOiBjYW4ndCBkZWNpZGVkIGl0IHlldC4iKTsKKyAgICAgICAgTE9H KENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYzogY2FuJ3QgZGVj aWRlZCBpdCB5ZXQuIik7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgTE9HKENvbnRlbnRP YnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJlc29sdmU6IG5vdGlmeSB0aGUgcGVuZGlu ZyBzeW50aGV0aWMgY2xpY2sgaGFuZGxlci4iKTsKKyAgICBMT0coQ29udGVudE9ic2VydmF0aW9u LCAic3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjOiBub3RpZnkgdGhlIHBlbmRpbmcgc3ludGhldGlj IGNsaWNrIGhhbmRsZXIuIik7CiAgICAgbV9wYWdlLmNocm9tZSgpLmNsaWVudCgpLm9ic2VydmVk Q29udGVudENoYW5nZShtX3BhZ2UubWFpbkZyYW1lKCkpOwogfQogCkBAIC0xNTYsNTkgKzE1Niwx NCBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hh bmdlcygpCiB7CiAgICAgc3RhcnRPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKTsKICAgICBy ZXNldE9ic2VydmVkQ29udGVudENoYW5nZSgpOwotICAgIG1fb2JzZXJ2aW5nQ29udGVudENoYW5n ZXMgPSB0cnVlOworICAgIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKKyAgICBtX2lzT2JzZXJ2 aW5nQ29udGVudENoYW5nZXMgPSB0cnVlOwogfQogCiB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZl cjo6c3RvcE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkKIHsKICAgICBzdG9wT2JzZXJ2aW5nRE9N VGltZXJTY2hlZHVsaW5nKCk7Ci0gICAgbV9vYnNlcnZpbmdDb250ZW50Q2hhbmdlcyA9IGZhbHNl OwotfQotCi1ib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6aXNPYnNlcnZpbmdDb250ZW50Q2hh bmdlcygpCi17Ci0gICAgcmV0dXJuIG1fb2JzZXJ2aW5nQ29udGVudENoYW5nZXM7Ci19Ci0KLXZv aWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGlu ZygpCi17Ci0gICAgbV9vYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcgPSB0cnVlOwotICAgIGNs ZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKLX0KLQotdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OnN0b3BPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKQotewotICAgIG1fb2JzZXJ2aW5nRE9N VGltZXJTY2hlZHVsaW5nID0gZmFsc2U7Ci19Ci0KLWJvb2wgQ29udGVudENoYW5nZU9ic2VydmVy Ojppc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpCi17Ci0gICAgcmV0dXJuIG1fb2JzZXJ2 aW5nRE9NVGltZXJTY2hlZHVsaW5nOwotfQotCi12b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6 c3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKQotewotICAgIG1fb2JzZXJ2aW5n U3R5bGVSZWNhbGNTY2hlZHVsaW5nID0gdHJ1ZTsKLX0KLQotdm9pZCBDb250ZW50Q2hhbmdlT2Jz ZXJ2ZXI6OnN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKQotewotICAgIG1fb2Jz ZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nID0gZmFsc2U7Ci19Ci0KLWJvb2wgQ29udGVudENo YW5nZU9ic2VydmVyOjppc09ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpCi17Ci0gICAg cmV0dXJuIG1fb2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5nOwotfQotCi12b2lkIENvbnRl bnRDaGFuZ2VPYnNlcnZlcjo6c2V0U2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sIG9i c2VydmUpCi17Ci0gICAgbV9vYnNlcnZpbmdOZXh0U3R5bGVSZWNhbGMgPSBvYnNlcnZlOwotfQot Ci1ib29sIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2hvdWxkT2JzZXJ2ZU5leHRTdHlsZVJlY2Fs YygpCi17Ci0gICAgcmV0dXJuIG1fb2JzZXJ2aW5nTmV4dFN0eWxlUmVjYWxjOworICAgIG1faXNP YnNlcnZpbmdDb250ZW50Q2hhbmdlcyA9IGZhbHNlOwogfQogCiBXS0NvbnRlbnRDaGFuZ2UgQ29u dGVudENoYW5nZU9ic2VydmVyOjpvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKQpAQCAtMjE2LDE2ICsx NzEsNiBAQCBXS0NvbnRlbnRDaGFuZ2UgQ29udGVudENoYW5nZU9ic2VydmVyOjpvYnNlcnZlZENv bnRlbnRDaGFuZ2UoKQogICAgIHJldHVybiBXS09ic2VydmVkQ29udGVudENoYW5nZSgpOwogfQog Ci11bnNpZ25lZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNvdW50T2ZPYnNlcnZlZERPTVRpbWVy cygpCi17Ci0gICAgcmV0dXJuIG1fRE9NVGltZXJMaXN0LnNpemUoKTsKLX0KLQotdm9pZCBDb250 ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKQotewotICAgIG1fRE9N VGltZXJMaXN0LmNsZWFyKCk7Ci19Ci0KIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpyZXNl dE9ic2VydmVkQ29udGVudENoYW5nZSgpCiB7CiAgICAgV0tTZXRPYnNlcnZlZENvbnRlbnRDaGFu Z2UoV0tDb250ZW50Tm9DaGFuZ2UpOwpAQCAtMjM4LDExICsxODMsNiBAQCB2b2lkIENvbnRlbnRD aGFuZ2VPYnNlcnZlcjo6c2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudENoYW5nZSBj aGFuZ2UpCiAgICAgV0tTZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoY2hhbmdlKTsKIH0KIAotYm9v bCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihjb25zdCBE T01UaW1lciYgdGltZXIpCi17Ci0gICAgcmV0dXJuIG1fRE9NVGltZXJMaXN0LmNvbnRhaW5zKCZ0 aW1lcik7Ci19Ci0KIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjphZGRPYnNlcnZlZERPTVRp bWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKIHsKICAgICBBU1NFUlQoaXNPYnNlcnZpbmdET01U aW1lclNjaGVkdWxpbmcoKSk7CkBAIC0zMjMsMTMgKzI2MywxMyBAQCBDb250ZW50Q2hhbmdlT2Jz ZXJ2ZXI6OlN0eWxlUmVjYWxjU2NvcGU6OlN0eWxlUmVjYWxjU2NvcGUoUGFnZSogcGFnZSkKICAg ICA6IG1fY29udGVudENoYW5nZU9ic2VydmVyKHBhZ2UgPyAmcGFnZS0+Y29udGVudENoYW5nZU9i c2VydmVyKCkgOiBudWxscHRyKQogewogICAgIGlmIChtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcikK LSAgICAgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZXNv bHZlKCk7CisgICAgICAgIG1fY29udGVudENoYW5nZU9ic2VydmVyLT5zdGFydE9ic2VydmluZ1N0 eWxlUmVjYWxjKCk7CiB9CiAKIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNTY29w ZTo6flN0eWxlUmVjYWxjU2NvcGUoKQogewogICAgIGlmIChtX2NvbnRlbnRDaGFuZ2VPYnNlcnZl cikKLSAgICAgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPnN0b3BPYnNlcnZpbmdTdHlsZVJl c29sdmUoKTsKKyAgICAgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPnN0b3BPYnNlcnZpbmdT dHlsZVJlY2FsYygpOwogfQogCiBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OkRPTVRpbWVyU2NvcGU6 OkRPTVRpbWVyU2NvcGUoUGFnZSogcGFnZSwgY29uc3QgRE9NVGltZXImIGRvbVRpbWVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAppbmRleCBj MjQ0YzI0ZjdlMS4uNjdiNWYyYWQ1MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv aW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9z L0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oCkBAIC04MSw0MyArODEsNDIgQEAgcHVibGljOgogICAg IH07CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBzdGFydE9ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGlu ZygpOwotICAgIHZvaWQgc3RvcE9ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpOworICAgIHZv aWQgc3RhcnRPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKSB7IG1faXNPYnNlcnZpbmdET01U aW1lclNjaGVkdWxpbmcgPSB0cnVlOyB9CisgICAgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJT Y2hlZHVsaW5nKCkgeyBtX2lzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nID0gZmFsc2U7IH0K IAogICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXIm KTsKICAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXIm KTsKIAotICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKLSAgICB2b2lkIHN0 b3BPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKKyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nU3R5bGVS ZWNhbGMoKTsKKyAgICB2b2lkIHN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYygpOwogCiAgICAgdm9p ZCBhZGRPYnNlcnZlZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJik7Ci0gICAgYm9vbCBpc09ic2Vy dmluZ0RPTVRpbWVyU2NoZWR1bGluZygpOworICAgIGJvb2wgaXNPYnNlcnZpbmdET01UaW1lclNj aGVkdWxpbmcoKSBjb25zdCB7IHJldHVybiBtX2lzT2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5n OyB9CiAgICAgdm9pZCByZW1vdmVPYnNlcnZlZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJik7Ci0g ICAgYm9vbCBjb250YWluc09ic2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGltZXImKTsKKyAgICBi b29sIGNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihjb25zdCBET01UaW1lciYgdGltZXIpIGNvbnN0 IHsgcmV0dXJuIG1fRE9NVGltZXJMaXN0LmNvbnRhaW5zKCZ0aW1lcik7IH0KIAotICAgIHZvaWQg c3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKLSAgICB2b2lkIHN0b3BPYnNl cnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKKyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nU3R5 bGVSZWNhbGNTY2hlZHVsaW5nKCkgeyBtX2lzT2JzZXJ2aW5nU3R5bGVSZWNhbGNTY2hlZHVsaW5n ID0gdHJ1ZTsgfQorICAgIHZvaWQgc3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygp IHsgbV9pc09ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZyA9IGZhbHNlOyB9CisgICAgYm9v bCBpc09ic2VydmluZ1N0eWxlUmVjYWxjU2NoZWR1bGluZygpIGNvbnN0IHsgcmV0dXJuIG1faXNP YnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmc7IH0KIAotICAgIHZvaWQgc2V0U2hvdWxkT2Jz ZXJ2ZU5leHRTdHlsZVJlY2FsYyhib29sKTsKLSAgICBib29sIHNob3VsZE9ic2VydmVOZXh0U3R5 bGVSZWNhbGMoKTsKLQotICAgIGJvb2wgaXNPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOwotICAg IGJvb2wgaXNPYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcoKTsKKyAgICB2b2lkIHNldFNo b3VsZE9ic2VydmVTdHlsZVJlY2FsYyhib29sIHNob3VsZE9ic2VydmUpIHsgbV9zaG91bGRPYnNl cnZlU3R5bGVSZWNhbGMgPSBzaG91bGRPYnNlcnZlOyB9CisgICAgYm9vbCBzaG91bGRPYnNlcnZl U3R5bGVSZWNhbGMoKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZE9ic2VydmVTdHlsZVJlY2FsYzsg fQogCiAgICAgdm9pZCBzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50Q2hhbmdlKTsK ICAgICB2b2lkIHJlc2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCk7CisgICAgYm9vbCBpc09ic2Vy dmluZ0NvbnRlbnRDaGFuZ2VzKCkgY29uc3QgeyByZXR1cm4gbV9pc09ic2VydmluZ0NvbnRlbnRD aGFuZ2VzOyB9CiAKLSAgICB1bnNpZ25lZCBjb3VudE9mT2JzZXJ2ZWRET01UaW1lcnMoKTsKLSAg ICB2b2lkIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKKyAgICB1bnNpZ25lZCBjb3VudE9mT2Jz ZXJ2ZWRET01UaW1lcnMoKSBjb25zdCB7IHJldHVybiBtX0RPTVRpbWVyTGlzdC5zaXplKCk7IH0K KyAgICB2b2lkIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKSB7IG1fRE9NVGltZXJMaXN0LmNsZWFy KCk7IH0KIAogICAgIHZvaWQgY2xlYXJUaW1lcnNBbmRSZXBvcnRDb250ZW50Q2hhbmdlKCk7CiAK ICAgICBQYWdlJiBtX3BhZ2U7CiAgICAgSGFzaFNldDxjb25zdCBET01UaW1lcio+IG1fRE9NVGlt ZXJMaXN0OwotICAgIGJvb2wgbV9vYnNlcnZpbmdOZXh0U3R5bGVSZWNhbGMgeyBmYWxzZSB9Owot ICAgIGJvb2wgbV9vYnNlcnZpbmdTdHlsZVJlY2FsY1NjaGVkdWxpbmcgeyBmYWxzZSB9OwotICAg IGJvb2wgbV9vYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcgeyBmYWxzZSB9OwotICAgIGJvb2wg bV9vYnNlcnZpbmdDb250ZW50Q2hhbmdlcyB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Nob3VsZE9i c2VydmVTdHlsZVJlY2FsYyB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzT2JzZXJ2aW5nU3R5bGVS ZWNhbGNTY2hlZHVsaW5nIHsgZmFsc2UgfTsKKyAgICBib29sIG1faXNPYnNlcnZpbmdET01UaW1l clNjaGVkdWxpbmcgeyBmYWxzZSB9OworICAgIGJvb2wgbV9pc09ic2VydmluZ0NvbnRlbnRDaGFu Z2VzIHsgZmFsc2UgfTsKIH07CiAKIH0K