195240 2019-03-01 21:08:03 -0800 [ContentChangeObserver] Move away from WKContentChange values 2019-03-02 14:57:25 -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 1511761 0 zalan 2019-03-01 21:08:03 -0800 ssia 1511762 1 webkit-bug-importer 2019-03-01 21:08:20 -0800 <rdar://problem/48532358> 1511765 2 363409 zalan 2019-03-01 21:15:10 -0800 Created attachment 363409 Patch 1511850 3 363409 simon.fraser 2019-03-02 13:18:50 -0800 Comment on attachment 363409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363409&action=review > Source/WebCore/ChangeLog:9 > + This is in preparation for moving towards a state machine like implementation. state machine-like > Source/WebCore/page/ios/ContentChangeObserver.cpp:133 > + LOG(ContentObservation, "stopObservingStyleRecalc: notify the pending synthetic click handler."); Mentioning synthetic clicks here indicates a layering problem, as we talked about. > Source/WebCore/page/ios/ContentChangeObserver.cpp:137 > + LOG(ContentObservation, "stopObservingStyleRecalc: can't decided it yet."); "can't decided it" ? > Source/WebCore/page/ios/ContentChangeObserver.cpp:193 > +bool ContentChangeObserver::hasDeterminedState() const So "determined" as an adjective means "intent on" as in "he was very determined". This should use "determinate", meaning "fixed" or "settled". 1511861 4 zalan 2019-03-02 14:57:25 -0800 Committed r242319: <https://trac.webkit.org/changeset/242319> 363409 2019-03-01 21:15:10 -0800 2019-03-02 13:18:50 -0800 Patch bug-195240-20190301211508.patch text/plain 12515 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMzA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRlNDcyMWNhZjYyMzAw NDExODM5MjY1YTcyZWI1Yjc4NGVjZjA0ZS4uMGE0ZmI1ZGI1ZGVkZjA5OTIyNTI5ZTQyZGQ3ZDRk YjFjNjI0ODRhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE5LTAzLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gTW92ZSBhd2F5IGZyb20gV0tDb250ZW50Q2hhbmdlIHZhbHVlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MjQwCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS80ODUzMjM1OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBtb3ZpbmcgdG93YXJkcyBh IHN0YXRlIG1hY2hpbmUgbGlrZSBpbXBsZW1lbnRhdGlvbi4KKworICAgICAgICAqIHBhZ2UvaW9z L0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hh bmdlT2JzZXJ2ZXI6OmRpZEluc3RhbGxET01UaW1lcik6IERvIG5vdCBpbnN0YWxsIHRoZSB0aW1l ciBpZiB3ZSBhcmUgYWxyZWFkeSBpbiAiaG92ZXIiIHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6 Q29udGVudENoYW5nZU9ic2VydmVyOjpkaWRSZW1vdmVET01UaW1lcik6CisgICAgICAgIChXZWJD b3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2Vydmlu Z0RPTVRpbWVyRXhlY3V0ZSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2 ZXI6OnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGMpOiBObyBuZWVkIHRvIHN0YXJ0IG9ic2Vydmlu ZyB0aGUgc3R5bGUgcmVjYWxjIGlmIHdlIGFyZSBhbHJlYWR5IGluICJob3ZlciIgc3RhdGUuCisg ICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0b3BPYnNlcnZpbmdTdHls ZVJlY2FsYyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmNsZWFy VGltZXJzQW5kUmVwb3J0Q29udGVudENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6OmRpZENvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlKToKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RhcnRPYnNlcnZpbmdDb250ZW50Q2hhbmdl cyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6Om9ic2VydmVkQ29u dGVudENoYW5nZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2 ZXI6OnJlbW92ZU9ic2VydmVkRE9NVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENo YW5nZU9ic2VydmVyOjpoYXNEZXRlcm1pbmVkU3RhdGUgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpvYnNlcnZlZENvbnRlbnRDaGFuZ2UpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjpyZXNldE9ic2VydmVk Q29udGVudENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OnNldE9ic2VydmVkQ29udGVudENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OmFkZE9ic2VydmVkRE9NVGltZXIpOiBEZWxl dGVkLgorICAgICAgICAqIHBhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudENoYW5nZU9ic2VydmVyOjphZGRPYnNlcnZlZERPTVRpbWVyKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y2xlYXJPYnNlcnZlZERP TVRpbWVycyk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6Omhhc1Zp c2libGVDaGFuZ2VTdGF0ZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6Omhhc09ic2VydmVkRE9NVGltZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 Q29udGVudENoYW5nZU9ic2VydmVyOjpzZXRIYXNOb0NoYW5nZVN0YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2V0SGFzSW5kZXRlcm1pbmF0ZVN0YXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c2V0SGFzVmlzaWJsZUNo YW5nZVN0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6Y291 bnRPZk9ic2VydmVkRE9NVGltZXJzIGNvbnN0KTogRGVsZXRlZC4KKwogMjAxOS0wMy0wMSAgQW50 b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIFR1cm4gbW91 c2UgZXZlbnQgc2ltdWxhdGlvbiBvbiBieSBkZWZhdWx0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcAppbmRleCAwYWQyNTkxYzQ4MTIzZDcz MDYzYmZiZjdiNDZmMzBiNDNlOGQwYzAyLi5lODc0MWY5YjgxZDFmYzEzMTEwMzA2NTBhYjA3NTgz MDRmNTMwNTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hh bmdlT2JzZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFu Z2VPYnNlcnZlci5jcHAKQEAgLTYxLDIwICs2MSwyNCBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6ZGlkSW5zdGFsbERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lciwgU2Vjb25kcyB0 aQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGlu ZygpKQogICAgICAgICByZXR1cm47Ci0gICAgc2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29u dGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOwotICAgIGFkZE9ic2VydmVkRE9NVGltZXIodGltZXIp OworICAgIGlmIChoYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKSkKKyAgICAgICAgcmV0dXJuOwogICAg IExPR19XSVRIX1NUUkVBTShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAiZGlkSW5zdGFs bERPTVRpbWVyOiByZWdpc3RlciB0aGlzIHRpbWVyOiAoIiA8PCAmdGltZXIgPDwgIikgYW5kIG9i c2VydmUgd2hlbiBpdCBmaXJlcy4iKTsKKworICAgIHNldEhhc0luZGV0ZXJtaW5hdGVTdGF0ZSgp OworICAgIGFkZE9ic2VydmVkRE9NVGltZXIodGltZXIpOwogfQogCiB2b2lkIENvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6ZGlkUmVtb3ZlRE9NVGltZXIoY29uc3QgRE9NVGltZXImIHRpbWVyKQogewog ICAgIGlmICghY29udGFpbnNPYnNlcnZlZERPTVRpbWVyKHRpbWVyKSkKICAgICAgICAgcmV0dXJu OwotICAgIHJlbW92ZU9ic2VydmVkRE9NVGltZXIodGltZXIpOwogICAgIExPR19XSVRIX1NUUkVB TShDb250ZW50T2JzZXJ2YXRpb24sIHN0cmVhbSA8PCAicmVtb3ZlRE9NVGltZXI6IHJlbW92ZSBy ZWdpc3RlcmVkIHRpbWVyICgiIDw8ICZ0aW1lciA8PCAiKSIpOwotICAgIGlmIChjb3VudE9mT2Jz ZXJ2ZWRET01UaW1lcnMoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIG1fcGFnZS5jaHJvbWUoKS5j bGllbnQoKS5vYnNlcnZlZENvbnRlbnRDaGFuZ2UobV9wYWdlLm1haW5GcmFtZSgpKTsKKworICAg IHJlbW92ZU9ic2VydmVkRE9NVGltZXIodGltZXIpOworICAgIC8vIEZJWE1FOiBKdXN0IGJlY2F1 c2UgdGhpcyBpcyB0aGUgbGFzdCB0aW1lciwgaXQgZG9lcyBub3QgbWVhbiB3ZSBhcmUgaW4gYSBk ZXRlcm1pbmVkIHN0YXRlLgorICAgIGlmICghaGFzT2JzZXJ2ZWRET01UaW1lcigpKQorICAgICAg ICBtX3BhZ2UuY2hyb21lKCkuY2xpZW50KCkub2JzZXJ2ZWRDb250ZW50Q2hhbmdlKG1fcGFnZS5t YWluRnJhbWUoKSk7CiB9CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2Vy dmluZ0RPTVRpbWVyRXhlY3V0ZShjb25zdCBET01UaW1lciYgdGltZXIpCkBAIC04Miw2ICs4Niw3 IEBAIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzdGFydE9ic2VydmluZ0RPTVRpbWVyRXhl Y3V0ZShjb25zdCBET01UaW1lciYgdGltZXIpCiAgICAgaWYgKCFjb250YWluc09ic2VydmVkRE9N VGltZXIodGltZXIpKQogICAgICAgICByZXR1cm47CiAgICAgTE9HX1dJVEhfU1RSRUFNKENvbnRl bnRPYnNlcnZhdGlvbiwgc3RyZWFtIDw8ICJzdGFydE9ic2VydmluZ0RPTVRpbWVyRXhlY3V0ZTog c3RhcnQgb2JzZXJ2aW5nICgiIDw8ICZ0aW1lciA8PCAiKSB0aW1lciBjYWxsYmFjay4iKTsKKwog ICAgIG1faXNPYnNlcnZpbmdDb250ZW50Q2hhbmdlcyA9IHRydWU7CiB9CiAKQEAgLTkzLDE2ICs5 OCwxMyBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2VydmluZ0RPTVRpbWVy RXhlY3V0ZShjb25zdCBET01UaW1lciYgdGltZXIpCiAKICAgICByZW1vdmVPYnNlcnZlZERPTVRp bWVyKHRpbWVyKTsKICAgICBzdG9wT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKLSAgICBhdXRv IG9ic2VydmVkQ29udGVudENoYW5nZSA9IHRoaXMtPm9ic2VydmVkQ29udGVudENoYW5nZSgpOwot ICAgIGF1dG8gaGFzUGVuZGluZ1N0eWxlUmVjYWxjID0gV2ViQ29yZTo6aGFzUGVuZGluZ1N0eWxl UmVjYWxjKG1fcGFnZSk7CiAgICAgLy8gQ2hlY2sgaWYgdGhlIHRpbWVyIGNhbGxiYWNrIHRyaWdn ZXJlZCBlaXRoZXIgYSBzeW5jIG9yIGFzeW5jIHN0eWxlIHVwZGF0ZS4KLSAgICBhdXRvIGhhc0Rl dGVybWluZWRTdGF0ZSA9IG9ic2VydmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmls aXR5Q2hhbmdlIHx8ICghY291bnRPZk9ic2VydmVkRE9NVGltZXJzKCkgJiYgb2JzZXJ2ZWRDb250 ZW50Q2hhbmdlID09IFdLQ29udGVudE5vQ2hhbmdlICYmICFoYXNQZW5kaW5nU3R5bGVSZWNhbGMp OyAgCi0gICAgaWYgKGhhc0RldGVybWluZWRTdGF0ZSkgeworICAgIGlmIChoYXNEZXRlcm1pbmVk U3RhdGUoKSkgewogICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBz dHJlYW0gPDwgInN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6ICgiIDw8ICZ0aW1lciA8PCAi KSBpbiBkZXRlcm1pbmVkIHN0YXRlLiIpOwogICAgICAgICBtX3BhZ2UuY2hyb21lKCkuY2xpZW50 KCkub2JzZXJ2ZWRDb250ZW50Q2hhbmdlKG1fcGFnZS5tYWluRnJhbWUoKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9Ci0gICAgaWYgKGhhc1BlbmRpbmdTdHlsZVJlY2FsYykgeworICAgIGlmIChX ZWJDb3JlOjpoYXNQZW5kaW5nU3R5bGVSZWNhbGMobV9wYWdlKSkgewogICAgICAgICAvLyBBbiBh c3luYyBzdHlsZSByZWNhbGMgaGFzIGJlZW4gc2NoZWR1bGVkLiBMZXQncyBvYnNlcnZlIGl0Lgog ICAgICAgICBMT0dfV0lUSF9TVFJFQU0oQ29udGVudE9ic2VydmF0aW9uLCBzdHJlYW0gPDwgInN0 b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGU6ICgiIDw8ICZ0aW1lciA8PCAiKSB3YWl0IHVudGls IG5leHQgc3R5bGUgcmVjYWxjIGZpcmVzLiIpOwogICAgICAgICBzZXRTaG91bGRPYnNlcnZlU3R5 bGVSZWNhbGModHJ1ZSk7CkBAIC0xMTMsNyArMTE1LDEwIEBAIHZvaWQgQ29udGVudENoYW5nZU9i c2VydmVyOjpzdGFydE9ic2VydmluZ1N0eWxlUmVjYWxjKCkKIHsKICAgICBpZiAoIXNob3VsZE9i c2VydmVTdHlsZVJlY2FsYygpKQogICAgICAgICByZXR1cm47CisgICAgaWYgKGhhc1Zpc2libGVD aGFuZ2VTdGF0ZSgpKQorICAgICAgICByZXR1cm47CiAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlv biwgInN0YXJ0T2JzZXJ2aW5nU3R5bGVSZWNhbGM6IHN0YXJ0IG9ic2VydmluZyBzdHlsZSByZWNh bGMuIik7CisKICAgICBtX2lzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMgPSB0cnVlOwogfQogCkBA IC0xMjIsMjEgKzEyNywyMiBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6c3RvcE9ic2Vy dmluZ1N0eWxlUmVjYWxjKCkKICAgICBpZiAoIXNob3VsZE9ic2VydmVTdHlsZVJlY2FsYygpKQog ICAgICAgICByZXR1cm47CiAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZp bmdTdHlsZVJlY2FsYzogc3RvcCBvYnNlcnZpbmcgc3R5bGUgcmVjYWxjIik7CisKICAgICBzZXRT aG91bGRPYnNlcnZlU3R5bGVSZWNhbGMoZmFsc2UpOwotICAgIGF1dG8gaGFzRGV0ZXJtaW5lZFN0 YXRlID0gb2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkgPT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5n ZSB8fCAhY291bnRPZk9ic2VydmVkRE9NVGltZXJzKCk7Ci0gICAgaWYgKCFoYXNEZXRlcm1pbmVk U3RhdGUpIHsKLSAgICAgICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdT dHlsZVJlY2FsYzogY2FuJ3QgZGVjaWRlZCBpdCB5ZXQuIik7CisgICAgaWYgKGhhc0RldGVybWlu ZWRTdGF0ZSgpKSB7CisgICAgICAgIExPRyhDb250ZW50T2JzZXJ2YXRpb24sICJzdG9wT2JzZXJ2 aW5nU3R5bGVSZWNhbGM6IG5vdGlmeSB0aGUgcGVuZGluZyBzeW50aGV0aWMgY2xpY2sgaGFuZGxl ci4iKTsKKyAgICAgICAgbV9wYWdlLmNocm9tZSgpLmNsaWVudCgpLm9ic2VydmVkQ29udGVudENo YW5nZShtX3BhZ2UubWFpbkZyYW1lKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIExP RyhDb250ZW50T2JzZXJ2YXRpb24sICJzdG9wT2JzZXJ2aW5nU3R5bGVSZWNhbGM6IG5vdGlmeSB0 aGUgcGVuZGluZyBzeW50aGV0aWMgY2xpY2sgaGFuZGxlci4iKTsKLSAgICBtX3BhZ2UuY2hyb21l KCkuY2xpZW50KCkub2JzZXJ2ZWRDb250ZW50Q2hhbmdlKG1fcGFnZS5tYWluRnJhbWUoKSk7Cisg ICAgTE9HKENvbnRlbnRPYnNlcnZhdGlvbiwgInN0b3BPYnNlcnZpbmdTdHlsZVJlY2FsYzogY2Fu J3QgZGVjaWRlZCBpdCB5ZXQuIik7CiB9CiAKIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpj bGVhclRpbWVyc0FuZFJlcG9ydENvbnRlbnRDaGFuZ2UoKQogewotICAgIGlmICghY291bnRPZk9i c2VydmVkRE9NVGltZXJzKCkpCisgICAgaWYgKCFoYXNPYnNlcnZlZERPTVRpbWVyKCkpCiAgICAg ICAgIHJldHVybjsKICAgICBMT0coQ29udGVudE9ic2VydmF0aW9uLCAiY2xlYXJUaW1lcnNBbmRS ZXBvcnRDb250ZW50Q2hhbmdlOiByZW1vdmUgcmVnaXN0ZXJlZCB0aW1lcnMgYW5kIHJlcG9ydCBj b250ZW50IGNoYW5nZS4iKTsKKwogICAgIGNsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKICAgICBt X3BhZ2UuY2hyb21lKCkuY2xpZW50KCkub2JzZXJ2ZWRDb250ZW50Q2hhbmdlKG1fcGFnZS5tYWlu RnJhbWUoKSk7CiB9CkBAIC0xNTMsMTQgKzE1OSwxNCBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6d2lsbERldGFjaFBhZ2UoKQogCiB2b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6ZGlk Q29udGVudFZpc2liaWxpdHlDaGFuZ2UoKQogewotICAgIHNldE9ic2VydmVkQ29udGVudENoYW5n ZShXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlKTsKKyAgICBzZXRIYXNWaXNpYmxlQ2hhbmdlU3Rh dGUoKTsKIH0KIAogdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnN0YXJ0T2JzZXJ2aW5nQ29u dGVudENoYW5nZXMoKQogewogICAgIEFTU0VSVCghaGFzUGVuZGluZ1N0eWxlUmVjYWxjKG1fcGFn ZSkpOwogICAgIHN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7Ci0gICAgcmVzZXRP YnNlcnZlZENvbnRlbnRDaGFuZ2UoKTsKKyAgICBzZXRIYXNOb0NoYW5nZVN0YXRlKCk7CiAgICAg Y2xlYXJPYnNlcnZlZERPTVRpbWVycygpOwogICAgIG1faXNPYnNlcnZpbmdDb250ZW50Q2hhbmdl cyA9IHRydWU7CiB9CkBAIC0xNzEsMzcgKzE3NywyNCBAQCB2b2lkIENvbnRlbnRDaGFuZ2VPYnNl cnZlcjo6c3RvcE9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkKICAgICBtX2lzT2JzZXJ2aW5nQ29u dGVudENoYW5nZXMgPSBmYWxzZTsKIH0KIAotV0tDb250ZW50Q2hhbmdlIENvbnRlbnRDaGFuZ2VP YnNlcnZlcjo6b2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkKK1dLQ29udGVudENoYW5nZSBDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6Om9ic2VydmVkQ29udGVudENoYW5nZSgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIFdLT2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCk7CiB9CiAKLXZvaWQgQ29udGVudENoYW5nZU9i c2VydmVyOjpyZXNldE9ic2VydmVkQ29udGVudENoYW5nZSgpCi17Ci0gICAgV0tTZXRPYnNlcnZl ZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50Tm9DaGFuZ2UpOwotfQotCi12b2lkIENvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6c2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudENoYW5nZSBjaGFu Z2UpCi17Ci0gICAgaWYgKG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudFZpc2li aWxpdHlDaGFuZ2UpCi0gICAgICAgIHJldHVybjsKLSAgICBXS1NldE9ic2VydmVkQ29udGVudENo YW5nZShjaGFuZ2UpOwotfQotCi12b2lkIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6YWRkT2JzZXJ2 ZWRET01UaW1lcihjb25zdCBET01UaW1lciYgdGltZXIpCi17Ci0gICAgQVNTRVJUKGlzT2JzZXJ2 aW5nRE9NVGltZXJTY2hlZHVsaW5nKCkpOwotICAgIGlmIChvYnNlcnZlZENvbnRlbnRDaGFuZ2Uo KSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlKQotICAgICAgICByZXR1cm47Ci0gICAgbV9E T01UaW1lckxpc3QuYWRkKCZ0aW1lcik7Ci19Ci0KIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVy OjpyZW1vdmVPYnNlcnZlZERPTVRpbWVyKGNvbnN0IERPTVRpbWVyJiB0aW1lcikKIHsKICAgICBt X0RPTVRpbWVyTGlzdC5yZW1vdmUoJnRpbWVyKTsKICAgICAvLyBGb3JjZSByZXNldCB0aGUgY29u dGVudCBjaGFuZ2UgZmxhZyB3aGVuIHRoZSBsYXN0IG9ic2VydmVkIGNvbnRlbnQgbW9kaWZpZXIg aXMgcmVtb3ZlZC4gV2Ugc2hvdWxkIG5vdCBiZSBpbiBhbiBpbmRldGVybWluYXRlIHN0YXRlIGFu eW1vcmUuCi0gICAgaWYgKCFjb3VudE9mT2JzZXJ2ZWRET01UaW1lcnMoKSAmJiBvYnNlcnZlZENv bnRlbnRDaGFuZ2UoKSA9PSBXS0NvbnRlbnRJbmRldGVybWluYXRlQ2hhbmdlKQotICAgICAgICBy ZXNldE9ic2VydmVkQ29udGVudENoYW5nZSgpOworICAgIGlmICghaGFzT2JzZXJ2ZWRET01UaW1l cigpICYmIG9ic2VydmVkQ29udGVudENoYW5nZSgpID09IFdLQ29udGVudEluZGV0ZXJtaW5hdGVD aGFuZ2UpCisgICAgICAgIHNldEhhc05vQ2hhbmdlU3RhdGUoKTsKK30KKworYm9vbCBDb250ZW50 Q2hhbmdlT2JzZXJ2ZXI6Omhhc0RldGVybWluZWRTdGF0ZSgpIGNvbnN0Cit7CisgICAgaWYgKGhh c1Zpc2libGVDaGFuZ2VTdGF0ZSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4g b2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkgPT0gV0tDb250ZW50Tm9DaGFuZ2UgJiYgIWhhc09ic2Vy dmVkRE9NVGltZXIoKSAmJiAhaGFzUGVuZGluZ1N0eWxlUmVjYWxjKG1fcGFnZSk7CiB9CiAKIHN0 YXRpYyBWaXNpYmlsaXR5IGVsZW1lbnRJbXBsaWNpdFZpc2liaWxpdHkoY29uc3QgRWxlbWVudCYg ZWxlbWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFu Z2VPYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2Vy dmVyLmgKaW5kZXggN2FiODIwZGE3ODlkZDE3Zjc4OWZjNDU3NDQzNmMxYmE5ZmZiY2JjNC4uYWVl MjliMWRiYzc0Y2UyNTcyNjY0OGM2MGI2N2JiNThkZmMzNzhlNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKQEAgLTQwLDcgKzQwLDcgQEAg cHVibGljOgogCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdGFydE9ic2VydmluZ0NvbnRlbnRD aGFuZ2VzKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdG9wT2JzZXJ2aW5nQ29udGVudENo YW5nZXMoKTsKLSAgICBXRUJDT1JFX0VYUE9SVCBXS0NvbnRlbnRDaGFuZ2Ugb2JzZXJ2ZWRDb250 ZW50Q2hhbmdlKCk7CisgICAgV0VCQ09SRV9FWFBPUlQgV0tDb250ZW50Q2hhbmdlIG9ic2VydmVk Q29udGVudENoYW5nZSgpIGNvbnN0OwogCiAgICAgdm9pZCBkaWRJbnN0YWxsRE9NVGltZXIoY29u c3QgRE9NVGltZXImLCBTZWNvbmRzIHRpbWVvdXQsIGJvb2wgc2luZ2xlU2hvdCk7CiAgICAgdm9p ZCBkaWRSZW1vdmVET01UaW1lcihjb25zdCBET01UaW1lciYpOwpAQCAtODksNyArODksNyBAQCBw cml2YXRlOgogICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdTdHlsZVJlY2FsYygpOwogICAgIHZvaWQg c3RvcE9ic2VydmluZ1N0eWxlUmVjYWxjKCk7CiAKLSAgICB2b2lkIGFkZE9ic2VydmVkRE9NVGlt ZXIoY29uc3QgRE9NVGltZXImKTsKKyAgICB2b2lkIGFkZE9ic2VydmVkRE9NVGltZXIoY29uc3Qg RE9NVGltZXImIHRpbWVyKSB7IG1fRE9NVGltZXJMaXN0LmFkZCgmdGltZXIpOyB9CiAgICAgYm9v bCBpc09ic2VydmluZ0RPTVRpbWVyU2NoZWR1bGluZygpIGNvbnN0IHsgcmV0dXJuIG1faXNPYnNl cnZpbmdET01UaW1lclNjaGVkdWxpbmc7IH0KICAgICB2b2lkIHJlbW92ZU9ic2VydmVkRE9NVGlt ZXIoY29uc3QgRE9NVGltZXImKTsKICAgICBib29sIGNvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcihj b25zdCBET01UaW1lciYgdGltZXIpIGNvbnN0IHsgcmV0dXJuIG1fRE9NVGltZXJMaXN0LmNvbnRh aW5zKCZ0aW1lcik7IH0KQEAgLTk3LDE1ICs5NywxOSBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0 U2hvdWxkT2JzZXJ2ZVN0eWxlUmVjYWxjKGJvb2wgc2hvdWxkT2JzZXJ2ZSkgeyBtX3Nob3VsZE9i c2VydmVTdHlsZVJlY2FsYyA9IHNob3VsZE9ic2VydmU7IH0KICAgICBib29sIHNob3VsZE9ic2Vy dmVTdHlsZVJlY2FsYygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkT2JzZXJ2ZVN0eWxlUmVjYWxj OyB9CiAKLSAgICB2b2lkIHNldE9ic2VydmVkQ29udGVudENoYW5nZShXS0NvbnRlbnRDaGFuZ2Up OwotICAgIHZvaWQgcmVzZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoKTsKICAgICBib29sIGlzT2Jz ZXJ2aW5nQ29udGVudENoYW5nZXMoKSBjb25zdCB7IHJldHVybiBtX2lzT2JzZXJ2aW5nQ29udGVu dENoYW5nZXM7IH0KIAotICAgIHVuc2lnbmVkIGNvdW50T2ZPYnNlcnZlZERPTVRpbWVycygpIGNv bnN0IHsgcmV0dXJuIG1fRE9NVGltZXJMaXN0LnNpemUoKTsgfQogICAgIHZvaWQgY2xlYXJPYnNl cnZlZERPTVRpbWVycygpIHsgbV9ET01UaW1lckxpc3QuY2xlYXIoKTsgfQotCiAgICAgdm9pZCBj bGVhclRpbWVyc0FuZFJlcG9ydENvbnRlbnRDaGFuZ2UoKTsKIAorICAgIHZvaWQgc2V0SGFzSW5k ZXRlcm1pbmF0ZVN0YXRlKCk7CisgICAgdm9pZCBzZXRIYXNWaXNpYmxlQ2hhbmdlU3RhdGUoKTsK KyAgICB2b2lkIHNldEhhc05vQ2hhbmdlU3RhdGUoKTsKKworICAgIGJvb2wgaGFzVmlzaWJsZUNo YW5nZVN0YXRlKCkgY29uc3QgeyByZXR1cm4gb2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkgPT0gV0tD b250ZW50VmlzaWJpbGl0eUNoYW5nZTsgfQorICAgIGJvb2wgaGFzT2JzZXJ2ZWRET01UaW1lcigp IGNvbnN0IHsgcmV0dXJuICFtX0RPTVRpbWVyTGlzdC5pc0VtcHR5KCk7IH0KKyAgICBib29sIGhh c0RldGVybWluZWRTdGF0ZSgpIGNvbnN0OworCiAgICAgUGFnZSYgbV9wYWdlOwogICAgIEhhc2hT ZXQ8Y29uc3QgRE9NVGltZXIqPiBtX0RPTVRpbWVyTGlzdDsKICAgICBib29sIG1fc2hvdWxkT2Jz ZXJ2ZVN0eWxlUmVjYWxjIHsgZmFsc2UgfTsKQEAgLTExMyw1ICsxMTcsMjEgQEAgcHJpdmF0ZToK ICAgICBib29sIG1faXNPYnNlcnZpbmdDb250ZW50Q2hhbmdlcyB7IGZhbHNlIH07CiB9OwogCitp bmxpbmUgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldEhhc05vQ2hhbmdlU3RhdGUoKQor eworICAgIFdLU2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudE5vQ2hhbmdlKTsKK30K KworaW5saW5lIHZvaWQgQ29udGVudENoYW5nZU9ic2VydmVyOjpzZXRIYXNJbmRldGVybWluYXRl U3RhdGUoKQoreworICAgIEFTU0VSVCghaGFzVmlzaWJsZUNoYW5nZVN0YXRlKCkpOworICAgIFdL U2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOwor fQorCitpbmxpbmUgdm9pZCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OnNldEhhc1Zpc2libGVDaGFu Z2VTdGF0ZSgpCit7CisgICAgV0tTZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50Vmlz aWJpbGl0eUNoYW5nZSk7Cit9CisKIH0KICNlbmRpZgo=