187997 2018-07-25 04:17:29 -0700 [WPE] Switch ViewBackend to using wpe_view_backend_exportable_fdo_egl APIs 2018-07-25 06:27:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan aperez cgarcia clopez ews-watchlist webkit-bug-importer oldest_to_newest 1444994 0 zan 2018-07-25 04:17:29 -0700 [WPE] Switch ViewBackend to using wpe_view_backend_exportable_fdo_egl APIs 1444996 1 345752 zan 2018-07-25 04:29:05 -0700 Created attachment 345752 Patch 1444997 2 345752 cgarcia 2018-07-25 04:37:39 -0700 Comment on attachment 345752 Patch Thanks! 1444998 3 cgarcia 2018-07-25 04:38:47 -0700 I think we should fix wpe_view_backend_exportable_fdo_create() in any case, or remove it. 1444999 4 345752 aperez 2018-07-25 04:45:19 -0700 Comment on attachment 345752 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345752&action=review Just one small nit, informal r+ otherwise. > Tools/flatpak/org.webkit.WPE.yaml:44 > + - /app/webkit/Tools/Scripts/build-webkit --wpe --prefix=/app Probably your text editor added the newline at the end of file automatically. This is unrelated to the rest of the patch. 1445010 5 345756 zan 2018-07-25 06:23:30 -0700 Created attachment 345756 Patch for landing 1445011 6 345756 zan 2018-07-25 06:26:08 -0700 Comment on attachment 345756 Patch for landing Clearing flags on attachment: 345756 Committed r234193: <https://trac.webkit.org/changeset/234193> 1445012 7 zan 2018-07-25 06:26:11 -0700 All reviewed patches have been landed. Closing bug. 1445013 8 webkit-bug-importer 2018-07-25 06:27:20 -0700 <rdar://problem/42580553> 345752 2018-07-25 04:29:05 -0700 2018-07-25 06:23:27 -0700 Patch bug-187997-20180725132904.patch text/plain 17935 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MTkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBlY2MyYTJiYWJkZWUwZDVhZjQzYTdmNTM5ZmEzNzI2 YWFkYTE3My4uYWQ2MTQ5ODcxMjg5NzlkZGIwYWExZDFmZDcyMGVjYzgzZTRmMDlkMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0 IEBACisyMDE4LTA3LTI1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbV1BFXSBTd2l0Y2ggVmlld0JhY2tlbmQgdG8gdXNpbmcgd3BlX3ZpZXdfYmFja2Vu ZF9leHBvcnRhYmxlX2Zkb19lZ2wgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg3OTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW5zdGVhZCBvZiB0aGUgcmF3IHdwZV92aWV3X2JhY2tlbmRfZXhw b3J0YWJsZV9mZG8gQVBJLCBzd2l0Y2ggdG8gdXNpbmcKKyAgICAgICAgdGhlIEVHTC1vcmllbnRl ZCBBUEkgdGhhdCBzaW1wbHkgc2VydmVzIEVHTEltYWdlS0hSIG9iamVjdHMgaW5zdGVhZCBvZgor ICAgICAgICByYXcgYnVmZmVyIHJlc291cmNlcy4gVGhpcyBhbGxvd3MgdXMgbm90IHRvIHdyYW5n bGUgd2l0aCBjcmVhdGluZyBhbmQKKyAgICAgICAgbWFuYWdpbmcgbGlmZXRpbWUgb2YgdGhlIHNh bWUgRUdMSW1hZ2VLSFIgYnkgb3Vyc2VsdmVzLgorCisgICAgICAgIFZpZXdCYWNrZW5kIG5vdyBk ZWZpbmVzIGEgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19lZ2xfY2xpZW50CisgICAg ICAgIHN0cnVjdCBhbmQgdXNlcyB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVfZmRvX2VnbF9j cmVhdGUoKSB0byBjcmVhdGUKKyAgICAgICAgdGhlIGV4cG9ydGFibGUgb2JqZWN0LiBUaGlzIG1l YW5zIHRoYXQgZm9yIGVhY2ggZnJhbWUgd2UncmUgc2VydmVkIGFuCisgICAgICAgIEVHTEltYWdl S0hSIG9iamVjdCB0aGF0IGlzIHBhc3NlZCBvbiB0byB0aGUgZGlzcGxheUJ1ZmZlcigpCisgICAg ICAgIGltcGxlbWVudGF0aW9uLgorCisgICAgICAgIEhlYWRsZXNzVmlld0JhY2tlbmQgbm93IGp1 c3QgbWFuYWdlcyB0aGUgcGVuZGluZyBhbmQgY29tbWl0dGVkIGltYWdlCisgICAgICAgIG9iamVj dHMuIFdpZHRoIGFuZCBoZWlnaHQgdmFsdWVzIHVzZWQgZHVyaW5nIHBpeGVsIGRhdGEgcmV0cmll dmFsIGFyZQorICAgICAgICBnYXRoZXJlZCBmcm9tIHRoZSBWaWV3QmFja2VuZCdzIHNpemUgdGhh dCB3YXMgc3BlY2lmaWVkIHdoZW4KKyAgICAgICAgY29uc3RydWN0ZWQuCisKKyAgICAgICAgV2lu ZG93Vmlld0JhY2tlbmQgc2ltaWxhcmx5IG9ubHkgbWFuYWdlcyB0aGUgY29tbWl0dGVkIGltYWdl IG9iamVjdCwKKyAgICAgICAgbm90IGhhdmluZyB0byBjcmVhdGUgYW4gZXF1aXZhbGVudCBFR0xJ bWFnZUtIUiBvYmplY3QgZnJvbSB0aGUgcmF3CisgICAgICAgIGJ1ZmZlciByZXNvdXJjZSBhbnlt b3JlLgorCisgICAgICAgIFVudXNlZCBFR0wgZW50cnlwb2ludHMgaW4gYm90aCBIZWFkbGVzc1Zp ZXdCYWNrZW5kIGFuZCBXaW5kb3dWaWV3QmFja2VuZAorICAgICAgICBjbGFzc2VzIGFyZSByZW1v dmVkLCBhbmQgZGVzdHJ1Y3RvcnMgZm9yIGJvdGggY2xhc3NlcyBhcmUgbWFkZSB2aXJ0dWFsLgor CisgICAgICAgIFRoZSBXUEVCYWNrZW5kLWZkbyB2ZXJzaW9uIGlzIGJ1bXBlZCBpbiBvcmRlciB0 byBoYXZlIHRoZSBFR0wtc3BlY2lmaWMKKyAgICAgICAgZXhwb3J0IEFQSSBhdmFpbGFibGUuCisK KyAgICAgICAgKiBmbGF0cGFrL29yZy53ZWJraXQuV1BFLnlhbWw6CisgICAgICAgICogd3BlL2Jh Y2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuY3BwOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tl bmRzOjpIZWFkbGVzc1ZpZXdCYWNrZW5kOjpIZWFkbGVzc1ZpZXdCYWNrZW5kKToKKyAgICAgICAg KFdQRVRvb2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZDo6fkhlYWRsZXNzVmlld0Jh Y2tlbmQpOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpIZWFkbGVzc1ZpZXdCYWNrZW5k OjpjcmVhdGVTbmFwc2hvdCk6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6OkhlYWRsZXNz Vmlld0JhY2tlbmQ6OnBlcmZvcm1VcGRhdGUpOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRz OjpIZWFkbGVzc1ZpZXdCYWNrZW5kOjpkaXNwbGF5QnVmZmVyKToKKyAgICAgICAgKiB3cGUvYmFj a2VuZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5oOgorICAgICAgICAqIHdwZS9iYWNrZW5kcy9WaWV3 QmFja2VuZC5jcHA6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6OlZpZXdCYWNrZW5kOjpp bml0aWFsaXplKToKKyAgICAgICAgKiB3cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaDoKKyAgICAg ICAgKiB3cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwOgorICAgICAgICAoV1BFVG9v bGluZ0JhY2tlbmRzOjpXaW5kb3dWaWV3QmFja2VuZDo6V2luZG93Vmlld0JhY2tlbmQpOgorICAg ICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpXaW5kb3dWaWV3QmFja2VuZDo6fldpbmRvd1ZpZXdC YWNrZW5kKToKKyAgICAgICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6V2luZG93Vmlld0JhY2tlbmQ6 OmRpc3BsYXlCdWZmZXIpOgorICAgICAgICAqIHdwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2Vu ZC5oOgorICAgICAgICAqIHdwZS9qaGJ1aWxkLm1vZHVsZXM6CisKIDIwMTgtMDctMjQgIFRob21h cyBEZW5uZXkgIDx0ZGVubmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc3VwcG9ydCBm b3IgdGhlIGRvdWJsZSB0eXBlIGZyb20gV0hMU0wKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsv b3JnLndlYmtpdC5XUEUueWFtbCBiL1Rvb2xzL2ZsYXRwYWsvb3JnLndlYmtpdC5XUEUueWFtbApp bmRleCBjYjFjZjlmMTNjN2ZlZjQ3NmJhZWUzNjY1ZTFlMjZlNDg0YWQ3MTEzLi5lODhjZjE0NjU5 MjRiMTUyOTJmYTBmMjBkNDU1YTMzNDY2ZDg5MTFhIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFr L29yZy53ZWJraXQuV1BFLnlhbWwKKysrIGIvVG9vbHMvZmxhdHBhay9vcmcud2Via2l0LldQRS55 YW1sCkBAIC05LDcgKzksNyBAQAogICBzb3VyY2VzOgogICAgIC0gdHlwZTogZ2l0CiAgICAgICB1 cmw6IGh0dHBzOi8vZ2l0aHViLmNvbS9JZ2FsaWEvV1BFQmFja2VuZC1mZG8uZ2l0Ci0gICAgICBi cmFuY2g6IGJkZDQ2ODcwYjFkYzNjOTIwMDUzNDNlMzE2MWJkZDI0ZjYyMGIxMWQKKyAgICAgIGJy YW5jaDogZGE3NDZhZjJkZmY2Yjk3MmM1YzQ5MDNhMTMyZWRjYWZkYjc2ODkyNgogLSBuYW1lOiBs dWEKICAgYnVpbGRzeXN0ZW06IHNpbXBsZQogICBidWlsZC1jb21tYW5kczoKQEAgLTQwLDQgKzQw LDQgQEAKIC0gbmFtZTogb3JnLndlYmtpdC5XUEUKICAgYnVpbGRzeXN0ZW06IHNpbXBsZQogICBi dWlsZC1jb21tYW5kczoKLSAgICAtIC9hcHAvd2Via2l0L1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Vi a2l0IC0td3BlIC0tcHJlZml4PS9hcHAKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCisgICAg LSAvYXBwL3dlYmtpdC9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdCAtLXdwZSAtLXByZWZpeD0v YXBwCmRpZmYgLS1naXQgYS9Ub29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5j cHAgYi9Ub29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5jcHAKaW5kZXggNzk5 NTNhNDMzZWJkNzQ1MzE0M2EwZmJmMWNjYjdhMjM4YzhkZmYwOS4uZWQxYWRhNDM5YmE3NjlmMTMz NTBjZmNhYjgzNjkxOTVkNjliYTBiMSAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2JhY2tlbmRzL0hl YWRsZXNzVmlld0JhY2tlbmQuY3BwCisrKyBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9IZWFkbGVzc1Zp ZXdCYWNrZW5kLmNwcApAQCAtNDQsOSArNDQsNiBAQCB0eXBlZGVmIEVHTEJvb2xlYW4gKEVHTEFQ SUVOVFJZUCBQRk5FR0xRVUVSWVdBWUxBTkRCVUZGRVJXTCkgKEVHTERpc3BsYXkgZHB5LCBzdAog CiBuYW1lc3BhY2UgV1BFVG9vbGluZ0JhY2tlbmRzIHsKIAotc3RhdGljIFBGTkVHTENSRUFURUlN QUdFS0hSUFJPQyBjcmVhdGVJbWFnZTsKLXN0YXRpYyBQRk5FR0xERVNUUk9ZSU1BR0VLSFJQUk9D IGRlc3Ryb3lJbWFnZTsKLXN0YXRpYyBQRk5FR0xRVUVSWVdBWUxBTkRCVUZGRVJXTCBxdWVyeUJ1 ZmZlcjsKIHN0YXRpYyBQRk5HTEVHTElNQUdFVEFSR0VUVEVYVFVSRTJET0VTUFJPQyBpbWFnZVRh cmdldFRleHR1cmUyRE9FUzsKIAogLy8gS2VlcCB0aGlzIGluIHN5bmMgd2l0aCB3dGYvZ2xpYi9S dW5Mb29wU291cmNlUHJpb3JpdHkuaC4KQEAgLTY4LDYgKzY1LDggQEAgc3RhdGljIEVHTERpc3Bs YXkgZ2V0RUdMRGlzcGxheSgpCiAKIEhlYWRsZXNzVmlld0JhY2tlbmQ6OkhlYWRsZXNzVmlld0Jh Y2tlbmQodWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCkKICAgICA6IFZpZXdCYWNrZW5k KHdpZHRoLCBoZWlnaHQpCisgICAgLCBtX3BlbmRpbmdJbWFnZShFR0xfTk9fSU1BR0VfS0hSKQor ICAgICwgbV9sb2NrZWRJbWFnZShFR0xfTk9fSU1BR0VfS0hSKQogewogICAgIG1fZWdsRGlzcGxh eSA9IGdldEVHTERpc3BsYXkoKTsKICAgICBpZiAoIWluaXRpYWxpemUoKSkKQEAgLTc2LDkgKzc1 LDYgQEAgSGVhZGxlc3NWaWV3QmFja2VuZDo6SGVhZGxlc3NWaWV3QmFja2VuZCh1aW50MzJfdCB3 aWR0aCwgdWludDMyX3QgaGVpZ2h0KQogICAgIGlmICghZWdsTWFrZUN1cnJlbnQobV9lZ2xEaXNw bGF5LCBFR0xfTk9fU1VSRkFDRSwgRUdMX05PX1NVUkZBQ0UsIG1fZWdsQ29udGV4dCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIGNyZWF0ZUltYWdlID0gcmVpbnRlcnByZXRfY2FzdDxQRk5FR0xD UkVBVEVJTUFHRUtIUlBST0M+KGVnbEdldFByb2NBZGRyZXNzKCJlZ2xDcmVhdGVJbWFnZUtIUiIp KTsKLSAgICBkZXN0cm95SW1hZ2UgPSByZWludGVycHJldF9jYXN0PFBGTkVHTERFU1RST1lJTUFH RUtIUlBST0M+KGVnbEdldFByb2NBZGRyZXNzKCJlZ2xEZXN0cm95SW1hZ2VLSFIiKSk7Ci0gICAg cXVlcnlCdWZmZXIgPSByZWludGVycHJldF9jYXN0PFBGTkVHTFFVRVJZV0FZTEFOREJVRkZFUldM PihlZ2xHZXRQcm9jQWRkcmVzcygiZWdsUXVlcnlXYXlsYW5kQnVmZmVyV0wiKSk7CiAgICAgaW1h Z2VUYXJnZXRUZXh0dXJlMkRPRVMgPSByZWludGVycHJldF9jYXN0PFBGTkdMRUdMSU1BR0VUQVJH RVRURVhUVVJFMkRPRVNQUk9DPihlZ2xHZXRQcm9jQWRkcmVzcygiZ2xFR0xJbWFnZVRhcmdldFRl eHR1cmUyRE9FUyIpKTsKIAogICAgIG1fdXBkYXRlU291cmNlID0gZ190aW1lb3V0X3NvdXJjZV9u ZXcobV9mcmFtZVJhdGUgLyAxMDAwKTsKQEAgLTk2LDExICs5Miw2IEBAIEhlYWRsZXNzVmlld0Jh Y2tlbmQ6On5IZWFkbGVzc1ZpZXdCYWNrZW5kKCkKICAgICAgICAgZ19zb3VyY2VfZGVzdHJveSht X3VwZGF0ZVNvdXJjZSk7CiAgICAgICAgIGdfc291cmNlX3VucmVmKG1fdXBkYXRlU291cmNlKTsK ICAgICB9Ci0KLSAgICBpZiAoYXV0byBpbWFnZSA9IHN0ZDo6Z2V0PDA+KG1fcGVuZGluZ0ltYWdl LnNlY29uZCkpCi0gICAgICAgIGRlc3Ryb3lJbWFnZShtX2VnbERpc3BsYXksIGltYWdlKTsKLSAg ICBpZiAoYXV0byBpbWFnZSA9IHN0ZDo6Z2V0PDA+KG1fbG9ja2VkSW1hZ2Uuc2Vjb25kKSkKLSAg ICAgICAgZGVzdHJveUltYWdlKG1fZWdsRGlzcGxheSwgaW1hZ2UpOwogfQogCiBjYWlyb19zdXJm YWNlX3QqIEhlYWRsZXNzVmlld0JhY2tlbmQ6OmNyZWF0ZVNuYXBzaG90KCkKQEAgLTExMCwxNCAr MTAxLDEwIEBAIGNhaXJvX3N1cmZhY2VfdCogSGVhZGxlc3NWaWV3QmFja2VuZDo6Y3JlYXRlU25h cHNob3QoKQogCiAgICAgcGVyZm9ybVVwZGF0ZSgpOwogCi0gICAgRUdMSW1hZ2VLSFIgaW1hZ2Ug PSBzdGQ6OmdldDwwPihtX2xvY2tlZEltYWdlLnNlY29uZCk7Ci0gICAgaWYgKCFpbWFnZSkKKyAg ICBpZiAoIW1fbG9ja2VkSW1hZ2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgdWlu dDMyX3Qgd2lkdGggPSBzdGQ6OmdldDwxPihtX2xvY2tlZEltYWdlLnNlY29uZCk7Ci0gICAgdWlu dDMyX3QgaGVpZ2h0ID0gc3RkOjpnZXQ8Mj4obV9sb2NrZWRJbWFnZS5zZWNvbmQpOwotCi0gICAg dWludDhfdCogYnVmZmVyID0gbmV3IHVpbnQ4X3RbNCAqIHdpZHRoICogaGVpZ2h0XTsKKyAgICB1 aW50OF90KiBidWZmZXIgPSBuZXcgdWludDhfdFs0ICogbV93aWR0aCAqIG1faGVpZ2h0XTsKICAg ICBib29sIHN1Y2Nlc3NmdWxTbmFwc2hvdCA9IGZhbHNlOwogCiAgICAgaWYgKCFlZ2xNYWtlQ3Vy cmVudChtX2VnbERpc3BsYXksIEVHTF9OT19TVVJGQUNFLCBFR0xfTk9fU1VSRkFDRSwgbV9lZ2xD b250ZXh0KSkKQEAgLTEzMCw5ICsxMTcsOSBAQCBjYWlyb19zdXJmYWNlX3QqIEhlYWRsZXNzVmll d0JhY2tlbmQ6OmNyZWF0ZVNuYXBzaG90KCkKICAgICBnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVS RV8yRCwgR0xfVEVYVFVSRV9NQUdfRklMVEVSLCBHTF9MSU5FQVIpOwogICAgIGdsVGV4UGFyYW1l dGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX1dSQVBfUywgR0xfQ0xBTVBfVE9fRURHRSk7 CiAgICAgZ2xUZXhQYXJhbWV0ZXJpKEdMX1RFWFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JBUF9ULCBH TF9DTEFNUF9UT19FREdFKTsKLSAgICBnbFRleEltYWdlMkQoR0xfVEVYVFVSRV8yRCwgMCwgR0xf QkdSQV9FWFQsIHdpZHRoLCBoZWlnaHQsIDAsIEdMX0JHUkFfRVhULCBHTF9VTlNJR05FRF9CWVRF LCBudWxscHRyKTsKKyAgICBnbFRleEltYWdlMkQoR0xfVEVYVFVSRV8yRCwgMCwgR0xfQkdSQV9F WFQsIG1fd2lkdGgsIG1faGVpZ2h0LCAwLCBHTF9CR1JBX0VYVCwgR0xfVU5TSUdORURfQllURSwg bnVsbHB0cik7CiAKLSAgICBpbWFnZVRhcmdldFRleHR1cmUyRE9FUyhHTF9URVhUVVJFXzJELCBp bWFnZSk7CisgICAgaW1hZ2VUYXJnZXRUZXh0dXJlMkRPRVMoR0xfVEVYVFVSRV8yRCwgbV9sb2Nr ZWRJbWFnZSk7CiAgICAgZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCAwKTsKIAogICAgIEdM dWludCBpbWFnZUZyYW1lYnVmZmVyOwpAQCAtMTQyLDcgKzEyOSw3IEBAIGNhaXJvX3N1cmZhY2Vf dCogSGVhZGxlc3NWaWV3QmFja2VuZDo6Y3JlYXRlU25hcHNob3QoKQogCiAgICAgZ2xGbHVzaCgp OwogICAgIGlmIChnbENoZWNrRnJhbWVidWZmZXJTdGF0dXMoR0xfRlJBTUVCVUZGRVIpID09IEdM X0ZSQU1FQlVGRkVSX0NPTVBMRVRFKSB7Ci0gICAgICAgIGdsUmVhZFBpeGVscygwLCAwLCB3aWR0 aCwgaGVpZ2h0LCBHTF9CR1JBX0VYVCwgR0xfVU5TSUdORURfQllURSwgYnVmZmVyKTsKKyAgICAg ICAgZ2xSZWFkUGl4ZWxzKDAsIDAsIG1fd2lkdGgsIG1faGVpZ2h0LCBHTF9CR1JBX0VYVCwgR0xf VU5TSUdORURfQllURSwgYnVmZmVyKTsKICAgICAgICAgc3VjY2Vzc2Z1bFNuYXBzaG90ID0gdHJ1 ZTsKICAgICB9CiAKQEAgLTE1Niw3ICsxNDMsNyBAQCBjYWlyb19zdXJmYWNlX3QqIEhlYWRsZXNz Vmlld0JhY2tlbmQ6OmNyZWF0ZVNuYXBzaG90KCkKICAgICB9CiAKICAgICBjYWlyb19zdXJmYWNl X3QqIGltYWdlU3VyZmFjZSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zvcl9kYXRhKGJ1 ZmZlciwKLSAgICAgICAgQ0FJUk9fRk9STUFUX0FSR0IzMiwgd2lkdGgsIGhlaWdodCwgY2Fpcm9f Zm9ybWF0X3N0cmlkZV9mb3Jfd2lkdGgoQ0FJUk9fRk9STUFUX0FSR0IzMiwgd2lkdGgpKTsKKyAg ICAgICAgQ0FJUk9fRk9STUFUX0FSR0IzMiwgbV93aWR0aCwgbV9oZWlnaHQsIGNhaXJvX2Zvcm1h dF9zdHJpZGVfZm9yX3dpZHRoKENBSVJPX0ZPUk1BVF9BUkdCMzIsIG1fd2lkdGgpKTsKICAgICBj YWlyb19zdXJmYWNlX21hcmtfZGlydHkoaW1hZ2VTdXJmYWNlKTsKIAogICAgIHN0YXRpYyBjYWly b191c2VyX2RhdGFfa2V5X3QgYnVmZmVyS2V5OwpAQCAtMTcxLDM2ICsxNTgsMjMgQEAgY2Fpcm9f c3VyZmFjZV90KiBIZWFkbGVzc1ZpZXdCYWNrZW5kOjpjcmVhdGVTbmFwc2hvdCgpCiAKIHZvaWQg SGVhZGxlc3NWaWV3QmFja2VuZDo6cGVyZm9ybVVwZGF0ZSgpCiB7Ci0gICAgaWYgKCFtX3BlbmRp bmdJbWFnZS5maXJzdCkKKyAgICBpZiAoIW1fcGVuZGluZ0ltYWdlKQogICAgICAgICByZXR1cm47 CiAKICAgICB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVfZmRvX2Rpc3BhdGNoX2ZyYW1lX2Nv bXBsZXRlKG1fZXhwb3J0YWJsZSk7Ci0gICAgaWYgKG1fbG9ja2VkSW1hZ2UuZmlyc3QpIHsKLSAg ICAgICAgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19kaXNwYXRjaF9yZWxlYXNlX2J1 ZmZlcihtX2V4cG9ydGFibGUsIG1fbG9ja2VkSW1hZ2UuZmlyc3QpOwotICAgICAgICBkZXN0cm95 SW1hZ2UobV9lZ2xEaXNwbGF5LCBzdGQ6OmdldDwwPihtX2xvY2tlZEltYWdlLnNlY29uZCkpOwot ICAgIH0KKyAgICBpZiAobV9sb2NrZWRJbWFnZSkKKyAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9l eHBvcnRhYmxlX2Zkb19lZ2xfZGlzcGF0Y2hfcmVsZWFzZV9pbWFnZShtX2V4cG9ydGFibGUsIG1f bG9ja2VkSW1hZ2UpOwogCiAgICAgbV9sb2NrZWRJbWFnZSA9IG1fcGVuZGluZ0ltYWdlOwotICAg IG1fcGVuZGluZ0ltYWdlID0gc3RkOjpwYWlyPHN0cnVjdCB3bF9yZXNvdXJjZSosIHN0ZDo6dHVw bGU8RUdMSW1hZ2VLSFIsIHVpbnQzMl90LCB1aW50MzJfdD4+IHsgfTsKKyAgICBtX3BlbmRpbmdJ bWFnZSA9IEVHTF9OT19JTUFHRV9LSFI7CiB9CiAKLXZvaWQgSGVhZGxlc3NWaWV3QmFja2VuZDo6 ZGlzcGxheUJ1ZmZlcihzdHJ1Y3Qgd2xfcmVzb3VyY2UqIGJ1ZmZlclJlc291cmNlKQordm9pZCBI ZWFkbGVzc1ZpZXdCYWNrZW5kOjpkaXNwbGF5QnVmZmVyKEVHTEltYWdlS0hSIGltYWdlKQogewot ICAgIGlmIChtX3BlbmRpbmdJbWFnZS5maXJzdCkKKyAgICBpZiAobV9wZW5kaW5nSW1hZ2UpCiAg ICAgICAgIHN0ZDo6YWJvcnQoKTsKIAotICAgIEVHTGludCBmb3JtYXQgPSAwOwotICAgIGlmICgh cXVlcnlCdWZmZXIobV9lZ2xEaXNwbGF5LCBidWZmZXJSZXNvdXJjZSwgRUdMX1RFWFRVUkVfRk9S TUFULCAmZm9ybWF0KSB8fCBmb3JtYXQgIT0gRUdMX1RFWFRVUkVfUkdCQSkKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgRUdMaW50IHdpZHRoLCBoZWlnaHQ7Ci0gICAgaWYgKCFxdWVyeUJ1ZmZlciht X2VnbERpc3BsYXksIGJ1ZmZlclJlc291cmNlLCBFR0xfV0lEVEgsICZ3aWR0aCkKLSAgICAgICAg fHwgIXF1ZXJ5QnVmZmVyKG1fZWdsRGlzcGxheSwgYnVmZmVyUmVzb3VyY2UsIEVHTF9IRUlHSFQs ICZoZWlnaHQpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBFR0xpbnQgYXR0cmlidXRlc1tdID0g eyBFR0xfV0FZTEFORF9QTEFORV9XTCwgMCwgRUdMX05PTkUgfTsKLSAgICBFR0xJbWFnZUtIUiBp bWFnZSA9IGNyZWF0ZUltYWdlKG1fZWdsRGlzcGxheSwgRUdMX05PX0NPTlRFWFQsIEVHTF9XQVlM QU5EX0JVRkZFUl9XTCwgYnVmZmVyUmVzb3VyY2UsIGF0dHJpYnV0ZXMpOwotICAgIG1fcGVuZGlu Z0ltYWdlID0geyBidWZmZXJSZXNvdXJjZSwgc3RkOjptYWtlX3R1cGxlKGltYWdlLCB3aWR0aCwg aGVpZ2h0KSB9OworICAgIG1fcGVuZGluZ0ltYWdlID0gaW1hZ2U7CiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdQRVRvb2xpbmdCYWNrZW5kcwpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2JhY2tlbmRzL0hl YWRsZXNzVmlld0JhY2tlbmQuaCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9IZWFkbGVzc1ZpZXdCYWNr ZW5kLmgKaW5kZXggMTc4NDI0ZTk3OGU1MmE3NDAwNTEyODg4MTMwN2QwZTQyOTA2MzI1YS4uYjBk NjZlMzlmM2U4MzA1OGE5YzljMTliZDAzODU1ODAyMTRmNTlkZSAxMDA2NDQKLS0tIGEvVG9vbHMv d3BlL2JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuaAorKysgYi9Ub29scy93cGUvYmFja2Vu ZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5oCkBAIC0zNywxNyArMzcsMTcgQEAgbmFtZXNwYWNlIFdQ RVRvb2xpbmdCYWNrZW5kcyB7CiBjbGFzcyBIZWFkbGVzc1ZpZXdCYWNrZW5kIGZpbmFsIDogcHVi bGljIFZpZXdCYWNrZW5kIHsKIHB1YmxpYzoKICAgICBIZWFkbGVzc1ZpZXdCYWNrZW5kKHVpbnQz Ml90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpOwotICAgIH5IZWFkbGVzc1ZpZXdCYWNrZW5kKCk7 CisgICAgdmlydHVhbCB+SGVhZGxlc3NWaWV3QmFja2VuZCgpOwogCiAgICAgY2Fpcm9fc3VyZmFj ZV90KiBjcmVhdGVTbmFwc2hvdCgpOwogCiBwcml2YXRlOgotICAgIHZvaWQgZGlzcGxheUJ1ZmZl cihzdHJ1Y3Qgd2xfcmVzb3VyY2UqKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpc3BsYXlCdWZmZXIo RUdMSW1hZ2VLSFIpIG92ZXJyaWRlOwogCiAgICAgdm9pZCBwZXJmb3JtVXBkYXRlKCk7CiAKLSAg ICBzdGQ6OnBhaXI8c3RydWN0IHdsX3Jlc291cmNlKiwgc3RkOjp0dXBsZTxFR0xJbWFnZUtIUiwg dWludDMyX3QsIHVpbnQzMl90Pj4gbV9wZW5kaW5nSW1hZ2UgeyB9OwotICAgIHN0ZDo6cGFpcjxz dHJ1Y3Qgd2xfcmVzb3VyY2UqLCBzdGQ6OnR1cGxlPEVHTEltYWdlS0hSLCB1aW50MzJfdCwgdWlu dDMyX3Q+PiBtX2xvY2tlZEltYWdlIHsgfTsKKyAgICBFR0xJbWFnZUtIUiBtX3BlbmRpbmdJbWFn ZTsKKyAgICBFR0xJbWFnZUtIUiBtX2xvY2tlZEltYWdlOwogCiAgICAgR1NvdXJjZSogbV91cGRh dGVTb3VyY2UgeyBudWxscHRyIH07CiAgICAgZ2ludDY0IG1fZnJhbWVSYXRlIHsgR19VU0VDX1BF Ul9TRUMgLyA2MCB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5k LmNwcCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5jcHAKaW5kZXggMDQ4ZmFmMDQw NDczNzliZTg2OGM0ODIyNWJiMGZiYzAzMTJlNmMzOC4uOGRhYjBhYWVlNzE2MWVkZDliMjVhMDg1 ZjliNzI0NzdhMDczOTY0NSAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNr ZW5kLmNwcAorKysgYi9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuY3BwCkBAIC05Miwx NiArOTIsMTYgQEAgYm9vbCBWaWV3QmFja2VuZDo6aW5pdGlhbGl6ZSgpCiAgICAgaWYgKCFtX2Vn bENvbnRleHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHN0YXRpYyBzdHJ1Y3Qgd3Bl X3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19jbGllbnQgZXhwb3J0YWJsZUNsaWVudCA9IHsK KyAgICBzdGF0aWMgc3RydWN0IHdwZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZWdsX2Ns aWVudCBleHBvcnRhYmxlQ2xpZW50ID0gewogICAgICAgICAvLyBleHBvcnRfYnVmZmVyX3Jlc291 cmNlCi0gICAgICAgIFtdKHZvaWQqIGRhdGEsIHN0cnVjdCB3bF9yZXNvdXJjZSogYnVmZmVyUmVz b3VyY2UpCisgICAgICAgIFtdKHZvaWQqIGRhdGEsIEVHTEltYWdlS0hSIGltYWdlKQogICAgICAg ICB7Ci0gICAgICAgICAgICBzdGF0aWNfY2FzdDxWaWV3QmFja2VuZCo+KGRhdGEpLT5kaXNwbGF5 QnVmZmVyKGJ1ZmZlclJlc291cmNlKTsKKyAgICAgICAgICAgIHN0YXRpY19jYXN0PFZpZXdCYWNr ZW5kKj4oZGF0YSktPmRpc3BsYXlCdWZmZXIoaW1hZ2UpOwogICAgICAgICB9LAogICAgICAgICAv LyBwYWRkaW5nCiAgICAgICAgIG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIsIG51bGxwdHIKICAg ICB9OwotICAgIG1fZXhwb3J0YWJsZSA9IHdwZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9f Y3JlYXRlKCZleHBvcnRhYmxlQ2xpZW50LCB0aGlzLCBtX3dpZHRoLCBtX2hlaWdodCk7CisgICAg bV9leHBvcnRhYmxlID0gd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19lZ2xfY3JlYXRl KCZleHBvcnRhYmxlQ2xpZW50LCB0aGlzLCBtX3dpZHRoLCBtX2hlaWdodCk7CiAKICAgICByZXR1 cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5o IGIvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmgKaW5kZXggZTk5YTE4OGQ2MDZkZTg4 Y2EyZTZhNmVhNDYyMDY4NjNhNmQ0NWI5Ny4uNjNlOWY4YmZiMDJmYzhlZTAzNWY5MjYxZjk3MjQ3 OGRmY2Y5MGUwMiAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmgK KysrIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmgKQEAgLTMxLDYgKzMxLDcgQEAK IHR5cGVkZWYgdm9pZCogRUdMQ29uZmlnOwogdHlwZWRlZiB2b2lkKiBFR0xDb250ZXh0OwogdHlw ZWRlZiB2b2lkKiBFR0xEaXNwbGF5OwordHlwZWRlZiB2b2lkKiBFR0xJbWFnZUtIUjsKIAogLy8g TWFudWFsbHkgcHJvdmlkZSB0aGUgRUdMX0NBU1QgQysrIGRlZmluaXRpb24gaW4gY2FzZSBlZ2xw bGF0Zm9ybS5oIGRvZXNuJ3QgcHJvdmlkZSBpdC4KICNpZm5kZWYgRUdMX0NBU1QKQEAgLTY2LDcg KzY3LDcgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgZGlzcGF0Y2hJbnB1dEtleWJvYXJkRXZlbnQo c3RydWN0IHdwZV9pbnB1dF9rZXlib2FyZF9ldmVudCopOwogICAgIHZvaWQgZGlzcGF0Y2hJbnB1 dFRvdWNoRXZlbnQoc3RydWN0IHdwZV9pbnB1dF90b3VjaF9ldmVudCopOwogCi0gICAgdmlydHVh bCB2b2lkIGRpc3BsYXlCdWZmZXIoc3RydWN0IHdsX3Jlc291cmNlKikgPSAwOworICAgIHZpcnR1 YWwgdm9pZCBkaXNwbGF5QnVmZmVyKEVHTEltYWdlS0hSKSA9IDA7CiAKICAgICB1aW50MzJfdCBt X3dpZHRoIHsgMCB9OwogICAgIHVpbnQzMl90IG1faGVpZ2h0IHsgMCB9OwpkaWZmIC0tZ2l0IGEv VG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNwcCBiL1Rvb2xzL3dwZS9iYWNr ZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5jcHAKaW5kZXggZjFlNmJkNTllMmE0NWQ4NjIzMGFmYzE0 N2UyN2VkOTk0Y2FiMjA1Zi4uYjI5OTcxYTliZjg4M2RmYmIyOTVlZjY3MDZiNjAyMDRhOTdlMmYy YiAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNwcAor KysgYi9Ub29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwCkBAIC0zNSw2ICsz NSw3IEBACiAvLyBUaGlzIGluY2x1ZGUgb3JkZXIgaXMgbmVjZXNzYXJ5IHRvIGVuZm9yY2UgdGhl IFdheWxhbmQgRUdMIHBsYXRmb3JtLgogI2luY2x1ZGUgPHdheWxhbmQtZWdsLmg+CiAjaW5jbHVk ZSA8ZXBveHkvZWdsLmg+CisjaW5jbHVkZSA8d3BlL2Zkby1lZ2wuaD4KIAogI2lmbmRlZiBFR0xf V0xfYmluZF93YXlsYW5kX2Rpc3BsYXkKICNkZWZpbmUgRUdMX1dMX2JpbmRfd2F5bGFuZF9kaXNw bGF5IDEKQEAgLTQ2LDggKzQ3LDYgQEAgdHlwZWRlZiBFR0xCb29sZWFuIChFR0xBUElFTlRSWVAg UEZORUdMUVVFUllXQVlMQU5EQlVGRkVSV0wpIChFR0xEaXNwbGF5IGRweSwgc3QKIAogbmFtZXNw YWNlIFdQRVRvb2xpbmdCYWNrZW5kcyB7CiAKLXN0YXRpYyBQRk5FR0xDUkVBVEVJTUFHRUtIUlBS T0MgY3JlYXRlSW1hZ2U7Ci1zdGF0aWMgUEZORUdMREVTVFJPWUlNQUdFS0hSUFJPQyBkZXN0cm95 SW1hZ2U7CiBzdGF0aWMgUEZOR0xFR0xJTUFHRVRBUkdFVFRFWFRVUkUyRE9FU1BST0MgaW1hZ2VU YXJnZXRUZXh0dXJlMkRPRVM7CiAKIHN0cnVjdCBFdmVudFNvdXJjZSB7CkBAIC00OTksOCArNDk4 LDYgQEAgV2luZG93Vmlld0JhY2tlbmQ6OldpbmRvd1ZpZXdCYWNrZW5kKHVpbnQzMl90IHdpZHRo LCB1aW50MzJfdCBoZWlnaHQpCiAgICAgaWYgKCFlZ2xNYWtlQ3VycmVudChtX2VnbERpc3BsYXks IG1fZWdsU3VyZmFjZSwgbV9lZ2xTdXJmYWNlLCBtX2VnbENvbnRleHQpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBjcmVhdGVJbWFnZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZORUdMQ1JFQVRFSU1B R0VLSFJQUk9DPihlZ2xHZXRQcm9jQWRkcmVzcygiZWdsQ3JlYXRlSW1hZ2VLSFIiKSk7Ci0gICAg ZGVzdHJveUltYWdlID0gcmVpbnRlcnByZXRfY2FzdDxQRk5FR0xERVNUUk9ZSU1BR0VLSFJQUk9D PihlZ2xHZXRQcm9jQWRkcmVzcygiZWdsRGVzdHJveUltYWdlS0hSIikpOwogICAgIGltYWdlVGFy Z2V0VGV4dHVyZTJET0VTID0gcmVpbnRlcnByZXRfY2FzdDxQRk5HTEVHTElNQUdFVEFSR0VUVEVY VFVSRTJET0VTUFJPQz4oZWdsR2V0UHJvY0FkZHJlc3MoImdsRUdMSW1hZ2VUYXJnZXRUZXh0dXJl MkRPRVMiKSk7CiAKICAgICB7CkBAIC01NzcsOSArNTc0LDYgQEAgV2luZG93Vmlld0JhY2tlbmQ6 On5XaW5kb3dWaWV3QmFja2VuZCgpCiAgICAgaWYgKG1fY29tcG9zaXRvcikKICAgICAgICAgd2xf Y29tcG9zaXRvcl9kZXN0cm95KG1fY29tcG9zaXRvcik7CiAKLSAgICBpZiAobV9jb21taXR0ZWQu aW1hZ2UpCi0gICAgICAgIGRlc3Ryb3lJbWFnZShtX2VnbERpc3BsYXksIG1fY29tbWl0dGVkLmlt YWdlKTsKLQogICAgIGlmIChtX2VnbFN1cmZhY2UpCiAgICAgICAgIGVnbERlc3Ryb3lTdXJmYWNl KG1fZWdsRGlzcGxheSwgbV9lZ2xTdXJmYWNlKTsKIApAQCAtNTk3LDE1ICs1OTEsMTMgQEAgY29u c3Qgc3RydWN0IHdsX2NhbGxiYWNrX2xpc3RlbmVyIFdpbmRvd1ZpZXdCYWNrZW5kOjpzX2ZyYW1l TGlzdGVuZXIgPSB7CiAgICAgICAgIGF1dG8mIHdpbmRvdyA9ICpzdGF0aWNfY2FzdDxXaW5kb3dW aWV3QmFja2VuZCo+KGRhdGEpOwogICAgICAgICB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVf ZmRvX2Rpc3BhdGNoX2ZyYW1lX2NvbXBsZXRlKHdpbmRvdy5tX2V4cG9ydGFibGUpOwogCi0gICAg ICAgIGlmICh3aW5kb3cubV9jb21taXR0ZWQuaW1hZ2UpCi0gICAgICAgICAgICBkZXN0cm95SW1h Z2Uod2luZG93Lm1fZWdsRGlzcGxheSwgd2luZG93Lm1fY29tbWl0dGVkLmltYWdlKTsKLSAgICAg ICAgaWYgKHdpbmRvdy5tX2NvbW1pdHRlZC5idWZmZXJSZXNvdXJjZSkKLSAgICAgICAgICAgIHdw ZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZGlzcGF0Y2hfcmVsZWFzZV9idWZmZXIod2lu ZG93Lm1fZXhwb3J0YWJsZSwgd2luZG93Lm1fY29tbWl0dGVkLmJ1ZmZlclJlc291cmNlKTsKLSAg ICAgICAgd2luZG93Lm1fY29tbWl0dGVkID0geyBudWxscHRyLCBudWxscHRyIH07CisgICAgICAg IGlmICh3aW5kb3cubV9jb21taXR0ZWRJbWFnZSkKKyAgICAgICAgICAgIHdwZV92aWV3X2JhY2tl bmRfZXhwb3J0YWJsZV9mZG9fZWdsX2Rpc3BhdGNoX3JlbGVhc2VfaW1hZ2Uod2luZG93Lm1fZXhw b3J0YWJsZSwgd2luZG93Lm1fY29tbWl0dGVkSW1hZ2UpOworICAgICAgICB3aW5kb3cubV9jb21t aXR0ZWRJbWFnZSA9IEVHTF9OT19JTUFHRV9LSFI7CiAgICAgfQogfTsKIAotdm9pZCBXaW5kb3dW aWV3QmFja2VuZDo6ZGlzcGxheUJ1ZmZlcihzdHJ1Y3Qgd2xfcmVzb3VyY2UqIGJ1ZmZlclJlc291 cmNlKQordm9pZCBXaW5kb3dWaWV3QmFja2VuZDo6ZGlzcGxheUJ1ZmZlcihFR0xJbWFnZUtIUiBp bWFnZSkKIHsKICAgICBpZiAoIW1fZWdsQ29udGV4dCkKICAgICAgICAgcmV0dXJuOwpAQCAtNjE3 LDIwICs2MDksMTIgQEAgdm9pZCBXaW5kb3dWaWV3QmFja2VuZDo6ZGlzcGxheUJ1ZmZlcihzdHJ1 Y3Qgd2xfcmVzb3VyY2UqIGJ1ZmZlclJlc291cmNlKQogCiAgICAgZ2xVc2VQcm9ncmFtKG1fcHJv Z3JhbSk7CiAKLSAgICB7Ci0gICAgICAgIHN0YXRpYyBFR0xpbnQgaW1hZ2VBdHRyaWJ1dGVzW10g PSB7Ci0gICAgICAgICAgICBFR0xfV0FZTEFORF9QTEFORV9XTCwgMCwKLSAgICAgICAgICAgIEVH TF9OT05FCi0gICAgICAgIH07Ci0gICAgICAgIEVHTEltYWdlS0hSIGltYWdlID0gY3JlYXRlSW1h Z2UobV9lZ2xEaXNwbGF5LCBFR0xfTk9fQ09OVEVYVCwgRUdMX1dBWUxBTkRfQlVGRkVSX1dMLCBi dWZmZXJSZXNvdXJjZSwgaW1hZ2VBdHRyaWJ1dGVzKTsKKyAgICBnbEFjdGl2ZVRleHR1cmUoR0xf VEVYVFVSRTApOworICAgIGdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgbV92aWV3VGV4dHVy ZSk7CisgICAgaW1hZ2VUYXJnZXRUZXh0dXJlMkRPRVMoR0xfVEVYVFVSRV8yRCwgaW1hZ2UpOwor ICAgIGdsVW5pZm9ybTFpKG1fdGV4dHVyZVVuaWZvcm0sIDApOwogCi0gICAgICAgIGdsQWN0aXZl VGV4dHVyZShHTF9URVhUVVJFMCk7Ci0gICAgICAgIGdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8y RCwgbV92aWV3VGV4dHVyZSk7Ci0gICAgICAgIGltYWdlVGFyZ2V0VGV4dHVyZTJET0VTKEdMX1RF WFRVUkVfMkQsIGltYWdlKTsKLSAgICAgICAgZ2xVbmlmb3JtMWkobV90ZXh0dXJlVW5pZm9ybSwg MCk7Ci0KLSAgICAgICAgbV9jb21taXR0ZWQgPSB7IGJ1ZmZlclJlc291cmNlLCBpbWFnZSB9Owot ICAgIH0KKyAgICBtX2NvbW1pdHRlZEltYWdlID0gaW1hZ2U7CiAKICAgICBzdGF0aWMgY29uc3Qg R0xmbG9hdCB2ZXJ0aWNlc1s0XVsyXSA9IHsKICAgICAgICAgeyAtMS4wLCAxLjAgfSwKZGlmZiAt LWdpdCBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5oIGIvVG9vbHMvd3Bl L2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmgKaW5kZXggM2YxMzRhOTM5ZjE3ZWU1Mjc2MTQw NmQ1Mjk4NDczM2RmN2NkZTYyMi4uMTM0ZmU3YzJiMjM1ZGJmYmU5MTQxZWJkZTM4MTM5N2IwOWUx OTdhYyAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmgK KysrIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmgKQEAgLTQxLDEwICs0 MSwxMCBAQCBuYW1lc3BhY2UgV1BFVG9vbGluZ0JhY2tlbmRzIHsKIGNsYXNzIFdpbmRvd1ZpZXdC YWNrZW5kIGZpbmFsIDogcHVibGljIFZpZXdCYWNrZW5kIHsKIHB1YmxpYzoKICAgICBXaW5kb3dW aWV3QmFja2VuZCh1aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KTsKLSAgICB+V2luZG93 Vmlld0JhY2tlbmQoKTsKKyAgICB2aXJ0dWFsIH5XaW5kb3dWaWV3QmFja2VuZCgpOwogCiBwcml2 YXRlOgotICAgIHZvaWQgZGlzcGxheUJ1ZmZlcihzdHJ1Y3Qgd2xfcmVzb3VyY2UqKSBvdmVycmlk ZTsKKyAgICB2b2lkIGRpc3BsYXlCdWZmZXIoRUdMSW1hZ2VLSFIpIG92ZXJyaWRlOwogCiAgICAg c3RhdGljIGNvbnN0IHN0cnVjdCB3bF9yZWdpc3RyeV9saXN0ZW5lciBzX3JlZ2lzdHJ5TGlzdGVu ZXI7CiAgICAgc3RhdGljIGNvbnN0IHN0cnVjdCB6eGRnX3NoZWxsX3Y2X2xpc3RlbmVyIHNfeGRn V21CYXNlTGlzdGVuZXI7CkBAIC0xMTksMTAgKzExOSw3IEBAIHByaXZhdGU6CiAgICAgdW5zaWdu ZWQgbV9wcm9ncmFtIHsgMCB9OwogICAgIHVuc2lnbmVkIG1fdGV4dHVyZVVuaWZvcm0geyAwIH07 CiAgICAgdW5zaWduZWQgbV92aWV3VGV4dHVyZSB7IDAgfTsKLSAgICBzdHJ1Y3QgewotICAgICAg ICBzdHJ1Y3Qgd2xfcmVzb3VyY2UqIGJ1ZmZlclJlc291cmNlIHsgbnVsbHB0ciB9OwotICAgICAg ICBFR0xJbWFnZUtIUiBpbWFnZTsKLSAgICB9IG1fY29tbWl0dGVkOworICAgIEVHTEltYWdlS0hS IG1fY29tbWl0dGVkSW1hZ2U7CiB9OwogCiB9IC8vIFdQRVRvb2xpbmdCYWNrZW5kcwpkaWZmIC0t Z2l0IGEvVG9vbHMvd3BlL2poYnVpbGQubW9kdWxlcyBiL1Rvb2xzL3dwZS9qaGJ1aWxkLm1vZHVs ZXMKaW5kZXggNDQ5MTBjMTE2ZWQ3OGNmOWEyMTg2ZTM2MmVhZDY0Njk0ZGJmYzgyYi4uYjFhYjQ2 ODI3MjhhMDliYjZjMTllZDAzNmQxYTg0OWEzODdhYWQ0MiAxMDA2NDQKLS0tIGEvVG9vbHMvd3Bl L2poYnVpbGQubW9kdWxlcworKysgYi9Ub29scy93cGUvamhidWlsZC5tb2R1bGVzCkBAIC0xNzYs NyArMTc2LDcgQEAKICAgICAgIDxkZXAgcGFja2FnZT0iZ2xpYiIvPgogICAgIDwvZGVwZW5kZW5j aWVzPgogICAgIDxicmFuY2ggcmVwbz0iZ2l0aHViLmNvbSIgbW9kdWxlPSJJZ2FsaWEvV1BFQmFj a2VuZC1mZG8uZ2l0IgotICAgICAgICAgICAgdGFnPSJiZGQ0Njg3MGIxZGMzYzkyMDA1MzQzZTMx NjFiZGQyNGY2MjBiMTFkIi8+CisgICAgICAgICAgICB0YWc9ImRhNzQ2YWYyZGZmNmI5NzJjNWM0 OTAzYTEzMmVkY2FmZGI3Njg5MjYiLz4KICAgPC9jbWFrZT4KIAogICA8YXV0b3Rvb2xzIGlkPSJs aWJncGctZXJyb3IiIGF1dG9nZW4tc2g9ImNvbmZpZ3VyZSI+Cg== 345756 2018-07-25 06:23:30 -0700 2018-07-25 06:23:30 -0700 Patch for landing bug-187997-20180725152329.patch text/plain 17697 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MTkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBlY2MyYTJiYWJkZWUwZDVhZjQzYTdmNTM5ZmEzNzI2 YWFkYTE3My4uMWEyNmI1YTRlOWI5NzUwYjUxZWU3ODc1NDNlMDliOTc2M2E4MTdlZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0 IEBACisyMDE4LTA3LTI1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbV1BFXSBTd2l0Y2ggVmlld0JhY2tlbmQgdG8gdXNpbmcgd3BlX3ZpZXdfYmFja2Vu ZF9leHBvcnRhYmxlX2Zkb19lZ2wgQVBJcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg3OTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2FybG9zIEdh cmNpYSBDYW1wb3MuCisKKyAgICAgICAgSW5zdGVhZCBvZiB0aGUgcmF3IHdwZV92aWV3X2JhY2tl bmRfZXhwb3J0YWJsZV9mZG8gQVBJLCBzd2l0Y2ggdG8gdXNpbmcKKyAgICAgICAgdGhlIEVHTC1v cmllbnRlZCBBUEkgdGhhdCBzaW1wbHkgc2VydmVzIEVHTEltYWdlS0hSIG9iamVjdHMgaW5zdGVh ZCBvZgorICAgICAgICByYXcgYnVmZmVyIHJlc291cmNlcy4gVGhpcyBhbGxvd3MgdXMgbm90IHRv IHdyYW5nbGUgd2l0aCBjcmVhdGluZyBhbmQKKyAgICAgICAgbWFuYWdpbmcgbGlmZXRpbWUgb2Yg dGhlIHNhbWUgRUdMSW1hZ2VLSFIgYnkgb3Vyc2VsdmVzLgorCisgICAgICAgIFZpZXdCYWNrZW5k IG5vdyBkZWZpbmVzIGEgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19lZ2xfY2xpZW50 CisgICAgICAgIHN0cnVjdCBhbmQgdXNlcyB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVfZmRv X2VnbF9jcmVhdGUoKSB0byBjcmVhdGUKKyAgICAgICAgdGhlIGV4cG9ydGFibGUgb2JqZWN0LiBU aGlzIG1lYW5zIHRoYXQgZm9yIGVhY2ggZnJhbWUgd2UncmUgc2VydmVkIGFuCisgICAgICAgIEVH TEltYWdlS0hSIG9iamVjdCB0aGF0IGlzIHBhc3NlZCBvbiB0byB0aGUgZGlzcGxheUJ1ZmZlcigp CisgICAgICAgIGltcGxlbWVudGF0aW9uLgorCisgICAgICAgIEhlYWRsZXNzVmlld0JhY2tlbmQg bm93IGp1c3QgbWFuYWdlcyB0aGUgcGVuZGluZyBhbmQgY29tbWl0dGVkIGltYWdlCisgICAgICAg IG9iamVjdHMuIFdpZHRoIGFuZCBoZWlnaHQgdmFsdWVzIHVzZWQgZHVyaW5nIHBpeGVsIGRhdGEg cmV0cmlldmFsIGFyZQorICAgICAgICBnYXRoZXJlZCBmcm9tIHRoZSBWaWV3QmFja2VuZCdzIHNp emUgdGhhdCB3YXMgc3BlY2lmaWVkIHdoZW4KKyAgICAgICAgY29uc3RydWN0ZWQuCisKKyAgICAg ICAgV2luZG93Vmlld0JhY2tlbmQgc2ltaWxhcmx5IG9ubHkgbWFuYWdlcyB0aGUgY29tbWl0dGVk IGltYWdlIG9iamVjdCwKKyAgICAgICAgbm90IGhhdmluZyB0byBjcmVhdGUgYW4gZXF1aXZhbGVu dCBFR0xJbWFnZUtIUiBvYmplY3QgZnJvbSB0aGUgcmF3CisgICAgICAgIGJ1ZmZlciByZXNvdXJj ZSBhbnltb3JlLgorCisgICAgICAgIFVudXNlZCBFR0wgZW50cnlwb2ludHMgaW4gYm90aCBIZWFk bGVzc1ZpZXdCYWNrZW5kIGFuZCBXaW5kb3dWaWV3QmFja2VuZAorICAgICAgICBjbGFzc2VzIGFy ZSByZW1vdmVkLCBhbmQgZGVzdHJ1Y3RvcnMgZm9yIGJvdGggY2xhc3NlcyBhcmUgbWFkZSB2aXJ0 dWFsLgorCisgICAgICAgIFRoZSBXUEVCYWNrZW5kLWZkbyB2ZXJzaW9uIGlzIGJ1bXBlZCBpbiBv cmRlciB0byBoYXZlIHRoZSBFR0wtc3BlY2lmaWMKKyAgICAgICAgZXhwb3J0IEFQSSBhdmFpbGFi bGUuCisKKyAgICAgICAgKiBmbGF0cGFrL29yZy53ZWJraXQuV1BFLnlhbWw6CisgICAgICAgICog d3BlL2JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuY3BwOgorICAgICAgICAoV1BFVG9vbGlu Z0JhY2tlbmRzOjpIZWFkbGVzc1ZpZXdCYWNrZW5kOjpIZWFkbGVzc1ZpZXdCYWNrZW5kKToKKyAg ICAgICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZDo6fkhlYWRsZXNz Vmlld0JhY2tlbmQpOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpIZWFkbGVzc1ZpZXdC YWNrZW5kOjpjcmVhdGVTbmFwc2hvdCk6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6Okhl YWRsZXNzVmlld0JhY2tlbmQ6OnBlcmZvcm1VcGRhdGUpOgorICAgICAgICAoV1BFVG9vbGluZ0Jh Y2tlbmRzOjpIZWFkbGVzc1ZpZXdCYWNrZW5kOjpkaXNwbGF5QnVmZmVyKToKKyAgICAgICAgKiB3 cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5oOgorICAgICAgICAqIHdwZS9iYWNrZW5k cy9WaWV3QmFja2VuZC5jcHA6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6OlZpZXdCYWNr ZW5kOjppbml0aWFsaXplKToKKyAgICAgICAgKiB3cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaDoK KyAgICAgICAgKiB3cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwOgorICAgICAgICAo V1BFVG9vbGluZ0JhY2tlbmRzOjpXaW5kb3dWaWV3QmFja2VuZDo6V2luZG93Vmlld0JhY2tlbmQp OgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpXaW5kb3dWaWV3QmFja2VuZDo6fldpbmRv d1ZpZXdCYWNrZW5kKToKKyAgICAgICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6V2luZG93Vmlld0Jh Y2tlbmQ6OmRpc3BsYXlCdWZmZXIpOgorICAgICAgICAqIHdwZS9iYWNrZW5kcy9XaW5kb3dWaWV3 QmFja2VuZC5oOgorICAgICAgICAqIHdwZS9qaGJ1aWxkLm1vZHVsZXM6CisKIDIwMTgtMDctMjQg IFRob21hcyBEZW5uZXkgIDx0ZGVubmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc3Vw cG9ydCBmb3IgdGhlIGRvdWJsZSB0eXBlIGZyb20gV0hMU0wKZGlmZiAtLWdpdCBhL1Rvb2xzL2Zs YXRwYWsvb3JnLndlYmtpdC5XUEUueWFtbCBiL1Rvb2xzL2ZsYXRwYWsvb3JnLndlYmtpdC5XUEUu eWFtbAppbmRleCBjYjFjZjlmMTNjN2ZlZjQ3NmJhZWUzNjY1ZTFlMjZlNDg0YWQ3MTEzLi5jNzNj ZDhkNTFhYzg1NjFmYWUxMjUwNjdiYTMyNmM1ODMyMmJjNmMwIDEwMDY0NAotLS0gYS9Ub29scy9m bGF0cGFrL29yZy53ZWJraXQuV1BFLnlhbWwKKysrIGIvVG9vbHMvZmxhdHBhay9vcmcud2Via2l0 LldQRS55YW1sCkBAIC05LDcgKzksNyBAQAogICBzb3VyY2VzOgogICAgIC0gdHlwZTogZ2l0CiAg ICAgICB1cmw6IGh0dHBzOi8vZ2l0aHViLmNvbS9JZ2FsaWEvV1BFQmFja2VuZC1mZG8uZ2l0Ci0g ICAgICBicmFuY2g6IGJkZDQ2ODcwYjFkYzNjOTIwMDUzNDNlMzE2MWJkZDI0ZjYyMGIxMWQKKyAg ICAgIGJyYW5jaDogZGE3NDZhZjJkZmY2Yjk3MmM1YzQ5MDNhMTMyZWRjYWZkYjc2ODkyNgogLSBu YW1lOiBsdWEKICAgYnVpbGRzeXN0ZW06IHNpbXBsZQogICBidWlsZC1jb21tYW5kczoKZGlmZiAt LWdpdCBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9IZWFkbGVzc1ZpZXdCYWNrZW5kLmNwcCBiL1Rvb2xz L3dwZS9iYWNrZW5kcy9IZWFkbGVzc1ZpZXdCYWNrZW5kLmNwcAppbmRleCA3OTk1M2E0MzNlYmQ3 NDUzMTQzYTBmYmYxY2NiN2EyMzhjOGRmZjA5Li5lZDFhZGE0MzliYTc2OWYxMzM1MGNmY2FiODM2 OTE5NWQ2OWJhMGIxIDEwMDY0NAotLS0gYS9Ub29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3 QmFja2VuZC5jcHAKKysrIGIvVG9vbHMvd3BlL2JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQu Y3BwCkBAIC00NCw5ICs0NCw2IEBAIHR5cGVkZWYgRUdMQm9vbGVhbiAoRUdMQVBJRU5UUllQIFBG TkVHTFFVRVJZV0FZTEFOREJVRkZFUldMKSAoRUdMRGlzcGxheSBkcHksIHN0CiAKIG5hbWVzcGFj ZSBXUEVUb29saW5nQmFja2VuZHMgewogCi1zdGF0aWMgUEZORUdMQ1JFQVRFSU1BR0VLSFJQUk9D IGNyZWF0ZUltYWdlOwotc3RhdGljIFBGTkVHTERFU1RST1lJTUFHRUtIUlBST0MgZGVzdHJveUlt YWdlOwotc3RhdGljIFBGTkVHTFFVRVJZV0FZTEFOREJVRkZFUldMIHF1ZXJ5QnVmZmVyOwogc3Rh dGljIFBGTkdMRUdMSU1BR0VUQVJHRVRURVhUVVJFMkRPRVNQUk9DIGltYWdlVGFyZ2V0VGV4dHVy ZTJET0VTOwogCiAvLyBLZWVwIHRoaXMgaW4gc3luYyB3aXRoIHd0Zi9nbGliL1J1bkxvb3BTb3Vy Y2VQcmlvcml0eS5oLgpAQCAtNjgsNiArNjUsOCBAQCBzdGF0aWMgRUdMRGlzcGxheSBnZXRFR0xE aXNwbGF5KCkKIAogSGVhZGxlc3NWaWV3QmFja2VuZDo6SGVhZGxlc3NWaWV3QmFja2VuZCh1aW50 MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KQogICAgIDogVmlld0JhY2tlbmQod2lkdGgsIGhl aWdodCkKKyAgICAsIG1fcGVuZGluZ0ltYWdlKEVHTF9OT19JTUFHRV9LSFIpCisgICAgLCBtX2xv Y2tlZEltYWdlKEVHTF9OT19JTUFHRV9LSFIpCiB7CiAgICAgbV9lZ2xEaXNwbGF5ID0gZ2V0RUdM RGlzcGxheSgpOwogICAgIGlmICghaW5pdGlhbGl6ZSgpKQpAQCAtNzYsOSArNzUsNiBAQCBIZWFk bGVzc1ZpZXdCYWNrZW5kOjpIZWFkbGVzc1ZpZXdCYWNrZW5kKHVpbnQzMl90IHdpZHRoLCB1aW50 MzJfdCBoZWlnaHQpCiAgICAgaWYgKCFlZ2xNYWtlQ3VycmVudChtX2VnbERpc3BsYXksIEVHTF9O T19TVVJGQUNFLCBFR0xfTk9fU1VSRkFDRSwgbV9lZ2xDb250ZXh0KSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgY3JlYXRlSW1hZ2UgPSByZWludGVycHJldF9jYXN0PFBGTkVHTENSRUFURUlNQUdF S0hSUFJPQz4oZWdsR2V0UHJvY0FkZHJlc3MoImVnbENyZWF0ZUltYWdlS0hSIikpOwotICAgIGRl c3Ryb3lJbWFnZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZORUdMREVTVFJPWUlNQUdFS0hSUFJPQz4o ZWdsR2V0UHJvY0FkZHJlc3MoImVnbERlc3Ryb3lJbWFnZUtIUiIpKTsKLSAgICBxdWVyeUJ1ZmZl ciA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZORUdMUVVFUllXQVlMQU5EQlVGRkVSV0w+KGVnbEdldFBy b2NBZGRyZXNzKCJlZ2xRdWVyeVdheWxhbmRCdWZmZXJXTCIpKTsKICAgICBpbWFnZVRhcmdldFRl eHR1cmUyRE9FUyA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZOR0xFR0xJTUFHRVRBUkdFVFRFWFRVUkUy RE9FU1BST0M+KGVnbEdldFByb2NBZGRyZXNzKCJnbEVHTEltYWdlVGFyZ2V0VGV4dHVyZTJET0VT IikpOwogCiAgICAgbV91cGRhdGVTb3VyY2UgPSBnX3RpbWVvdXRfc291cmNlX25ldyhtX2ZyYW1l UmF0ZSAvIDEwMDApOwpAQCAtOTYsMTEgKzkyLDYgQEAgSGVhZGxlc3NWaWV3QmFja2VuZDo6fkhl YWRsZXNzVmlld0JhY2tlbmQoKQogICAgICAgICBnX3NvdXJjZV9kZXN0cm95KG1fdXBkYXRlU291 cmNlKTsKICAgICAgICAgZ19zb3VyY2VfdW5yZWYobV91cGRhdGVTb3VyY2UpOwogICAgIH0KLQot ICAgIGlmIChhdXRvIGltYWdlID0gc3RkOjpnZXQ8MD4obV9wZW5kaW5nSW1hZ2Uuc2Vjb25kKSkK LSAgICAgICAgZGVzdHJveUltYWdlKG1fZWdsRGlzcGxheSwgaW1hZ2UpOwotICAgIGlmIChhdXRv IGltYWdlID0gc3RkOjpnZXQ8MD4obV9sb2NrZWRJbWFnZS5zZWNvbmQpKQotICAgICAgICBkZXN0 cm95SW1hZ2UobV9lZ2xEaXNwbGF5LCBpbWFnZSk7CiB9CiAKIGNhaXJvX3N1cmZhY2VfdCogSGVh ZGxlc3NWaWV3QmFja2VuZDo6Y3JlYXRlU25hcHNob3QoKQpAQCAtMTEwLDE0ICsxMDEsMTAgQEAg Y2Fpcm9fc3VyZmFjZV90KiBIZWFkbGVzc1ZpZXdCYWNrZW5kOjpjcmVhdGVTbmFwc2hvdCgpCiAK ICAgICBwZXJmb3JtVXBkYXRlKCk7CiAKLSAgICBFR0xJbWFnZUtIUiBpbWFnZSA9IHN0ZDo6Z2V0 PDA+KG1fbG9ja2VkSW1hZ2Uuc2Vjb25kKTsKLSAgICBpZiAoIWltYWdlKQorICAgIGlmICghbV9s b2NrZWRJbWFnZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICB1aW50MzJfdCB3aWR0 aCA9IHN0ZDo6Z2V0PDE+KG1fbG9ja2VkSW1hZ2Uuc2Vjb25kKTsKLSAgICB1aW50MzJfdCBoZWln aHQgPSBzdGQ6OmdldDwyPihtX2xvY2tlZEltYWdlLnNlY29uZCk7Ci0KLSAgICB1aW50OF90KiBi dWZmZXIgPSBuZXcgdWludDhfdFs0ICogd2lkdGggKiBoZWlnaHRdOworICAgIHVpbnQ4X3QqIGJ1 ZmZlciA9IG5ldyB1aW50OF90WzQgKiBtX3dpZHRoICogbV9oZWlnaHRdOwogICAgIGJvb2wgc3Vj Y2Vzc2Z1bFNuYXBzaG90ID0gZmFsc2U7CiAKICAgICBpZiAoIWVnbE1ha2VDdXJyZW50KG1fZWds RGlzcGxheSwgRUdMX05PX1NVUkZBQ0UsIEVHTF9OT19TVVJGQUNFLCBtX2VnbENvbnRleHQpKQpA QCAtMTMwLDkgKzExNyw5IEBAIGNhaXJvX3N1cmZhY2VfdCogSGVhZGxlc3NWaWV3QmFja2VuZDo6 Y3JlYXRlU25hcHNob3QoKQogICAgIGdsVGV4UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9U RVhUVVJFX01BR19GSUxURVIsIEdMX0xJTkVBUik7CiAgICAgZ2xUZXhQYXJhbWV0ZXJpKEdMX1RF WFRVUkVfMkQsIEdMX1RFWFRVUkVfV1JBUF9TLCBHTF9DTEFNUF9UT19FREdFKTsKICAgICBnbFRl eFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVYVFVSRV9XUkFQX1QsIEdMX0NMQU1QX1RP X0VER0UpOwotICAgIGdsVGV4SW1hZ2UyRChHTF9URVhUVVJFXzJELCAwLCBHTF9CR1JBX0VYVCwg d2lkdGgsIGhlaWdodCwgMCwgR0xfQkdSQV9FWFQsIEdMX1VOU0lHTkVEX0JZVEUsIG51bGxwdHIp OworICAgIGdsVGV4SW1hZ2UyRChHTF9URVhUVVJFXzJELCAwLCBHTF9CR1JBX0VYVCwgbV93aWR0 aCwgbV9oZWlnaHQsIDAsIEdMX0JHUkFfRVhULCBHTF9VTlNJR05FRF9CWVRFLCBudWxscHRyKTsK IAotICAgIGltYWdlVGFyZ2V0VGV4dHVyZTJET0VTKEdMX1RFWFRVUkVfMkQsIGltYWdlKTsKKyAg ICBpbWFnZVRhcmdldFRleHR1cmUyRE9FUyhHTF9URVhUVVJFXzJELCBtX2xvY2tlZEltYWdlKTsK ICAgICBnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIDApOwogCiAgICAgR0x1aW50IGltYWdl RnJhbWVidWZmZXI7CkBAIC0xNDIsNyArMTI5LDcgQEAgY2Fpcm9fc3VyZmFjZV90KiBIZWFkbGVz c1ZpZXdCYWNrZW5kOjpjcmVhdGVTbmFwc2hvdCgpCiAKICAgICBnbEZsdXNoKCk7CiAgICAgaWYg KGdsQ2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHTF9GUkFNRUJVRkZFUikgPT0gR0xfRlJBTUVCVUZG RVJfQ09NUExFVEUpIHsKLSAgICAgICAgZ2xSZWFkUGl4ZWxzKDAsIDAsIHdpZHRoLCBoZWlnaHQs IEdMX0JHUkFfRVhULCBHTF9VTlNJR05FRF9CWVRFLCBidWZmZXIpOworICAgICAgICBnbFJlYWRQ aXhlbHMoMCwgMCwgbV93aWR0aCwgbV9oZWlnaHQsIEdMX0JHUkFfRVhULCBHTF9VTlNJR05FRF9C WVRFLCBidWZmZXIpOwogICAgICAgICBzdWNjZXNzZnVsU25hcHNob3QgPSB0cnVlOwogICAgIH0K IApAQCAtMTU2LDcgKzE0Myw3IEBAIGNhaXJvX3N1cmZhY2VfdCogSGVhZGxlc3NWaWV3QmFja2Vu ZDo6Y3JlYXRlU25hcHNob3QoKQogICAgIH0KIAogICAgIGNhaXJvX3N1cmZhY2VfdCogaW1hZ2VT dXJmYWNlID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEoYnVmZmVyLAotICAg ICAgICBDQUlST19GT1JNQVRfQVJHQjMyLCB3aWR0aCwgaGVpZ2h0LCBjYWlyb19mb3JtYXRfc3Ry aWRlX2Zvcl93aWR0aChDQUlST19GT1JNQVRfQVJHQjMyLCB3aWR0aCkpOworICAgICAgICBDQUlS T19GT1JNQVRfQVJHQjMyLCBtX3dpZHRoLCBtX2hlaWdodCwgY2Fpcm9fZm9ybWF0X3N0cmlkZV9m b3Jfd2lkdGgoQ0FJUk9fRk9STUFUX0FSR0IzMiwgbV93aWR0aCkpOwogICAgIGNhaXJvX3N1cmZh Y2VfbWFya19kaXJ0eShpbWFnZVN1cmZhY2UpOwogCiAgICAgc3RhdGljIGNhaXJvX3VzZXJfZGF0 YV9rZXlfdCBidWZmZXJLZXk7CkBAIC0xNzEsMzYgKzE1OCwyMyBAQCBjYWlyb19zdXJmYWNlX3Qq IEhlYWRsZXNzVmlld0JhY2tlbmQ6OmNyZWF0ZVNuYXBzaG90KCkKIAogdm9pZCBIZWFkbGVzc1Zp ZXdCYWNrZW5kOjpwZXJmb3JtVXBkYXRlKCkKIHsKLSAgICBpZiAoIW1fcGVuZGluZ0ltYWdlLmZp cnN0KQorICAgIGlmICghbV9wZW5kaW5nSW1hZ2UpCiAgICAgICAgIHJldHVybjsKIAogICAgIHdw ZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZGlzcGF0Y2hfZnJhbWVfY29tcGxldGUobV9l eHBvcnRhYmxlKTsKLSAgICBpZiAobV9sb2NrZWRJbWFnZS5maXJzdCkgewotICAgICAgICB3cGVf dmlld19iYWNrZW5kX2V4cG9ydGFibGVfZmRvX2Rpc3BhdGNoX3JlbGVhc2VfYnVmZmVyKG1fZXhw b3J0YWJsZSwgbV9sb2NrZWRJbWFnZS5maXJzdCk7Ci0gICAgICAgIGRlc3Ryb3lJbWFnZShtX2Vn bERpc3BsYXksIHN0ZDo6Z2V0PDA+KG1fbG9ja2VkSW1hZ2Uuc2Vjb25kKSk7Ci0gICAgfQorICAg IGlmIChtX2xvY2tlZEltYWdlKQorICAgICAgICB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVf ZmRvX2VnbF9kaXNwYXRjaF9yZWxlYXNlX2ltYWdlKG1fZXhwb3J0YWJsZSwgbV9sb2NrZWRJbWFn ZSk7CiAKICAgICBtX2xvY2tlZEltYWdlID0gbV9wZW5kaW5nSW1hZ2U7Ci0gICAgbV9wZW5kaW5n SW1hZ2UgPSBzdGQ6OnBhaXI8c3RydWN0IHdsX3Jlc291cmNlKiwgc3RkOjp0dXBsZTxFR0xJbWFn ZUtIUiwgdWludDMyX3QsIHVpbnQzMl90Pj4geyB9OworICAgIG1fcGVuZGluZ0ltYWdlID0gRUdM X05PX0lNQUdFX0tIUjsKIH0KIAotdm9pZCBIZWFkbGVzc1ZpZXdCYWNrZW5kOjpkaXNwbGF5QnVm ZmVyKHN0cnVjdCB3bF9yZXNvdXJjZSogYnVmZmVyUmVzb3VyY2UpCit2b2lkIEhlYWRsZXNzVmll d0JhY2tlbmQ6OmRpc3BsYXlCdWZmZXIoRUdMSW1hZ2VLSFIgaW1hZ2UpCiB7Ci0gICAgaWYgKG1f cGVuZGluZ0ltYWdlLmZpcnN0KQorICAgIGlmIChtX3BlbmRpbmdJbWFnZSkKICAgICAgICAgc3Rk OjphYm9ydCgpOwogCi0gICAgRUdMaW50IGZvcm1hdCA9IDA7Ci0gICAgaWYgKCFxdWVyeUJ1ZmZl cihtX2VnbERpc3BsYXksIGJ1ZmZlclJlc291cmNlLCBFR0xfVEVYVFVSRV9GT1JNQVQsICZmb3Jt YXQpIHx8IGZvcm1hdCAhPSBFR0xfVEVYVFVSRV9SR0JBKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBFR0xpbnQgd2lkdGgsIGhlaWdodDsKLSAgICBpZiAoIXF1ZXJ5QnVmZmVyKG1fZWdsRGlzcGxh eSwgYnVmZmVyUmVzb3VyY2UsIEVHTF9XSURUSCwgJndpZHRoKQotICAgICAgICB8fCAhcXVlcnlC dWZmZXIobV9lZ2xEaXNwbGF5LCBidWZmZXJSZXNvdXJjZSwgRUdMX0hFSUdIVCwgJmhlaWdodCkp Ci0gICAgICAgIHJldHVybjsKLQotICAgIEVHTGludCBhdHRyaWJ1dGVzW10gPSB7IEVHTF9XQVlM QU5EX1BMQU5FX1dMLCAwLCBFR0xfTk9ORSB9OwotICAgIEVHTEltYWdlS0hSIGltYWdlID0gY3Jl YXRlSW1hZ2UobV9lZ2xEaXNwbGF5LCBFR0xfTk9fQ09OVEVYVCwgRUdMX1dBWUxBTkRfQlVGRkVS X1dMLCBidWZmZXJSZXNvdXJjZSwgYXR0cmlidXRlcyk7Ci0gICAgbV9wZW5kaW5nSW1hZ2UgPSB7 IGJ1ZmZlclJlc291cmNlLCBzdGQ6Om1ha2VfdHVwbGUoaW1hZ2UsIHdpZHRoLCBoZWlnaHQpIH07 CisgICAgbV9wZW5kaW5nSW1hZ2UgPSBpbWFnZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV1BFVG9v bGluZ0JhY2tlbmRzCmRpZmYgLS1naXQgYS9Ub29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3 QmFja2VuZC5oIGIvVG9vbHMvd3BlL2JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuaAppbmRl eCAxNzg0MjRlOTc4ZTUyYTc0MDA1MTI4ODgxMzA3ZDBlNDI5MDYzMjVhLi5iMGQ2NmUzOWYzZTgz MDU4YTljOWMxOWJkMDM4NTU4MDIxNGY1OWRlIDEwMDY0NAotLS0gYS9Ub29scy93cGUvYmFja2Vu ZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5oCisrKyBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9IZWFkbGVz c1ZpZXdCYWNrZW5kLmgKQEAgLTM3LDE3ICszNywxNyBAQCBuYW1lc3BhY2UgV1BFVG9vbGluZ0Jh Y2tlbmRzIHsKIGNsYXNzIEhlYWRsZXNzVmlld0JhY2tlbmQgZmluYWwgOiBwdWJsaWMgVmlld0Jh Y2tlbmQgewogcHVibGljOgogICAgIEhlYWRsZXNzVmlld0JhY2tlbmQodWludDMyX3Qgd2lkdGgs IHVpbnQzMl90IGhlaWdodCk7Ci0gICAgfkhlYWRsZXNzVmlld0JhY2tlbmQoKTsKKyAgICB2aXJ0 dWFsIH5IZWFkbGVzc1ZpZXdCYWNrZW5kKCk7CiAKICAgICBjYWlyb19zdXJmYWNlX3QqIGNyZWF0 ZVNuYXBzaG90KCk7CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBkaXNwbGF5QnVmZmVyKHN0cnVjdCB3 bF9yZXNvdXJjZSopIG92ZXJyaWRlOworICAgIHZvaWQgZGlzcGxheUJ1ZmZlcihFR0xJbWFnZUtI Uikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIHBlcmZvcm1VcGRhdGUoKTsKIAotICAgIHN0ZDo6cGFp cjxzdHJ1Y3Qgd2xfcmVzb3VyY2UqLCBzdGQ6OnR1cGxlPEVHTEltYWdlS0hSLCB1aW50MzJfdCwg dWludDMyX3Q+PiBtX3BlbmRpbmdJbWFnZSB7IH07Ci0gICAgc3RkOjpwYWlyPHN0cnVjdCB3bF9y ZXNvdXJjZSosIHN0ZDo6dHVwbGU8RUdMSW1hZ2VLSFIsIHVpbnQzMl90LCB1aW50MzJfdD4+IG1f bG9ja2VkSW1hZ2UgeyB9OworICAgIEVHTEltYWdlS0hSIG1fcGVuZGluZ0ltYWdlOworICAgIEVH TEltYWdlS0hSIG1fbG9ja2VkSW1hZ2U7CiAKICAgICBHU291cmNlKiBtX3VwZGF0ZVNvdXJjZSB7 IG51bGxwdHIgfTsKICAgICBnaW50NjQgbV9mcmFtZVJhdGUgeyBHX1VTRUNfUEVSX1NFQyAvIDYw IH07CmRpZmYgLS1naXQgYS9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuY3BwIGIvVG9v bHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmNwcAppbmRleCAwNDhmYWYwNDA0NzM3OWJlODY4 YzQ4MjI1YmIwZmJjMDMxMmU2YzM4Li44ZGFiMGFhZWU3MTYxZWRkOWIyNWEwODVmOWI3MjQ3N2Ew NzM5NjQ1IDEwMDY0NAotLS0gYS9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuY3BwCisr KyBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5jcHAKQEAgLTkyLDE2ICs5MiwxNiBA QCBib29sIFZpZXdCYWNrZW5kOjppbml0aWFsaXplKCkKICAgICBpZiAoIW1fZWdsQ29udGV4dCkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgc3RhdGljIHN0cnVjdCB3cGVfdmlld19iYWNr ZW5kX2V4cG9ydGFibGVfZmRvX2NsaWVudCBleHBvcnRhYmxlQ2xpZW50ID0geworICAgIHN0YXRp YyBzdHJ1Y3Qgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19lZ2xfY2xpZW50IGV4cG9y dGFibGVDbGllbnQgPSB7CiAgICAgICAgIC8vIGV4cG9ydF9idWZmZXJfcmVzb3VyY2UKLSAgICAg ICAgW10odm9pZCogZGF0YSwgc3RydWN0IHdsX3Jlc291cmNlKiBidWZmZXJSZXNvdXJjZSkKKyAg ICAgICAgW10odm9pZCogZGF0YSwgRUdMSW1hZ2VLSFIgaW1hZ2UpCiAgICAgICAgIHsKLSAgICAg ICAgICAgIHN0YXRpY19jYXN0PFZpZXdCYWNrZW5kKj4oZGF0YSktPmRpc3BsYXlCdWZmZXIoYnVm ZmVyUmVzb3VyY2UpOworICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Vmlld0JhY2tlbmQqPihkYXRh KS0+ZGlzcGxheUJ1ZmZlcihpbWFnZSk7CiAgICAgICAgIH0sCiAgICAgICAgIC8vIHBhZGRpbmcK ICAgICAgICAgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0ciwgbnVsbHB0cgogICAgIH07Ci0gICAg bV9leHBvcnRhYmxlID0gd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19jcmVhdGUoJmV4 cG9ydGFibGVDbGllbnQsIHRoaXMsIG1fd2lkdGgsIG1faGVpZ2h0KTsKKyAgICBtX2V4cG9ydGFi bGUgPSB3cGVfdmlld19iYWNrZW5kX2V4cG9ydGFibGVfZmRvX2VnbF9jcmVhdGUoJmV4cG9ydGFi bGVDbGllbnQsIHRoaXMsIG1fd2lkdGgsIG1faGVpZ2h0KTsKIAogICAgIHJldHVybiB0cnVlOwog fQpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmggYi9Ub29scy93 cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaAppbmRleCBlOTlhMTg4ZDYwNmRlODhjYTJlNmE2ZWE0 NjIwNjg2M2E2ZDQ1Yjk3Li42M2U5ZjhiZmIwMmZjOGVlMDM1ZjkyNjFmOTcyNDc4ZGZjZjkwZTAy IDEwMDY0NAotLS0gYS9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaAorKysgYi9Ub29s cy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaApAQCAtMzEsNiArMzEsNyBAQAogdHlwZWRlZiB2 b2lkKiBFR0xDb25maWc7CiB0eXBlZGVmIHZvaWQqIEVHTENvbnRleHQ7CiB0eXBlZGVmIHZvaWQq IEVHTERpc3BsYXk7Cit0eXBlZGVmIHZvaWQqIEVHTEltYWdlS0hSOwogCiAvLyBNYW51YWxseSBw cm92aWRlIHRoZSBFR0xfQ0FTVCBDKysgZGVmaW5pdGlvbiBpbiBjYXNlIGVnbHBsYXRmb3JtLmgg ZG9lc24ndCBwcm92aWRlIGl0LgogI2lmbmRlZiBFR0xfQ0FTVApAQCAtNjYsNyArNjcsNyBAQCBw cm90ZWN0ZWQ6CiAgICAgdm9pZCBkaXNwYXRjaElucHV0S2V5Ym9hcmRFdmVudChzdHJ1Y3Qgd3Bl X2lucHV0X2tleWJvYXJkX2V2ZW50Kik7CiAgICAgdm9pZCBkaXNwYXRjaElucHV0VG91Y2hFdmVu dChzdHJ1Y3Qgd3BlX2lucHV0X3RvdWNoX2V2ZW50Kik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZGlz cGxheUJ1ZmZlcihzdHJ1Y3Qgd2xfcmVzb3VyY2UqKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRp c3BsYXlCdWZmZXIoRUdMSW1hZ2VLSFIpID0gMDsKIAogICAgIHVpbnQzMl90IG1fd2lkdGggeyAw IH07CiAgICAgdWludDMyX3QgbV9oZWlnaHQgeyAwIH07CmRpZmYgLS1naXQgYS9Ub29scy93cGUv YmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRv d1ZpZXdCYWNrZW5kLmNwcAppbmRleCBmMWU2YmQ1OWUyYTQ1ZDg2MjMwYWZjMTQ3ZTI3ZWQ5OTRj YWIyMDVmLi5iMjk5NzFhOWJmODgzZGZiYjI5NWVmNjcwNmI2MDIwNGE5N2UyZjJiIDEwMDY0NAot LS0gYS9Ub29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwCisrKyBiL1Rvb2xz L3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2VuZC5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKIC8v IFRoaXMgaW5jbHVkZSBvcmRlciBpcyBuZWNlc3NhcnkgdG8gZW5mb3JjZSB0aGUgV2F5bGFuZCBF R0wgcGxhdGZvcm0uCiAjaW5jbHVkZSA8d2F5bGFuZC1lZ2wuaD4KICNpbmNsdWRlIDxlcG94eS9l Z2wuaD4KKyNpbmNsdWRlIDx3cGUvZmRvLWVnbC5oPgogCiAjaWZuZGVmIEVHTF9XTF9iaW5kX3dh eWxhbmRfZGlzcGxheQogI2RlZmluZSBFR0xfV0xfYmluZF93YXlsYW5kX2Rpc3BsYXkgMQpAQCAt NDYsOCArNDcsNiBAQCB0eXBlZGVmIEVHTEJvb2xlYW4gKEVHTEFQSUVOVFJZUCBQRk5FR0xRVUVS WVdBWUxBTkRCVUZGRVJXTCkgKEVHTERpc3BsYXkgZHB5LCBzdAogCiBuYW1lc3BhY2UgV1BFVG9v bGluZ0JhY2tlbmRzIHsKIAotc3RhdGljIFBGTkVHTENSRUFURUlNQUdFS0hSUFJPQyBjcmVhdGVJ bWFnZTsKLXN0YXRpYyBQRk5FR0xERVNUUk9ZSU1BR0VLSFJQUk9DIGRlc3Ryb3lJbWFnZTsKIHN0 YXRpYyBQRk5HTEVHTElNQUdFVEFSR0VUVEVYVFVSRTJET0VTUFJPQyBpbWFnZVRhcmdldFRleHR1 cmUyRE9FUzsKIAogc3RydWN0IEV2ZW50U291cmNlIHsKQEAgLTQ5OSw4ICs0OTgsNiBAQCBXaW5k b3dWaWV3QmFja2VuZDo6V2luZG93Vmlld0JhY2tlbmQodWludDMyX3Qgd2lkdGgsIHVpbnQzMl90 IGhlaWdodCkKICAgICBpZiAoIWVnbE1ha2VDdXJyZW50KG1fZWdsRGlzcGxheSwgbV9lZ2xTdXJm YWNlLCBtX2VnbFN1cmZhY2UsIG1fZWdsQ29udGV4dCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IGNyZWF0ZUltYWdlID0gcmVpbnRlcnByZXRfY2FzdDxQRk5FR0xDUkVBVEVJTUFHRUtIUlBST0M+ KGVnbEdldFByb2NBZGRyZXNzKCJlZ2xDcmVhdGVJbWFnZUtIUiIpKTsKLSAgICBkZXN0cm95SW1h Z2UgPSByZWludGVycHJldF9jYXN0PFBGTkVHTERFU1RST1lJTUFHRUtIUlBST0M+KGVnbEdldFBy b2NBZGRyZXNzKCJlZ2xEZXN0cm95SW1hZ2VLSFIiKSk7CiAgICAgaW1hZ2VUYXJnZXRUZXh0dXJl MkRPRVMgPSByZWludGVycHJldF9jYXN0PFBGTkdMRUdMSU1BR0VUQVJHRVRURVhUVVJFMkRPRVNQ Uk9DPihlZ2xHZXRQcm9jQWRkcmVzcygiZ2xFR0xJbWFnZVRhcmdldFRleHR1cmUyRE9FUyIpKTsK IAogICAgIHsKQEAgLTU3Nyw5ICs1NzQsNiBAQCBXaW5kb3dWaWV3QmFja2VuZDo6fldpbmRvd1Zp ZXdCYWNrZW5kKCkKICAgICBpZiAobV9jb21wb3NpdG9yKQogICAgICAgICB3bF9jb21wb3NpdG9y X2Rlc3Ryb3kobV9jb21wb3NpdG9yKTsKIAotICAgIGlmIChtX2NvbW1pdHRlZC5pbWFnZSkKLSAg ICAgICAgZGVzdHJveUltYWdlKG1fZWdsRGlzcGxheSwgbV9jb21taXR0ZWQuaW1hZ2UpOwotCiAg ICAgaWYgKG1fZWdsU3VyZmFjZSkKICAgICAgICAgZWdsRGVzdHJveVN1cmZhY2UobV9lZ2xEaXNw bGF5LCBtX2VnbFN1cmZhY2UpOwogCkBAIC01OTcsMTUgKzU5MSwxMyBAQCBjb25zdCBzdHJ1Y3Qg d2xfY2FsbGJhY2tfbGlzdGVuZXIgV2luZG93Vmlld0JhY2tlbmQ6OnNfZnJhbWVMaXN0ZW5lciA9 IHsKICAgICAgICAgYXV0byYgd2luZG93ID0gKnN0YXRpY19jYXN0PFdpbmRvd1ZpZXdCYWNrZW5k Kj4oZGF0YSk7CiAgICAgICAgIHdwZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZGlzcGF0 Y2hfZnJhbWVfY29tcGxldGUod2luZG93Lm1fZXhwb3J0YWJsZSk7CiAKLSAgICAgICAgaWYgKHdp bmRvdy5tX2NvbW1pdHRlZC5pbWFnZSkKLSAgICAgICAgICAgIGRlc3Ryb3lJbWFnZSh3aW5kb3cu bV9lZ2xEaXNwbGF5LCB3aW5kb3cubV9jb21taXR0ZWQuaW1hZ2UpOwotICAgICAgICBpZiAod2lu ZG93Lm1fY29tbWl0dGVkLmJ1ZmZlclJlc291cmNlKQotICAgICAgICAgICAgd3BlX3ZpZXdfYmFj a2VuZF9leHBvcnRhYmxlX2Zkb19kaXNwYXRjaF9yZWxlYXNlX2J1ZmZlcih3aW5kb3cubV9leHBv cnRhYmxlLCB3aW5kb3cubV9jb21taXR0ZWQuYnVmZmVyUmVzb3VyY2UpOwotICAgICAgICB3aW5k b3cubV9jb21taXR0ZWQgPSB7IG51bGxwdHIsIG51bGxwdHIgfTsKKyAgICAgICAgaWYgKHdpbmRv dy5tX2NvbW1pdHRlZEltYWdlKQorICAgICAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRh YmxlX2Zkb19lZ2xfZGlzcGF0Y2hfcmVsZWFzZV9pbWFnZSh3aW5kb3cubV9leHBvcnRhYmxlLCB3 aW5kb3cubV9jb21taXR0ZWRJbWFnZSk7CisgICAgICAgIHdpbmRvdy5tX2NvbW1pdHRlZEltYWdl ID0gRUdMX05PX0lNQUdFX0tIUjsKICAgICB9CiB9OwogCi12b2lkIFdpbmRvd1ZpZXdCYWNrZW5k OjpkaXNwbGF5QnVmZmVyKHN0cnVjdCB3bF9yZXNvdXJjZSogYnVmZmVyUmVzb3VyY2UpCit2b2lk IFdpbmRvd1ZpZXdCYWNrZW5kOjpkaXNwbGF5QnVmZmVyKEVHTEltYWdlS0hSIGltYWdlKQogewog ICAgIGlmICghbV9lZ2xDb250ZXh0KQogICAgICAgICByZXR1cm47CkBAIC02MTcsMjAgKzYwOSwx MiBAQCB2b2lkIFdpbmRvd1ZpZXdCYWNrZW5kOjpkaXNwbGF5QnVmZmVyKHN0cnVjdCB3bF9yZXNv dXJjZSogYnVmZmVyUmVzb3VyY2UpCiAKICAgICBnbFVzZVByb2dyYW0obV9wcm9ncmFtKTsKIAot ICAgIHsKLSAgICAgICAgc3RhdGljIEVHTGludCBpbWFnZUF0dHJpYnV0ZXNbXSA9IHsKLSAgICAg ICAgICAgIEVHTF9XQVlMQU5EX1BMQU5FX1dMLCAwLAotICAgICAgICAgICAgRUdMX05PTkUKLSAg ICAgICAgfTsKLSAgICAgICAgRUdMSW1hZ2VLSFIgaW1hZ2UgPSBjcmVhdGVJbWFnZShtX2VnbERp c3BsYXksIEVHTF9OT19DT05URVhULCBFR0xfV0FZTEFORF9CVUZGRVJfV0wsIGJ1ZmZlclJlc291 cmNlLCBpbWFnZUF0dHJpYnV0ZXMpOworICAgIGdsQWN0aXZlVGV4dHVyZShHTF9URVhUVVJFMCk7 CisgICAgZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX3ZpZXdUZXh0dXJlKTsKKyAgICBp bWFnZVRhcmdldFRleHR1cmUyRE9FUyhHTF9URVhUVVJFXzJELCBpbWFnZSk7CisgICAgZ2xVbmlm b3JtMWkobV90ZXh0dXJlVW5pZm9ybSwgMCk7CiAKLSAgICAgICAgZ2xBY3RpdmVUZXh0dXJlKEdM X1RFWFRVUkUwKTsKLSAgICAgICAgZ2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX3ZpZXdU ZXh0dXJlKTsKLSAgICAgICAgaW1hZ2VUYXJnZXRUZXh0dXJlMkRPRVMoR0xfVEVYVFVSRV8yRCwg aW1hZ2UpOwotICAgICAgICBnbFVuaWZvcm0xaShtX3RleHR1cmVVbmlmb3JtLCAwKTsKLQotICAg ICAgICBtX2NvbW1pdHRlZCA9IHsgYnVmZmVyUmVzb3VyY2UsIGltYWdlIH07Ci0gICAgfQorICAg IG1fY29tbWl0dGVkSW1hZ2UgPSBpbWFnZTsKIAogICAgIHN0YXRpYyBjb25zdCBHTGZsb2F0IHZl cnRpY2VzWzRdWzJdID0gewogICAgICAgICB7IC0xLjAsIDEuMCB9LApkaWZmIC0tZ2l0IGEvVG9v bHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmggYi9Ub29scy93cGUvYmFja2VuZHMv V2luZG93Vmlld0JhY2tlbmQuaAppbmRleCAzZjEzNGE5MzlmMTdlZTUyNzYxNDA2ZDUyOTg0NzMz ZGY3Y2RlNjIyLi4xMzRmZTdjMmIyMzVkYmZiZTkxNDFlYmRlMzgxMzk3YjA5ZTE5N2FjIDEwMDY0 NAotLS0gYS9Ub29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuaAorKysgYi9Ub29s cy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuaApAQCAtNDEsMTAgKzQxLDEwIEBAIG5h bWVzcGFjZSBXUEVUb29saW5nQmFja2VuZHMgewogY2xhc3MgV2luZG93Vmlld0JhY2tlbmQgZmlu YWwgOiBwdWJsaWMgVmlld0JhY2tlbmQgewogcHVibGljOgogICAgIFdpbmRvd1ZpZXdCYWNrZW5k KHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpOwotICAgIH5XaW5kb3dWaWV3QmFja2Vu ZCgpOworICAgIHZpcnR1YWwgfldpbmRvd1ZpZXdCYWNrZW5kKCk7CiAKIHByaXZhdGU6Ci0gICAg dm9pZCBkaXNwbGF5QnVmZmVyKHN0cnVjdCB3bF9yZXNvdXJjZSopIG92ZXJyaWRlOworICAgIHZv aWQgZGlzcGxheUJ1ZmZlcihFR0xJbWFnZUtIUikgb3ZlcnJpZGU7CiAKICAgICBzdGF0aWMgY29u c3Qgc3RydWN0IHdsX3JlZ2lzdHJ5X2xpc3RlbmVyIHNfcmVnaXN0cnlMaXN0ZW5lcjsKICAgICBz dGF0aWMgY29uc3Qgc3RydWN0IHp4ZGdfc2hlbGxfdjZfbGlzdGVuZXIgc194ZGdXbUJhc2VMaXN0 ZW5lcjsKQEAgLTExOSwxMCArMTE5LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX3Byb2dy YW0geyAwIH07CiAgICAgdW5zaWduZWQgbV90ZXh0dXJlVW5pZm9ybSB7IDAgfTsKICAgICB1bnNp Z25lZCBtX3ZpZXdUZXh0dXJlIHsgMCB9OwotICAgIHN0cnVjdCB7Ci0gICAgICAgIHN0cnVjdCB3 bF9yZXNvdXJjZSogYnVmZmVyUmVzb3VyY2UgeyBudWxscHRyIH07Ci0gICAgICAgIEVHTEltYWdl S0hSIGltYWdlOwotICAgIH0gbV9jb21taXR0ZWQ7CisgICAgRUdMSW1hZ2VLSFIgbV9jb21taXR0 ZWRJbWFnZTsKIH07CiAKIH0gLy8gV1BFVG9vbGluZ0JhY2tlbmRzCmRpZmYgLS1naXQgYS9Ub29s cy93cGUvamhidWlsZC5tb2R1bGVzIGIvVG9vbHMvd3BlL2poYnVpbGQubW9kdWxlcwppbmRleCA0 NDkxMGMxMTZlZDc4Y2Y5YTIxODZlMzYyZWFkNjQ2OTRkYmZjODJiLi5iMWFiNDY4MjcyOGEwOWJi NmMxOWVkMDM2ZDFhODQ5YTM4N2FhZDQyIDEwMDY0NAotLS0gYS9Ub29scy93cGUvamhidWlsZC5t b2R1bGVzCisrKyBiL1Rvb2xzL3dwZS9qaGJ1aWxkLm1vZHVsZXMKQEAgLTE3Niw3ICsxNzYsNyBA QAogICAgICAgPGRlcCBwYWNrYWdlPSJnbGliIi8+CiAgICAgPC9kZXBlbmRlbmNpZXM+CiAgICAg PGJyYW5jaCByZXBvPSJnaXRodWIuY29tIiBtb2R1bGU9IklnYWxpYS9XUEVCYWNrZW5kLWZkby5n aXQiCi0gICAgICAgICAgICB0YWc9ImJkZDQ2ODcwYjFkYzNjOTIwMDUzNDNlMzE2MWJkZDI0ZjYy MGIxMWQiLz4KKyAgICAgICAgICAgIHRhZz0iZGE3NDZhZjJkZmY2Yjk3MmM1YzQ5MDNhMTMyZWRj YWZkYjc2ODkyNiIvPgogICA8L2NtYWtlPgogCiAgIDxhdXRvdG9vbHMgaWQ9ImxpYmdwZy1lcnJv ciIgYXV0b2dlbi1zaD0iY29uZmlndXJlIj4K