192168 2018-11-29 11:24:16 -0800 [ContentObservation] Rename *ObservedContentModifier(s) to *ObservedDOMTimer(s) 2018-11-29 13:14:51 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham cdumez dbates esprehn+autocc ews-watchlist kangil.han simon.fraser webkit-bug-importer zalan oldest_to_newest 1483049 0 zalan 2018-11-29 11:24:16 -0800 There's only one type of content modifier. 1483061 1 356029 zalan 2018-11-29 11:48:02 -0800 Created attachment 356029 Patch 1483089 2 356029 simon.fraser 2018-11-29 12:37:19 -0800 Comment on attachment 356029 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356029&action=review > Source/WebKitLegacy/ios/ChangeLog:8 > + There's only one type of content modifier (DOMTimer). What about when we observe requestAnimationFrame in future? 1483119 3 zalan 2018-11-29 13:13:15 -0800 Committed r238689: <https://trac.webkit.org/changeset/238689> 1483121 4 webkit-bug-importer 2018-11-29 13:14:51 -0800 <rdar://problem/46351839> 356029 2018-11-29 11:48:02 -0800 2018-11-29 12:37:19 -0800 Patch bug-192168-20181129114801.patch text/plain 12620 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4Njc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAwZDI5ODBlY2FmZTc3 Mzk2OGQxNGQxZWJhNmQwMWJjM2RmYTg3OS4uODVmYjE0NmU2MTgyMTdkYTAwMTMzMTFhZDdhZDcx MDhlOGQxMDQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE4LTExLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lICpPYnNlcnZlZENv bnRlbnRNb2RpZmllcihzKSB0byAqT2JzZXJ2ZWRET01UaW1lcihzKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMTY4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnBsYXRmb3JtU3VzcGVuZE9yU3RvcEFjdGl2ZURPTU9i amVjdHMpOgorICAgICAgICAqIHBhZ2UvRE9NVGltZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RE9NVGltZXI6Omluc3RhbGwpOgorICAgICAgICAoV2ViQ29yZTo6RE9NVGltZXI6OmZpcmVkKToK KyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5k b3c6OmNsZWFyVGltZW91dCk6CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZTo6d2lsbERldGFjaFBhZ2UpOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy93 YWsvV0tDb250ZW50T2JzZXJ2YXRpb24uY3BwOgorICAgICAgICAoV0tCZWdpbk9ic2VydmluZ0Nv bnRlbnRDaGFuZ2VzKToKKyAgICAgICAgKFdLU2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKToKKyAg ICAgICAgKFdlYlRocmVhZEdldE9ic2VydmVkRE9NVGltZXJzKToKKyAgICAgICAgKFdlYlRocmVh ZENvdW50T2ZPYnNlcnZlZERPTVRpbWVycyk6CisgICAgICAgIChXZWJUaHJlYWRDbGVhck9ic2Vy dmVkRE9NVGltZXJzKToKKyAgICAgICAgKFdlYlRocmVhZENvbnRhaW5zT2JzZXJ2ZWRET01UaW1l cik6CisgICAgICAgIChXZWJUaHJlYWRBZGRPYnNlcnZlZERPTVRpbWVyKToKKyAgICAgICAgKFdl YlRocmVhZFJlbW92ZU9ic2VydmVkRE9NVGltZXIpOgorICAgICAgICAoV2ViVGhyZWFkQ291bnRP Zk9ic2VydmVkQ29udGVudE1vZGlmaWVycyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJUaHJlYWRD bGVhck9ic2VydmVkQ29udGVudE1vZGlmaWVycyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJUaHJl YWRDb250YWluc09ic2VydmVkQ29udGVudE1vZGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YlRocmVhZEFkZE9ic2VydmVkQ29udGVudE1vZGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YlRocmVhZFJlbW92ZU9ic2VydmVkQ29udGVudE1vZGlmaWVyKTogRGVsZXRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmg6CisgICAgICAgICogcGxh dGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbkludGVybmFsLmg6CisKIDIwMTgtMTEt MjkgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5leHBlY3Rl ZCBjb25zdHJ1Y3RvciAvIGluc3RhbmNlb2YgIGJlaGF2aW9yIHdoZW4gcmV0cmlldmluZyBpbmRl eGVkREIgZGF0YSBpbiBhbiBpZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv aW9zL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvaW9zL0NoYW5nZUxvZwppbmRleCA1 YjY5MzFhMDc0MWQ3OWMyNTg3YzFmMjg3MmQyM2Q0MjAzM2IzZWRjLi5lYWE2ZjgxYmMyMmYzZjcy MGM0OWFkMmNiYzAxMzgwOTMxYWM2YWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5 L2lvcy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9pb3MvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTgtMTEtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KKworICAgICAgICBSZW5hbWUgKk9ic2VydmVkQ29udGVudE1vZGlmaWVyKHMpIHRvICpPYnNl cnZlZERPTVRpbWVyKHMpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTIxNjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGVyZSdzIG9ubHkgb25lIHR5cGUgb2YgY29udGVudCBtb2RpZmllciAoRE9NVGlt ZXIpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50SU9TLm1tOgor ICAgICAgICAoV2ViQ2hyb21lQ2xpZW50SU9TOjpjbGVhckNvbnRlbnRDaGFuZ2VPYnNlcnZlcnMp OgorCiAyMDE4LTExLTE5ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogIlJlbG9hZCBXZWIgSW5zcGVjdG9yIiBidXR0b24gbm8g bG9uZ2VyIHBhcnRpYWxseSB3b3JrcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMmFjNWJi ZWY3YTdmMjA2ZDdkM2U5MTg3YzJhZTA4NTY0Njc2MTVkMi4uY2QyMmY3OGI1NjliNjM1YTliZThj ODA2OTM3YWZmZThlNWZkZTlhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0yNTk0LDcg KzI1OTQsNyBAQCBib29sIERvY3VtZW50OjpzaG91bGRCeXBhc3NNYWluV29ybGRDb250ZW50U2Vj dXJpdHlQb2xpY3koKSBjb25zdAogdm9pZCBEb2N1bWVudDo6cGxhdGZvcm1TdXNwZW5kT3JTdG9w QWN0aXZlRE9NT2JqZWN0cygpCiB7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBpZiAo V2ViVGhyZWFkQ291bnRPZk9ic2VydmVkQ29udGVudE1vZGlmaWVycygpID4gMCkgeworICAgIGlm IChXZWJUaHJlYWRDb3VudE9mT2JzZXJ2ZWRET01UaW1lcnMoKSA+IDApIHsKICAgICAgICAgaWYg KGF1dG8qIGZyYW1lID0gdGhpcy0+ZnJhbWUoKSkgewogICAgICAgICAgICAgaWYgKGF1dG8qIHBh Z2UgPSBmcmFtZS0+cGFnZSgpKQogICAgICAgICAgICAgICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVu dCgpLmNsZWFyQ29udGVudENoYW5nZU9ic2VydmVycygqZnJhbWUpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9ET01UaW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRp bWVyLmNwcAppbmRleCBhOWYxNGRlNDcwYmJjMDBkMjc5MWQzNDJlZjExZjdkYWY4MmMxYjUzLi4w ZDYwNGQ2NmUzZGYzMzRlNDMzMDhlZDg5YzE0MDNiZWY2YTJmY2U1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RP TVRpbWVyLmNwcApAQCAtMjI0LDcgKzIyNCw3IEBAIGludCBET01UaW1lcjo6aW5zdGFsbChTY3Jp cHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0LCBzdGQ6OnVuaXF1ZV9wdHI8U2NoZWR1bGVkCiAg ICAgICAgIGJvb2wgZGlkRGVmZXJUaW1lb3V0ID0gY29udGV4dC5hY3RpdmVET01PYmplY3RzQXJl U3VzcGVuZGVkKCk7CiAgICAgICAgIGlmICghZGlkRGVmZXJUaW1lb3V0ICYmIHRpbWVvdXQgPD0g MTAwX21zICYmIHNpbmdsZVNob3QpIHsKICAgICAgICAgICAgIFdLU2V0T2JzZXJ2ZWRDb250ZW50 Q2hhbmdlKFdLQ29udGVudEluZGV0ZXJtaW5hdGVDaGFuZ2UpOwotICAgICAgICAgICAgV2ViVGhy ZWFkQWRkT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXIodGltZXIpOyAvLyBXaWxsIG9ubHkgdGFrZSBh ZmZlY3QgaWYgbm90IGFscmVhZHkgdmlzaWJpbGl0eSBjaGFuZ2UuCisgICAgICAgICAgICBXZWJU aHJlYWRBZGRPYnNlcnZlZERPTVRpbWVyKHRpbWVyKTsgLy8gV2lsbCBvbmx5IHRha2UgYWZmZWN0 IGlmIG5vdCBhbHJlYWR5IHZpc2liaWxpdHkgY2hhbmdlLgogICAgICAgICB9CiAgICAgfQogI2Vu ZGlmCkBAIC0zNDQsOCArMzQ0LDggQEAgdm9pZCBET01UaW1lcjo6ZmlyZWQoKQogICAgIGJvb2wg c2hvdWxkUmVwb3J0TGFja09mQ2hhbmdlczsKICAgICBib29sIHNob3VsZEJlZ2luT2JzZXJ2aW5n Q2hhbmdlczsKICAgICBpZiAoaXM8RG9jdW1lbnQ+KGNvbnRleHQpKSB7Ci0gICAgICAgIHNob3Vs ZFJlcG9ydExhY2tPZkNoYW5nZXMgPSBXZWJUaHJlYWRDb3VudE9mT2JzZXJ2ZWRDb250ZW50TW9k aWZpZXJzKCkgPT0gMTsKLSAgICAgICAgc2hvdWxkQmVnaW5PYnNlcnZpbmdDaGFuZ2VzID0gV2Vi VGhyZWFkQ29udGFpbnNPYnNlcnZlZENvbnRlbnRNb2RpZmllcih0aGlzKTsKKyAgICAgICAgc2hv dWxkUmVwb3J0TGFja09mQ2hhbmdlcyA9IFdlYlRocmVhZENvdW50T2ZPYnNlcnZlZERPTVRpbWVy cygpID09IDE7CisgICAgICAgIHNob3VsZEJlZ2luT2JzZXJ2aW5nQ2hhbmdlcyA9IFdlYlRocmVh ZENvbnRhaW5zT2JzZXJ2ZWRET01UaW1lcih0aGlzKTsKICAgICB9IGVsc2UgewogICAgICAgICBz aG91bGRSZXBvcnRMYWNrT2ZDaGFuZ2VzID0gZmFsc2U7CiAgICAgICAgIHNob3VsZEJlZ2luT2Jz ZXJ2aW5nQ2hhbmdlcyA9IGZhbHNlOwpAQCAtMzUzLDcgKzM1Myw3IEBAIHZvaWQgRE9NVGltZXI6 OmZpcmVkKCkKIAogICAgIGlmIChzaG91bGRCZWdpbk9ic2VydmluZ0NoYW5nZXMpIHsKICAgICAg ICAgV0tCZWdpbk9ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKGZhbHNlKTsKLSAgICAgICAgV2ViVGhy ZWFkUmVtb3ZlT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXIodGhpcyk7CisgICAgICAgIFdlYlRocmVh ZFJlbW92ZU9ic2VydmVkRE9NVGltZXIodGhpcyk7CiAgICAgfQogI2VuZGlmCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRE9NV2luZG93LmNwcAppbmRleCAzNjhlOGJjMzM2M2VkY2MzOTA3ZmRkMGI5NzIzZjBjY2Ez N2I4YzhkLi4wYzI3YjZkNWYxODZmNjMyNTU0ODdmNjgyZjFmMmEyODM5MWZjMTVlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC0xNjc4LDEwICsxNjc4LDEwIEBAIHZvaWQgRE9NV2lu ZG93OjpjbGVhclRpbWVvdXQoaW50IHRpbWVvdXRJZCkKICAgICAgICAgRG9jdW1lbnQqIGRvY3Vt ZW50ID0gZnJhbWUtPmRvY3VtZW50KCk7CiAgICAgICAgIGlmICh0aW1lb3V0SWQgPiAwICYmIGRv Y3VtZW50KSB7CiAgICAgICAgICAgICBET01UaW1lciogdGltZXIgPSBkb2N1bWVudC0+ZmluZFRp bWVvdXQodGltZW91dElkKTsKLSAgICAgICAgICAgIGlmICh0aW1lciAmJiBXZWJUaHJlYWRDb250 YWluc09ic2VydmVkQ29udGVudE1vZGlmaWVyKHRpbWVyKSkgewotICAgICAgICAgICAgICAgIFdl YlRocmVhZFJlbW92ZU9ic2VydmVkQ29udGVudE1vZGlmaWVyKHRpbWVyKTsKKyAgICAgICAgICAg IGlmICh0aW1lciAmJiBXZWJUaHJlYWRDb250YWluc09ic2VydmVkRE9NVGltZXIodGltZXIpKSB7 CisgICAgICAgICAgICAgICAgV2ViVGhyZWFkUmVtb3ZlT2JzZXJ2ZWRET01UaW1lcih0aW1lcik7 CiAKLSAgICAgICAgICAgICAgICBpZiAoIVdlYlRocmVhZENvdW50T2ZPYnNlcnZlZENvbnRlbnRN b2RpZmllcnMoKSkgeworICAgICAgICAgICAgICAgIGlmICghV2ViVGhyZWFkQ291bnRPZk9ic2Vy dmVkRE9NVGltZXJzKCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBm cmFtZS0+cGFnZSgpKQogICAgICAgICAgICAgICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xp ZW50KCkub2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCpmcmFtZSk7CiAgICAgICAgICAgICAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lLmNwcAppbmRleCAxMGQyYzRmZmQ4YTIyMDdlYWFhMmY2YWI2YjBhNTEzNjg1 MThlMTViLi5jZDk2YjAwZDY5ODk4ZDI1YTkxZTAxZjhiMjFiNDVkMmE3NjgzZmRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lLmNwcApAQCAtODA1LDcgKzgwNSw3IEBAIHZvaWQgRnJhbWU6OndpbGxEZXRhY2hQ YWdlKCkKICAgICAgICAgcGFnZSgpLT5zY3JvbGxpbmdDb29yZGluYXRvcigpLT53aWxsRGVzdHJv eVNjcm9sbGFibGVBcmVhKCptX3ZpZXcpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAg ICBpZiAoV2ViVGhyZWFkQ291bnRPZk9ic2VydmVkQ29udGVudE1vZGlmaWVycygpID4gMCAmJiBt X3BhZ2UpCisgICAgaWYgKFdlYlRocmVhZENvdW50T2ZPYnNlcnZlZERPTVRpbWVycygpID4gMCAm JiBtX3BhZ2UpCiAgICAgICAgIG1fcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkuY2xlYXJDb250ZW50 Q2hhbmdlT2JzZXJ2ZXJzKCp0aGlzKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb24uY3BwCmluZGV4IDQz NjkwMDA4ODM1YmI0NmYzMzY3OTZhNzhjMGRmZDQ1ZGVjMjg3YzAuLmQ5ZTcwMmEwZTczMjk4M2Iy NThmNWZiNGI5MWVjMzM0MDhlZmYxYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb24uY3BwCkBAIC0yOSw2ICsyOSw3 IEBACiAKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogCisjaW5jbHVkZSAiRE9NVGltZXIuaCIK ICNpbmNsdWRlICJKU0RPTUJpbmRpbmcuaCIKICNpbmNsdWRlICJXZWJDb3JlVGhyZWFkLmgiCiAj aW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KQEAgLTU3LDcgKzU4LDcgQEAgdm9pZCBXS0JlZ2luT2Jz ZXJ2aW5nQ29udGVudENoYW5nZXMoYm9vbCBhbGxvd3NJbnRlZGV0ZXJtaW5hdGVDaGFuZ2VzKQog ICAgIAogICAgIF9XS09ic2VydmluZ0luZGV0ZXJtaW5hdGVDaGFuZ2VzID0gYWxsb3dzSW50ZWRl dGVybWluYXRlQ2hhbmdlczsKICAgICBpZiAoX1dLT2JzZXJ2aW5nSW5kZXRlcm1pbmF0ZUNoYW5n ZXMpCi0gICAgICAgIFdlYlRocmVhZENsZWFyT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXJzKCk7Cisg ICAgICAgIFdlYlRocmVhZENsZWFyT2JzZXJ2ZWRET01UaW1lcnMoKTsKIH0KIAogV0tDb250ZW50 Q2hhbmdlIFdLT2JzZXJ2ZWRDb250ZW50Q2hhbmdlKHZvaWQpCkBAIC03MCw0NCArNzEsNDQgQEAg dm9pZCBXS1NldE9ic2VydmVkQ29udGVudENoYW5nZShXS0NvbnRlbnRDaGFuZ2UgYUNoYW5nZSkK ICAgICBpZiAoYUNoYW5nZSA+IF9XS0NvbnRlbnRDaGFuZ2UgJiYgKF9XS09ic2VydmluZ0luZGV0 ZXJtaW5hdGVDaGFuZ2VzIHx8IGFDaGFuZ2UgIT0gV0tDb250ZW50SW5kZXRlcm1pbmF0ZUNoYW5n ZSkpIHsKICAgICAgICAgX1dLQ29udGVudENoYW5nZSA9IGFDaGFuZ2U7CiAgICAgICAgIGlmIChf V0tDb250ZW50Q2hhbmdlID09IFdLQ29udGVudFZpc2liaWxpdHlDaGFuZ2UpCi0gICAgICAgICAg ICBXZWJUaHJlYWRDbGVhck9ic2VydmVkQ29udGVudE1vZGlmaWVycygpOworICAgICAgICAgICAg V2ViVGhyZWFkQ2xlYXJPYnNlcnZlZERPTVRpbWVycygpOwogICAgIH0KIH0KIAotc3RhdGljIEhh c2hNYXA8dm9pZCAqLCB2b2lkICo+ICogV2ViVGhyZWFkR2V0T2JzZXJ2ZWRDb250ZW50TW9kaWZp ZXJzKCkKK3VzaW5nIERPTVRpbWVyTGlzdCA9IEhhc2hTZXQ8dm9pZCo+Oworc3RhdGljIERPTVRp bWVyTGlzdCYgV2ViVGhyZWFkR2V0T2JzZXJ2ZWRET01UaW1lcnMoKQogewogICAgIEFTU0VSVChX ZWJUaHJlYWRJc0xvY2tlZE9yRGlzYWJsZWQoKSk7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPHZvaWQg Kiwgdm9pZCAqPiBWb2lkVm9pZE1hcDsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Vm9pZFZv aWRNYXA+IG9ic2VydmVkQ29udGVudE1vZGlmaWVyczsKLSAgICByZXR1cm4gJm9ic2VydmVkQ29u dGVudE1vZGlmaWVycy5nZXQoKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8RE9NVGltZXJM aXN0PiBvYnNlcnZlZERPTVRpbWVyczsKKyAgICByZXR1cm4gb2JzZXJ2ZWRET01UaW1lcnM7CiB9 CiAKLWludCBXZWJUaHJlYWRDb3VudE9mT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXJzKHZvaWQpCitp bnQgV2ViVGhyZWFkQ291bnRPZk9ic2VydmVkRE9NVGltZXJzKHZvaWQpCiB7Ci0gICAgcmV0dXJu IFdlYlRocmVhZEdldE9ic2VydmVkQ29udGVudE1vZGlmaWVycygpLT5zaXplKCk7CisgICAgcmV0 dXJuIFdlYlRocmVhZEdldE9ic2VydmVkRE9NVGltZXJzKCkuc2l6ZSgpOwogfQogCi12b2lkIFdl YlRocmVhZENsZWFyT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXJzKCkKK3ZvaWQgV2ViVGhyZWFkQ2xl YXJPYnNlcnZlZERPTVRpbWVycygpCiB7Ci0gICAgV2ViVGhyZWFkR2V0T2JzZXJ2ZWRDb250ZW50 TW9kaWZpZXJzKCktPmNsZWFyKCk7CisgICAgV2ViVGhyZWFkR2V0T2JzZXJ2ZWRET01UaW1lcnMo KS5jbGVhcigpOwogfQogCi1ib29sIFdlYlRocmVhZENvbnRhaW5zT2JzZXJ2ZWRDb250ZW50TW9k aWZpZXIodm9pZCAqIGFDb250ZW50TW9kaWZpZXIpCitib29sIFdlYlRocmVhZENvbnRhaW5zT2Jz ZXJ2ZWRET01UaW1lcih2b2lkKiB0aW1lcikKIHsKLSAgICByZXR1cm4gV2ViVGhyZWFkR2V0T2Jz ZXJ2ZWRDb250ZW50TW9kaWZpZXJzKCktPmNvbnRhaW5zKGFDb250ZW50TW9kaWZpZXIpOworICAg IHJldHVybiBXZWJUaHJlYWRHZXRPYnNlcnZlZERPTVRpbWVycygpLmNvbnRhaW5zKHRpbWVyKTsK IH0KIAotdm9pZCBXZWJUaHJlYWRBZGRPYnNlcnZlZENvbnRlbnRNb2RpZmllcih2b2lkICogYUNv bnRlbnRNb2RpZmllcikKK3ZvaWQgV2ViVGhyZWFkQWRkT2JzZXJ2ZWRET01UaW1lcih2b2lkKiB0 aW1lcikKIHsKICAgICBpZiAoX1dLQ29udGVudENoYW5nZSAhPSBXS0NvbnRlbnRWaXNpYmlsaXR5 Q2hhbmdlICYmIF9XS09ic2VydmluZ0luZGV0ZXJtaW5hdGVDaGFuZ2VzKQotICAgICAgICBXZWJU aHJlYWRHZXRPYnNlcnZlZENvbnRlbnRNb2RpZmllcnMoKS0+c2V0KGFDb250ZW50TW9kaWZpZXIs IGFDb250ZW50TW9kaWZpZXIpOworICAgICAgICBXZWJUaHJlYWRHZXRPYnNlcnZlZERPTVRpbWVy cygpLmFkZCh0aW1lcik7CiB9CiAKLXZvaWQgV2ViVGhyZWFkUmVtb3ZlT2JzZXJ2ZWRDb250ZW50 TW9kaWZpZXIodm9pZCAqIGFDb250ZW50TW9kaWZpZXIpCit2b2lkIFdlYlRocmVhZFJlbW92ZU9i c2VydmVkRE9NVGltZXIodm9pZCogdGltZXIpCiB7Ci0gICAgV2ViVGhyZWFkR2V0T2JzZXJ2ZWRD b250ZW50TW9kaWZpZXJzKCktPnJlbW92ZShhQ29udGVudE1vZGlmaWVyKTsKKyAgICBXZWJUaHJl YWRHZXRPYnNlcnZlZERPTVRpbWVycygpLnJlbW92ZSh0aW1lcik7CiAgICAgLy8gRm9yY2UgcmVz ZXQgdGhlIGNvbnRlbnQgY2hhbmdlIGZsYWcgd2hlbiB0aGUgbGFzdCBvYnNlcnZlZCBjb250ZW50 IG1vZGlmaWVyIGlzIHJlbW92ZWQuIFdlIHNob3VsZCBub3QgYmUgaW4gaW5kZXRlcm1pbmF0ZSBz dGF0ZSBhbnltb3JlLgotICAgIGlmIChXZWJUaHJlYWRDb3VudE9mT2JzZXJ2ZWRDb250ZW50TW9k aWZpZXJzKCkpCisgICAgaWYgKFdlYlRocmVhZENvdW50T2ZPYnNlcnZlZERPTVRpbWVycygpKQog ICAgICAgICByZXR1cm47CiAgICAgaWYgKFdLT2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkgIT0gV0tD b250ZW50SW5kZXRlcm1pbmF0ZUNoYW5nZSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbi5oCmlu ZGV4IGM1MTg1ZjQyYjhkODMwZmUyMjUxNTZjYmE0YmE0YTFhZjAwNGE0OTYuLjViYjM2ZTBkNWQy MjRhMTg1Yjc4OTdjYzQ4MmZiZmM3MGFkMWQxNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb24uaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3Mvd2FrL1dLQ29udGVudE9ic2VydmF0aW9uLmgKQEAgLTQ0LDggKzQ0 LDggQEAgV0VCQ09SRV9FWFBPUlQgdm9pZCBXS0JlZ2luT2JzZXJ2aW5nQ29udGVudENoYW5nZXMo Ym9vbCBhbGxvd3NJbnRlZGV0ZXJtaW5hdGVDaGEKIAogV0VCQ09SRV9FWFBPUlQgV0tDb250ZW50 Q2hhbmdlIFdLT2JzZXJ2ZWRDb250ZW50Q2hhbmdlKHZvaWQpOwogCi1XRUJDT1JFX0VYUE9SVCBp bnQgV2ViVGhyZWFkQ291bnRPZk9ic2VydmVkQ29udGVudE1vZGlmaWVycyh2b2lkKTsKLVdFQkNP UkVfRVhQT1JUIHZvaWQgV2ViVGhyZWFkQ2xlYXJPYnNlcnZlZENvbnRlbnRNb2RpZmllcnModm9p ZCk7CitXRUJDT1JFX0VYUE9SVCBpbnQgV2ViVGhyZWFkQ291bnRPZk9ic2VydmVkRE9NVGltZXJz KHZvaWQpOworV0VCQ09SRV9FWFBPUlQgdm9pZCBXZWJUaHJlYWRDbGVhck9ic2VydmVkRE9NVGlt ZXJzKHZvaWQpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0tDb250ZW50T2JzZXJ2YXRpb25JbnRlcm5hbC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbkludGVy bmFsLmgKaW5kZXggMTRhZDJlOThmMjRiNWFiYmZiMjZiNjI4OGFhY2ZlZWJiMmE2MDRlYi4uNTc2 NDA2N2EzMmQ5YmFmYjczOTA2MWJmOTI0YzNmMDhkZmZhODIzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlvbkludGVybmFsLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XS0NvbnRlbnRPYnNlcnZhdGlv bkludGVybmFsLmgKQEAgLTM1LDEwICszNSwxMCBAQCBleHRlcm4gIkMiIHsKICNlbmRpZgogCiBi b29sIFdLT2JzZXJ2aW5nQ29udGVudENoYW5nZXModm9pZCk7Ci12b2lkIFdLU2V0T2JzZXJ2ZWRD b250ZW50Q2hhbmdlKFdLQ29udGVudENoYW5nZSBhQ2hhbmdlKTsKLWJvb2wgV2ViVGhyZWFkQ29u dGFpbnNPYnNlcnZlZENvbnRlbnRNb2RpZmllcih2b2lkICogYUNvbnRlbnRNb2RpZmllcik7Ci12 b2lkIFdlYlRocmVhZEFkZE9ic2VydmVkQ29udGVudE1vZGlmaWVyKHZvaWQgKiBhQ29udGVudE1v ZGlmaWVyKTsKLXZvaWQgV2ViVGhyZWFkUmVtb3ZlT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXIodm9p ZCAqIGFDb250ZW50TW9kaWZpZXIpOwordm9pZCBXS1NldE9ic2VydmVkQ29udGVudENoYW5nZShX S0NvbnRlbnRDaGFuZ2UpOworYm9vbCBXZWJUaHJlYWRDb250YWluc09ic2VydmVkRE9NVGltZXIo dm9pZCogdGltZXIpOwordm9pZCBXZWJUaHJlYWRBZGRPYnNlcnZlZERPTVRpbWVyKHZvaWQqIHRp bWVyKTsKK3ZvaWQgV2ViVGhyZWFkUmVtb3ZlT2JzZXJ2ZWRET01UaW1lcih2b2lkKiB0aW1lcik7 CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2Fj eS9pb3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50SU9TLm1tIGIvU291cmNlL1dlYktp dExlZ2FjeS9pb3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50SU9TLm1tCmluZGV4IDBm N2Q4ZWM4N2NhNTYxMTFmYzNkNzJmNzNiZDcxOWYwNjgwMTdhYjcuLjYxMTI3ZGFhZTM5MjkyYjJl YjAxMzhmN2JlNjM5MGM3Mzk0ZTg5NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kv aW9zL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudElPUy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0TGVnYWN5L2lvcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnRJT1MubW0KQEAgLTE4 OCw5ICsxODgsOSBAQCB2b2lkIFdlYkNocm9tZUNsaWVudElPUzo6b2JzZXJ2ZWRDb250ZW50Q2hh bmdlKFdlYkNvcmU6OkZyYW1lJiBmcmFtZSkKIAogdm9pZCBXZWJDaHJvbWVDbGllbnRJT1M6OmNs ZWFyQ29udGVudENoYW5nZU9ic2VydmVycyhXZWJDb3JlOjpGcmFtZSYgZnJhbWUpCiB7Ci0gICAg QVNTRVJUKFdlYlRocmVhZENvdW50T2ZPYnNlcnZlZENvbnRlbnRNb2RpZmllcnMoKSA+IDApOwot ICAgIGlmIChXZWJUaHJlYWRDb3VudE9mT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXJzKCkgPiAwKSB7 Ci0gICAgICAgIFdlYlRocmVhZENsZWFyT2JzZXJ2ZWRDb250ZW50TW9kaWZpZXJzKCk7CisgICAg QVNTRVJUKFdlYlRocmVhZENvdW50T2ZPYnNlcnZlZERPTVRpbWVycygpID4gMCk7CisgICAgaWYg KFdlYlRocmVhZENvdW50T2ZPYnNlcnZlZERPTVRpbWVycygpID4gMCkgeworICAgICAgICBXZWJU aHJlYWRDbGVhck9ic2VydmVkRE9NVGltZXJzKCk7CiAgICAgICAgIG9ic2VydmVkQ29udGVudENo YW5nZShmcmFtZSk7CiAgICAgfQogfQo=