195172 2019-02-28 10:29:23 -0800 [ContentChangeObserver] Introduce observer subclasses to scope content change observing. 2019-02-28 15:18:13 -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 1510981 0 zalan 2019-02-28 10:29:23 -0800 instead of adding start/stops everywhere. 1510983 1 webkit-bug-importer 2019-02-28 10:32:16 -0800 <rdar://problem/48479259> 1510986 2 363237 zalan 2019-02-28 10:34:25 -0800 Created attachment 363237 Patch 1511005 3 363237 simon.fraser 2019-02-28 11:10:41 -0800 Comment on attachment 363237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363237&action=review > Source/WebCore/dom/Document.cpp:2058 > + ContentChangeObserver::StyleRecalcObserver observer(page()); observingScope? > Source/WebCore/page/ios/ContentChangeObserver.h:53 > + class StyleChangeObserver { StyleChangeScope 1511134 4 363263 zalan 2019-02-28 14:51:12 -0800 Created attachment 363263 Patch 1511150 5 363263 commit-queue 2019-02-28 15:18:11 -0800 Comment on attachment 363263 Patch Clearing flags on attachment: 363263 Committed r242234: <https://trac.webkit.org/changeset/242234> 1511151 6 commit-queue 2019-02-28 15:18:13 -0800 All reviewed patches have been landed. Closing bug. 363237 2019-02-28 10:34:25 -0800 2019-02-28 14:51:11 -0800 Patch bug-195172-20190228103425.patch text/plain 10674 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTI1ODk4YmNjN2YxMjE0 Zjc0YTMyZDU5MWZmMmFhY2E1ZDZhYmIzOS4uYzAzYzAxYmI1MTY2YzAyNzE4NjM0NzBlMTYwNGYx ZTEyMjIyM2M4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gSW50cm9kdWNlIG9ic2VydmVyIHN1YmNsYXNzZXMgdG8gc2NvcGUgY29udGVudCBjaGFu Z2Ugb2JzZXJ2aW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk1MTcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODQ3OTI1OT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQncyBzY29wZSBzdGFy dC9zdG9wT2JzZXJ2aW5nIGNhbGwgcGFpcnMuIAorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVTdHlsZUlmTmVlZGVkKToKKyAg ICAgICAgKiBwYWdlL0RPTVRpbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVRpbWVyOjpm aXJlZCk6CisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2VPYnNlcnZl cjo6U3R5bGVDaGFuZ2VPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OlN0eWxlQ2hhbmdlT2JzZXJ2ZXI6On5TdHlsZUNoYW5nZU9ic2VydmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNPYnNlcnZl cjo6U3R5bGVSZWNhbGNPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OlN0eWxlUmVjYWxjT2JzZXJ2ZXI6On5TdHlsZVJlY2FsY09ic2VydmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6RE9NVGltZXJPYnNlcnZlcjo6 RE9NVGltZXJPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2 ZXI6OkRPTVRpbWVyT2JzZXJ2ZXI6On5ET01UaW1lck9ic2VydmVyKToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2U6OlN0eWxlQ2hhbmdlKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFu Z2U6On5TdHlsZUNoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLmg6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVV cGRhdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVVcGRhdGVyOjp1cGRhdGVF bGVtZW50UmVuZGVyZXIpOgorCiAyMDE5LTAyLTI4ICBKdXN0aW4gRmFuICA8anVzdGluX2ZhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW1dlYiBHUFVdIEVuYWJsZSBXZWIgR1BVIG9ubHkgb24gNjQt Yml0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA2NjAwZTRjOTdmZGRkMDBiMWI1MzU0NTli ZTYyNjZjZGJlZDg4NTA2Li5kNWIxZWU0MjAyOWFjNWE3MzhmMzMyN2JhNTBhMmM5MGU4OGI1OGM2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTIwNTUsMTggKzIwNTUsMTEgQEAgYm9vbCBE b2N1bWVudDo6dXBkYXRlU3R5bGVJZk5lZWRlZCgpCiAgICAgfQogCiAjaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKLSAgICBpZiAoYXV0byogcGFnZSA9IHRoaXMtPnBhZ2UoKSkKLSAgICAgICAgcGFn ZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkuc3RhcnRPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsK KyAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxlUmVjYWxjT2JzZXJ2ZXIgb2JzZXJ2ZXIo cGFnZSgpKTsKICNlbmRpZgogICAgIC8vIFRoZSBlYXJseSBleGl0IGFib3ZlIGZvciAhbmVlZHNT dHlsZVJlY2FsYygpIGlzIG5lZWRlZCB3aGVuIHVwZGF0ZVdpZGdldFBvc2l0aW9ucygpIGlzIGNh bGxlZCBpbiBydW5PclNjaGVkdWxlQXN5bmNocm9ub3VzVGFza3MoKS4KICAgICBSRUxFQVNFX0FT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGlzU2FmZVRvVXBkYXRlU3R5bGVPckxheW91 dCgqdGhpcykpOwotCiAgICAgcmVzb2x2ZVN0eWxlKCk7Ci0KLSNpZiBQTEFURk9STShJT1NfRkFN SUxZKQotICAgIGlmIChhdXRvKiBwYWdlID0gdGhpcy0+cGFnZSgpKQotICAgICAgICBwYWdlLT5j b250ZW50Q2hhbmdlT2JzZXJ2ZXIoKS5zdG9wT2JzZXJ2aW5nU3R5bGVSZXNvbHZlKCk7Ci0jZW5k aWYKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9ET01UaW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcAppbmRleCA3 NzM3ZTdjNGVmODMwMDk3OTUzY2Y4OWU2ZGFjYmVjZTRiZjJmNDYzLi4xNGVmYTdkMWIzZTNkYzBh NWY2MGJmOGM0ODIyNGM2NjE5ODg0NWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RPTVRpbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcApAQCAt MzM1LDE1ICszMzUsOSBAQCB2b2lkIERPTVRpbWVyOjpmaXJlZCgpCiAgICAgICAgIG5lc3RlZFRp bWVycy0+c3RhcnRUcmFja2luZygpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBQ YWdlKiBwYWdlID0gaXM8RG9jdW1lbnQ+KGNvbnRleHQpID8gZG93bmNhc3Q8RG9jdW1lbnQ+KGNv bnRleHQpLnBhZ2UoKSA6IG51bGxwdHI7Ci0gICAgaWYgKHBhZ2UpCi0gICAgICAgIHBhZ2UtPmNv bnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKCp0aGlz KTsKKyAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OkRPTVRpbWVyT2JzZXJ2ZXIgb2JzZXJ2ZXIo aXM8RG9jdW1lbnQ+KGNvbnRleHQpID8gZG93bmNhc3Q8RG9jdW1lbnQ+KGNvbnRleHQpLnBhZ2Uo KSA6IG51bGxwdHIsICp0aGlzKTsKICNlbmRpZgogICAgIG1fYWN0aW9uLT5leGVjdXRlKGNvbnRl eHQpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKHBhZ2UpCi0gICAgICAgIHBh Z2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUo KnRoaXMpOwotI2VuZGlmCiAKICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZpcmVU aW1lcihjb29raWUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250 ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLmNwcAppbmRleCA0NmY4NmY4YWU1OGNmOTFjZGFhMTNjNzdkMGYxNjU0Yjk4 YzJmMDQ2Li42MDRlYWUxZDI4ZTY1NmRhYTBlZTQ1MTViZmVmMmRkMWI5NmFlZmY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAKQEAg LTI3MiwxOCArMjcyLDIxIEBAIHN0YXRpYyBWaXNpYmlsaXR5IGVsZW1lbnRJbXBsaWNpdFZpc2li aWxpdHkoY29uc3QgRWxlbWVudCYgZWxlbWVudCkKICAgICByZXR1cm4gVmlzaWJpbGl0eTo6Vmlz aWJsZTsKIH0KIAotQ29udGVudENoYW5nZU9ic2VydmVyOjpTdHlsZUNoYW5nZTo6U3R5bGVDaGFu Z2UoY29uc3QgRWxlbWVudCYgZWxlbWVudCwgQ29udGVudENoYW5nZU9ic2VydmVyJiBjb250ZW50 Q2hhbmdlT2JzZXJ2ZXIpCi0gICAgOiBtX2VsZW1lbnQoZWxlbWVudCkKLSAgICAsIG1fY29udGVu dENoYW5nZU9ic2VydmVyKGNvbnRlbnRDaGFuZ2VPYnNlcnZlcikKLSAgICAsIG1fcHJldmlvdXNE aXNwbGF5KGVsZW1lbnQucmVuZGVyU3R5bGUoKSA/IGVsZW1lbnQucmVuZGVyU3R5bGUoKS0+ZGlz cGxheSgpIDogRGlzcGxheVR5cGU6Ok5vbmUpCi0gICAgLCBtX3ByZXZpb3VzVmlzaWJpbGl0eShl bGVtZW50LnJlbmRlclN0eWxlKCkgPyBlbGVtZW50LnJlbmRlclN0eWxlKCktPnZpc2liaWxpdHko KSA6IFZpc2liaWxpdHk6OkhpZGRlbikKLSAgICAsIG1fcHJldmlvdXNJbXBsaWNpdFZpc2liaWxp dHkoY29udGVudENoYW5nZU9ic2VydmVyLmlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKSAmJiBj b250ZW50Q2hhbmdlT2JzZXJ2ZXIub2JzZXJ2ZWRDb250ZW50Q2hhbmdlKCkgIT0gV0tDb250ZW50 VmlzaWJpbGl0eUNoYW5nZSA/IGVsZW1lbnRJbXBsaWNpdFZpc2liaWxpdHkoZWxlbWVudCkgOiBW aXNpYmlsaXR5OjpWaXNpYmxlKQoteworQ29udGVudENoYW5nZU9ic2VydmVyOjpTdHlsZUNoYW5n ZU9ic2VydmVyOjpTdHlsZUNoYW5nZU9ic2VydmVyKFBhZ2UqIHBhZ2UsIGNvbnN0IEVsZW1lbnQm IGVsZW1lbnQpCisgICAgOiBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcihwYWdlID8gJnBhZ2UtPmNv bnRlbnRDaGFuZ2VPYnNlcnZlcigpIDogbnVsbHB0cikKKyAgICAsIG1fbmVlZHNPYnNlcnZpbmco bV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIgJiYgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPmlzT2Jz ZXJ2aW5nQ29udGVudENoYW5nZXMoKSAmJiBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci0+b2JzZXJ2 ZWRDb250ZW50Q2hhbmdlKCkgIT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSkKKyAgICAsIG1f ZWxlbWVudChlbGVtZW50KQoreworICAgIGlmIChtX25lZWRzT2JzZXJ2aW5nKSB7CisgICAgICAg IG1fcHJldmlvdXNEaXNwbGF5ID0gZWxlbWVudC5yZW5kZXJTdHlsZSgpID8gZWxlbWVudC5yZW5k ZXJTdHlsZSgpLT5kaXNwbGF5KCkgOiBEaXNwbGF5VHlwZTo6Tm9uZTsKKyAgICAgICAgbV9wcmV2 aW91c1Zpc2liaWxpdHkgPSBlbGVtZW50LnJlbmRlclN0eWxlKCkgPyBlbGVtZW50LnJlbmRlclN0 eWxlKCktPnZpc2liaWxpdHkoKSA6IFZpc2liaWxpdHk6OkhpZGRlbjsKKyAgICAgICAgbV9wcmV2 aW91c0ltcGxpY2l0VmlzaWJpbGl0eSA9IGVsZW1lbnRJbXBsaWNpdFZpc2liaWxpdHkoZWxlbWVu dCk7CisgICAgfQogfQogCi1Db250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxlQ2hhbmdlOjp+U3R5 bGVDaGFuZ2UoKQorQ29udGVudENoYW5nZU9ic2VydmVyOjpTdHlsZUNoYW5nZU9ic2VydmVyOjp+ U3R5bGVDaGFuZ2VPYnNlcnZlcigpCiB7Ci0gICAgaWYgKCFtX2NvbnRlbnRDaGFuZ2VPYnNlcnZl ci5pc09ic2VydmluZ0NvbnRlbnRDaGFuZ2VzKCkpCisgICAgaWYgKCFtX25lZWRzT2JzZXJ2aW5n KQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvKiBzdHlsZSA9IG1fZWxlbWVudC5yZW5kZXJT dHlsZSgpOwpAQCAtMzAzLDggKzMwNiwzNiBAQCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxl Q2hhbmdlOjp+U3R5bGVDaGFuZ2UoKQogICAgIGlmICgobV9wcmV2aW91c0Rpc3BsYXkgPT0gRGlz cGxheVR5cGU6Ok5vbmUgJiYgc3R5bGUtPmRpc3BsYXkoKSAhPSBEaXNwbGF5VHlwZTo6Tm9uZSkK ICAgICAgICAgfHwgKG1fcHJldmlvdXNWaXNpYmlsaXR5ID09IFZpc2liaWxpdHk6OkhpZGRlbiAm JiBzdHlsZS0+dmlzaWJpbGl0eSgpICE9IFZpc2liaWxpdHk6OkhpZGRlbikKICAgICAgICAgfHwg KG1fcHJldmlvdXNJbXBsaWNpdFZpc2liaWxpdHkgPT0gVmlzaWJpbGl0eTo6SGlkZGVuICYmIGVs ZW1lbnRJbXBsaWNpdFZpc2liaWxpdHkobV9lbGVtZW50KSA9PSBWaXNpYmlsaXR5OjpWaXNpYmxl KSkKLSAgICAgICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIuc2V0T2JzZXJ2ZWRDb250ZW50Q2hh bmdlKFdLQ29udGVudFZpc2liaWxpdHlDaGFuZ2UpOworICAgICAgICBtX2NvbnRlbnRDaGFuZ2VP YnNlcnZlci0+c2V0T2JzZXJ2ZWRDb250ZW50Q2hhbmdlKFdLQ29udGVudFZpc2liaWxpdHlDaGFu Z2UpOworfQorCitDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxlUmVjYWxjT2JzZXJ2ZXI6OlN0 eWxlUmVjYWxjT2JzZXJ2ZXIoUGFnZSogcGFnZSkKKyAgICA6IG1fY29udGVudENoYW5nZU9ic2Vy dmVyKHBhZ2UgPyAmcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkgOiBudWxscHRyKQorewor ICAgIGlmIChtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcikKKyAgICAgICAgbV9jb250ZW50Q2hhbmdl T2JzZXJ2ZXItPnN0YXJ0T2JzZXJ2aW5nU3R5bGVSZXNvbHZlKCk7Cit9CisKK0NvbnRlbnRDaGFu Z2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNPYnNlcnZlcjo6flN0eWxlUmVjYWxjT2JzZXJ2ZXIoKQor eworICAgIGlmIChtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcikKKyAgICAgICAgbV9jb250ZW50Q2hh bmdlT2JzZXJ2ZXItPnN0b3BPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKIH0KKworQ29udGVudENo YW5nZU9ic2VydmVyOjpET01UaW1lck9ic2VydmVyOjpET01UaW1lck9ic2VydmVyKFBhZ2UqIHBh Z2UsIGNvbnN0IERPTVRpbWVyJiBkb21UaW1lcikKKyAgICA6IG1fY29udGVudENoYW5nZU9ic2Vy dmVyKHBhZ2UgPyAmcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkgOiBudWxscHRyKQorICAg ICwgbV9kb21UaW1lcihkb21UaW1lcikKK3sKKyAgICBpZiAobV9jb250ZW50Q2hhbmdlT2JzZXJ2 ZXIpCisgICAgICAgIG1fY29udGVudENoYW5nZU9ic2VydmVyLT5zdGFydE9ic2VydmluZ0RPTVRp bWVyRXhlY3V0ZShtX2RvbVRpbWVyKTsKK30KKworQ29udGVudENoYW5nZU9ic2VydmVyOjpET01U aW1lck9ic2VydmVyOjp+RE9NVGltZXJPYnNlcnZlcigpCit7CisgICAgaWYgKG1fY29udGVudENo YW5nZU9ic2VydmVyKQorICAgICAgICBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci0+c3RvcE9ic2Vy dmluZ0RPTVRpbWVyRXhlY3V0ZShtX2RvbVRpbWVyKTsKK30KKwogfQogCiAjZW5kaWYgLy8gUExB VEZPUk0oSU9TX0ZBTUlMWSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0Nv bnRlbnRDaGFuZ2VPYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLmgKaW5kZXggZDY3OTVkZjY5ZDczNjJjZTM2NzBmNzI1MWNjYzUyMjg2YzRl Y2RmNy4uMzllM2EyY2RkMTU0MjEyNDRhZTA4YjJkODA0ODFkMWU0MjRhMzFkZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmgKQEAgLTM4LDM3 ICszOCw1NiBAQCBjbGFzcyBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIgewogcHVibGljOgogICAgIENv bnRlbnRDaGFuZ2VPYnNlcnZlcihQYWdlJik7CiAKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0 YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHN0 b3BPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOworICAgIFdFQkNPUkVfRVhQT1JUIFdLQ29udGVu dENoYW5nZSBvYnNlcnZlZENvbnRlbnRDaGFuZ2UoKTsKKwogICAgIHZvaWQgZGlkSW5zdGFsbERP TVRpbWVyKGNvbnN0IERPTVRpbWVyJiwgU2Vjb25kcyB0aW1lb3V0LCBib29sIHNpbmdsZVNob3Qp OwogICAgIHZvaWQgcmVtb3ZlRE9NVGltZXIoY29uc3QgRE9NVGltZXImKTsKLSAgICB2b2lkIHN0 YXJ0T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERPTVRpbWVyJik7Ci0gICAgdm9pZCBz dG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERPTVRpbWVyJik7CiAKICAgICB2b2lk IGRpZFNjaGVkdWxlU3R5bGVSZWNhbGMoKTsKLSAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nU3R5bGVS ZXNvbHZlKCk7Ci0gICAgdm9pZCBzdG9wT2JzZXJ2aW5nU3R5bGVSZXNvbHZlKCk7CiAKICAgICB2 b2lkIGRpZFN1c3BlbmRBY3RpdmVET01PYmplY3RzKCk7CiAgICAgdm9pZCB3aWxsRGV0YWNoUGFn ZSgpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdGFydE9ic2VydmluZ0NvbnRlbnRDaGFu Z2VzKCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzdG9wT2JzZXJ2aW5nQ29udGVudENoYW5n ZXMoKTsKLQotICAgIFdFQkNPUkVfRVhQT1JUIFdLQ29udGVudENoYW5nZSBvYnNlcnZlZENvbnRl bnRDaGFuZ2UoKTsKLQotICAgIGNsYXNzIFN0eWxlQ2hhbmdlIHsKKyAgICBjbGFzcyBTdHlsZUNo YW5nZU9ic2VydmVyIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFN0eWxlQ2hhbmdlKGNvbnN0IEVs ZW1lbnQmLCBDb250ZW50Q2hhbmdlT2JzZXJ2ZXImKTsKLSAgICAgICAgflN0eWxlQ2hhbmdlKCk7 CisgICAgICAgIFN0eWxlQ2hhbmdlT2JzZXJ2ZXIoUGFnZSosIGNvbnN0IEVsZW1lbnQmKTsKKyAg ICAgICAgflN0eWxlQ2hhbmdlT2JzZXJ2ZXIoKTsKIAogICAgIHByaXZhdGU6CisgICAgICAgIENv bnRlbnRDaGFuZ2VPYnNlcnZlciogbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIgeyBudWxscHRyIH07 CisgICAgICAgIGJvb2wgbV9uZWVkc09ic2VydmluZyB7IGZhbHNlIH07CiAgICAgICAgIGNvbnN0 IEVsZW1lbnQmIG1fZWxlbWVudDsKLSAgICAgICAgQ29udGVudENoYW5nZU9ic2VydmVyJiBtX2Nv bnRlbnRDaGFuZ2VPYnNlcnZlcjsKICAgICAgICAgRGlzcGxheVR5cGUgbV9wcmV2aW91c0Rpc3Bs YXk7CiAgICAgICAgIFZpc2liaWxpdHkgbV9wcmV2aW91c1Zpc2liaWxpdHk7CiAgICAgICAgIFZp c2liaWxpdHkgbV9wcmV2aW91c0ltcGxpY2l0VmlzaWJpbGl0eTsKICAgICB9OwogCisgICAgY2xh c3MgU3R5bGVSZWNhbGNPYnNlcnZlciB7CisgICAgcHVibGljOgorICAgICAgICBTdHlsZVJlY2Fs Y09ic2VydmVyKFBhZ2UqKTsKKyAgICAgICAgflN0eWxlUmVjYWxjT2JzZXJ2ZXIoKTsKKyAgICBw cml2YXRlOgorICAgICAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIqIG1fY29udGVudENoYW5nZU9i c2VydmVyIHsgbnVsbHB0ciB9OworICAgIH07CisKKyAgICBjbGFzcyBET01UaW1lck9ic2VydmVy IHsKKyAgICBwdWJsaWM6CisgICAgICAgIERPTVRpbWVyT2JzZXJ2ZXIoUGFnZSosIGNvbnN0IERP TVRpbWVyJik7CisgICAgICAgIH5ET01UaW1lck9ic2VydmVyKCk7CisgICAgcHJpdmF0ZToKKyAg ICAgICAgQ29udGVudENoYW5nZU9ic2VydmVyKiBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlciB7IG51 bGxwdHIgfTsKKyAgICAgICAgY29uc3QgRE9NVGltZXImIG1fZG9tVGltZXI7CisgICAgfTsKKwog cHJpdmF0ZToKKyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERP TVRpbWVyJik7CisgICAgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRlKGNvbnN0IERP TVRpbWVyJik7CisKKyAgICB2b2lkIHN0YXJ0T2JzZXJ2aW5nU3R5bGVSZXNvbHZlKCk7CisgICAg dm9pZCBzdG9wT2JzZXJ2aW5nU3R5bGVSZXNvbHZlKCk7CisKICAgICB2b2lkIHN0YXJ0T2JzZXJ2 aW5nRE9NVGltZXJTY2hlZHVsaW5nKCk7CiAgICAgdm9pZCBzdG9wT2JzZXJ2aW5nRE9NVGltZXJT Y2hlZHVsaW5nKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlVXBkYXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBk YXRpbmcvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCmluZGV4IDllZjlmNjE5NmY2MDRlYTkzNzdmMjI4 OGE0ZjY3NjVlZmMyMDQwYTMuLmYzZDNmMGM2MWMzOWI0YTEwOTUyYjNlNjZmNTEwNDg0NTI0YmUy MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlVXBkYXRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVVcGRhdGVyLmNwcApAQCAtMjkzLDcgKzI5Myw3IEBAIHZvaWQgUmVuZGVyVHJlZVVw ZGF0ZXI6OnVwZGF0ZVJlbmRlcmVyU3R5bGUoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIFJlbmRl clN0eWxlCiB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjp1cGRhdGVFbGVtZW50UmVuZGVyZXIoRWxl bWVudCYgZWxlbWVudCwgY29uc3QgU3R5bGU6OkVsZW1lbnRVcGRhdGUmIHVwZGF0ZSkKIHsKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVD aGFuZ2UgY2hlY2tGb3JTdHlsZUNoYW5nZShlbGVtZW50LCBtX2RvY3VtZW50LnBhZ2UoKS0+Y29u dGVudENoYW5nZU9ic2VydmVyKCkpOworICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVD aGFuZ2VPYnNlcnZlciBvYnNlcnZlcihtX2RvY3VtZW50LnBhZ2UoKSwgZWxlbWVudCk7CiAjZW5k aWYKIAogICAgIGJvb2wgc2hvdWxkVGVhckRvd25SZW5kZXJlcnMgPSB1cGRhdGUuY2hhbmdlID09 IFN0eWxlOjpEZXRhY2ggJiYgKGVsZW1lbnQucmVuZGVyZXIoKSB8fCBlbGVtZW50Lmhhc0Rpc3Bs YXlDb250ZW50cygpKTsK 363263 2019-02-28 14:51:12 -0800 2019-02-28 15:18:11 -0800 Patch bug-195172-20190228145111.patch text/plain 10776 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTJlNmZjYjgxMmQyN2Qw OTk0ZGYxYWYzYzljNjNiM2Y0ZDNmODE3Ny4uZjlmM2Q0ZmRhYTI5MDA0YjQ0YTQ1MWU3OTQ4MDI0 NmQwOWRkY2NiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAyLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gSW50cm9kdWNlIG9ic2VydmVyIHN1YmNsYXNzZXMgdG8gc2NvcGUgY29udGVudCBjaGFu Z2Ugb2JzZXJ2aW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk1MTcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODQ3OTI1OT4KKworICAgICAg ICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgTGV0J3Mgc2NvcGUgc3RhcnQv c3RvcE9ic2VydmluZyBjYWxsIHBhaXJzLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVTdHlsZUlmTmVlZGVkKToKKyAgICAg ICAgKiBwYWdlL0RPTVRpbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVRpbWVyOjpmaXJl ZCk6CisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2VydmVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2VPYnNlcnZlcjo6 U3R5bGVDaGFuZ2VPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2Jz ZXJ2ZXI6OlN0eWxlQ2hhbmdlT2JzZXJ2ZXI6On5TdHlsZUNoYW5nZU9ic2VydmVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNPYnNlcnZlcjo6 U3R5bGVSZWNhbGNPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2Jz ZXJ2ZXI6OlN0eWxlUmVjYWxjT2JzZXJ2ZXI6On5TdHlsZVJlY2FsY09ic2VydmVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6RE9NVGltZXJPYnNlcnZlcjo6RE9N VGltZXJPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6 OkRPTVRpbWVyT2JzZXJ2ZXI6On5ET01UaW1lck9ic2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2U6OlN0eWxlQ2hhbmdlKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2U6 On5TdHlsZUNoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICogcGFnZS9pb3MvQ29udGVudENoYW5n ZU9ic2VydmVyLmg6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRh dGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVVcGRhdGVyOjp1cGRhdGVFbGVt ZW50UmVuZGVyZXIpOgorCiAyMDE5LTAyLTI4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNlcnZlcl0gTWFrZSBvYnNlcnZlZCBzdGF0 ZSByZXNldCBleHBsaWNpdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDY2MDBlNGM5N2Zk ZGQwMGIxYjUzNTQ1OWJlNjI2NmNkYmVkODg1MDYuLjZiNmYwY2VhOThkYmJkYzRiYmJkNGVjOWZh ZTUyMzdhMzE4NjA0YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMjA1NSwxOCArMjA1 NSwxMSBAQCBib29sIERvY3VtZW50Ojp1cGRhdGVTdHlsZUlmTmVlZGVkKCkKICAgICB9CiAKICNp ZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIGlmIChhdXRvKiBwYWdlID0gdGhpcy0+cGFnZSgp KQotICAgICAgICBwYWdlLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKS5zdGFydE9ic2VydmluZ1N0 eWxlUmVzb2x2ZSgpOworICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNTY29w ZSBvYnNlcnZpbmdTY29wZShwYWdlKCkpOwogI2VuZGlmCiAgICAgLy8gVGhlIGVhcmx5IGV4aXQg YWJvdmUgZm9yICFuZWVkc1N0eWxlUmVjYWxjKCkgaXMgbmVlZGVkIHdoZW4gdXBkYXRlV2lkZ2V0 UG9zaXRpb25zKCkgaXMgY2FsbGVkIGluIHJ1bk9yU2NoZWR1bGVBc3luY2hyb25vdXNUYXNrcygp LgogICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaXNTYWZlVG9V cGRhdGVTdHlsZU9yTGF5b3V0KCp0aGlzKSk7Ci0KICAgICByZXNvbHZlU3R5bGUoKTsKLQotI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgaWYgKGF1dG8qIHBhZ2UgPSB0aGlzLT5wYWdlKCkp Ci0gICAgICAgIHBhZ2UtPmNvbnRlbnRDaGFuZ2VPYnNlcnZlcigpLnN0b3BPYnNlcnZpbmdTdHls ZVJlc29sdmUoKTsKLSNlbmRpZgogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVRpbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9N VGltZXIuY3BwCmluZGV4IDc3MzdlN2M0ZWY4MzAwOTc5NTNjZjg5ZTZkYWNiZWNlNGJmMmY0NjMu LmM4YTMxM2RjNDA3ZDQyOTJmOWYyODIxODRmNWVjNzA0YjA3YmVjODcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRE9NVGltZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RE9NVGltZXIuY3BwCkBAIC0zMzUsMTUgKzMzNSw5IEBAIHZvaWQgRE9NVGltZXI6OmZpcmVkKCkK ICAgICAgICAgbmVzdGVkVGltZXJzLT5zdGFydFRyYWNraW5nKCk7CiAKICNpZiBQTEFURk9STShJ T1NfRkFNSUxZKQotICAgIFBhZ2UqIHBhZ2UgPSBpczxEb2N1bWVudD4oY29udGV4dCkgPyBkb3du Y2FzdDxEb2N1bWVudD4oY29udGV4dCkucGFnZSgpIDogbnVsbHB0cjsKLSAgICBpZiAocGFnZSkK LSAgICAgICAgcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkuc3RhcnRPYnNlcnZpbmdET01U aW1lckV4ZWN1dGUoKnRoaXMpOworICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6RE9NVGltZXJT Y29wZSBvYnNlcnZpbmdTY29wZShpczxEb2N1bWVudD4oY29udGV4dCkgPyBkb3duY2FzdDxEb2N1 bWVudD4oY29udGV4dCkucGFnZSgpIDogbnVsbHB0ciwgKnRoaXMpOwogI2VuZGlmCiAgICAgbV9h Y3Rpb24tPmV4ZWN1dGUoY29udGV4dCk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBp ZiAocGFnZSkKLSAgICAgICAgcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkuc3RvcE9ic2Vy dmluZ0RPTVRpbWVyRXhlY3V0ZSgqdGhpcyk7Ci0jZW5kaWYKIAogICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkRmlyZVRpbWVyKGNvb2tpZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRDaGFuZ2VPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuY3BwCmluZGV4IGZjZmE2ODM2NzFiZTU3 YTlhOGRiMDZkNGUxZmZmNGIwYWQ0NjQ0MjMuLjhhZWZkYjE1YzgxOGNlOTI2ODdhOWNmNjEzMThl MjkwZTRmZjJhMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0NvbnRlbnRD aGFuZ2VPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENo YW5nZU9ic2VydmVyLmNwcApAQCAtMjc3LDE4ICsyNzcsMjEgQEAgc3RhdGljIFZpc2liaWxpdHkg ZWxlbWVudEltcGxpY2l0VmlzaWJpbGl0eShjb25zdCBFbGVtZW50JiBlbGVtZW50KQogICAgIHJl dHVybiBWaXNpYmlsaXR5OjpWaXNpYmxlOwogfQogCi1Db250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0 eWxlQ2hhbmdlOjpTdHlsZUNoYW5nZShjb25zdCBFbGVtZW50JiBlbGVtZW50LCBDb250ZW50Q2hh bmdlT2JzZXJ2ZXImIGNvbnRlbnRDaGFuZ2VPYnNlcnZlcikKLSAgICA6IG1fZWxlbWVudChlbGVt ZW50KQotICAgICwgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoY29udGVudENoYW5nZU9ic2VydmVy KQotICAgICwgbV9wcmV2aW91c0Rpc3BsYXkoZWxlbWVudC5yZW5kZXJTdHlsZSgpID8gZWxlbWVu dC5yZW5kZXJTdHlsZSgpLT5kaXNwbGF5KCkgOiBEaXNwbGF5VHlwZTo6Tm9uZSkKLSAgICAsIG1f cHJldmlvdXNWaXNpYmlsaXR5KGVsZW1lbnQucmVuZGVyU3R5bGUoKSA/IGVsZW1lbnQucmVuZGVy U3R5bGUoKS0+dmlzaWJpbGl0eSgpIDogVmlzaWJpbGl0eTo6SGlkZGVuKQotICAgICwgbV9wcmV2 aW91c0ltcGxpY2l0VmlzaWJpbGl0eShjb250ZW50Q2hhbmdlT2JzZXJ2ZXIuaXNPYnNlcnZpbmdD b250ZW50Q2hhbmdlcygpICYmIGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5vYnNlcnZlZENvbnRlbnRD aGFuZ2UoKSAhPSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlID8gZWxlbWVudEltcGxpY2l0Vmlz aWJpbGl0eShlbGVtZW50KSA6IFZpc2liaWxpdHk6OlZpc2libGUpCi17CitDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OlN0eWxlQ2hhbmdlU2NvcGU6OlN0eWxlQ2hhbmdlU2NvcGUoUGFnZSogcGFnZSwg Y29uc3QgRWxlbWVudCYgZWxlbWVudCkKKyAgICA6IG1fY29udGVudENoYW5nZU9ic2VydmVyKHBh Z2UgPyAmcGFnZS0+Y29udGVudENoYW5nZU9ic2VydmVyKCkgOiBudWxscHRyKQorICAgICwgbV9l bGVtZW50KGVsZW1lbnQpCisgICAgLCBtX25lZWRzT2JzZXJ2aW5nKG1fY29udGVudENoYW5nZU9i c2VydmVyICYmIG1fY29udGVudENoYW5nZU9ic2VydmVyLT5pc09ic2VydmluZ0NvbnRlbnRDaGFu Z2VzKCkgJiYgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPm9ic2VydmVkQ29udGVudENoYW5nZSgp ICE9IFdLQ29udGVudFZpc2liaWxpdHlDaGFuZ2UpCit7CisgICAgaWYgKG1fbmVlZHNPYnNlcnZp bmcpIHsKKyAgICAgICAgbV9wcmV2aW91c0Rpc3BsYXkgPSBlbGVtZW50LnJlbmRlclN0eWxlKCkg PyBlbGVtZW50LnJlbmRlclN0eWxlKCktPmRpc3BsYXkoKSA6IERpc3BsYXlUeXBlOjpOb25lOwor ICAgICAgICBtX3ByZXZpb3VzVmlzaWJpbGl0eSA9IGVsZW1lbnQucmVuZGVyU3R5bGUoKSA/IGVs ZW1lbnQucmVuZGVyU3R5bGUoKS0+dmlzaWJpbGl0eSgpIDogVmlzaWJpbGl0eTo6SGlkZGVuOwor ICAgICAgICBtX3ByZXZpb3VzSW1wbGljaXRWaXNpYmlsaXR5ID0gZWxlbWVudEltcGxpY2l0Vmlz aWJpbGl0eShlbGVtZW50KTsKKyAgICB9CiB9CiAKLUNvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5 bGVDaGFuZ2U6On5TdHlsZUNoYW5nZSgpCitDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OlN0eWxlQ2hh bmdlU2NvcGU6On5TdHlsZUNoYW5nZVNjb3BlKCkKIHsKLSAgICBpZiAoIW1fY29udGVudENoYW5n ZU9ic2VydmVyLmlzT2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKSkKKyAgICBpZiAoIW1fbmVlZHNP YnNlcnZpbmcpCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8qIHN0eWxlID0gbV9lbGVtZW50 LnJlbmRlclN0eWxlKCk7CkBAIC0zMDgsOCArMzExLDM2IEBAIENvbnRlbnRDaGFuZ2VPYnNlcnZl cjo6U3R5bGVDaGFuZ2U6On5TdHlsZUNoYW5nZSgpCiAgICAgaWYgKChtX3ByZXZpb3VzRGlzcGxh eSA9PSBEaXNwbGF5VHlwZTo6Tm9uZSAmJiBzdHlsZS0+ZGlzcGxheSgpICE9IERpc3BsYXlUeXBl OjpOb25lKQogICAgICAgICB8fCAobV9wcmV2aW91c1Zpc2liaWxpdHkgPT0gVmlzaWJpbGl0eTo6 SGlkZGVuICYmIHN0eWxlLT52aXNpYmlsaXR5KCkgIT0gVmlzaWJpbGl0eTo6SGlkZGVuKQogICAg ICAgICB8fCAobV9wcmV2aW91c0ltcGxpY2l0VmlzaWJpbGl0eSA9PSBWaXNpYmlsaXR5OjpIaWRk ZW4gJiYgZWxlbWVudEltcGxpY2l0VmlzaWJpbGl0eShtX2VsZW1lbnQpID09IFZpc2liaWxpdHk6 OlZpc2libGUpKQotICAgICAgICBtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlci5zZXRPYnNlcnZlZENv bnRlbnRDaGFuZ2UoV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSk7CisgICAgICAgIG1fY29udGVu dENoYW5nZU9ic2VydmVyLT5zZXRPYnNlcnZlZENvbnRlbnRDaGFuZ2UoV0tDb250ZW50VmlzaWJp bGl0eUNoYW5nZSk7Cit9CisKK0NvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVSZWNhbGNTY29w ZTo6U3R5bGVSZWNhbGNTY29wZShQYWdlKiBwYWdlKQorICAgIDogbV9jb250ZW50Q2hhbmdlT2Jz ZXJ2ZXIocGFnZSA/ICZwYWdlLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSA6IG51bGxwdHIpCit7 CisgICAgaWYgKG1fY29udGVudENoYW5nZU9ic2VydmVyKQorICAgICAgICBtX2NvbnRlbnRDaGFu Z2VPYnNlcnZlci0+c3RhcnRPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKK30KKworQ29udGVudENo YW5nZU9ic2VydmVyOjpTdHlsZVJlY2FsY1Njb3BlOjp+U3R5bGVSZWNhbGNTY29wZSgpCit7Cisg ICAgaWYgKG1fY29udGVudENoYW5nZU9ic2VydmVyKQorICAgICAgICBtX2NvbnRlbnRDaGFuZ2VP YnNlcnZlci0+c3RvcE9ic2VydmluZ1N0eWxlUmVzb2x2ZSgpOwogfQorCitDb250ZW50Q2hhbmdl T2JzZXJ2ZXI6OkRPTVRpbWVyU2NvcGU6OkRPTVRpbWVyU2NvcGUoUGFnZSogcGFnZSwgY29uc3Qg RE9NVGltZXImIGRvbVRpbWVyKQorICAgIDogbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIocGFnZSA/ ICZwYWdlLT5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSA6IG51bGxwdHIpCisgICAgLCBtX2RvbVRp bWVyKGRvbVRpbWVyKQoreworICAgIGlmIChtX2NvbnRlbnRDaGFuZ2VPYnNlcnZlcikKKyAgICAg ICAgbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXItPnN0YXJ0T2JzZXJ2aW5nRE9NVGltZXJFeGVjdXRl KG1fZG9tVGltZXIpOworfQorCitDb250ZW50Q2hhbmdlT2JzZXJ2ZXI6OkRPTVRpbWVyU2NvcGU6 On5ET01UaW1lclNjb3BlKCkKK3sKKyAgICBpZiAobV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIpCisg ICAgICAgIG1fY29udGVudENoYW5nZU9ic2VydmVyLT5zdG9wT2JzZXJ2aW5nRE9NVGltZXJFeGVj dXRlKG1fZG9tVGltZXIpOworfQorCiB9CiAKICNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZ KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvQ29udGVudENoYW5nZU9ic2Vy dmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApp bmRleCBmYzg3ZDgzYjM1ZmI5YTg2MTNhMWYyOTNiYmJmYzAzZmQzMDliYzk3Li44YzQ4NmY0Mzkx ODRiODNmOGQ3ZTg1NjU5MTlmNjI0MTA3YjMzNGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2lvcy9Db250ZW50Q2hhbmdlT2JzZXJ2ZXIuaApAQCAtMzgsNDAgKzM4LDU4IEBAIGNsYXNz IENvbnRlbnRDaGFuZ2VPYnNlcnZlciB7CiBwdWJsaWM6CiAgICAgQ29udGVudENoYW5nZU9ic2Vy dmVyKFBhZ2UmKTsKIAorICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RhcnRPYnNlcnZpbmdDb250 ZW50Q2hhbmdlcygpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc3RvcE9ic2VydmluZ0NvbnRl bnRDaGFuZ2VzKCk7CisgICAgV0VCQ09SRV9FWFBPUlQgV0tDb250ZW50Q2hhbmdlIG9ic2VydmVk Q29udGVudENoYW5nZSgpOworCiAgICAgdm9pZCBkaWRJbnN0YWxsRE9NVGltZXIoY29uc3QgRE9N VGltZXImLCBTZWNvbmRzIHRpbWVvdXQsIGJvb2wgc2luZ2xlU2hvdCk7CiAgICAgdm9pZCByZW1v dmVET01UaW1lcihjb25zdCBET01UaW1lciYpOwotICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdET01U aW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXImKTsKLSAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01U aW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXImKTsKIAogICAgIHZvaWQgZGlkU2NoZWR1bGVTdHls ZVJlY2FsYygpOwotICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKLSAgICB2 b2lkIHN0b3BPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKLQogICAgIHZvaWQgZGlkU3VzcGVuZEFj dGl2ZURPTU9iamVjdHMoKTsKICAgICB2b2lkIHdpbGxEZXRhY2hQYWdlKCk7CiAKLSAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHN0YXJ0T2JzZXJ2aW5nQ29udGVudENoYW5nZXMoKTsKLSAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHN0b3BPYnNlcnZpbmdDb250ZW50Q2hhbmdlcygpOwotCi0gICAgV0VC Q09SRV9FWFBPUlQgV0tDb250ZW50Q2hhbmdlIG9ic2VydmVkQ29udGVudENoYW5nZSgpOwotCi0g ICAgY2xhc3MgU3R5bGVDaGFuZ2UgeworICAgIGNsYXNzIFN0eWxlQ2hhbmdlU2NvcGUgewogICAg IHB1YmxpYzoKLSAgICAgICAgU3R5bGVDaGFuZ2UoY29uc3QgRWxlbWVudCYsIENvbnRlbnRDaGFu Z2VPYnNlcnZlciYpOwotICAgICAgICB+U3R5bGVDaGFuZ2UoKTsKKyAgICAgICAgU3R5bGVDaGFu Z2VTY29wZShQYWdlKiwgY29uc3QgRWxlbWVudCYpOworICAgICAgICB+U3R5bGVDaGFuZ2VTY29w ZSgpOwogCiAgICAgcHJpdmF0ZToKKyAgICAgICAgQ29udGVudENoYW5nZU9ic2VydmVyKiBtX2Nv bnRlbnRDaGFuZ2VPYnNlcnZlciB7IG51bGxwdHIgfTsKICAgICAgICAgY29uc3QgRWxlbWVudCYg bV9lbGVtZW50OwotICAgICAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXImIG1fY29udGVudENoYW5n ZU9ic2VydmVyOworICAgICAgICBib29sIG1fbmVlZHNPYnNlcnZpbmcgeyBmYWxzZSB9OwogICAg ICAgICBEaXNwbGF5VHlwZSBtX3ByZXZpb3VzRGlzcGxheTsKICAgICAgICAgVmlzaWJpbGl0eSBt X3ByZXZpb3VzVmlzaWJpbGl0eTsKICAgICAgICAgVmlzaWJpbGl0eSBtX3ByZXZpb3VzSW1wbGlj aXRWaXNpYmlsaXR5OwogICAgIH07CiAKKyAgICBjbGFzcyBTdHlsZVJlY2FsY1Njb3BlIHsKKyAg ICBwdWJsaWM6CisgICAgICAgIFN0eWxlUmVjYWxjU2NvcGUoUGFnZSopOworICAgICAgICB+U3R5 bGVSZWNhbGNTY29wZSgpOworICAgIHByaXZhdGU6CisgICAgICAgIENvbnRlbnRDaGFuZ2VPYnNl cnZlciogbV9jb250ZW50Q2hhbmdlT2JzZXJ2ZXIgeyBudWxscHRyIH07CisgICAgfTsKKworICAg IGNsYXNzIERPTVRpbWVyU2NvcGUgeworICAgIHB1YmxpYzoKKyAgICAgICAgRE9NVGltZXJTY29w ZShQYWdlKiwgY29uc3QgRE9NVGltZXImKTsKKyAgICAgICAgfkRPTVRpbWVyU2NvcGUoKTsKKyAg ICBwcml2YXRlOgorICAgICAgICBDb250ZW50Q2hhbmdlT2JzZXJ2ZXIqIG1fY29udGVudENoYW5n ZU9ic2VydmVyIHsgbnVsbHB0ciB9OworICAgICAgICBjb25zdCBET01UaW1lciYgbV9kb21UaW1l cjsKKyAgICB9OworCiBwcml2YXRlOgogICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lclNj aGVkdWxpbmcoKTsKICAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lclNjaGVkdWxpbmcoKTsK IAorICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXIm KTsKKyAgICB2b2lkIHN0b3BPYnNlcnZpbmdET01UaW1lckV4ZWN1dGUoY29uc3QgRE9NVGltZXIm KTsKKworICAgIHZvaWQgc3RhcnRPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKKyAgICB2b2lkIHN0 b3BPYnNlcnZpbmdTdHlsZVJlc29sdmUoKTsKKwogICAgIHZvaWQgYWRkT2JzZXJ2ZWRET01UaW1l cihjb25zdCBET01UaW1lciYpOwogICAgIGJvb2wgaXNPYnNlcnZpbmdET01UaW1lclNjaGVkdWxp bmcoKTsKICAgICB2b2lkIHJlbW92ZU9ic2VydmVkRE9NVGltZXIoY29uc3QgRE9NVGltZXImKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVl VXBkYXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZVVwZGF0ZXIuY3BwCmluZGV4IDllZjlmNjE5NmY2MDRlYTkzNzdmMjI4OGE0ZjY3NjVlZmMyMDQw YTMuLmM1ZjQzNTA5YjVjMDUxNjQwZTljODc0NTljYjVlOTg5MzFmYmQ3ZTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlVXBkYXRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVVcGRhdGVy LmNwcApAQCAtMjkzLDcgKzI5Myw3IEBAIHZvaWQgUmVuZGVyVHJlZVVwZGF0ZXI6OnVwZGF0ZVJl bmRlcmVyU3R5bGUoUmVuZGVyRWxlbWVudCYgcmVuZGVyZXIsIFJlbmRlclN0eWxlCiB2b2lkIFJl bmRlclRyZWVVcGRhdGVyOjp1cGRhdGVFbGVtZW50UmVuZGVyZXIoRWxlbWVudCYgZWxlbWVudCwg Y29uc3QgU3R5bGU6OkVsZW1lbnRVcGRhdGUmIHVwZGF0ZSkKIHsKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQotICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2UgY2hlY2tGb3JT dHlsZUNoYW5nZShlbGVtZW50LCBtX2RvY3VtZW50LnBhZ2UoKS0+Y29udGVudENoYW5nZU9ic2Vy dmVyKCkpOworICAgIENvbnRlbnRDaGFuZ2VPYnNlcnZlcjo6U3R5bGVDaGFuZ2VTY29wZSBvYnNl cnZpbmdTY29wZShtX2RvY3VtZW50LnBhZ2UoKSwgZWxlbWVudCk7CiAjZW5kaWYKIAogICAgIGJv b2wgc2hvdWxkVGVhckRvd25SZW5kZXJlcnMgPSB1cGRhdGUuY2hhbmdlID09IFN0eWxlOjpEZXRh Y2ggJiYgKGVsZW1lbnQucmVuZGVyZXIoKSB8fCBlbGVtZW50Lmhhc0Rpc3BsYXlDb250ZW50cygp KTsK