211189 2020-04-29 09:40:23 -0700 [GTK4][X11] Add support for rendering web view contents 2020-04-30 05:59:00 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 210100 1 cgarcia webkit-unassigned aperez bugs-noreply oldest_to_newest 1647026 0 cgarcia 2020-04-29 09:40:23 -0700 . 1647029 1 397970 cgarcia 2020-04-29 09:46:36 -0700 Created attachment 397970 Patch 1647339 2 397970 aperez 2020-04-30 05:53:05 -0700 Comment on attachment 397970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397970&action=review > Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h:37 > +#define WK_XVISUAL(platformDisplay) (static_cast<Visual*>(platformDisplay.visual())) /me sighs at X11 (╥_╥) > Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp:205 > + auto* visual = WK_XVISUAL(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay())); Maybe we want to always use the WK_XVISUAL() variant and remove the #if here? I doubt that GTK would choose one different from what PlatformDisplayX11::visual() finds. 1647342 3 cgarcia 2020-04-30 05:57:50 -0700 (In reply to Adrian Perez from comment #2) > Comment on attachment 397970 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=397970&action=review > > > Source/WebCore/platform/graphics/x11/PlatformDisplayX11.h:37 > > +#define WK_XVISUAL(platformDisplay) (static_cast<Visual*>(platformDisplay.visual())) > > /me sighs at X11 (╥_╥) > > > Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp:205 > > + auto* visual = WK_XVISUAL(downcast<PlatformDisplayX11>(PlatformDisplay::sharedDisplay())); > > Maybe we want to always use the WK_XVISUAL() variant and remove the #if here? > I doubt that GTK would choose one different from what > PlatformDisplayX11::visual() > finds. I prefer not to change the GTK3 behavior, even less in X11 related code that I don't test myself. 1647344 4 cgarcia 2020-04-30 05:59:00 -0700 Committed r260946: <https://trac.webkit.org/changeset/260946> 397970 2020-04-29 09:46:36 -0700 2020-04-30 05:53:05 -0700 Patch wkgtk4-x11.diff text/plain 14505 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYzQ0YmQ0Zjg0ZGYuLmY3YWY0MTE4NDkyZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIwLTA0LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF1bWDExXSBBZGQgc3VwcG9ydCBmb3IgcmVuZGVy aW5nIHdlYiB2aWV3IGNvbnRlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTExODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgUGxhdGZvcm1EaXNwbGF5WDExOjp2aXN1YWwoKSB0byBnZXQgdGhl IFggdmlzdWFsIHVzZWQgZm9yIHJlbmRlcmluZy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZv cm1EaXNwbGF5WDExOjp2aXN1YWwgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuaDoKKwogMjAyMC0wNC0yOSAgUm9iIEJ1aXMgIDxyYnVp c0BpZ2FsaWEuY29tPgogCiAgICAgICAgIE1ha2UgUG9saWN5Q2hlY2tlciBhbiBpbm5lciBjbGFz cyBvZiBGcmFtZUxvYWRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MveDExL1BsYXRmb3JtRGlzcGxheVgxMS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy94MTEvUGxhdGZvcm1EaXNwbGF5WDExLmNwcAppbmRleCA4YzgxMTE5YmM1MGQu LjhmZTNkM2U5MmM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MveDExL1BsYXRmb3JtRGlzcGxheVgxMS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MveDExL1BsYXRmb3JtRGlzcGxheVgxMS5jcHAKQEAgLTEyNCw2ICsxMjQsMzEg QEAgYm9vbCBQbGF0Zm9ybURpc3BsYXlYMTE6OnN1cHBvcnRzWERhbWFnZShPcHRpb25hbDxpbnQ+ JiBkYW1hZ2VFdmVudEJhc2UsIE9wdGlvbmEKICAgICByZXR1cm4gbV9zdXBwb3J0c1hEYW1hZ2Uu dmFsdWUoKTsKIH0KIAordm9pZCogUGxhdGZvcm1EaXNwbGF5WDExOjp2aXN1YWwoKSBjb25zdAor eworICAgIGlmIChtX3Zpc3VhbCkKKyAgICAgICAgcmV0dXJuIG1fdmlzdWFsOworCisgICAgWFZp c3VhbEluZm8gdmlzdWFsVGVtcGxhdGU7CisgICAgdmlzdWFsVGVtcGxhdGUuc2NyZWVuID0gRGVm YXVsdFNjcmVlbihtX2Rpc3BsYXkpOworCisgICAgaW50IHZpc3VhbENvdW50ID0gMDsKKyAgICBY VmlzdWFsSW5mbyogdmlzdWFsSW5mbyA9IFhHZXRWaXN1YWxJbmZvKG1fZGlzcGxheSwgVmlzdWFs U2NyZWVuTWFzaywgJnZpc3VhbFRlbXBsYXRlLCAmdmlzdWFsQ291bnQpOworICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgdmlzdWFsQ291bnQ7ICsraSkgeworICAgICAgICBhdXRvJiBpbmZvID0gdmlz dWFsSW5mb1tpXTsKKyAgICAgICAgaWYgKGluZm8uZGVwdGggPT0gMzIgJiYgaW5mby5yZWRfbWFz ayA9PSAweGZmMDAwMCAmJiBpbmZvLmdyZWVuX21hc2sgPT0gMHgwMGZmMDAgJiYgaW5mby5ibHVl X21hc2sgPT0gMHgwMDAwZmYpIHsKKyAgICAgICAgICAgIG1fdmlzdWFsID0gaW5mby52aXN1YWw7 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKyAgICBYRnJlZSh2aXN1YWxJ bmZvKTsKKworICAgIGlmICghbV92aXN1YWwpCisgICAgICAgIG1fdmlzdWFsID0gRGVmYXVsdFZp c3VhbChtX2Rpc3BsYXksIERlZmF1bHRTY3JlZW4obV9kaXNwbGF5KSk7CisKKyAgICByZXR1cm4g bV92aXN1YWw7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFBMQVRG T1JNKFgxMSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gx MS9QbGF0Zm9ybURpc3BsYXlYMTEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3gxMS9QbGF0Zm9ybURpc3BsYXlYMTEuaAppbmRleCBkZjAwZDFlNzNhM2EuLmY0YWYxNWM3NTY5 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MveDExL1BsYXRm b3JtRGlzcGxheVgxMS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3gx MS9QbGF0Zm9ybURpc3BsYXlYMTEuaApAQCAtMjMsOCArMjMsNyBAQAogICogVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAq LwogCi0jaWZuZGVmIFBsYXRmb3JtRGlzcGxheVgxMV9oCi0jZGVmaW5lIFBsYXRmb3JtRGlzcGxh eVgxMV9oCisjcHJhZ21hIG9uY2UKIAogI2lmIFBMQVRGT1JNKFgxMSkKIApAQCAtMzMsNiArMzIs MTAgQEAKIAogdHlwZWRlZiBzdHJ1Y3QgX1hEaXNwbGF5IERpc3BsYXk7CiAKKy8vIEl0J3Mgbm90 IHBvc3NpYmxlIHRvIGZvcndhcmQgZGVjbGFyZSBWaXN1YWwsIGFuZCBpbmNsdWRpbmcgeGxpYiBp biBoZWFkZXJzIGlzIHByb2JsZW1hdGljLAorLy8gc28gd2UgdXNlIHZvaWQqIGZvciBWaXN1YWwg YW5kIHByb3ZpZGUgdGhpcyBtYWNybyB0byBnZXQgdGhlIHZpc3VhbCBlYXNpbHkuCisjZGVmaW5l IFdLX1hWSVNVQUwocGxhdGZvcm1EaXNwbGF5KSAoc3RhdGljX2Nhc3Q8VmlzdWFsKj4ocGxhdGZv cm1EaXNwbGF5LnZpc3VhbCgpKSkKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBQbGF0 Zm9ybURpc3BsYXlYMTEgZmluYWwgOiBwdWJsaWMgUGxhdGZvcm1EaXNwbGF5IHsKQEAgLTQzLDYg KzQ2LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflBsYXRmb3JtRGlzcGxheVgxMSgpOwogCiAg ICAgRGlzcGxheSogbmF0aXZlKCkgY29uc3QgeyByZXR1cm4gbV9kaXNwbGF5OyB9CisgICAgdm9p ZCogdmlzdWFsKCkgY29uc3Q7CiAgICAgYm9vbCBzdXBwb3J0c1hDb21wb3NpdGUoKSBjb25zdDsK ICAgICBib29sIHN1cHBvcnRzWERhbWFnZShPcHRpb25hbDxpbnQ+JiBkYW1hZ2VFdmVudEJhc2Us IE9wdGlvbmFsPGludD4mIGRhbWFnZUVycm9yQmFzZSkgY29uc3Q7CiAKQEAgLTYwLDYgKzY0LDcg QEAgcHJpdmF0ZToKICAgICBtdXRhYmxlIE9wdGlvbmFsPGJvb2w+IG1fc3VwcG9ydHNYRGFtYWdl OwogICAgIG11dGFibGUgT3B0aW9uYWw8aW50PiBtX2RhbWFnZUV2ZW50QmFzZTsKICAgICBtdXRh YmxlIE9wdGlvbmFsPGludD4gbV9kYW1hZ2VFcnJvckJhc2U7CisgICAgbXV0YWJsZSB2b2lkKiBt X3Zpc3VhbCB7IG51bGxwdHIgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKQEAgLTY3 LDUgKzcyLDMgQEAgcHJpdmF0ZToKIFNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfUExBVEZPUk1fRElT UExBWShQbGF0Zm9ybURpc3BsYXlYMTEsIFgxMSkKIAogI2VuZGlmIC8vIFBMQVRGT1JNKFgxMSkK LQotI2VuZGlmIC8vIFBsYXRmb3JtRGlzcGxheVgxMQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2YzE1OWFiNzQ1Y2Qu LmE0MDBmZTNlNjhkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAyMC0wNC0yOSAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUSzRd W1gxMV0gQWRkIHN1cHBvcnQgZm9yIHJlbmRlcmluZyB3ZWIgdmlldyBjb250ZW50cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExMTg5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEdka0Rpc3BsYXlY MTE6OnhldmVudCBzaWduYWwgaW5zdGVhZCBvZiBmaWx0ZXJpbmcgZXZlbnRzIHRoYXQgaXMgbm8g bG9uZ2VyIGF2YWlsYWJsZSBpbiBHVEs0LiBHZGtWaXN1YWwgbm8KKyAgICAgICAgbG9uZ2VyIGV4 aXN0cyBlaXRoZXIsIHNvIHdlIGdldCB0aGUgWCB2aXN1YWwgZnJvbSB0aGUgUGxhdGZvcm1EaXNw bGF5LgorCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgx MS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlhEYW1hZ2VOb3RpZmllcjo6YWRkKToKKyAgICAgICAg KFdlYktpdDo6WERhbWFnZU5vdGlmaWVyOjpyZW1vdmUpOgorICAgICAgICAoV2ViS2l0OjpYRGFt YWdlTm90aWZpZXI6OmZpbHRlclhEYW1hZ2VFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OkFjY2Vs ZXJhdGVkQmFja2luZ1N0b3JlWDExOjp+QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVYMTEpOgorICAg ICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgxMTo6dXBkYXRlKToKKyAgICAg ICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVYMTE6OnNuYXBzaG90KToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0FjY2VsZXJhdGVkU3VyZmFjZVgxMS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkU3VyZmFjZVgxMTo6QWNjZWxlcmF0ZWRTdXJmYWNl WDExKToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRTdXJmYWNlWDExOjpjcmVhdGVQaXht YXApOgorCiAyMDIwLTA0LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1RLNF0gQWRkIHN1cHBvcnQgY2xpY2sgZXZlbnRzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVY MTEuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0 b3JlWDExLmNwcAppbmRleCAxNmE3ZWY2NmYxMzEuLmJlMTliNjAwN2M5YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlWDExLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3Rv cmVYMTEuY3BwCkBAIC01Miw3ICs1Miw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogc3Rh dGljIE9wdGlvbmFsPGludD4gc19kYW1hZ2VFdmVudEJhc2U7CiBzdGF0aWMgT3B0aW9uYWw8aW50 PiBzX2RhbWFnZUVycm9yQmFzZTsKIAotI2lmICFVU0UoR1RLNCkKIGNsYXNzIFhEYW1hZ2VOb3Rp ZmllciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoWERhbWFnZU5vdGlmaWVyKTsKICAgICBm cmllbmQgTmV2ZXJEZXN0cm95ZWQ8WERhbWFnZU5vdGlmaWVyPjsKQEAgLTY1LDIxICs2NCw0NiBA QCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZChEYW1hZ2UgZGFtYWdlLCBXVEY6OkZ1bmN0aW9uPHZv aWQoKT4mJiBub3RpZnlGdW5jdGlvbikKICAgICB7Ci0gICAgICAgIGlmIChtX25vdGlmeUZ1bmN0 aW9ucy5pc0VtcHR5KCkpCisgICAgICAgIGlmIChtX25vdGlmeUZ1bmN0aW9ucy5pc0VtcHR5KCkp IHsKKyNpZiBVU0UoR1RLNCkKKyAgICAgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3QoZ2RrX2Rpc3Bs YXlfZ2V0X2RlZmF1bHQoKSwgInhldmVudCIsIEdfQ0FMTEJBQ0soZmlsdGVyWERhbWFnZUV2ZW50 KSwgdGhpcyk7CisjZWxzZQogICAgICAgICAgICAgZ2RrX3dpbmRvd19hZGRfZmlsdGVyKG51bGxw dHIsIHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRmlsdGVyRnVuYz4oJmZpbHRlclhEYW1hZ2VFdmVudCks IHRoaXMpOworI2VuZGlmCisgICAgICAgIH0KICAgICAgICAgbV9ub3RpZnlGdW5jdGlvbnMuYWRk KGRhbWFnZSwgV1RGTW92ZShub3RpZnlGdW5jdGlvbikpOwogICAgIH0KIAogICAgIHZvaWQgcmVt b3ZlKERhbWFnZSBkYW1hZ2UpCiAgICAgewogICAgICAgICBtX25vdGlmeUZ1bmN0aW9ucy5yZW1v dmUoZGFtYWdlKTsKLSAgICAgICAgaWYgKG1fbm90aWZ5RnVuY3Rpb25zLmlzRW1wdHkoKSkKKyAg ICAgICAgaWYgKG1fbm90aWZ5RnVuY3Rpb25zLmlzRW1wdHkoKSkgeworI2lmIFVTRShHVEs0KQor ICAgICAgICAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9kYXRhKGdka19kaXNw bGF5X2dldF9kZWZhdWx0KCksIHRoaXMpOworI2Vsc2UKICAgICAgICAgICAgIGdka193aW5kb3df cmVtb3ZlX2ZpbHRlcihudWxscHRyLCByZWludGVycHJldF9jYXN0PEdka0ZpbHRlckZ1bmM+KCZm aWx0ZXJYRGFtYWdlRXZlbnQpLCB0aGlzKTsKKyNlbmRpZgorICAgICAgICB9CiAgICAgfQogCiBw cml2YXRlOgogICAgIFhEYW1hZ2VOb3RpZmllcigpID0gZGVmYXVsdDsKIAorI2lmIFVTRShHVEs0 KQorICAgIHN0YXRpYyBnYm9vbGVhbiBmaWx0ZXJYRGFtYWdlRXZlbnQoR2RrRGlzcGxheSosIFhF dmVudCogeEV2ZW50LCBYRGFtYWdlTm90aWZpZXIqIG5vdGlmaWVyKQorICAgIHsKKyAgICAgICAg aWYgKHhFdmVudC0+dHlwZSAhPSBzX2RhbWFnZUV2ZW50QmFzZS52YWx1ZSgpICsgWERhbWFnZU5v dGlmeSkKKyAgICAgICAgICAgIHJldHVybiBHREtfRVZFTlRfUFJPUEFHQVRFOworCisgICAgICAg IGF1dG8qIGRhbWFnZUV2ZW50ID0gcmVpbnRlcnByZXRfY2FzdDxYRGFtYWdlTm90aWZ5RXZlbnQq Pih4RXZlbnQpOworICAgICAgICBpZiAobm90aWZpZXItPm5vdGlmeShkYW1hZ2VFdmVudC0+ZGFt YWdlKSkgeworICAgICAgICAgICAgWERhbWFnZVN1YnRyYWN0KHhFdmVudC0+eGFueS5kaXNwbGF5 LCBkYW1hZ2VFdmVudC0+ZGFtYWdlLCBOb25lLCBOb25lKTsKKyAgICAgICAgICAgIHJldHVybiBH REtfRVZFTlRfU1RPUDsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBHREtfRVZFTlRfUFJP UEFHQVRFOworICAgIH0KKyNlbHNlCiAgICAgc3RhdGljIEdka0ZpbHRlclJldHVybiBmaWx0ZXJY RGFtYWdlRXZlbnQoR2RrWEV2ZW50KiBldmVudCwgR2RrRXZlbnQqLCBYRGFtYWdlTm90aWZpZXIq IG5vdGlmaWVyKQogICAgIHsKICAgICAgICAgYXV0byogeEV2ZW50ID0gc3RhdGljX2Nhc3Q8WEV2 ZW50Kj4oZXZlbnQpOwpAQCAtOTQsNiArMTE4LDcgQEAgcHJpdmF0ZToKIAogICAgICAgICByZXR1 cm4gR0RLX0ZJTFRFUl9DT05USU5VRTsKICAgICB9CisjZW5kaWYKIAogICAgIGJvb2wgbm90aWZ5 KERhbWFnZSBkYW1hZ2UpIGNvbnN0CiAgICAgewpAQCAtMTA3LDcgKzEzMiw2IEBAIHByaXZhdGU6 CiAKICAgICBIYXNoTWFwPERhbWFnZSwgV1RGOjpGdW5jdGlvbjx2b2lkKCk+PiBtX25vdGlmeUZ1 bmN0aW9uczsKIH07Ci0jZW5kaWYKIAogYm9vbCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgxMTo6 Y2hlY2tSZXF1aXJlbWVudHMoKQogewpAQCAtMTM3LDcgKzE2MSw2IEBAIEFjY2VsZXJhdGVkQmFj a2luZ1N0b3JlWDExOjp+QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVYMTEoKQogICAgIGlmICghbV9z dXJmYWNlICYmICFtX2RhbWFnZSkKICAgICAgICAgcmV0dXJuOwogCi0jaWYgIVVTRShHVEs0KQog ICAgIERpc3BsYXkqIGRpc3BsYXkgPSBkb3duY2FzdDxQbGF0Zm9ybURpc3BsYXlYMTE+KFBsYXRm b3JtRGlzcGxheTo6c2hhcmVkRGlzcGxheSgpKS5uYXRpdmUoKTsKICAgICBYRXJyb3JUcmFwcGVy IHRyYXBwZXIoZGlzcGxheSwgWEVycm9yVHJhcHBlcjo6UG9saWN5OjpDcmFzaCwgeyBCYWREcmF3 YWJsZSwgeERhbWFnZUVycm9yQ29kZShCYWREYW1hZ2UpIH0pOwogICAgIGlmIChtX2RhbWFnZSkg ewpAQCAtMTQ1LDcgKzE2OCw2IEBAIEFjY2VsZXJhdGVkQmFja2luZ1N0b3JlWDExOjp+QWNjZWxl cmF0ZWRCYWNraW5nU3RvcmVYMTEoKQogICAgICAgICBtX2RhbWFnZS5yZXNldCgpOwogICAgICAg ICBYU3luYyhkaXNwbGF5LCBGYWxzZSk7CiAgICAgfQotI2VuZGlmCiB9CiAKIHZvaWQgQWNjZWxl cmF0ZWRCYWNraW5nU3RvcmVYMTE6OnVwZGF0ZShjb25zdCBMYXllclRyZWVDb250ZXh0JiBsYXll clRyZWVDb250ZXh0KQpAQCAtMTU3LDE0ICsxNzksMTIgQEAgdm9pZCBBY2NlbGVyYXRlZEJhY2tp bmdTdG9yZVgxMTo6dXBkYXRlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNvbnRl eHQKICAgICBEaXNwbGF5KiBkaXNwbGF5ID0gZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDExPihQ bGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXkoKSkubmF0aXZlKCk7CiAKICAgICBpZiAobV9z dXJmYWNlKSB7Ci0jaWYgIVVTRShHVEs0KQogICAgICAgICBYRXJyb3JUcmFwcGVyIHRyYXBwZXIo ZGlzcGxheSwgWEVycm9yVHJhcHBlcjo6UG9saWN5OjpDcmFzaCwgeyBCYWREcmF3YWJsZSwgeERh bWFnZUVycm9yQ29kZShCYWREYW1hZ2UpIH0pOwogICAgICAgICBpZiAobV9kYW1hZ2UpIHsKICAg ICAgICAgICAgIFhEYW1hZ2VOb3RpZmllcjo6c2luZ2xldG9uKCkucmVtb3ZlKG1fZGFtYWdlLmdl dCgpKTsKICAgICAgICAgICAgIG1fZGFtYWdlLnJlc2V0KCk7CiAgICAgICAgICAgICBYU3luYyhk aXNwbGF5LCBGYWxzZSk7CiAgICAgICAgIH0KLSNlbmRpZgogICAgICAgICBtX3N1cmZhY2UgPSBu dWxscHRyOwogICAgIH0KIApAQCAtMTc4LDEzICsxOTgsMTggQEAgdm9pZCBBY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZVgxMTo6dXBkYXRlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNv bnRleHQKICAgICBJbnRTaXplIHNpemUgPSBkcmF3aW5nQXJlYS0+c2l6ZSgpOwogICAgIGZsb2F0 IGRldmljZVNjYWxlRmFjdG9yID0gbV93ZWJQYWdlLmRldmljZVNjYWxlRmFjdG9yKCk7CiAgICAg c2l6ZS5zY2FsZShkZXZpY2VTY2FsZUZhY3Rvcik7Ci0jaWYgIVVTRShHVEs0KQorCiAgICAgWEVy cm9yVHJhcHBlciB0cmFwcGVyKGRpc3BsYXksIFhFcnJvclRyYXBwZXI6OlBvbGljeTo6Q3Jhc2gs IHsgQmFkRHJhd2FibGUsIHhEYW1hZ2VFcnJvckNvZGUoQmFkRGFtYWdlKSB9KTsKLSAgICBBU1NF UlQoZG93bmNhc3Q8UGxhdGZvcm1EaXNwbGF5WDExPihQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERp c3BsYXkoKSkubmF0aXZlKCkgPT0gR0RLX0RJU1BMQVlfWERJU1BMQVkoZ2RrX2Rpc3BsYXlfZ2V0 X2RlZmF1bHQoKSkpOwotICAgIEdka1Zpc3VhbCogdmlzdWFsID0gZ2RrX3NjcmVlbl9nZXRfcmdi YV92aXN1YWwoZ2RrX3NjcmVlbl9nZXRfZGVmYXVsdCgpKTsKLSAgICBpZiAoIXZpc3VhbCkKLSAg ICAgICAgdmlzdWFsID0gZ2RrX3NjcmVlbl9nZXRfc3lzdGVtX3Zpc3VhbChnZGtfc2NyZWVuX2dl dF9kZWZhdWx0KCkpOwotICAgIG1fc3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX3hsaWJfc3VyZmFj ZV9jcmVhdGUoZGlzcGxheSwgcGl4bWFwLCBHREtfVklTVUFMX1hWSVNVQUwodmlzdWFsKSwgc2l6 ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKSk7CisgICAgQVNTRVJUKGRvd25jYXN0PFBsYXRmb3Jt RGlzcGxheVgxMT4oUGxhdGZvcm1EaXNwbGF5OjpzaGFyZWREaXNwbGF5KCkpLm5hdGl2ZSgpID09 IGdka194MTFfZGlzcGxheV9nZXRfeGRpc3BsYXkoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHQoKSkp OworI2lmIFVTRShHVEs0KQorICAgIGF1dG8qIHZpc3VhbCA9IFdLX1hWSVNVQUwoZG93bmNhc3Q8 UGxhdGZvcm1EaXNwbGF5WDExPihQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXkoKSkpOwor I2Vsc2UKKyAgICBHZGtWaXN1YWwqIGdka1Zpc3VhbCA9IGdka19zY3JlZW5fZ2V0X3JnYmFfdmlz dWFsKGdka19zY3JlZW5fZ2V0X2RlZmF1bHQoKSk7CisgICAgaWYgKCFnZGtWaXN1YWwpCisgICAg ICAgIGdka1Zpc3VhbCA9IGdka19zY3JlZW5fZ2V0X3N5c3RlbV92aXN1YWwoZ2RrX3NjcmVlbl9n ZXRfZGVmYXVsdCgpKTsKKyAgICBhdXRvKiB2aXN1YWwgPSBHREtfVklTVUFMX1hWSVNVQUwoZ2Rr VmlzdWFsKTsKKyNlbmRpZgorICAgIG1fc3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX3hsaWJfc3Vy ZmFjZV9jcmVhdGUoZGlzcGxheSwgcGl4bWFwLCB2aXN1YWwsIHNpemUud2lkdGgoKSwgc2l6ZS5o ZWlnaHQoKSkpOwogICAgIGNhaXJvU3VyZmFjZVNldERldmljZVNjYWxlKG1fc3VyZmFjZS5nZXQo KSwgZGV2aWNlU2NhbGVGYWN0b3IsIGRldmljZVNjYWxlRmFjdG9yKTsKICAgICBtX2RhbWFnZSA9 IFhEYW1hZ2VDcmVhdGUoZGlzcGxheSwgcGl4bWFwLCBYRGFtYWdlUmVwb3J0Tm9uRW1wdHkpOwog ICAgIFhEYW1hZ2VOb3RpZmllcjo6c2luZ2xldG9uKCkuYWRkKG1fZGFtYWdlLmdldCgpLCBbdGhp c10gewpAQCAtMTkyLDEzICsyMTcsMjYgQEAgdm9pZCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgx MTo6dXBkYXRlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmIGxheWVyVHJlZUNvbnRleHQKICAgICAg ICAgICAgIGd0a193aWRnZXRfcXVldWVfZHJhdyhtX3dlYlBhZ2Uudmlld1dpZGdldCgpKTsKICAg ICB9KTsKICAgICBYU3luYyhkaXNwbGF5LCBGYWxzZSk7Ci0jZW5kaWYKIH0KIAogI2lmIFVTRShH VEs0KQotdm9pZCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgxMTo6c25hcHNob3QoR3RrU25hcHNo b3QqKQordm9pZCBBY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgxMTo6c25hcHNob3QoR3RrU25hcHNo b3QqIGd0a1NuYXBzaG90KQogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgdGhpcy4KKyAgICBp ZiAoIW1fc3VyZmFjZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gVGhlIHN1cmZhY2UgY2Fu IGJlIG1vZGlmaWVkIGJ5IHRoZSB3ZWIgcHJvY2VzcyBhdCBhbnkgdGltZSwgc28gd2UgbWFyayBp dAorICAgIC8vIGFzIGRpcnR5IHRvIGVuc3VyZSB3ZSBhbHdheXMgcmVuZGVyIHRoZSB1cGRhdGVk IGNvbnRlbnRzIGFzIHNvb24gYXMgcG9zc2libGUuCisgICAgY2Fpcm9fc3VyZmFjZV9tYXJrX2Rp cnR5KG1fc3VyZmFjZS5nZXQoKSk7CisKKyAgICBGbG9hdFNpemUgdmlld1NpemUoZ3RrX3dpZGdl dF9nZXRfd2lkdGgobV93ZWJQYWdlLnZpZXdXaWRnZXQoKSksIGd0a193aWRnZXRfZ2V0X2hlaWdo dChtX3dlYlBhZ2Uudmlld1dpZGdldCgpKSk7CisgICAgZ3JhcGhlbmVfcmVjdF90IHJlY3QgPSBH UkFQSEVORV9SRUNUX0lOSVQoMCwgMCwgdmlld1NpemUud2lkdGgoKSwgdmlld1NpemUuaGVpZ2h0 KCkpOworICAgIFJlZlB0cjxjYWlyb190PiBjciA9IGFkb3B0UmVmKGd0a19zbmFwc2hvdF9hcHBl bmRfY2Fpcm8oZ3RrU25hcHNob3QsICZyZWN0KSk7CisgICAgY2Fpcm9fc2V0X3NvdXJjZV9zdXJm YWNlKGNyLmdldCgpLCBtX3N1cmZhY2UuZ2V0KCksIDAsIDApOworICAgIGNhaXJvX3NldF9vcGVy YXRvcihjci5nZXQoKSwgQ0FJUk9fT1BFUkFUT1JfT1ZFUik7CisgICAgY2Fpcm9fcGFpbnQoY3Iu Z2V0KCkpOworCisgICAgY2Fpcm9fc3VyZmFjZV9mbHVzaChtX3N1cmZhY2UuZ2V0KCkpOwogfQog I2Vsc2UKIGJvb2wgQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVYMTE6OnBhaW50KGNhaXJvX3QqIGNy LCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL2d0ay9BY2NlbGVyYXRlZFN1cmZhY2VYMTEuY3BwIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0FjY2VsZXJhdGVkU3VyZmFjZVgxMS5jcHAKaW5k ZXggNmYxZDc0N2VlMTUzLi44ZTNiMmVkMDdkOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9BY2NlbGVyYXRlZFN1cmZhY2VYMTEuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9BY2NlbGVyYXRlZFN1cmZhY2VYMTEu Y3BwCkBAIC02NCwxMyArNjQsMTggQEAgQWNjZWxlcmF0ZWRTdXJmYWNlWDExOjpBY2NlbGVyYXRl ZFN1cmZhY2VYMTEoV2ViUGFnZSYgd2ViUGFnZSwgQ2xpZW50JiBjbGllbnQpCiAgICAgOiBBY2Nl bGVyYXRlZFN1cmZhY2Uod2ViUGFnZSwgY2xpZW50KQogICAgICwgbV9kaXNwbGF5KGRvd25jYXN0 PFBsYXRmb3JtRGlzcGxheVgxMT4oUGxhdGZvcm1EaXNwbGF5OjpzaGFyZWREaXNwbGF5KCkpLm5h dGl2ZSgpKQogewotI2lmICFVU0UoR1RLNCkKICAgICBTY3JlZW4qIHNjcmVlbiA9IERlZmF1bHRT Y3JlZW5PZkRpc3BsYXkobV9kaXNwbGF5KTsKIAogICAgIEFTU0VSVChkb3duY2FzdDxQbGF0Zm9y bURpc3BsYXlYMTE+KFBsYXRmb3JtRGlzcGxheTo6c2hhcmVkRGlzcGxheSgpKS5uYXRpdmUoKSA9 PSBtX2Rpc3BsYXkpOwogCi0gICAgR2RrVmlzdWFsKiB2aXN1YWwgPSBkZWZhdWx0VmlzdWFsKCk7 Ci0gICAgWFVuaXF1ZUNvbG9ybWFwIGNvbG9ybWFwKFhDcmVhdGVDb2xvcm1hcChtX2Rpc3BsYXks IFJvb3RXaW5kb3dPZlNjcmVlbihzY3JlZW4pLCBHREtfVklTVUFMX1hWSVNVQUwodmlzdWFsKSwg QWxsb2NOb25lKSk7CisjaWYgVVNFKEdUSzQpCisgICAgYXV0byogdmlzdWFsID0gV0tfWFZJU1VB TChkb3duY2FzdDxQbGF0Zm9ybURpc3BsYXlYMTE+KFBsYXRmb3JtRGlzcGxheTo6c2hhcmVkRGlz cGxheSgpKSk7CisjZWxzZQorICAgIGF1dG8qIHZpc3VhbCA9IEdES19WSVNVQUxfWFZJU1VBTChk ZWZhdWx0VmlzdWFsKCkpOworI2VuZGlmCisgICAgWFVuaXF1ZUNvbG9ybWFwIGNvbG9ybWFwKFhD cmVhdGVDb2xvcm1hcChtX2Rpc3BsYXksIFJvb3RXaW5kb3dPZlNjcmVlbihzY3JlZW4pLCB2aXN1 YWwsIEFsbG9jTm9uZSkpOworCisgICAgaW50IGRlcHRoID0gdmlzdWFsID09IHNjcmVlbi0+cm9v dF92aXN1YWwgPyBzY3JlZW4tPnJvb3RfZGVwdGggOiAzMjsKIAogICAgIFhTZXRXaW5kb3dBdHRy aWJ1dGVzIHdpbmRvd0F0dHJpYnV0ZXM7CiAgICAgd2luZG93QXR0cmlidXRlcy5vdmVycmlkZV9y ZWRpcmVjdCA9IFRydWU7CkBAIC04NCw5ICs4OSw5IEBAIEFjY2VsZXJhdGVkU3VyZmFjZVgxMTo6 QWNjZWxlcmF0ZWRTdXJmYWNlWDExKFdlYlBhZ2UmIHdlYlBhZ2UsIENsaWVudCYgY2xpZW50KQog ICAgICAgICBSb290V2luZG93T2ZTY3JlZW4oc2NyZWVuKSwKICAgICAgICAgLTEsIC0xLCAxLCAx LAogICAgICAgICAwLAotICAgICAgICBnZGtfdmlzdWFsX2dldF9kZXB0aCh2aXN1YWwpLAorICAg ICAgICBkZXB0aCwKICAgICAgICAgSW5wdXRPdXRwdXQsCi0gICAgICAgIEdES19WSVNVQUxfWFZJ U1VBTCh2aXN1YWwpLAorICAgICAgICB2aXN1YWwsCiAgICAgICAgIENXT3ZlcnJpZGVSZWRpcmVj dCB8IENXQ29sb3JtYXAgfCBDV0JvcmRlclBpeGVsLAogICAgICAgICAmd2luZG93QXR0cmlidXRl cyk7CiAgICAgWE1hcFdpbmRvdyhtX2Rpc3BsYXksIG1fcGFyZW50V2luZG93LmdldCgpKTsKQEAg LTExNyw3ICsxMjIsNiBAQCBBY2NlbGVyYXRlZFN1cmZhY2VYMTE6OkFjY2VsZXJhdGVkU3VyZmFj ZVgxMShXZWJQYWdlJiB3ZWJQYWdlLCBDbGllbnQmIGNsaWVudCkKICAgICBYU2VsZWN0SW5wdXQo bV9kaXNwbGF5LCBtX3dpbmRvdy5nZXQoKSwgTm9FdmVudE1hc2spOwogICAgIFhDb21wb3NpdGVS ZWRpcmVjdFdpbmRvdyhtX2Rpc3BsYXksIG1fd2luZG93LmdldCgpLCBDb21wb3NpdGVSZWRpcmVj dE1hbnVhbCk7CiAgICAgY3JlYXRlUGl4bWFwKCk7Ci0jZW5kaWYKIH0KIAogQWNjZWxlcmF0ZWRT dXJmYWNlWDExOjp+QWNjZWxlcmF0ZWRTdXJmYWNlWDExKCkKQEAgLTEzMywxNCArMTM3LDE3IEBA IEFjY2VsZXJhdGVkU3VyZmFjZVgxMTo6fkFjY2VsZXJhdGVkU3VyZmFjZVgxMSgpCiAKIHZvaWQg QWNjZWxlcmF0ZWRTdXJmYWNlWDExOjpjcmVhdGVQaXhtYXAoKQogewotI2lmICFVU0UoR1RLNCkK ICAgICBtX3BpeG1hcCA9IFhDb21wb3NpdGVOYW1lV2luZG93UGl4bWFwKG1fZGlzcGxheSwgbV93 aW5kb3cuZ2V0KCkpOwotICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IHN1cmZhY2UgPSBhZG9w dFJlZihjYWlyb194bGliX3N1cmZhY2VfY3JlYXRlKG1fZGlzcGxheSwgbV9waXhtYXAuZ2V0KCks IEdES19WSVNVQUxfWFZJU1VBTChkZWZhdWx0VmlzdWFsKCkpLCBtX3NpemUud2lkdGgoKSwgbV9z aXplLmhlaWdodCgpKSk7CisjaWYgVVNFKEdUSzQpCisgICAgYXV0byogdmlzdWFsID0gV0tfWFZJ U1VBTChkb3duY2FzdDxQbGF0Zm9ybURpc3BsYXlYMTE+KFBsYXRmb3JtRGlzcGxheTo6c2hhcmVk RGlzcGxheSgpKSk7CisjZWxzZQorICAgIGF1dG8qIHZpc3VhbCA9IEdES19WSVNVQUxfWFZJU1VB TChkZWZhdWx0VmlzdWFsKCkpOworI2VuZGlmCisgICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4g c3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX3hsaWJfc3VyZmFjZV9jcmVhdGUobV9kaXNwbGF5LCBt X3BpeG1hcC5nZXQoKSwgdmlzdWFsLCBtX3NpemUud2lkdGgoKSwgbV9zaXplLmhlaWdodCgpKSk7 CiAgICAgUmVmUHRyPGNhaXJvX3Q+IGNyID0gYWRvcHRSZWYoY2Fpcm9fY3JlYXRlKHN1cmZhY2Uu Z2V0KCkpKTsKICAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3IuZ2V0KCksIENBSVJPX09QRVJBVE9S X0NMRUFSKTsKICAgICBjYWlyb19wYWludChjci5nZXQoKSk7CiAgICAgWFN5bmMobV9kaXNwbGF5 LCBGYWxzZSk7Ci0jZW5kaWYKIH0KIAogYm9vbCBBY2NlbGVyYXRlZFN1cmZhY2VYMTE6Omhvc3RS ZXNpemUoY29uc3QgSW50U2l6ZSYgc2l6ZSkK