199066 2019-06-20 04:11:18 -0700 [GTK] Stop pretending WebCore::Widget can have a platform widget 2019-06-20 22:15:12 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply mcatanzaro oldest_to_newest 1546493 0 cgarcia 2019-06-20 04:11:18 -0700 That was only possible in legacy WebKit that we no longer support. The code can be simplified a bit. 1546494 1 372550 cgarcia 2019-06-20 04:13:51 -0700 Created attachment 372550 Patch 1546498 2 372550 mcatanzaro 2019-06-20 06:56:01 -0700 Comment on attachment 372550 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372550&action=review Wow, this survived a really long time. > Source/WebKit/ChangeLog:8 > + Rename PlatformWidget as PlatformViewWidget to avoid conflict with PlatformWidget defined in WebCore. Perhaps you hit a unified build issue? WebCore::PlatformWidget and WebKit::PlatformWidget are not the same and should not conflict except when a source file that is using namespace WebCore; gets unified into another source file that isn't expecting it. Anyway, this change is harmless and I think we can skirt the owner rules if it's a build issue. 1546514 3 cgarcia 2019-06-20 07:44:12 -0700 Those ifdefs are usually defined outside the namespace, because Namespace::GtkWidget doesn't exist, for example. It has worked so far because we were using GtkWidget in both places. 1546805 4 cgarcia 2019-06-20 22:15:12 -0700 Committed r246669: <https://trac.webkit.org/changeset/246669> 372550 2019-06-20 04:13:51 -0700 2019-06-20 06:56:01 -0700 Patch wk2-no-platform-widget.diff text/plain 13336 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZWY1MzkyYzgyYi4uZThjMGE4NjA1NzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxOS0wNi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gU3RvcCBwcmV0ZW5kaW5nIFdlYkNvcmU6OldpZGdl dCBjYW4gaGF2ZSBhIHBsYXRmb3JtIHdpZGdldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhhdCB3YXMgb25seSBwb3NzaWJsZSBpbiBsZWdhY3kgV2Vi S2l0IHRoYXQgd2Ugbm8gbG9uZ2VyIHN1cHBvcnQuIFRoZSBjb2RlIGNhbiBiZSBzaW1wbGlmaWVk IGEgYml0LgorCisgICAgICAgICogcGxhdGZvcm0vV2lkZ2V0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OldpZGdldDo6aW5pdCk6CisgICAgICAgICogcGxhdGZvcm0vV2lkZ2V0Lmg6CisgICAgICAg IChXZWJDb3JlOjpXaWRnZXQ6OnNldFBsYXRmb3JtV2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6 OldpZGdldDo6cmVsZWFzZVBsYXRmb3JtV2lkZ2V0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OldpZGdldDo6cmV0YWluUGxhdGZvcm1XaWRnZXQpOiBEZWxldGVkLgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzeXN0 ZW1WaXN1YWwpOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuRGVwdGgpOgorICAgICAgICAoV2Vi Q29yZTo6c2NyZWVuRGVwdGhQZXJDb21wb25lbnQpOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVu UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5BdmFpbGFibGVSZWN0KToKKyAgICAgICAg KFdlYkNvcmU6OmdldFRvcGxldmVsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmdldFZp c3VhbCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpnZXRTY3JlZW4pOiBEZWxldGVkLgor ICAgICAgICAqIHBsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 V2lkZ2V0Ojp+V2lkZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6OldpZGdldDo6c2hvdyk6CisgICAg ICAgIChXZWJDb3JlOjpXaWRnZXQ6OmhpZGUpOgorICAgICAgICAoV2ViQ29yZTo6V2lkZ2V0Ojpz ZXRJc1NlbGVjdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OldpZGdldDo6c2V0RnJhbWVSZWN0KToK KyAgICAgICAgKFdlYkNvcmU6OldpZGdldDo6cmVsZWFzZVBsYXRmb3JtV2lkZ2V0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OldpZGdldDo6cmV0YWluUGxhdGZvcm1XaWRnZXQpOiBEZWxl dGVkLgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XaWRnZXRJT1MubW06CisgICAgICAgIChXZWJD b3JlOjpXaWRnZXQ6On5XaWRnZXQpOgorCiAyMDE5LTA2LTIwICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgc3VwcG9ydCBm b3IgR1RLMiBwbHVnaW5zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRn ZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmNwcAppbmRleCA2Y2M2NDVl MTcyMi4uZTlmNWQ4MWUwM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1dp ZGdldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmNwcApAQCAtMzgs OCArMzgsNiBAQCB2b2lkIFdpZGdldDo6aW5pdChQbGF0Zm9ybVdpZGdldCB3aWRnZXQpCiAgICAg bV9zZWxmVmlzaWJsZSA9IGZhbHNlOwogICAgIG1fcGFyZW50VmlzaWJsZSA9IGZhbHNlOwogICAg IG1fd2lkZ2V0ID0gd2lkZ2V0OwotICAgIGlmIChtX3dpZGdldCkKLSAgICAgICAgcmV0YWluUGxh dGZvcm1XaWRnZXQoKTsKIH0KIAogU2Nyb2xsVmlldyogV2lkZ2V0OjpwYXJlbnQoKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9XaWRnZXQuaAppbmRleCBmMjg3OWNjMmMwYi4uMWNmOTMxYzEyMjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5oCkBAIC01MCwxMCArNTAsNiBAQCB0eXBlZGVmIE5TVmll dyAqUGxhdGZvcm1XaWRnZXQ7CiAjZWxpZiBQTEFURk9STShXSU4pCiB0eXBlZGVmIHN0cnVjdCBI V05EX18qIEhXTkQ7CiB0eXBlZGVmIEhXTkQgUGxhdGZvcm1XaWRnZXQ7Ci0jZWxpZiBQTEFURk9S TShHVEspCi10eXBlZGVmIHN0cnVjdCBfR3RrV2lkZ2V0IEd0a1dpZGdldDsKLXR5cGVkZWYgc3Ry dWN0IF9HdGtDb250YWluZXIgR3RrQ29udGFpbmVyOwotdHlwZWRlZiBHdGtXaWRnZXQqIFBsYXRm b3JtV2lkZ2V0OwogI2Vsc2UKIHR5cGVkZWYgdm9pZCogUGxhdGZvcm1XaWRnZXQ7CiAjZW5kaWYK QEAgLTIwMCw5ICsxOTYsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZvaWQgaW5pdChQbGF0 Zm9ybVdpZGdldCk7IC8vIE11c3QgYmUgY2FsbGVkIGJ5IGFsbCBXaWRnZXQgY29uc3RydWN0b3Jz IHRvIGluaXRpYWxpemUgY3Jvc3MtcGxhdGZvcm0gZGF0YS4KIAotICAgIHZvaWQgcmVsZWFzZVBs YXRmb3JtV2lkZ2V0KCk7Ci0gICAgdm9pZCByZXRhaW5QbGF0Zm9ybVdpZGdldCgpOwotCiAgICAg Ly8gVGhlc2UgbWV0aG9kcyBhcmUgdXNlZCB0byBjb252ZXJ0IGZyb20gdGhlIHJvb3Qgd2lkZ2V0 IHRvIHRoZSBjb250YWluaW5nIHdpbmRvdywKICAgICAvLyB3aGljaCBoYXMgYmVoYXZpb3IgdGhh dCBtYXkgZGlmZmVyIGJldHdlZW4gcGxhdGZvcm1zIChlLmcuIE1hYyB1c2VzIGZsaXBwZWQgd2lu ZG93IGNvb3JkaW5hdGVzKS4KICAgICBzdGF0aWMgSW50UmVjdCBjb252ZXJ0RnJvbVJvb3RUb0Nv bnRhaW5pbmdXaW5kb3coY29uc3QgV2lkZ2V0KiByb290V2lkZ2V0LCBjb25zdCBJbnRSZWN0Jik7 CkBAIC0yMzQsMjMgKzIyNyw3IEBAIGlubGluZSBQbGF0Zm9ybVdpZGdldCBXaWRnZXQ6OnBsYXRm b3JtV2lkZ2V0KCkgY29uc3QKIAogaW5saW5lIHZvaWQgV2lkZ2V0OjpzZXRQbGF0Zm9ybVdpZGdl dChQbGF0Zm9ybVdpZGdldCB3aWRnZXQpCiB7Ci0gICAgaWYgKHdpZGdldCAhPSBtX3dpZGdldCkg ewotICAgICAgICByZWxlYXNlUGxhdGZvcm1XaWRnZXQoKTsKLSAgICAgICAgbV93aWRnZXQgPSB3 aWRnZXQ7Ci0gICAgICAgIHJldGFpblBsYXRmb3JtV2lkZ2V0KCk7Ci0gICAgfQotfQotCi0jZW5k aWYKLQotI2lmICFQTEFURk9STShHVEspCi0KLWlubGluZSB2b2lkIFdpZGdldDo6cmVsZWFzZVBs YXRmb3JtV2lkZ2V0KCkKLXsKLX0KLQotaW5saW5lIHZvaWQgV2lkZ2V0OjpyZXRhaW5QbGF0Zm9y bVdpZGdldCgpCi17CisgICAgbV93aWRnZXQgPSB3aWRnZXQ7CiB9CiAKICNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKaW5kZXgg YmQ0N2I3Mzk2NjcuLmJlZTZlZjRiZDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKQEAgLTQ2LDQwICs0NiwyOCBAQAogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRpYyBHdGtXaWRnZXQqIGdldFRvcGxldmVsKEd0a1dpZGdl dCogd2lkZ2V0KQorc3RhdGljIEdka1Zpc3VhbCogc3lzdGVtVmlzdWFsKCkKIHsKLSAgICBHdGtX aWRnZXQqIHRvcGxldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwod2lkZ2V0KTsKLSAgICBy ZXR1cm4gZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkgPyB0b3BsZXZlbCA6IDA7Ci19 CisgICAgaWYgKGF1dG8qIHNjcmVlbiA9IGdka19zY3JlZW5fZ2V0X2RlZmF1bHQoKSkKKyAgICAg ICAgcmV0dXJuIGdka19zY3JlZW5fZ2V0X3N5c3RlbV92aXN1YWwoc2NyZWVuKTsKIAotc3RhdGlj IEdka1Zpc3VhbCogZ2V0VmlzdWFsKFdpZGdldCogd2lkZ2V0KQotewotICAgIEd0a1dpZGdldCog Y29udGFpbmVyID0gd2lkZ2V0ID8gR1RLX1dJREdFVCh3aWRnZXQtPnJvb3QoKS0+aG9zdFdpbmRv dygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkgOiAwOwotICAgIGlmICghY29udGFpbmVyKSB7Ci0g ICAgICAgIEdka1NjcmVlbiogc2NyZWVuID0gZ2RrX3NjcmVlbl9nZXRfZGVmYXVsdCgpOwotICAg ICAgICByZXR1cm4gc2NyZWVuID8gZ2RrX3NjcmVlbl9nZXRfc3lzdGVtX3Zpc3VhbChzY3JlZW4p IDogMDsKLSAgICB9Ci0KLSAgICBpZiAoIWd0a193aWRnZXRfZ2V0X3JlYWxpemVkKGNvbnRhaW5l cikpCi0gICAgICAgIGNvbnRhaW5lciA9IGdldFRvcGxldmVsKGNvbnRhaW5lcik7Ci0gICAgcmV0 dXJuIGNvbnRhaW5lciA/IGdka193aW5kb3dfZ2V0X3Zpc3VhbChndGtfd2lkZ2V0X2dldF93aW5k b3coY29udGFpbmVyKSkgOiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCi1pbnQgc2NyZWVu RGVwdGgoV2lkZ2V0KiB3aWRnZXQpCitpbnQgc2NyZWVuRGVwdGgoV2lkZ2V0KikKIHsKLSAgICBH ZGtWaXN1YWwqIHZpc3VhbCA9IGdldFZpc3VhbCh3aWRnZXQpOwotICAgIGlmICghdmlzdWFsKQot ICAgICAgICByZXR1cm4gMjQ7Ci0gICAgcmV0dXJuIGdka192aXN1YWxfZ2V0X2RlcHRoKHZpc3Vh bCk7CisgICAgaWYgKGF1dG8qIHZpc3VhbCA9IHN5c3RlbVZpc3VhbCgpKQorICAgICAgICByZXR1 cm4gZ2RrX3Zpc3VhbF9nZXRfZGVwdGgodmlzdWFsKTsKKworICAgIHJldHVybiAyNDsKIH0KIAot aW50IHNjcmVlbkRlcHRoUGVyQ29tcG9uZW50KFdpZGdldCogd2lkZ2V0KQoraW50IHNjcmVlbkRl cHRoUGVyQ29tcG9uZW50KFdpZGdldCopCiB7Ci0gICAgR2RrVmlzdWFsKiB2aXN1YWwgPSBnZXRW aXN1YWwod2lkZ2V0KTsKLSAgICBpZiAoIXZpc3VhbCkKLSAgICAgICAgcmV0dXJuIDg7CisgICAg aWYgKGF1dG8qIHZpc3VhbCA9IHN5c3RlbVZpc3VhbCgpKQorICAgICAgICByZXR1cm4gZ2RrX3Zp c3VhbF9nZXRfYml0c19wZXJfcmdiKHZpc3VhbCk7CiAKLSAgICByZXR1cm4gZ2RrX3Zpc3VhbF9n ZXRfYml0c19wZXJfcmdiKHZpc3VhbCk7CisgICAgcmV0dXJuIDg7CiB9CiAKIGJvb2wgc2NyZWVu SXNNb25vY2hyb21lKFdpZGdldCogd2lkZ2V0KQpAQCAtMTQ5LDY4ICsxMzcsNTIgQEAgdm9pZCBz ZXRTY3JlZW5EUElPYnNlcnZlckhhbmRsZXIoRnVuY3Rpb248dm9pZCgpPiYmIGhhbmRsZXIsIHZv aWQqIGNvbnRleHQpCiAgICAgfQogfQogCi0jaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDIyLCAw KQotc3RhdGljIEdka1NjcmVlbiogZ2V0U2NyZWVuKEd0a1dpZGdldCogd2lkZ2V0KQorRmxvYXRS ZWN0IHNjcmVlblJlY3QoV2lkZ2V0KikKIHsKLSAgICByZXR1cm4gZ3RrX3dpZGdldF9oYXNfc2Ny ZWVuKHdpZGdldCkgPyBndGtfd2lkZ2V0X2dldF9zY3JlZW4od2lkZ2V0KSA6IGdka19zY3JlZW5f Z2V0X2RlZmF1bHQoKTsKLX0KLSNlbmRpZgotCi1GbG9hdFJlY3Qgc2NyZWVuUmVjdChXaWRnZXQq IHdpZGdldCkKLXsKLSAgICBHdGtXaWRnZXQqIGNvbnRhaW5lciA9IHdpZGdldCA/IEdUS19XSURH RVQod2lkZ2V0LT5yb290KCktPmhvc3RXaW5kb3coKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpIDog MDsKLSAgICBpZiAoY29udGFpbmVyKQotICAgICAgICBjb250YWluZXIgPSBnZXRUb3BsZXZlbChj b250YWluZXIpOwotCiAgICAgR2RrUmVjdGFuZ2xlIGdlb21ldHJ5OwogI2lmIEdUS19DSEVDS19W RVJTSU9OKDMsIDIyLCAwKQotICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBjb250YWluZXIgPyBn dGtfd2lkZ2V0X2dldF9kaXNwbGF5KGNvbnRhaW5lcikgOiBnZGtfZGlzcGxheV9nZXRfZGVmYXVs dCgpOworICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxheV9nZXRfZGVmYXVsdCgp OwogICAgIGlmICghZGlzcGxheSkKLSAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOworICAgICAg ICByZXR1cm4geyB9OwogCi0gICAgR2RrTW9uaXRvciogbW9uaXRvciA9IGNvbnRhaW5lciA/IGdk a19kaXNwbGF5X2dldF9tb25pdG9yX2F0X3dpbmRvdyhkaXNwbGF5LCBndGtfd2lkZ2V0X2dldF93 aW5kb3coY29udGFpbmVyKSkgOiBnZGtfZGlzcGxheV9nZXRfbW9uaXRvcihkaXNwbGF5LCAwKTsK KyAgICBhdXRvKiBtb25pdG9yID0gZ2RrX2Rpc3BsYXlfZ2V0X21vbml0b3IoZGlzcGxheSwgMCk7 CisgICAgaWYgKCFtb25pdG9yKQorICAgICAgICByZXR1cm4geyB9OwogCiAgICAgZ2RrX21vbml0 b3JfZ2V0X2dlb21ldHJ5KG1vbml0b3IsICZnZW9tZXRyeSk7CiAjZWxzZQotICAgIEdka1NjcmVl biogc2NyZWVuID0gY29udGFpbmVyID8gZ2V0U2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVu X2dldF9kZWZhdWx0KCk7CisgICAgR2RrU2NyZWVuKiBzY3JlZW4gPSBnZGtfc2NyZWVuX2dldF9k ZWZhdWx0KCk7CiAgICAgaWYgKCFzY3JlZW4pCi0gICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsK KyAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIGdpbnQgbW9uaXRvciA9IGNvbnRhaW5lciA/IGdk a19zY3JlZW5fZ2V0X21vbml0b3JfYXRfd2luZG93KHNjcmVlbiwgZ3RrX3dpZGdldF9nZXRfd2lu ZG93KGNvbnRhaW5lcikpIDogMDsKLQotICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3JfZ2VvbWV0 cnkoc2NyZWVuLCBtb25pdG9yLCAmZ2VvbWV0cnkpOworICAgIGdka19zY3JlZW5fZ2V0X21vbml0 b3JfZ2VvbWV0cnkoc2NyZWVuLCAwLCAmZ2VvbWV0cnkpOwogI2VuZGlmIC8vICFHVEtfQ0hFQ0tf VkVSU0lPTigzLCAyMiwgMCkKIAogICAgIHJldHVybiBGbG9hdFJlY3QoZ2VvbWV0cnkueCwgZ2Vv bWV0cnkueSwgZ2VvbWV0cnkud2lkdGgsIGdlb21ldHJ5LmhlaWdodCk7CiB9CiAKLUZsb2F0UmVj dCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdldCogd2lkZ2V0KQorRmxvYXRSZWN0IHNjcmVlbkF2 YWlsYWJsZVJlY3QoV2lkZ2V0KikKIHsKLSAgICBHdGtXaWRnZXQqIGNvbnRhaW5lciA9IHdpZGdl dCA/IEdUS19XSURHRVQod2lkZ2V0LT5yb290KCktPmhvc3RXaW5kb3coKS0+cGxhdGZvcm1QYWdl Q2xpZW50KCkpIDogMDsKLSAgICBpZiAoY29udGFpbmVyICYmICFndGtfd2lkZ2V0X2dldF9yZWFs aXplZChjb250YWluZXIpKQotICAgICAgICByZXR1cm4gc2NyZWVuUmVjdCh3aWRnZXQpOwotCiAg ICAgR2RrUmVjdGFuZ2xlIHdvcmtBcmVhOwogI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDIyLCAw KQotICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBjb250YWluZXIgPyBndGtfd2lkZ2V0X2dldF9k aXNwbGF5KGNvbnRhaW5lcikgOiBnZGtfZGlzcGxheV9nZXRfZGVmYXVsdCgpOworICAgIEdka0Rp c3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxheV9nZXRfZGVmYXVsdCgpOwogICAgIGlmICghZGlz cGxheSkKLSAgICAgICAgcmV0dXJuIEZsb2F0UmVjdCgpOworICAgICAgICByZXR1cm4geyB9Owog Ci0gICAgR2RrTW9uaXRvciogbW9uaXRvciA9IGNvbnRhaW5lciA/IGdka19kaXNwbGF5X2dldF9t b25pdG9yX2F0X3dpbmRvdyhkaXNwbGF5LCBndGtfd2lkZ2V0X2dldF93aW5kb3coY29udGFpbmVy KSkgOiBnZGtfZGlzcGxheV9nZXRfbW9uaXRvcihkaXNwbGF5LCAwKTsKKyAgICBhdXRvKiBtb25p dG9yID0gZ2RrX2Rpc3BsYXlfZ2V0X21vbml0b3IoZGlzcGxheSwgMCk7CisgICAgaWYgKCFtb25p dG9yKQorICAgICAgICByZXR1cm4geyB9OwogCiAgICAgZ2RrX21vbml0b3JfZ2V0X3dvcmthcmVh KG1vbml0b3IsICZ3b3JrQXJlYSk7CiAjZWxzZQotICAgIEdka1NjcmVlbiogc2NyZWVuID0gY29u dGFpbmVyID8gZ2V0U2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCk7 CisgICAgR2RrU2NyZWVuKiBzY3JlZW4gPSBnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCk7CiAgICAg aWYgKCFzY3JlZW4pCiAgICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsKIAotICAgIGdpbnQgbW9u aXRvciA9IGNvbnRhaW5lciA/IGdka19zY3JlZW5fZ2V0X21vbml0b3JfYXRfd2luZG93KHNjcmVl biwgZ3RrX3dpZGdldF9nZXRfd2luZG93KGNvbnRhaW5lcikpIDogMDsKLQotICAgIGdka19zY3Jl ZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoc2NyZWVuLCBtb25pdG9yLCAmd29ya0FyZWEpOworICAg IGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoc2NyZWVuLCAwLCAmd29ya0FyZWEpOwog I2VuZGlmIC8vICFHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyMiwgMCkKIAogICAgIHJldHVybiBGbG9h dFJlY3Qod29ya0FyZWEueCwgd29ya0FyZWEueSwgd29ya0FyZWEud2lkdGgsIHdvcmtBcmVhLmhl aWdodCk7Ci0KIH0KIAogYm9vbCBzY3JlZW5TdXBwb3J0c0V4dGVuZGVkQ29sb3IoV2lkZ2V0KikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9XaWRnZXRHdGsuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1dpZGdldEd0ay5jcHAKaW5kZXggNzM2MTZmYjYy NzcuLjY5MTllZTQyYmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv V2lkZ2V0R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvV2lkZ2V0R3Rr LmNwcApAQCAtMzAsMjAgKzMwLDE0IEBACiAKICNpbmNsdWRlICJDdXJzb3IuaCIKICNpbmNsdWRl ICJGcmFtZVZpZXcuaCIKLSNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJI b3N0V2luZG93LmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogCi0jaW5jbHVkZSA8Z2RrL2dkay5o PgotI2luY2x1ZGUgPGd0ay9ndGsuaD4KLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBXaWRnZXQ6 On5XaWRnZXQoKQogewogICAgIEFTU0VSVCghcGFyZW50KCkpOwotCi0gICAgcmVsZWFzZVBsYXRm b3JtV2lkZ2V0KCk7CiB9CiAKIHZvaWQgV2lkZ2V0OjpzZXRGb2N1cyhib29sKQpAQCAtNjEsNTYg KzU1LDI0IEBAIHZvaWQgV2lkZ2V0OjpzZXRDdXJzb3IoY29uc3QgQ3Vyc29yJiBjdXJzb3IpCiB2 b2lkIFdpZGdldDo6c2hvdygpCiB7CiAgICAgc2V0U2VsZlZpc2libGUodHJ1ZSk7Ci0KLSAgICBp ZiAoaXNQYXJlbnRWaXNpYmxlKCkgJiYgcGxhdGZvcm1XaWRnZXQoKSkKLSAgICAgICAgZ3RrX3dp ZGdldF9zaG93KHBsYXRmb3JtV2lkZ2V0KCkpOwogfQogCiB2b2lkIFdpZGdldDo6aGlkZSgpCiB7 CiAgICAgc2V0U2VsZlZpc2libGUoZmFsc2UpOwotCi0gICAgaWYgKGlzUGFyZW50VmlzaWJsZSgp ICYmIHBsYXRmb3JtV2lkZ2V0KCkpCi0gICAgICAgIGd0a193aWRnZXRfaGlkZShwbGF0Zm9ybVdp ZGdldCgpKTsKIH0KIAogdm9pZCBXaWRnZXQ6OnBhaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0 IEludFJlY3QmLCBTZWN1cml0eU9yaWdpblBhaW50UG9saWN5KQogewogfQogCi12b2lkIFdpZGdl dDo6c2V0SXNTZWxlY3RlZChib29sIGlzU2VsZWN0ZWQpCit2b2lkIFdpZGdldDo6c2V0SXNTZWxl Y3RlZChib29sKQogewotICAgIGlmICghcGxhdGZvcm1XaWRnZXQoKSkKLSAgICAgICAgcmV0dXJu OwotCi0gICAgLy8gU2VlIGlmIHRoZSBwbGF0Zm9ybVdpZGdldCBoYXMgYSB3ZWJraXQtd2lkZ2V0 LWlzLXNlbGVjdGVkIHByb3BlcnR5Ci0gICAgLy8gYW5kIHNldCBpdCBhZnRlcndhcmRzLgotICAg IEdQYXJhbVNwZWMqIHNwZWMgPSBnX29iamVjdF9jbGFzc19maW5kX3Byb3BlcnR5KEdfT0JKRUNU X0dFVF9DTEFTUyhwbGF0Zm9ybVdpZGdldCgpKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAid2Via2l0LXdpZGdldC1pcy1zZWxlY3RlZCIpOwot ICAgIGlmICghc3BlYykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgZ19vYmplY3Rfc2V0KHBsYXRm b3JtV2lkZ2V0KCksICJ3ZWJraXQtd2lkZ2V0LWlzLXNlbGVjdGVkIiwgaXNTZWxlY3RlZCwgTlVM TCk7CiB9CiAKIHZvaWQgV2lkZ2V0OjpzZXRGcmFtZVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkK IHsKICAgICBtX2ZyYW1lID0gcmVjdDsKLSAgICBmcmFtZVJlY3RzQ2hhbmdlZCgpOwotfQotCi12 b2lkIFdpZGdldDo6cmVsZWFzZVBsYXRmb3JtV2lkZ2V0KCkKLXsKLSAgICBpZiAoIXBsYXRmb3Jt V2lkZ2V0KCkpCi0gICAgICAgICByZXR1cm47Ci0gICAgZ19vYmplY3RfdW5yZWYocGxhdGZvcm1X aWRnZXQoKSk7Ci19Ci0KLXZvaWQgV2lkZ2V0OjpyZXRhaW5QbGF0Zm9ybVdpZGdldCgpCi17Ci0g ICAgaWYgKCFwbGF0Zm9ybVdpZGdldCgpKQotICAgICAgICAgcmV0dXJuOwotICAgIGdfb2JqZWN0 X3JlZl9zaW5rKHBsYXRmb3JtV2lkZ2V0KCkpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2lkZ2V0SU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1dpZGdldElPUy5tbQppbmRleCAwNWI0NDQ5MWJlZS4uMDQ5MjhmOTQzNDUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XaWRnZXRJT1MubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dpZGdldElPUy5tbQpAQCAtNjIsOSArNjIsOCBAQCBX aWRnZXQ6OldpZGdldChOU1ZpZXcqIHZpZXcpCiAgICAgaW5pdCh2aWV3KTsKIH0KIAotV2lkZ2V0 Ojp+V2lkZ2V0KCkgCitXaWRnZXQ6On5XaWRnZXQoKQogewotICAgIHJlbGVhc2VQbGF0Zm9ybVdp ZGdldCgpOwogfQogCiAvLyBGSVhNRTogU2hvdWxkIG1vdmUgdGhpcyB0byBDaHJvbWU7IGJhZCBs YXllcmluZyB0aGF0IHRoaXMga25vd3MgYWJvdXQgRnJhbWUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIzMzkzYmU1 NTYwLi45MGE1ZTRmNTUzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOS0wNi0yMCAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S10gU3RvcCBwcmV0ZW5kaW5nIFdlYkNvcmU6OldpZGdldCBjYW4gaGF2ZSBhIHBsYXRmb3JtIHdp ZGdldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5 MDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVu YW1lIFBsYXRmb3JtV2lkZ2V0IGFzIFBsYXRmb3JtVmlld1dpZGdldCB0byBhdm9pZCBjb25mbGlj dCB3aXRoIFBsYXRmb3JtV2lkZ2V0IGRlZmluZWQgaW4gV2ViQ29yZS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mvd2luL1dlYlBhZ2VQ cm94eVdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dmlld1dpZGdldCk6 CisKIDIwMTktMDYtMjAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdIFJlbW92ZSBzdXBwb3J0IGZvciBHVEsyIHBsdWdpbnMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggNWRkNjIzYjQ3MzIuLjE4YjIwMTZl MDM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjE3LDcgKzIx Nyw3IEBAIHVzaW5nIEZsb2F0Qm94RXh0ZW50ID0gUmVjdEVkZ2VzPGZsb2F0PjsKIH0KIAogI2lm IFBMQVRGT1JNKEdUSykKLXR5cGVkZWYgR3RrV2lkZ2V0KiBQbGF0Zm9ybVdpZGdldDsKK3R5cGVk ZWYgR3RrV2lkZ2V0KiBQbGF0Zm9ybVZpZXdXaWRnZXQ7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JN KFdQRSkKQEAgLTIyOSw3ICsyMjksNyBAQCB0eXBlZGVmIHN0cnVjdCBPcGFxdWVKU0NvbnRleHQq IEpTR2xvYmFsQ29udGV4dFJlZjsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oV0lOKQotdHlwZWRl ZiBIV05EIFBsYXRmb3JtV2lkZ2V0OwordHlwZWRlZiBIV05EIFBsYXRmb3JtVmlld1dpZGdldDsK ICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTgwNCw3ICs4MDQsNyBAQCBwdWJsaWM6 CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCiAjaWYgUExBVEZPUk0oR1RLKQotICAgIFBsYXRm b3JtV2lkZ2V0IHZpZXdXaWRnZXQoKTsKKyAgICBQbGF0Zm9ybVZpZXdXaWRnZXQgdmlld1dpZGdl dCgpOwogICAgIGJvb2wgbWFrZUdMQ29udGV4dEN1cnJlbnQoKTsKICNlbmRpZgogCkBAIC04MTIs NyArODEyLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0QmFja2dyb3VuZENvbG9yKGNvbnN0IE9w dGlvbmFsPFdlYkNvcmU6OkNvbG9yPiYpOwogCiAjaWYgUExBVEZPUk0oV0lOKQotICAgIFBsYXRm b3JtV2lkZ2V0IHZpZXdXaWRnZXQoKTsKKyAgICBQbGF0Zm9ybVZpZXdXaWRnZXQgdmlld1dpZGdl dCgpOwogI2VuZGlmCiAjaWYgUExBVEZPUk0oV1BFKQogICAgIHN0cnVjdCB3cGVfdmlld19iYWNr ZW5kKiB2aWV3QmFja2VuZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv d2luL1dlYlBhZ2VQcm94eVdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy93aW4vV2Vi UGFnZVByb3h5V2luLmNwcAppbmRleCA2Zjc2MDUyNzkzNS4uOGQ1ODU5MmQ1NGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJQYWdlUHJveHlXaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL3dpbi9XZWJQYWdlUHJveHlXaW4uY3BwCkBAIC02NSw3 ICs2NSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp1cGRhdGVFZGl0b3JTdGF0ZShjb25zdCBFZGl0 b3JTdGF0ZSYgZWRpdG9yU3RhdGUpCiAgICAgbV9lZGl0b3JTdGF0ZSA9IGVkaXRvclN0YXRlOwog fQogCi1QbGF0Zm9ybVdpZGdldCBXZWJQYWdlUHJveHk6OnZpZXdXaWRnZXQoKQorUGxhdGZvcm1W aWV3V2lkZ2V0IFdlYlBhZ2VQcm94eTo6dmlld1dpZGdldCgpCiB7CiAgICAgcmV0dXJuIHN0YXRp Y19jYXN0PFBhZ2VDbGllbnRJbXBsJj4ocGFnZUNsaWVudCgpKS52aWV3V2lkZ2V0KCk7CiB9Cg==