201415 2019-09-02 23:20:35 -0700 [WPE] Make view backends multi-view-friendly 2019-09-03 03:46:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan cgarcia webkit-bug-importer oldest_to_newest 1567289 0 zan 2019-09-02 23:20:35 -0700 [WPE] Make view backends multi-view-friendly 1567290 1 377871 zan 2019-09-02 23:27:20 -0700 Created attachment 377871 Patch 1567301 2 377871 cgarcia 2019-09-03 01:15:05 -0700 Comment on attachment 377871 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377871&action=review > Tools/ChangeLog:7 > + Could you explain here why the changes make view backends multi-view-friendly? Looking at the patch it seems just a refactoring to move the code to initialize EGL. > Tools/wpe/backends/HeadlessViewBackend.cpp:61 > + if (!eglInitialize(eglDisplay, nullptr, nullptr)) Don't we need to do the eglBindAPI here too? 1567331 3 377885 zan 2019-09-03 03:43:40 -0700 Created attachment 377885 Patch for landing 1567334 4 377885 zan 2019-09-03 03:45:48 -0700 Comment on attachment 377885 Patch for landing Clearing flags on attachment: 377885 Committed r249424: <https://trac.webkit.org/changeset/249424> 1567335 5 zan 2019-09-03 03:45:51 -0700 All reviewed patches have been landed. Closing bug. 1567336 6 webkit-bug-importer 2019-09-03 03:46:18 -0700 <rdar://problem/54970698> 377871 2019-09-02 23:27:20 -0700 2019-09-03 03:43:37 -0700 Patch bug-201415-20190903082718.patch text/plain 14222 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NDE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzlhYzRmZTlkNmU3NzNiMjBkOTUzMDBiYzA5OTViN2U3 MjY5OTU2Yy4uZDliZTYyNGFlODU0YzYyNDdhZGRkMzFmNGZmODdkOTQxMGJiYjZiNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDE5LTA5LTAyICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbV1BFXSBNYWtlIHZpZXcgYmFja2VuZHMgbXVsdGktdmlldy1mcmllbmRseQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNDE1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3cGUvYmFja2Vu ZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5jcHA6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6 OkhlYWRsZXNzRUdMQ29ubmVjdGlvbjo6c2luZ2xldG9uKToKKyAgICAgICAgKFdQRVRvb2xpbmdC YWNrZW5kczo6SGVhZGxlc3NWaWV3QmFja2VuZDo6SGVhZGxlc3NWaWV3QmFja2VuZCk6CisgICAg ICAgIChXUEVUb29saW5nQmFja2VuZHM6OkhlYWRsZXNzVmlld0JhY2tlbmQ6On5IZWFkbGVzc1Zp ZXdCYWNrZW5kKToKKyAgICAgICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6SGVhZGxlc3NWaWV3QmFj a2VuZDo6Y3JlYXRlU25hcHNob3QpOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpnZXRF R0xEaXNwbGF5KTogRGVsZXRlZC4KKyAgICAgICAgKiB3cGUvYmFja2VuZHMvVmlld0JhY2tlbmQu Y3BwOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpWaWV3QmFja2VuZDo6aW5pdGlhbGl6 ZSk6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6OlZpZXdCYWNrZW5kOjpkZWluaXRpYWxp emUpOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpWaWV3QmFja2VuZDo6flZpZXdCYWNr ZW5kKTogRGVsZXRlZC4KKyAgICAgICAgKiB3cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaDoKKyAg ICAgICAgKiB3cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwOgorICAgICAgICAoV1BF VG9vbGluZ0JhY2tlbmRzOjpXYXlsYW5kRUdMQ29ubmVjdGlvbjo6c2luZ2xldG9uKToKKyAgICAg ICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6V2luZG93Vmlld0JhY2tlbmQ6OldpbmRvd1ZpZXdCYWNr ZW5kKToKKyAgICAgICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6V2luZG93Vmlld0JhY2tlbmQ6On5X aW5kb3dWaWV3QmFja2VuZCk6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6OldpbmRvd1Zp ZXdCYWNrZW5kOjpkaXNwbGF5QnVmZmVyKToKKwogMjAxOS0wOS0wMiAgWmFuIERvYmVyc2VrICA8 emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gV2luZG93QmFja2VuZCBzaG91 bGQgZG8gcmVzaXppbmcgcHJvcGVybHkKZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9I ZWFkbGVzc1ZpZXdCYWNrZW5kLmNwcCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9IZWFkbGVzc1ZpZXdC YWNrZW5kLmNwcAppbmRleCAxZDA0MTA0YWMwNTI2ZDBiNGMwMGMxMmZjNWMyYzhmMWZlYjQ3Yjk2 Li5iM2YzY2U3NmVmMzIzMDNmYTk0YWVhYzY3YjJkMDUyZTMwMDQ5YTFjIDEwMDY0NAotLS0gYS9U b29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5jcHAKKysrIGIvVG9vbHMvd3Bl L2JhY2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAKICNp bmNsdWRlIDxjYXNzZXJ0PgogI2luY2x1ZGUgPGZjbnRsLmg+CisjaW5jbHVkZSA8bXV0ZXg+CiAj aW5jbHVkZSA8dW5pc3RkLmg+CiAKIC8vIFRoaXMgaW5jbHVkZSBvcmRlciBpcyBuZWNlc3Nhcnkg dG8gZW5mb3JjZSB0aGUgR0JNIEVHTCBwbGF0Zm9ybS4KQEAgLTQ0LDM1ICs0NSw0NSBAQCB0eXBl ZGVmIEVHTEJvb2xlYW4gKEVHTEFQSUVOVFJZUCBQRk5FR0xRVUVSWVdBWUxBTkRCVUZGRVJXTCkg KEVHTERpc3BsYXkgZHB5LCBzdAogCiBuYW1lc3BhY2UgV1BFVG9vbGluZ0JhY2tlbmRzIHsKIAot c3RhdGljIFBGTkdMRUdMSU1BR0VUQVJHRVRURVhUVVJFMkRPRVNQUk9DIGltYWdlVGFyZ2V0VGV4 dHVyZTJET0VTOworc3RydWN0IEhlYWRsZXNzRUdMQ29ubmVjdGlvbiB7CisgICAgRUdMRGlzcGxh eSBlZ2xEaXNwbGF5IHsgRUdMX05PX0RJU1BMQVkgfTsKIAotLy8gS2VlcCB0aGlzIGluIHN5bmMg d2l0aCB3dGYvZ2xpYi9SdW5Mb29wU291cmNlUHJpb3JpdHkuaC4KLXN0YXRpYyBpbnQga1J1bkxv b3BTb3VyY2VQcmlvcml0eURpc3BhdGNoZXIgPSAtNzA7CisgICAgc3RhdGljIGNvbnN0IEhlYWRs ZXNzRUdMQ29ubmVjdGlvbiYgc2luZ2xldG9uKCkKKyAgICB7CisgICAgICAgIHN0YXRpYyBzdGQ6 Om9uY2VfZmxhZyBzX29uY2VGbGFnOworICAgICAgICBzdGF0aWMgSGVhZGxlc3NFR0xDb25uZWN0 aW9uIHNfY29ubmVjdGlvbjsKKyAgICAgICAgc3RkOjpjYWxsX29uY2Uoc19vbmNlRmxhZywKKyAg ICAgICAgICAgIFtdIHsKKyAgICAgICAgICAgICAgICBFR0xEaXNwbGF5IGVnbERpc3BsYXkgPSBl Z2xHZXREaXNwbGF5KEVHTF9ERUZBVUxUX0RJU1BMQVkpOworICAgICAgICAgICAgICAgIGlmIChl Z2xEaXNwbGF5ID09IEVHTF9OT19ESVNQTEFZKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47 CiAKLXN0YXRpYyBFR0xEaXNwbGF5IGdldEVHTERpc3BsYXkoKQotewotICAgIHN0YXRpYyBFR0xE aXNwbGF5IHNfZGlzcGxheSA9IEVHTF9OT19ESVNQTEFZOwotICAgIGlmIChzX2Rpc3BsYXkgPT0g RUdMX05PX0RJU1BMQVkpIHsKLSAgICAgICAgRUdMRGlzcGxheSBkaXNwbGF5ID0gZWdsR2V0RGlz cGxheShFR0xfREVGQVVMVF9ESVNQTEFZKTsKLSAgICAgICAgaWYgKGRpc3BsYXkgPT0gRUdMX05P X0RJU1BMQVkpCi0gICAgICAgICAgICByZXR1cm4gRUdMX05PX0RJU1BMQVk7CisgICAgICAgICAg ICAgICAgaWYgKCFlZ2xJbml0aWFsaXplKGVnbERpc3BsYXksIG51bGxwdHIsIG51bGxwdHIpKQor ICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgc19kaXNwbGF5ID0gZGlzcGxh eTsKKyAgICAgICAgICAgICAgICBzX2Nvbm5lY3Rpb24uZWdsRGlzcGxheSA9IGVnbERpc3BsYXk7 CisgICAgICAgICAgICAgICAgd3BlX2Zkb19pbml0aWFsaXplX2Zvcl9lZ2xfZGlzcGxheShzX2Nv bm5lY3Rpb24uZWdsRGlzcGxheSk7CisgICAgICAgICAgICB9KTsKKworICAgICAgICByZXR1cm4g c19jb25uZWN0aW9uOwogICAgIH0KK307CiAKLSAgICByZXR1cm4gc19kaXNwbGF5OwotfQorc3Rh dGljIFBGTkdMRUdMSU1BR0VUQVJHRVRURVhUVVJFMkRPRVNQUk9DIGltYWdlVGFyZ2V0VGV4dHVy ZTJET0VTOworCisvLyBLZWVwIHRoaXMgaW4gc3luYyB3aXRoIHd0Zi9nbGliL1J1bkxvb3BTb3Vy Y2VQcmlvcml0eS5oLgorc3RhdGljIGludCBrUnVuTG9vcFNvdXJjZVByaW9yaXR5RGlzcGF0Y2hl ciA9IC03MDsKIAogSGVhZGxlc3NWaWV3QmFja2VuZDo6SGVhZGxlc3NWaWV3QmFja2VuZCh1aW50 MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KQogICAgIDogVmlld0JhY2tlbmQod2lkdGgsIGhl aWdodCkKIHsKLSAgICBtX2VnbERpc3BsYXkgPSBnZXRFR0xEaXNwbGF5KCk7Ci0gICAgaWYgKCFp bml0aWFsaXplKCkpCisgICAgYXV0byYgY29ubmVjdGlvbiA9IEhlYWRsZXNzRUdMQ29ubmVjdGlv bjo6c2luZ2xldG9uKCk7CisgICAgaWYgKGNvbm5lY3Rpb24uZWdsRGlzcGxheSA9PSBFR0xfTk9f RElTUExBWSB8fCAhaW5pdGlhbGl6ZShjb25uZWN0aW9uLmVnbERpc3BsYXkpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBhZGRBY3Rpdml0eVN0YXRlKHdwZV92aWV3X2FjdGl2aXR5X3N0YXRlX3Zp c2libGUgfCB3cGVfdmlld19hY3Rpdml0eV9zdGF0ZV9mb2N1c2VkIHwgd3BlX3ZpZXdfYWN0aXZp dHlfc3RhdGVfaW5fd2luZG93KTsKIAotICAgIGlmICghZWdsTWFrZUN1cnJlbnQobV9lZ2xEaXNw bGF5LCBFR0xfTk9fU1VSRkFDRSwgRUdMX05PX1NVUkZBQ0UsIG1fZWdsQ29udGV4dCkpCisgICAg aWYgKCFlZ2xNYWtlQ3VycmVudChjb25uZWN0aW9uLmVnbERpc3BsYXksIEVHTF9OT19TVVJGQUNF LCBFR0xfTk9fU1VSRkFDRSwgbV9lZ2xDb250ZXh0KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg aW1hZ2VUYXJnZXRUZXh0dXJlMkRPRVMgPSByZWludGVycHJldF9jYXN0PFBGTkdMRUdMSU1BR0VU QVJHRVRURVhUVVJFMkRPRVNQUk9DPihlZ2xHZXRQcm9jQWRkcmVzcygiZ2xFR0xJbWFnZVRhcmdl dFRleHR1cmUyRE9FUyIpKTsKQEAgLTkyLDYgKzEwMywxMyBAQCBIZWFkbGVzc1ZpZXdCYWNrZW5k Ojp+SGVhZGxlc3NWaWV3QmFja2VuZCgpCiAgICAgICAgIGdfc291cmNlX2Rlc3Ryb3kobV91cGRh dGVTb3VyY2UpOwogICAgICAgICBnX3NvdXJjZV91bnJlZihtX3VwZGF0ZVNvdXJjZSk7CiAgICAg fQorCisgICAgaWYgKG1fbG9ja2VkSW1hZ2UpCisgICAgICAgIHdwZV92aWV3X2JhY2tlbmRfZXhw b3J0YWJsZV9mZG9fZWdsX2Rpc3BhdGNoX3JlbGVhc2VfZXhwb3J0ZWRfaW1hZ2UobV9leHBvcnRh YmxlLCBtX2xvY2tlZEltYWdlKTsKKyAgICBpZiAobV9wZW5kaW5nSW1hZ2UpCisgICAgICAgIHdw ZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZWdsX2Rpc3BhdGNoX3JlbGVhc2VfZXhwb3J0 ZWRfaW1hZ2UobV9leHBvcnRhYmxlLCBtX3BlbmRpbmdJbWFnZSk7CisKKyAgICBkZWluaXRpYWxp emUoSGVhZGxlc3NFR0xDb25uZWN0aW9uOjpzaW5nbGV0b24oKS5lZ2xEaXNwbGF5KTsKIH0KIAog Y2Fpcm9fc3VyZmFjZV90KiBIZWFkbGVzc1ZpZXdCYWNrZW5kOjpjcmVhdGVTbmFwc2hvdCgpCkBA IC0xMDcsNyArMTI1LDcgQEAgY2Fpcm9fc3VyZmFjZV90KiBIZWFkbGVzc1ZpZXdCYWNrZW5kOjpj cmVhdGVTbmFwc2hvdCgpCiAgICAgdWludDhfdCogYnVmZmVyID0gbmV3IHVpbnQ4X3RbNCAqIG1f d2lkdGggKiBtX2hlaWdodF07CiAgICAgYm9vbCBzdWNjZXNzZnVsU25hcHNob3QgPSBmYWxzZTsK IAotICAgIGlmICghZWdsTWFrZUN1cnJlbnQobV9lZ2xEaXNwbGF5LCBFR0xfTk9fU1VSRkFDRSwg RUdMX05PX1NVUkZBQ0UsIG1fZWdsQ29udGV4dCkpCisgICAgaWYgKCFlZ2xNYWtlQ3VycmVudChI ZWFkbGVzc0VHTENvbm5lY3Rpb246OnNpbmdsZXRvbigpLmVnbERpc3BsYXksIEVHTF9OT19TVVJG QUNFLCBFR0xfTk9fU1VSRkFDRSwgbV9lZ2xDb250ZXh0KSkKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAKICAgICBHTHVpbnQgaW1hZ2VUZXh0dXJlOwpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2Jh Y2tlbmRzL1ZpZXdCYWNrZW5kLmNwcCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5j cHAKaW5kZXggMDJmYjQ2YmRhNzJkNjg2NDdlODBkZjg4MDIzZGZhZWUzNjdmNzI2YS4uNjkzZDEy ZGMzNmE4ZGM1N2IxMDU5NWRmNWJjODY5MmNjOTM0MzgwMyAxMDA2NDQKLS0tIGEvVG9vbHMvd3Bl L2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmNwcAorKysgYi9Ub29scy93cGUvYmFja2VuZHMvVmlld0Jh Y2tlbmQuY3BwCkBAIC0xMzYsMjcgKzEzNiwxMCBAQCBWaWV3QmFja2VuZDo6Vmlld0JhY2tlbmQo dWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCkKICAgICB3cGVfbG9hZGVyX2luaXQoImxp YldQRUJhY2tlbmQtZmRvLTEuMC5zbyIpOwogfQogCi1WaWV3QmFja2VuZDo6flZpZXdCYWNrZW5k KCkKLXsKLSAgICBpZiAobV9leHBvcnRhYmxlKQotICAgICAgICB3cGVfdmlld19iYWNrZW5kX2V4 cG9ydGFibGVfZmRvX2Rlc3Ryb3kobV9leHBvcnRhYmxlKTsKLQotICAgIGlmIChtX2VnbENvbnRl eHQpCi0gICAgICAgIGVnbERlc3Ryb3lDb250ZXh0KG1fZWdsRGlzcGxheSwgbV9lZ2xDb250ZXh0 KTsKLX0KK1ZpZXdCYWNrZW5kOjp+Vmlld0JhY2tlbmQoKSA9IGRlZmF1bHQ7CiAKLWJvb2wgVmll d0JhY2tlbmQ6OmluaXRpYWxpemUoKQorYm9vbCBWaWV3QmFja2VuZDo6aW5pdGlhbGl6ZShFR0xE aXNwbGF5IGVnbERpc3BsYXkpCiB7Ci0gICAgaWYgKG1fZWdsRGlzcGxheSA9PSBFR0xfTk9fRElT UExBWSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgZWdsSW5pdGlhbGl6ZShtX2VnbERp c3BsYXksIG51bGxwdHIsIG51bGxwdHIpOwotCi0gICAgaWYgKCFlZ2xCaW5kQVBJKEVHTF9PUEVO R0xfRVNfQVBJKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgd3BlX2Zkb19pbml0aWFs aXplX2Zvcl9lZ2xfZGlzcGxheShtX2VnbERpc3BsYXkpOwotCiAgICAgc3RhdGljIGNvbnN0IEVH TGludCBjb25maWdBdHRyaWJ1dGVzWzEzXSA9IHsKICAgICAgICAgRUdMX1NVUkZBQ0VfVFlQRSwg RUdMX1dJTkRPV19CSVQsCiAgICAgICAgIEVHTF9SRURfU0laRSwgMSwKQEAgLTE2OSwxMiArMTUy LDEyIEBAIGJvb2wgVmlld0JhY2tlbmQ6OmluaXRpYWxpemUoKQogCiAgICAgewogICAgICAgICBF R0xpbnQgY291bnQgPSAwOwotICAgICAgICBpZiAoIWVnbEdldENvbmZpZ3MobV9lZ2xEaXNwbGF5 LCBudWxscHRyLCAwLCAmY291bnQpIHx8IGNvdW50IDwgMSkKKyAgICAgICAgaWYgKCFlZ2xHZXRD b25maWdzKGVnbERpc3BsYXksIG51bGxwdHIsIDAsICZjb3VudCkgfHwgY291bnQgPCAxKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgICAgIEVHTENvbmZpZyogY29uZmlncyA9IGdf bmV3MChFR0xDb25maWcsIGNvdW50KTsKICAgICAgICAgRUdMaW50IG1hdGNoZWQgPSAwOwotICAg ICAgICBpZiAoZWdsQ2hvb3NlQ29uZmlnKG1fZWdsRGlzcGxheSwgY29uZmlnQXR0cmlidXRlcywg Y29uZmlncywgY291bnQsICZtYXRjaGVkKSAmJiAhIW1hdGNoZWQpCisgICAgICAgIGlmIChlZ2xD aG9vc2VDb25maWcoZWdsRGlzcGxheSwgY29uZmlnQXR0cmlidXRlcywgY29uZmlncywgY291bnQs ICZtYXRjaGVkKSAmJiAhIW1hdGNoZWQpCiAgICAgICAgICAgICBtX2VnbENvbmZpZyA9IGNvbmZp Z3NbMF07CiAgICAgICAgIGdfZnJlZShjb25maWdzKTsKICAgICB9CkBAIC0xODQsNyArMTY3LDcg QEAgYm9vbCBWaWV3QmFja2VuZDo6aW5pdGlhbGl6ZSgpCiAgICAgICAgIEVHTF9OT05FCiAgICAg fTsKIAotICAgIG1fZWdsQ29udGV4dCA9IGVnbENyZWF0ZUNvbnRleHQobV9lZ2xEaXNwbGF5LCBt X2VnbENvbmZpZywgRUdMX05PX0NPTlRFWFQsIGNvbnRleHRBdHRyaWJ1dGVzKTsKKyAgICBtX2Vn bENvbnRleHQgPSBlZ2xDcmVhdGVDb250ZXh0KGVnbERpc3BsYXksIG1fZWdsQ29uZmlnLCBFR0xf Tk9fQ09OVEVYVCwgY29udGV4dEF0dHJpYnV0ZXMpOwogICAgIGlmICghbV9lZ2xDb250ZXh0KQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTIwNiw2ICsxODksMTcgQEAgYm9vbCBWaWV3QmFj a2VuZDo6aW5pdGlhbGl6ZSgpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK3ZvaWQgVmlld0JhY2tl bmQ6OmRlaW5pdGlhbGl6ZShFR0xEaXNwbGF5IGVnbERpc3BsYXkpCit7CisgICAgbV9pbnB1dENs aWVudCA9IG51bGxwdHI7CisKKyAgICBpZiAobV9lZ2xDb250ZXh0KQorICAgICAgICBlZ2xEZXN0 cm95Q29udGV4dChlZ2xEaXNwbGF5LCBtX2VnbENvbnRleHQpOworCisgICAgaWYgKG1fZXhwb3J0 YWJsZSkKKyAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19kZXN0cm95KG1f ZXhwb3J0YWJsZSk7Cit9CisKIHZvaWQgVmlld0JhY2tlbmQ6OmluaXRpYWxpemVBY2Nlc3NpYmls aXR5KCkKIHsKICNpZiBkZWZpbmVkKEhBVkVfQUNDRVNTSUJJTElUWSkgJiYgSEFWRV9BQ0NFU1NJ QklMSVRZCmRpZmYgLS1naXQgYS9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuaCBiL1Rv b2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5oCmluZGV4IDAwOWNlNDY4MDY4ODU4MzEzYTZm ZTA3YjFiYTJjMGQ1NTY4OWQxMGQuLmRmODU3OTdiZTI1MmYxODkyOTZlNWMyOGUwMmQyZGVhNGE0 NTUyMjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5oCisrKyBi L1Rvb2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5oCkBAIC02NCw3ICs2NCw5IEBAIHB1Ymxp YzoKIHByb3RlY3RlZDoKICAgICBWaWV3QmFja2VuZCh1aW50MzJfdCB3aWR0aCwgdWludDMyX3Qg aGVpZ2h0KTsKIAotICAgIGJvb2wgaW5pdGlhbGl6ZSgpOworICAgIGJvb2wgaW5pdGlhbGl6ZShF R0xEaXNwbGF5KTsKKyAgICB2b2lkIGRlaW5pdGlhbGl6ZShFR0xEaXNwbGF5KTsKKwogICAgIHZv aWQgaW5pdGlhbGl6ZUFjY2Vzc2liaWxpdHkoKTsKICAgICB2b2lkIHVwZGF0ZUFjY2Vzc2liaWxp dHlTdGF0ZSh1aW50MzJfdCk7CiAKQEAgLTgwLDcgKzgyLDYgQEAgcHJvdGVjdGVkOgogCiAgICAg dWludDMyX3QgbV93aWR0aCB7IDAgfTsKICAgICB1aW50MzJfdCBtX2hlaWdodCB7IDAgfTsKLSAg ICBFR0xEaXNwbGF5IG1fZWdsRGlzcGxheSB7IG51bGxwdHIgfTsKICAgICBFR0xDb250ZXh0IG1f ZWdsQ29udGV4dCB7IG51bGxwdHIgfTsKICAgICBFR0xDb25maWcgbV9lZ2xDb25maWc7CiAgICAg c3RydWN0IHdwZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG8qIG1fZXhwb3J0YWJsZSB7IG51 bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dWaWV3QmFja2Vu ZC5jcHAgYi9Ub29scy93cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwCmluZGV4IDVk ODkyNjVlZmMyN2YzMzlmNzljNDMzNWVlMzhiM2Y1OTkzZTRmNTMuLjQzY2VlNGQ3N2U3YWU4ZGEy ZDNjYzBmZTcxY2NmMzE5MTZmYWZkODIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL3dwZS9iYWNrZW5kcy9X aW5kb3dWaWV3QmFja2VuZC5jcHAKKysrIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdC YWNrZW5kLmNwcApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgPGNzdHJpbmc+CiAjaW5jbHVk ZSA8bGludXgvaW5wdXQuaD4KICNpbmNsdWRlIDxtZW1vcnk+CisjaW5jbHVkZSA8bXV0ZXg+CiAj aW5jbHVkZSA8c3lzL21tYW4uaD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KIApAQCAtNDcsNiArNDgs MzUgQEAgdHlwZWRlZiBFR0xCb29sZWFuIChFR0xBUElFTlRSWVAgUEZORUdMUVVFUllXQVlMQU5E QlVGRkVSV0wpIChFR0xEaXNwbGF5IGRweSwgc3QKIAogbmFtZXNwYWNlIFdQRVRvb2xpbmdCYWNr ZW5kcyB7CiAKK3N0cnVjdCBXYXlsYW5kRUdMQ29ubmVjdGlvbiB7CisgICAgc3RydWN0IHdsX2Rp c3BsYXkqIGRpc3BsYXkgeyBudWxscHRyIH07CisgICAgRUdMRGlzcGxheSBlZ2xEaXNwbGF5IHsg RUdMX05PX0RJU1BMQVkgfTsKKworICAgIHN0YXRpYyBjb25zdCBXYXlsYW5kRUdMQ29ubmVjdGlv biYgc2luZ2xldG9uKCkKKyAgICB7CisgICAgICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxhZyBzX29u Y2VGbGFnOworICAgICAgICBzdGF0aWMgV2F5bGFuZEVHTENvbm5lY3Rpb24gc19jb25uZWN0aW9u OworICAgICAgICBzdGQ6OmNhbGxfb25jZShzX29uY2VGbGFnLAorICAgICAgICAgICAgW10gewor ICAgICAgICAgICAgICAgIHNfY29ubmVjdGlvbi5kaXNwbGF5ID0gd2xfZGlzcGxheV9jb25uZWN0 KG51bGxwdHIpOworICAgICAgICAgICAgICAgIGlmICghc19jb25uZWN0aW9uLmRpc3BsYXkpCisg ICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgIEVHTERpc3BsYXkg ZWdsRGlzcGxheSA9IGVnbEdldERpc3BsYXkoc19jb25uZWN0aW9uLmRpc3BsYXkpOworICAgICAg ICAgICAgICAgIGlmIChlZ2xEaXNwbGF5ID09IEVHTF9OT19ESVNQTEFZKQorICAgICAgICAgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAgICBpZiAoIWVnbEluaXRpYWxpemUoZWds RGlzcGxheSwgbnVsbHB0ciwgbnVsbHB0cikgfHwgIWVnbEJpbmRBUEkoRUdMX09QRU5HTF9FU19B UEkpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAgICBzX2Nv bm5lY3Rpb24uZWdsRGlzcGxheSA9IGVnbERpc3BsYXk7CisgICAgICAgICAgICAgICAgd3BlX2Zk b19pbml0aWFsaXplX2Zvcl9lZ2xfZGlzcGxheShzX2Nvbm5lY3Rpb24uZWdsRGlzcGxheSk7Cisg ICAgICAgICAgICB9KTsKKworICAgICAgICByZXR1cm4gc19jb25uZWN0aW9uOworICAgIH0KK307 CisKIHN0YXRpYyBQRk5HTEVHTElNQUdFVEFSR0VUVEVYVFVSRTJET0VTUFJPQyBpbWFnZVRhcmdl dFRleHR1cmUyRE9FUzsKIAogc3RydWN0IEV2ZW50U291cmNlIHsKQEAgLTQ4MSwxOCArNTExLDE3 IEBAIFdpbmRvd1ZpZXdCYWNrZW5kOjpXaW5kb3dWaWV3QmFja2VuZCh1aW50MzJfdCB3aWR0aCwg dWludDMyX3QgaGVpZ2h0KQogICAgIG1faW5pdGlhbFNpemUud2lkdGggPSB3aWR0aDsKICAgICBt X2luaXRpYWxTaXplLmhlaWdodCA9IGhlaWdodDsKIAotICAgIG1fZGlzcGxheSA9IHdsX2Rpc3Bs YXlfY29ubmVjdChudWxscHRyKTsKLSAgICBpZiAoIW1fZGlzcGxheSkKKyAgICBhdXRvJiBjb25u ZWN0aW9uID0gV2F5bGFuZEVHTENvbm5lY3Rpb246OnNpbmdsZXRvbigpOworICAgIGlmICghY29u bmVjdGlvbi5kaXNwbGF5KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2VnbERpc3BsYXkgPSBl Z2xHZXREaXNwbGF5KG1fZGlzcGxheSk7Ci0gICAgaWYgKCFpbml0aWFsaXplKCkpCisgICAgaWYg KGNvbm5lY3Rpb24uZWdsRGlzcGxheSA9PSBFR0xfTk9fRElTUExBWSB8fCAhaW5pdGlhbGl6ZShj b25uZWN0aW9uLmVnbERpc3BsYXkpKQogICAgICAgICByZXR1cm47CiAKICAgICB7Ci0gICAgICAg IGF1dG8qIHJlZ2lzdHJ5ID0gd2xfZGlzcGxheV9nZXRfcmVnaXN0cnkobV9kaXNwbGF5KTsKKyAg ICAgICAgYXV0byogcmVnaXN0cnkgPSB3bF9kaXNwbGF5X2dldF9yZWdpc3RyeShjb25uZWN0aW9u LmRpc3BsYXkpOwogICAgICAgICB3bF9yZWdpc3RyeV9hZGRfbGlzdGVuZXIocmVnaXN0cnksICZz X3JlZ2lzdHJ5TGlzdGVuZXIsIHRoaXMpOwotICAgICAgICB3bF9kaXNwbGF5X3JvdW5kdHJpcCht X2Rpc3BsYXkpOworICAgICAgICB3bF9kaXNwbGF5X3JvdW5kdHJpcChjb25uZWN0aW9uLmRpc3Bs YXkpOwogCiAgICAgICAgIGlmIChtX3hkZykKICAgICAgICAgICAgIHp4ZGdfc2hlbGxfdjZfYWRk X2xpc3RlbmVyKG1feGRnLCAmc194ZGdXbUJhc2VMaXN0ZW5lciwgbnVsbHB0cik7CkBAIC01MDQs OSArNTMzLDkgQEAgV2luZG93Vmlld0JhY2tlbmQ6OldpbmRvd1ZpZXdCYWNrZW5kKHVpbnQzMl90 IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpCiAgICAgbV9ldmVudFNvdXJjZSA9IGdfc291cmNlX25l dygmRXZlbnRTb3VyY2U6OnNvdXJjZUZ1bmNzLCBzaXplb2YoRXZlbnRTb3VyY2UpKTsKICAgICB7 CiAgICAgICAgIGF1dG8mIHNvdXJjZSA9ICpyZWludGVycHJldF9jYXN0PEV2ZW50U291cmNlKj4o bV9ldmVudFNvdXJjZSk7Ci0gICAgICAgIHNvdXJjZS5kaXNwbGF5ID0gbV9kaXNwbGF5OworICAg ICAgICBzb3VyY2UuZGlzcGxheSA9IGNvbm5lY3Rpb24uZGlzcGxheTsKIAotICAgICAgICBzb3Vy Y2UucGZkLmZkID0gd2xfZGlzcGxheV9nZXRfZmQobV9kaXNwbGF5KTsKKyAgICAgICAgc291cmNl LnBmZC5mZCA9IHdsX2Rpc3BsYXlfZ2V0X2ZkKGNvbm5lY3Rpb24uZGlzcGxheSk7CiAgICAgICAg IHNvdXJjZS5wZmQuZXZlbnRzID0gR19JT19JTiB8IEdfSU9fRVJSIHwgR19JT19IVVA7CiAgICAg ICAgIHNvdXJjZS5wZmQucmV2ZW50cyA9IDA7CiAgICAgICAgIGdfc291cmNlX2FkZF9wb2xsKCZz b3VyY2Uuc291cmNlLCAmc291cmNlLnBmZCk7CkBAIC01MzMsMTEgKzU2MiwxMSBAQCBXaW5kb3dW aWV3QmFja2VuZDo6V2luZG93Vmlld0JhY2tlbmQodWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhl aWdodCkKIAogICAgIGF1dG8gY3JlYXRlUGxhdGZvcm1XaW5kb3dTdXJmYWNlID0KICAgICAgICAg cmVpbnRlcnByZXRfY2FzdDxQRk5FR0xDUkVBVEVQTEFURk9STVdJTkRPV1NVUkZBQ0VFWFRQUk9D PihlZ2xHZXRQcm9jQWRkcmVzcygiZWdsQ3JlYXRlUGxhdGZvcm1XaW5kb3dTdXJmYWNlRVhUIikp OwotICAgIG1fZWdsU3VyZmFjZSA9IGNyZWF0ZVBsYXRmb3JtV2luZG93U3VyZmFjZShtX2VnbERp c3BsYXksIG1fZWdsQ29uZmlnLCBtX2VnbFdpbmRvdywgbnVsbHB0cik7CisgICAgbV9lZ2xTdXJm YWNlID0gY3JlYXRlUGxhdGZvcm1XaW5kb3dTdXJmYWNlKGNvbm5lY3Rpb24uZWdsRGlzcGxheSwg bV9lZ2xDb25maWcsIG1fZWdsV2luZG93LCBudWxscHRyKTsKICAgICBpZiAoIW1fZWdsU3VyZmFj ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCFlZ2xNYWtlQ3VycmVudChtX2VnbERpc3Bs YXksIG1fZWdsU3VyZmFjZSwgbV9lZ2xTdXJmYWNlLCBtX2VnbENvbnRleHQpKQorICAgIGlmICgh ZWdsTWFrZUN1cnJlbnQoY29ubmVjdGlvbi5lZ2xEaXNwbGF5LCBtX2VnbFN1cmZhY2UsIG1fZWds U3VyZmFjZSwgbV9lZ2xDb250ZXh0KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaW1hZ2VUYXJn ZXRUZXh0dXJlMkRPRVMgPSByZWludGVycHJldF9jYXN0PFBGTkdMRUdMSU1BR0VUQVJHRVRURVhU VVJFMkRPRVNQUk9DPihlZ2xHZXRQcm9jQWRkcmVzcygiZ2xFR0xJbWFnZVRhcmdldFRleHR1cmUy RE9FUyIpKTsKQEAgLTU4Miw2ICs2MTEsOCBAQCBXaW5kb3dWaWV3QmFja2VuZDo6V2luZG93Vmll d0JhY2tlbmQodWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCkKIAogV2luZG93Vmlld0Jh Y2tlbmQ6On5XaW5kb3dWaWV3QmFja2VuZCgpCiB7CisgICAgYXV0byYgY29ubmVjdGlvbiA9IFdh eWxhbmRFR0xDb25uZWN0aW9uOjpzaW5nbGV0b24oKTsKKwogICAgIGlmIChtX2V2ZW50U291cmNl KSB7CiAgICAgICAgIGdfc291cmNlX2Rlc3Ryb3kobV9ldmVudFNvdXJjZSk7CiAgICAgICAgIGdf c291cmNlX3VucmVmKG1fZXZlbnRTb3VyY2UpOwpAQCAtNjA5LDEwICs2NDAsMTIgQEAgV2luZG93 Vmlld0JhY2tlbmQ6On5XaW5kb3dWaWV3QmFja2VuZCgpCiAgICAgICAgIHdsX2NvbXBvc2l0b3Jf ZGVzdHJveShtX2NvbXBvc2l0b3IpOwogCiAgICAgaWYgKG1fZWdsU3VyZmFjZSkKLSAgICAgICAg ZWdsRGVzdHJveVN1cmZhY2UobV9lZ2xEaXNwbGF5LCBtX2VnbFN1cmZhY2UpOworICAgICAgICBl Z2xEZXN0cm95U3VyZmFjZShjb25uZWN0aW9uLmVnbERpc3BsYXksIG1fZWdsU3VyZmFjZSk7CiAK ICAgICBpZiAobV9kaXNwbGF5KQogICAgICAgICB3bF9kaXNwbGF5X2Rpc2Nvbm5lY3QobV9kaXNw bGF5KTsKKworICAgIGRlaW5pdGlhbGl6ZShjb25uZWN0aW9uLmVnbERpc3BsYXkpOwogfQogCiBj b25zdCBzdHJ1Y3Qgd2xfY2FsbGJhY2tfbGlzdGVuZXIgV2luZG93Vmlld0JhY2tlbmQ6OnNfZnJh bWVMaXN0ZW5lciA9IHsKQEAgLTY2OSw3ICs3MDIsOCBAQCB2b2lkIFdpbmRvd1ZpZXdCYWNrZW5k OjpkaXNwbGF5QnVmZmVyKHN0cnVjdCB3cGVfZmRvX2VnbF9leHBvcnRlZF9pbWFnZSogaW1hZ2Up CiAgICAgaWYgKCFtX2VnbENvbnRleHQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGVnbE1ha2VD dXJyZW50KG1fZWdsRGlzcGxheSwgbV9lZ2xTdXJmYWNlLCBtX2VnbFN1cmZhY2UsIG1fZWdsQ29u dGV4dCk7CisgICAgYXV0byYgY29ubmVjdGlvbiA9IFdheWxhbmRFR0xDb25uZWN0aW9uOjpzaW5n bGV0b24oKTsKKyAgICBlZ2xNYWtlQ3VycmVudChjb25uZWN0aW9uLmVnbERpc3BsYXksIG1fZWds U3VyZmFjZSwgbV9lZ2xTdXJmYWNlLCBtX2VnbENvbnRleHQpOwogCiAgICAgZ2xWaWV3cG9ydCgw LCAwLCBtX3dpZHRoLCBtX2hlaWdodCk7CiAgICAgZ2xDbGVhckNvbG9yKDEsIDAsIDAsIDEpOwpA QCAtNzEyLDcgKzc0Niw3IEBAIHZvaWQgV2luZG93Vmlld0JhY2tlbmQ6OmRpc3BsYXlCdWZmZXIo c3RydWN0IHdwZV9mZG9fZWdsX2V4cG9ydGVkX2ltYWdlKiBpbWFnZSkKICAgICBzdHJ1Y3Qgd2xf Y2FsbGJhY2sqIGNhbGxiYWNrID0gd2xfc3VyZmFjZV9mcmFtZShtX3N1cmZhY2UpOwogICAgIHds X2NhbGxiYWNrX2FkZF9saXN0ZW5lcihjYWxsYmFjaywgJnNfZnJhbWVMaXN0ZW5lciwgdGhpcyk7 CiAKLSAgICBlZ2xTd2FwQnVmZmVycyhtX2VnbERpc3BsYXksIG1fZWdsU3VyZmFjZSk7CisgICAg ZWdsU3dhcEJ1ZmZlcnMoY29ubmVjdGlvbi5lZ2xEaXNwbGF5LCBtX2VnbFN1cmZhY2UpOwogfQog CiB2b2lkIFdpbmRvd1ZpZXdCYWNrZW5kOjpoYW5kbGVLZXlFdmVudCh1aW50MzJfdCBrZXksIHVp bnQzMl90IHN0YXRlLCB1aW50MzJfdCB0aW1lKQo= 377885 2019-09-03 03:43:40 -0700 2019-09-03 03:43:40 -0700 Patch for landing bug-201415-20190903124339.patch text/plain 14758 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NDE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzlhYzRmZTlkNmU3NzNiMjBkOTUzMDBiYzA5OTViN2U3 MjY5OTU2Yy4uZjQxN2QyMzRhMWZmNjllZmJiMjI1ZDY2MWYwNzk3YTI0ZmE5NDc1ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDE5LTA5LTAzICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbV1BFXSBNYWtlIHZpZXcgYmFja2VuZHMgbXVsdGktdmlldy1mcmllbmRseQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxNDE1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQ2FybG9zIEdhcmNpYSBDYW1wb3MuCisKKyAgICAgICAgSGF2ZSB0 aGUgV2F5bGFuZCBFR0wgY29ubmVjdGlvbiBmb3IgV2luZG93Vmlld0JhY2tlbmQgaW5zdGFuY2Vz IG1hbmFnZWQKKyAgICAgICAgdGhyb3VnaCBhIHBlci1wcm9jZXNzIHNpbmdsZXRvbiwgYWxsb3dp bmcgbXVsdGlwbGUgYmFja2VuZCBvYmplY3RzCisgICAgICAgIHVzZSBpdCBmb3IgZGlmZmVyZW50 IHZpZXdzLiBIZWFkbGVzc1ZpZXdCYWNrZW5kIGFscmVhZHkgZG9lcyB0aGlzLCBidXQKKyAgICAg ICAgdGhlIGNvZGUgdGhlcmUgaXMgcmVmdXJiaXNoZWQgaW50byBhIHNpbmdsZXRvbiBzdHJ1Y3R1 cmUuCisKKyAgICAgICAgVGhlIFZpZXdCYWNrZW5kIGNsYXNzZXMgYXJlIGFkanVzdGVkIHRvIHdv cmsgd2l0aCB0aGUgYmFja2VuZC1zcGVjaWZpYworICAgICAgICBFR0xEaXNwbGF5IG9iamVjdHMg KGFzIGNvbnN0cnVjdGVkIHRocm91Z2ggdGhlIGJhY2tlbmQtc3BlY2lmaWMgRUdMCisgICAgICAg IGNvbm5lY3Rpb24gYXBwcm9hY2gpLgorCisgICAgICAgICogd3BlL2JhY2tlbmRzL0hlYWRsZXNz Vmlld0JhY2tlbmQuY3BwOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpIZWFkbGVzc0VH TENvbm5lY3Rpb246OnNpbmdsZXRvbik6CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6Okhl YWRsZXNzVmlld0JhY2tlbmQ6OkhlYWRsZXNzVmlld0JhY2tlbmQpOgorICAgICAgICAoV1BFVG9v bGluZ0JhY2tlbmRzOjpIZWFkbGVzc1ZpZXdCYWNrZW5kOjp+SGVhZGxlc3NWaWV3QmFja2VuZCk6 CisgICAgICAgIChXUEVUb29saW5nQmFja2VuZHM6OkhlYWRsZXNzVmlld0JhY2tlbmQ6OmNyZWF0 ZVNuYXBzaG90KToKKyAgICAgICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6Z2V0RUdMRGlzcGxheSk6 IERlbGV0ZWQuCisgICAgICAgICogd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmNwcDoKKyAgICAg ICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6Vmlld0JhY2tlbmQ6OmluaXRpYWxpemUpOgorICAgICAg ICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpWaWV3QmFja2VuZDo6ZGVpbml0aWFsaXplKToKKyAgICAg ICAgKFdQRVRvb2xpbmdCYWNrZW5kczo6Vmlld0JhY2tlbmQ6On5WaWV3QmFja2VuZCk6IERlbGV0 ZWQuCisgICAgICAgICogd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmg6CisgICAgICAgICogd3Bl L2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdQRVRvb2xpbmdCYWNr ZW5kczo6V2F5bGFuZEVHTENvbm5lY3Rpb246OnNpbmdsZXRvbik6CisgICAgICAgIChXUEVUb29s aW5nQmFja2VuZHM6OldpbmRvd1ZpZXdCYWNrZW5kOjpXaW5kb3dWaWV3QmFja2VuZCk6CisgICAg ICAgIChXUEVUb29saW5nQmFja2VuZHM6OldpbmRvd1ZpZXdCYWNrZW5kOjp+V2luZG93Vmlld0Jh Y2tlbmQpOgorICAgICAgICAoV1BFVG9vbGluZ0JhY2tlbmRzOjpXaW5kb3dWaWV3QmFja2VuZDo6 ZGlzcGxheUJ1ZmZlcik6CisKIDIwMTktMDktMDIgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0Bp Z2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdIFdpbmRvd0JhY2tlbmQgc2hvdWxkIGRvIHJlc2l6 aW5nIHByb3Blcmx5CmRpZmYgLS1naXQgYS9Ub29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3 QmFja2VuZC5jcHAgYi9Ub29scy93cGUvYmFja2VuZHMvSGVhZGxlc3NWaWV3QmFja2VuZC5jcHAK aW5kZXggMWQwNDEwNGFjMDUyNmQwYjRjMDBjMTJmYzVjMmM4ZjFmZWI0N2I5Ni4uMTEyZGI4MmM2 Njc5NjMzOGNmZTM4YTk2NmFhYWJjNmRmNjgwNjZhNyAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2Jh Y2tlbmRzL0hlYWRsZXNzVmlld0JhY2tlbmQuY3BwCisrKyBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9I ZWFkbGVzc1ZpZXdCYWNrZW5kLmNwcApAQCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8Y2Fz c2VydD4KICNpbmNsdWRlIDxmY250bC5oPgorI2luY2x1ZGUgPG11dGV4PgogI2luY2x1ZGUgPHVu aXN0ZC5oPgogCiAvLyBUaGlzIGluY2x1ZGUgb3JkZXIgaXMgbmVjZXNzYXJ5IHRvIGVuZm9yY2Ug dGhlIEdCTSBFR0wgcGxhdGZvcm0uCkBAIC00NCwzNSArNDUsNDUgQEAgdHlwZWRlZiBFR0xCb29s ZWFuIChFR0xBUElFTlRSWVAgUEZORUdMUVVFUllXQVlMQU5EQlVGRkVSV0wpIChFR0xEaXNwbGF5 IGRweSwgc3QKIAogbmFtZXNwYWNlIFdQRVRvb2xpbmdCYWNrZW5kcyB7CiAKLXN0YXRpYyBQRk5H TEVHTElNQUdFVEFSR0VUVEVYVFVSRTJET0VTUFJPQyBpbWFnZVRhcmdldFRleHR1cmUyRE9FUzsK K3N0cnVjdCBIZWFkbGVzc0VHTENvbm5lY3Rpb24geworICAgIEVHTERpc3BsYXkgZWdsRGlzcGxh eSB7IEVHTF9OT19ESVNQTEFZIH07CiAKLS8vIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggd3RmL2ds aWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5LmguCi1zdGF0aWMgaW50IGtSdW5Mb29wU291cmNlUHJp b3JpdHlEaXNwYXRjaGVyID0gLTcwOworICAgIHN0YXRpYyBjb25zdCBIZWFkbGVzc0VHTENvbm5l Y3Rpb24mIHNpbmdsZXRvbigpCisgICAgeworICAgICAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcg c19vbmNlRmxhZzsKKyAgICAgICAgc3RhdGljIEhlYWRsZXNzRUdMQ29ubmVjdGlvbiBzX2Nvbm5l Y3Rpb247CisgICAgICAgIHN0ZDo6Y2FsbF9vbmNlKHNfb25jZUZsYWcsCisgICAgICAgICAgICBb XSB7CisgICAgICAgICAgICAgICAgRUdMRGlzcGxheSBlZ2xEaXNwbGF5ID0gZWdsR2V0RGlzcGxh eShFR0xfREVGQVVMVF9ESVNQTEFZKTsKKyAgICAgICAgICAgICAgICBpZiAoZWdsRGlzcGxheSA9 PSBFR0xfTk9fRElTUExBWSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi1zdGF0aWMg RUdMRGlzcGxheSBnZXRFR0xEaXNwbGF5KCkKLXsKLSAgICBzdGF0aWMgRUdMRGlzcGxheSBzX2Rp c3BsYXkgPSBFR0xfTk9fRElTUExBWTsKLSAgICBpZiAoc19kaXNwbGF5ID09IEVHTF9OT19ESVNQ TEFZKSB7Ci0gICAgICAgIEVHTERpc3BsYXkgZGlzcGxheSA9IGVnbEdldERpc3BsYXkoRUdMX0RF RkFVTFRfRElTUExBWSk7Ci0gICAgICAgIGlmIChkaXNwbGF5ID09IEVHTF9OT19ESVNQTEFZKQot ICAgICAgICAgICAgcmV0dXJuIEVHTF9OT19ESVNQTEFZOworICAgICAgICAgICAgICAgIGlmICgh ZWdsSW5pdGlhbGl6ZShlZ2xEaXNwbGF5LCBudWxscHRyLCBudWxscHRyKSB8fCAhZWdsQmluZEFQ SShFR0xfT1BFTkdMX0VTX0FQSSkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAg ICAgICBzX2Rpc3BsYXkgPSBkaXNwbGF5OworICAgICAgICAgICAgICAgIHNfY29ubmVjdGlvbi5l Z2xEaXNwbGF5ID0gZWdsRGlzcGxheTsKKyAgICAgICAgICAgICAgICB3cGVfZmRvX2luaXRpYWxp emVfZm9yX2VnbF9kaXNwbGF5KHNfY29ubmVjdGlvbi5lZ2xEaXNwbGF5KTsKKyAgICAgICAgICAg IH0pOworCisgICAgICAgIHJldHVybiBzX2Nvbm5lY3Rpb247CiAgICAgfQorfTsKIAotICAgIHJl dHVybiBzX2Rpc3BsYXk7Ci19CitzdGF0aWMgUEZOR0xFR0xJTUFHRVRBUkdFVFRFWFRVUkUyRE9F U1BST0MgaW1hZ2VUYXJnZXRUZXh0dXJlMkRPRVM7CisKKy8vIEtlZXAgdGhpcyBpbiBzeW5jIHdp dGggd3RmL2dsaWIvUnVuTG9vcFNvdXJjZVByaW9yaXR5LmguCitzdGF0aWMgaW50IGtSdW5Mb29w U291cmNlUHJpb3JpdHlEaXNwYXRjaGVyID0gLTcwOwogCiBIZWFkbGVzc1ZpZXdCYWNrZW5kOjpI ZWFkbGVzc1ZpZXdCYWNrZW5kKHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpCiAgICAg OiBWaWV3QmFja2VuZCh3aWR0aCwgaGVpZ2h0KQogewotICAgIG1fZWdsRGlzcGxheSA9IGdldEVH TERpc3BsYXkoKTsKLSAgICBpZiAoIWluaXRpYWxpemUoKSkKKyAgICBhdXRvJiBjb25uZWN0aW9u ID0gSGVhZGxlc3NFR0xDb25uZWN0aW9uOjpzaW5nbGV0b24oKTsKKyAgICBpZiAoY29ubmVjdGlv bi5lZ2xEaXNwbGF5ID09IEVHTF9OT19ESVNQTEFZIHx8ICFpbml0aWFsaXplKGNvbm5lY3Rpb24u ZWdsRGlzcGxheSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGFkZEFjdGl2aXR5U3RhdGUod3Bl X3ZpZXdfYWN0aXZpdHlfc3RhdGVfdmlzaWJsZSB8IHdwZV92aWV3X2FjdGl2aXR5X3N0YXRlX2Zv Y3VzZWQgfCB3cGVfdmlld19hY3Rpdml0eV9zdGF0ZV9pbl93aW5kb3cpOwogCi0gICAgaWYgKCFl Z2xNYWtlQ3VycmVudChtX2VnbERpc3BsYXksIEVHTF9OT19TVVJGQUNFLCBFR0xfTk9fU1VSRkFD RSwgbV9lZ2xDb250ZXh0KSkKKyAgICBpZiAoIWVnbE1ha2VDdXJyZW50KGNvbm5lY3Rpb24uZWds RGlzcGxheSwgRUdMX05PX1NVUkZBQ0UsIEVHTF9OT19TVVJGQUNFLCBtX2VnbENvbnRleHQpKQog ICAgICAgICByZXR1cm47CiAKICAgICBpbWFnZVRhcmdldFRleHR1cmUyRE9FUyA9IHJlaW50ZXJw cmV0X2Nhc3Q8UEZOR0xFR0xJTUFHRVRBUkdFVFRFWFRVUkUyRE9FU1BST0M+KGVnbEdldFByb2NB ZGRyZXNzKCJnbEVHTEltYWdlVGFyZ2V0VGV4dHVyZTJET0VTIikpOwpAQCAtOTIsNiArMTAzLDEz IEBAIEhlYWRsZXNzVmlld0JhY2tlbmQ6On5IZWFkbGVzc1ZpZXdCYWNrZW5kKCkKICAgICAgICAg Z19zb3VyY2VfZGVzdHJveShtX3VwZGF0ZVNvdXJjZSk7CiAgICAgICAgIGdfc291cmNlX3VucmVm KG1fdXBkYXRlU291cmNlKTsKICAgICB9CisKKyAgICBpZiAobV9sb2NrZWRJbWFnZSkKKyAgICAg ICAgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19lZ2xfZGlzcGF0Y2hfcmVsZWFzZV9l eHBvcnRlZF9pbWFnZShtX2V4cG9ydGFibGUsIG1fbG9ja2VkSW1hZ2UpOworICAgIGlmIChtX3Bl bmRpbmdJbWFnZSkKKyAgICAgICAgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxlX2Zkb19lZ2xf ZGlzcGF0Y2hfcmVsZWFzZV9leHBvcnRlZF9pbWFnZShtX2V4cG9ydGFibGUsIG1fcGVuZGluZ0lt YWdlKTsKKworICAgIGRlaW5pdGlhbGl6ZShIZWFkbGVzc0VHTENvbm5lY3Rpb246OnNpbmdsZXRv bigpLmVnbERpc3BsYXkpOwogfQogCiBjYWlyb19zdXJmYWNlX3QqIEhlYWRsZXNzVmlld0JhY2tl bmQ6OmNyZWF0ZVNuYXBzaG90KCkKQEAgLTEwNyw3ICsxMjUsNyBAQCBjYWlyb19zdXJmYWNlX3Qq IEhlYWRsZXNzVmlld0JhY2tlbmQ6OmNyZWF0ZVNuYXBzaG90KCkKICAgICB1aW50OF90KiBidWZm ZXIgPSBuZXcgdWludDhfdFs0ICogbV93aWR0aCAqIG1faGVpZ2h0XTsKICAgICBib29sIHN1Y2Nl c3NmdWxTbmFwc2hvdCA9IGZhbHNlOwogCi0gICAgaWYgKCFlZ2xNYWtlQ3VycmVudChtX2VnbERp c3BsYXksIEVHTF9OT19TVVJGQUNFLCBFR0xfTk9fU1VSRkFDRSwgbV9lZ2xDb250ZXh0KSkKKyAg ICBpZiAoIWVnbE1ha2VDdXJyZW50KEhlYWRsZXNzRUdMQ29ubmVjdGlvbjo6c2luZ2xldG9uKCku ZWdsRGlzcGxheSwgRUdMX05PX1NVUkZBQ0UsIEVHTF9OT19TVVJGQUNFLCBtX2VnbENvbnRleHQp KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIEdMdWludCBpbWFnZVRleHR1cmU7CmRp ZmYgLS1naXQgYS9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuY3BwIGIvVG9vbHMvd3Bl L2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmNwcAppbmRleCAwMmZiNDZiZGE3MmQ2ODY0N2U4MGRmODgw MjNkZmFlZTM2N2Y3MjZhLi42OTNkMTJkYzM2YThkYzU3YjEwNTk1ZGY1YmM4NjkyY2M5MzQzODAz IDEwMDY0NAotLS0gYS9Ub29scy93cGUvYmFja2VuZHMvVmlld0JhY2tlbmQuY3BwCisrKyBiL1Rv b2xzL3dwZS9iYWNrZW5kcy9WaWV3QmFja2VuZC5jcHAKQEAgLTEzNiwyNyArMTM2LDEwIEBAIFZp ZXdCYWNrZW5kOjpWaWV3QmFja2VuZCh1aW50MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KQog ICAgIHdwZV9sb2FkZXJfaW5pdCgibGliV1BFQmFja2VuZC1mZG8tMS4wLnNvIik7CiB9CiAKLVZp ZXdCYWNrZW5kOjp+Vmlld0JhY2tlbmQoKQotewotICAgIGlmIChtX2V4cG9ydGFibGUpCi0gICAg ICAgIHdwZV92aWV3X2JhY2tlbmRfZXhwb3J0YWJsZV9mZG9fZGVzdHJveShtX2V4cG9ydGFibGUp OwotCi0gICAgaWYgKG1fZWdsQ29udGV4dCkKLSAgICAgICAgZWdsRGVzdHJveUNvbnRleHQobV9l Z2xEaXNwbGF5LCBtX2VnbENvbnRleHQpOwotfQorVmlld0JhY2tlbmQ6On5WaWV3QmFja2VuZCgp ID0gZGVmYXVsdDsKIAotYm9vbCBWaWV3QmFja2VuZDo6aW5pdGlhbGl6ZSgpCitib29sIFZpZXdC YWNrZW5kOjppbml0aWFsaXplKEVHTERpc3BsYXkgZWdsRGlzcGxheSkKIHsKLSAgICBpZiAobV9l Z2xEaXNwbGF5ID09IEVHTF9OT19ESVNQTEFZKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAg ICBlZ2xJbml0aWFsaXplKG1fZWdsRGlzcGxheSwgbnVsbHB0ciwgbnVsbHB0cik7Ci0KLSAgICBp ZiAoIWVnbEJpbmRBUEkoRUdMX09QRU5HTF9FU19BUEkpKQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0KLSAgICB3cGVfZmRvX2luaXRpYWxpemVfZm9yX2VnbF9kaXNwbGF5KG1fZWdsRGlzcGxheSk7 Ci0KICAgICBzdGF0aWMgY29uc3QgRUdMaW50IGNvbmZpZ0F0dHJpYnV0ZXNbMTNdID0gewogICAg ICAgICBFR0xfU1VSRkFDRV9UWVBFLCBFR0xfV0lORE9XX0JJVCwKICAgICAgICAgRUdMX1JFRF9T SVpFLCAxLApAQCAtMTY5LDEyICsxNTIsMTIgQEAgYm9vbCBWaWV3QmFja2VuZDo6aW5pdGlhbGl6 ZSgpCiAKICAgICB7CiAgICAgICAgIEVHTGludCBjb3VudCA9IDA7Ci0gICAgICAgIGlmICghZWds R2V0Q29uZmlncyhtX2VnbERpc3BsYXksIG51bGxwdHIsIDAsICZjb3VudCkgfHwgY291bnQgPCAx KQorICAgICAgICBpZiAoIWVnbEdldENvbmZpZ3MoZWdsRGlzcGxheSwgbnVsbHB0ciwgMCwgJmNv dW50KSB8fCBjb3VudCA8IDEpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAg RUdMQ29uZmlnKiBjb25maWdzID0gZ19uZXcwKEVHTENvbmZpZywgY291bnQpOwogICAgICAgICBF R0xpbnQgbWF0Y2hlZCA9IDA7Ci0gICAgICAgIGlmIChlZ2xDaG9vc2VDb25maWcobV9lZ2xEaXNw bGF5LCBjb25maWdBdHRyaWJ1dGVzLCBjb25maWdzLCBjb3VudCwgJm1hdGNoZWQpICYmICEhbWF0 Y2hlZCkKKyAgICAgICAgaWYgKGVnbENob29zZUNvbmZpZyhlZ2xEaXNwbGF5LCBjb25maWdBdHRy aWJ1dGVzLCBjb25maWdzLCBjb3VudCwgJm1hdGNoZWQpICYmICEhbWF0Y2hlZCkKICAgICAgICAg ICAgIG1fZWdsQ29uZmlnID0gY29uZmlnc1swXTsKICAgICAgICAgZ19mcmVlKGNvbmZpZ3MpOwog ICAgIH0KQEAgLTE4NCw3ICsxNjcsNyBAQCBib29sIFZpZXdCYWNrZW5kOjppbml0aWFsaXplKCkK ICAgICAgICAgRUdMX05PTkUKICAgICB9OwogCi0gICAgbV9lZ2xDb250ZXh0ID0gZWdsQ3JlYXRl Q29udGV4dChtX2VnbERpc3BsYXksIG1fZWdsQ29uZmlnLCBFR0xfTk9fQ09OVEVYVCwgY29udGV4 dEF0dHJpYnV0ZXMpOworICAgIG1fZWdsQ29udGV4dCA9IGVnbENyZWF0ZUNvbnRleHQoZWdsRGlz cGxheSwgbV9lZ2xDb25maWcsIEVHTF9OT19DT05URVhULCBjb250ZXh0QXR0cmlidXRlcyk7CiAg ICAgaWYgKCFtX2VnbENvbnRleHQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjA2LDYg KzE4OSwxNyBAQCBib29sIFZpZXdCYWNrZW5kOjppbml0aWFsaXplKCkKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAordm9pZCBWaWV3QmFja2VuZDo6ZGVpbml0aWFsaXplKEVHTERpc3BsYXkgZWdsRGlz cGxheSkKK3sKKyAgICBtX2lucHV0Q2xpZW50ID0gbnVsbHB0cjsKKworICAgIGlmIChtX2VnbENv bnRleHQpCisgICAgICAgIGVnbERlc3Ryb3lDb250ZXh0KGVnbERpc3BsYXksIG1fZWdsQ29udGV4 dCk7CisKKyAgICBpZiAobV9leHBvcnRhYmxlKQorICAgICAgICB3cGVfdmlld19iYWNrZW5kX2V4 cG9ydGFibGVfZmRvX2Rlc3Ryb3kobV9leHBvcnRhYmxlKTsKK30KKwogdm9pZCBWaWV3QmFja2Vu ZDo6aW5pdGlhbGl6ZUFjY2Vzc2liaWxpdHkoKQogewogI2lmIGRlZmluZWQoSEFWRV9BQ0NFU1NJ QklMSVRZKSAmJiBIQVZFX0FDQ0VTU0lCSUxJVFkKZGlmZiAtLWdpdCBhL1Rvb2xzL3dwZS9iYWNr ZW5kcy9WaWV3QmFja2VuZC5oIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmgKaW5k ZXggMDA5Y2U0NjgwNjg4NTgzMTNhNmZlMDdiMWJhMmMwZDU1Njg5ZDEwZC4uZGY4NTc5N2JlMjUy ZjE4OTI5NmU1YzI4ZTAyZDJkZWE0YTQ1NTIyNiAxMDA2NDQKLS0tIGEvVG9vbHMvd3BlL2JhY2tl bmRzL1ZpZXdCYWNrZW5kLmgKKysrIGIvVG9vbHMvd3BlL2JhY2tlbmRzL1ZpZXdCYWNrZW5kLmgK QEAgLTY0LDcgKzY0LDkgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIFZpZXdCYWNrZW5kKHVp bnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpOwogCi0gICAgYm9vbCBpbml0aWFsaXplKCk7 CisgICAgYm9vbCBpbml0aWFsaXplKEVHTERpc3BsYXkpOworICAgIHZvaWQgZGVpbml0aWFsaXpl KEVHTERpc3BsYXkpOworCiAgICAgdm9pZCBpbml0aWFsaXplQWNjZXNzaWJpbGl0eSgpOwogICAg IHZvaWQgdXBkYXRlQWNjZXNzaWJpbGl0eVN0YXRlKHVpbnQzMl90KTsKIApAQCAtODAsNyArODIs NiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB1aW50MzJfdCBtX3dpZHRoIHsgMCB9OwogICAgIHVpbnQz Ml90IG1faGVpZ2h0IHsgMCB9OwotICAgIEVHTERpc3BsYXkgbV9lZ2xEaXNwbGF5IHsgbnVsbHB0 ciB9OwogICAgIEVHTENvbnRleHQgbV9lZ2xDb250ZXh0IHsgbnVsbHB0ciB9OwogICAgIEVHTENv bmZpZyBtX2VnbENvbmZpZzsKICAgICBzdHJ1Y3Qgd3BlX3ZpZXdfYmFja2VuZF9leHBvcnRhYmxl X2ZkbyogbV9leHBvcnRhYmxlIHsgbnVsbHB0ciB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvd3BlL2Jh Y2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNwcCBiL1Rvb2xzL3dwZS9iYWNrZW5kcy9XaW5kb3dW aWV3QmFja2VuZC5jcHAKaW5kZXggNWQ4OTI2NWVmYzI3ZjMzOWY3OWM0MzM1ZWUzOGIzZjU5OTNl NGY1My4uNDNjZWU0ZDc3ZTdhZThkYTJkM2NjMGZlNzFjY2YzMTkxNmZhZmQ4MiAxMDA2NDQKLS0t IGEvVG9vbHMvd3BlL2JhY2tlbmRzL1dpbmRvd1ZpZXdCYWNrZW5kLmNwcAorKysgYi9Ub29scy93 cGUvYmFja2VuZHMvV2luZG93Vmlld0JhY2tlbmQuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5j bHVkZSA8Y3N0cmluZz4KICNpbmNsdWRlIDxsaW51eC9pbnB1dC5oPgogI2luY2x1ZGUgPG1lbW9y eT4KKyNpbmNsdWRlIDxtdXRleD4KICNpbmNsdWRlIDxzeXMvbW1hbi5oPgogI2luY2x1ZGUgPHVu aXN0ZC5oPgogCkBAIC00Nyw2ICs0OCwzNSBAQCB0eXBlZGVmIEVHTEJvb2xlYW4gKEVHTEFQSUVO VFJZUCBQRk5FR0xRVUVSWVdBWUxBTkRCVUZGRVJXTCkgKEVHTERpc3BsYXkgZHB5LCBzdAogCiBu YW1lc3BhY2UgV1BFVG9vbGluZ0JhY2tlbmRzIHsKIAorc3RydWN0IFdheWxhbmRFR0xDb25uZWN0 aW9uIHsKKyAgICBzdHJ1Y3Qgd2xfZGlzcGxheSogZGlzcGxheSB7IG51bGxwdHIgfTsKKyAgICBF R0xEaXNwbGF5IGVnbERpc3BsYXkgeyBFR0xfTk9fRElTUExBWSB9OworCisgICAgc3RhdGljIGNv bnN0IFdheWxhbmRFR0xDb25uZWN0aW9uJiBzaW5nbGV0b24oKQorICAgIHsKKyAgICAgICAgc3Rh dGljIHN0ZDo6b25jZV9mbGFnIHNfb25jZUZsYWc7CisgICAgICAgIHN0YXRpYyBXYXlsYW5kRUdM Q29ubmVjdGlvbiBzX2Nvbm5lY3Rpb247CisgICAgICAgIHN0ZDo6Y2FsbF9vbmNlKHNfb25jZUZs YWcsCisgICAgICAgICAgICBbXSB7CisgICAgICAgICAgICAgICAgc19jb25uZWN0aW9uLmRpc3Bs YXkgPSB3bF9kaXNwbGF5X2Nvbm5lY3QobnVsbHB0cik7CisgICAgICAgICAgICAgICAgaWYgKCFz X2Nvbm5lY3Rpb24uZGlzcGxheSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgICAgICAgICAgRUdMRGlzcGxheSBlZ2xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShzX2Nvbm5l Y3Rpb24uZGlzcGxheSk7CisgICAgICAgICAgICAgICAgaWYgKGVnbERpc3BsYXkgPT0gRUdMX05P X0RJU1BMQVkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAg IGlmICghZWdsSW5pdGlhbGl6ZShlZ2xEaXNwbGF5LCBudWxscHRyLCBudWxscHRyKSB8fCAhZWds QmluZEFQSShFR0xfT1BFTkdMX0VTX0FQSSkpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICAgICAgICAgIHNfY29ubmVjdGlvbi5lZ2xEaXNwbGF5ID0gZWdsRGlzcGxheTsK KyAgICAgICAgICAgICAgICB3cGVfZmRvX2luaXRpYWxpemVfZm9yX2VnbF9kaXNwbGF5KHNfY29u bmVjdGlvbi5lZ2xEaXNwbGF5KTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgIHJldHVybiBz X2Nvbm5lY3Rpb247CisgICAgfQorfTsKKwogc3RhdGljIFBGTkdMRUdMSU1BR0VUQVJHRVRURVhU VVJFMkRPRVNQUk9DIGltYWdlVGFyZ2V0VGV4dHVyZTJET0VTOwogCiBzdHJ1Y3QgRXZlbnRTb3Vy Y2UgewpAQCAtNDgxLDE4ICs1MTEsMTcgQEAgV2luZG93Vmlld0JhY2tlbmQ6OldpbmRvd1ZpZXdC YWNrZW5kKHVpbnQzMl90IHdpZHRoLCB1aW50MzJfdCBoZWlnaHQpCiAgICAgbV9pbml0aWFsU2l6 ZS53aWR0aCA9IHdpZHRoOwogICAgIG1faW5pdGlhbFNpemUuaGVpZ2h0ID0gaGVpZ2h0OwogCi0g ICAgbV9kaXNwbGF5ID0gd2xfZGlzcGxheV9jb25uZWN0KG51bGxwdHIpOwotICAgIGlmICghbV9k aXNwbGF5KQorICAgIGF1dG8mIGNvbm5lY3Rpb24gPSBXYXlsYW5kRUdMQ29ubmVjdGlvbjo6c2lu Z2xldG9uKCk7CisgICAgaWYgKCFjb25uZWN0aW9uLmRpc3BsYXkpCiAgICAgICAgIHJldHVybjsK IAotICAgIG1fZWdsRGlzcGxheSA9IGVnbEdldERpc3BsYXkobV9kaXNwbGF5KTsKLSAgICBpZiAo IWluaXRpYWxpemUoKSkKKyAgICBpZiAoY29ubmVjdGlvbi5lZ2xEaXNwbGF5ID09IEVHTF9OT19E SVNQTEFZIHx8ICFpbml0aWFsaXplKGNvbm5lY3Rpb24uZWdsRGlzcGxheSkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIHsKLSAgICAgICAgYXV0byogcmVnaXN0cnkgPSB3bF9kaXNwbGF5X2dldF9y ZWdpc3RyeShtX2Rpc3BsYXkpOworICAgICAgICBhdXRvKiByZWdpc3RyeSA9IHdsX2Rpc3BsYXlf Z2V0X3JlZ2lzdHJ5KGNvbm5lY3Rpb24uZGlzcGxheSk7CiAgICAgICAgIHdsX3JlZ2lzdHJ5X2Fk ZF9saXN0ZW5lcihyZWdpc3RyeSwgJnNfcmVnaXN0cnlMaXN0ZW5lciwgdGhpcyk7Ci0gICAgICAg IHdsX2Rpc3BsYXlfcm91bmR0cmlwKG1fZGlzcGxheSk7CisgICAgICAgIHdsX2Rpc3BsYXlfcm91 bmR0cmlwKGNvbm5lY3Rpb24uZGlzcGxheSk7CiAKICAgICAgICAgaWYgKG1feGRnKQogICAgICAg ICAgICAgenhkZ19zaGVsbF92Nl9hZGRfbGlzdGVuZXIobV94ZGcsICZzX3hkZ1dtQmFzZUxpc3Rl bmVyLCBudWxscHRyKTsKQEAgLTUwNCw5ICs1MzMsOSBAQCBXaW5kb3dWaWV3QmFja2VuZDo6V2lu ZG93Vmlld0JhY2tlbmQodWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCkKICAgICBtX2V2 ZW50U291cmNlID0gZ19zb3VyY2VfbmV3KCZFdmVudFNvdXJjZTo6c291cmNlRnVuY3MsIHNpemVv ZihFdmVudFNvdXJjZSkpOwogICAgIHsKICAgICAgICAgYXV0byYgc291cmNlID0gKnJlaW50ZXJw cmV0X2Nhc3Q8RXZlbnRTb3VyY2UqPihtX2V2ZW50U291cmNlKTsKLSAgICAgICAgc291cmNlLmRp c3BsYXkgPSBtX2Rpc3BsYXk7CisgICAgICAgIHNvdXJjZS5kaXNwbGF5ID0gY29ubmVjdGlvbi5k aXNwbGF5OwogCi0gICAgICAgIHNvdXJjZS5wZmQuZmQgPSB3bF9kaXNwbGF5X2dldF9mZChtX2Rp c3BsYXkpOworICAgICAgICBzb3VyY2UucGZkLmZkID0gd2xfZGlzcGxheV9nZXRfZmQoY29ubmVj dGlvbi5kaXNwbGF5KTsKICAgICAgICAgc291cmNlLnBmZC5ldmVudHMgPSBHX0lPX0lOIHwgR19J T19FUlIgfCBHX0lPX0hVUDsKICAgICAgICAgc291cmNlLnBmZC5yZXZlbnRzID0gMDsKICAgICAg ICAgZ19zb3VyY2VfYWRkX3BvbGwoJnNvdXJjZS5zb3VyY2UsICZzb3VyY2UucGZkKTsKQEAgLTUz MywxMSArNTYyLDExIEBAIFdpbmRvd1ZpZXdCYWNrZW5kOjpXaW5kb3dWaWV3QmFja2VuZCh1aW50 MzJfdCB3aWR0aCwgdWludDMyX3QgaGVpZ2h0KQogCiAgICAgYXV0byBjcmVhdGVQbGF0Zm9ybVdp bmRvd1N1cmZhY2UgPQogICAgICAgICByZWludGVycHJldF9jYXN0PFBGTkVHTENSRUFURVBMQVRG T1JNV0lORE9XU1VSRkFDRUVYVFBST0M+KGVnbEdldFByb2NBZGRyZXNzKCJlZ2xDcmVhdGVQbGF0 Zm9ybVdpbmRvd1N1cmZhY2VFWFQiKSk7Ci0gICAgbV9lZ2xTdXJmYWNlID0gY3JlYXRlUGxhdGZv cm1XaW5kb3dTdXJmYWNlKG1fZWdsRGlzcGxheSwgbV9lZ2xDb25maWcsIG1fZWdsV2luZG93LCBu dWxscHRyKTsKKyAgICBtX2VnbFN1cmZhY2UgPSBjcmVhdGVQbGF0Zm9ybVdpbmRvd1N1cmZhY2Uo Y29ubmVjdGlvbi5lZ2xEaXNwbGF5LCBtX2VnbENvbmZpZywgbV9lZ2xXaW5kb3csIG51bGxwdHIp OwogICAgIGlmICghbV9lZ2xTdXJmYWNlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIWVn bE1ha2VDdXJyZW50KG1fZWdsRGlzcGxheSwgbV9lZ2xTdXJmYWNlLCBtX2VnbFN1cmZhY2UsIG1f ZWdsQ29udGV4dCkpCisgICAgaWYgKCFlZ2xNYWtlQ3VycmVudChjb25uZWN0aW9uLmVnbERpc3Bs YXksIG1fZWdsU3VyZmFjZSwgbV9lZ2xTdXJmYWNlLCBtX2VnbENvbnRleHQpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBpbWFnZVRhcmdldFRleHR1cmUyRE9FUyA9IHJlaW50ZXJwcmV0X2Nhc3Q8 UEZOR0xFR0xJTUFHRVRBUkdFVFRFWFRVUkUyRE9FU1BST0M+KGVnbEdldFByb2NBZGRyZXNzKCJn bEVHTEltYWdlVGFyZ2V0VGV4dHVyZTJET0VTIikpOwpAQCAtNTgyLDYgKzYxMSw4IEBAIFdpbmRv d1ZpZXdCYWNrZW5kOjpXaW5kb3dWaWV3QmFja2VuZCh1aW50MzJfdCB3aWR0aCwgdWludDMyX3Qg aGVpZ2h0KQogCiBXaW5kb3dWaWV3QmFja2VuZDo6fldpbmRvd1ZpZXdCYWNrZW5kKCkKIHsKKyAg ICBhdXRvJiBjb25uZWN0aW9uID0gV2F5bGFuZEVHTENvbm5lY3Rpb246OnNpbmdsZXRvbigpOwor CiAgICAgaWYgKG1fZXZlbnRTb3VyY2UpIHsKICAgICAgICAgZ19zb3VyY2VfZGVzdHJveShtX2V2 ZW50U291cmNlKTsKICAgICAgICAgZ19zb3VyY2VfdW5yZWYobV9ldmVudFNvdXJjZSk7CkBAIC02 MDksMTAgKzY0MCwxMiBAQCBXaW5kb3dWaWV3QmFja2VuZDo6fldpbmRvd1ZpZXdCYWNrZW5kKCkK ICAgICAgICAgd2xfY29tcG9zaXRvcl9kZXN0cm95KG1fY29tcG9zaXRvcik7CiAKICAgICBpZiAo bV9lZ2xTdXJmYWNlKQotICAgICAgICBlZ2xEZXN0cm95U3VyZmFjZShtX2VnbERpc3BsYXksIG1f ZWdsU3VyZmFjZSk7CisgICAgICAgIGVnbERlc3Ryb3lTdXJmYWNlKGNvbm5lY3Rpb24uZWdsRGlz cGxheSwgbV9lZ2xTdXJmYWNlKTsKIAogICAgIGlmIChtX2Rpc3BsYXkpCiAgICAgICAgIHdsX2Rp c3BsYXlfZGlzY29ubmVjdChtX2Rpc3BsYXkpOworCisgICAgZGVpbml0aWFsaXplKGNvbm5lY3Rp b24uZWdsRGlzcGxheSk7CiB9CiAKIGNvbnN0IHN0cnVjdCB3bF9jYWxsYmFja19saXN0ZW5lciBX aW5kb3dWaWV3QmFja2VuZDo6c19mcmFtZUxpc3RlbmVyID0gewpAQCAtNjY5LDcgKzcwMiw4IEBA IHZvaWQgV2luZG93Vmlld0JhY2tlbmQ6OmRpc3BsYXlCdWZmZXIoc3RydWN0IHdwZV9mZG9fZWds X2V4cG9ydGVkX2ltYWdlKiBpbWFnZSkKICAgICBpZiAoIW1fZWdsQ29udGV4dCkKICAgICAgICAg cmV0dXJuOwogCi0gICAgZWdsTWFrZUN1cnJlbnQobV9lZ2xEaXNwbGF5LCBtX2VnbFN1cmZhY2Us IG1fZWdsU3VyZmFjZSwgbV9lZ2xDb250ZXh0KTsKKyAgICBhdXRvJiBjb25uZWN0aW9uID0gV2F5 bGFuZEVHTENvbm5lY3Rpb246OnNpbmdsZXRvbigpOworICAgIGVnbE1ha2VDdXJyZW50KGNvbm5l Y3Rpb24uZWdsRGlzcGxheSwgbV9lZ2xTdXJmYWNlLCBtX2VnbFN1cmZhY2UsIG1fZWdsQ29udGV4 dCk7CiAKICAgICBnbFZpZXdwb3J0KDAsIDAsIG1fd2lkdGgsIG1faGVpZ2h0KTsKICAgICBnbENs ZWFyQ29sb3IoMSwgMCwgMCwgMSk7CkBAIC03MTIsNyArNzQ2LDcgQEAgdm9pZCBXaW5kb3dWaWV3 QmFja2VuZDo6ZGlzcGxheUJ1ZmZlcihzdHJ1Y3Qgd3BlX2Zkb19lZ2xfZXhwb3J0ZWRfaW1hZ2Uq IGltYWdlKQogICAgIHN0cnVjdCB3bF9jYWxsYmFjayogY2FsbGJhY2sgPSB3bF9zdXJmYWNlX2Zy YW1lKG1fc3VyZmFjZSk7CiAgICAgd2xfY2FsbGJhY2tfYWRkX2xpc3RlbmVyKGNhbGxiYWNrLCAm c19mcmFtZUxpc3RlbmVyLCB0aGlzKTsKIAotICAgIGVnbFN3YXBCdWZmZXJzKG1fZWdsRGlzcGxh eSwgbV9lZ2xTdXJmYWNlKTsKKyAgICBlZ2xTd2FwQnVmZmVycyhjb25uZWN0aW9uLmVnbERpc3Bs YXksIG1fZWdsU3VyZmFjZSk7CiB9CiAKIHZvaWQgV2luZG93Vmlld0JhY2tlbmQ6OmhhbmRsZUtl eUV2ZW50KHVpbnQzMl90IGtleSwgdWludDMyX3Qgc3RhdGUsIHVpbnQzMl90IHRpbWUpCg==