133378 2014-05-29 08:05:17 -0700 [GTK] Bump cairo version to support HiDPI 2020-09-21 23:08:24 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia aperez adrien-xx-webkit aperez berto bugs-noreply cgarcia clopez don.olmstead ews-watchlist gustavo mrobinson svillar oldest_to_newest 1012424 0 cgarcia 2014-05-29 08:05:17 -0700 I know we can't do it ATM, but this bug will also work as reminder to remove all the ifdefs we currently have, and that we will be able to remove once we bump the cairo requirements. 1012431 1 svillar 2014-05-29 08:28:46 -0700 Do we have an specific bug in cairo to follow? 1012434 2 cgarcia 2014-05-29 09:02:28 -0700 Cairo already supports it, but in snapshots releases. 1036326 3 mrobinson 2014-09-20 22:00:18 -0700 I don't think we can raise our requirements until 4.x. 1685070 4 aperez 2020-09-02 17:12:39 -0700 I think we can close this issue as obsolete: We have had code in “Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp” to set the device scale factor for Cairo surfaces for a good while, which is used conditionally if Cairo 1.13 or newer is being used. Or is there something else that needs to be done in this regard? 1690259 5 cgarcia 2020-09-21 01:18:05 -0700 This is about bumping cairo requirement and remove the ifdefs we currently have to support HiDPI. 1690260 6 aperez 2020-09-21 01:22:13 -0700 (In reply to Carlos Garcia Campos from comment #5) > This is about bumping cairo requirement and remove the ifdefs we currently > have to support HiDPI. Ah, I get it know. I'll check later what versions distributions are using and see whether it would possible to bump the requirement, taking https://trac.webkit.org/wiki/WebKitGTK/DependenciesPolicy into account 👍️ 1690529 7 aperez 2020-09-21 14:50:43 -0700 (In reply to Adrian Perez from comment #6) > (In reply to Carlos Garcia Campos from comment #5) > > This is about bumping cairo requirement and remove the ifdefs we currently > > have to support HiDPI. > > Ah, I get it know. I'll check later what versions distributions are > using and see whether it would possible to bump the requirement, > taking https://trac.webkit.org/wiki/WebKitGTK/DependenciesPolicy > into account 👍️ - Debian Stretch, supported until August 2021, has Cairo 1.14.8: https://packages.debian.org/stretch/libcairo2 - Ubuntu LTS 18.04, supported until April 2021, has Cairo 1.15.10: https://packages.ubuntu.com/bionic/libcairo2 So yes, it looks like we can bump the minimum Cairo requirement to 1.14.x and remove the conditional compilation guards 🙌️ 1690532 8 aperez 2020-09-21 15:01:45 -0700 (In reply to Adrian Perez from comment #7) > (In reply to Adrian Perez from comment #6) > > (In reply to Carlos Garcia Campos from comment #5) > > > This is about bumping cairo requirement and remove the ifdefs we currently > > > have to support HiDPI. > > > > Ah, I get it know. I'll check later what versions distributions are > > using and see whether it would possible to bump the requirement, > > taking https://trac.webkit.org/wiki/WebKitGTK/DependenciesPolicy > > into account 👍️ > > - Debian Stretch, supported until August 2021, has Cairo 1.14.8: > https://packages.debian.org/stretch/libcairo2 > - Ubuntu LTS 18.04, supported until April 2021, has Cairo 1.15.10: > https://packages.ubuntu.com/bionic/libcairo2 > > So yes, it looks like we can bump the minimum Cairo requirement to 1.14.x > and remove the conditional compilation guards 🙌️ Funny story: in “Source/cmake/Options{GTK,WPE}.cmake” we are already listing 1.14.0 as the minimum required Cairo version. 1690538 9 409326 aperez 2020-09-21 15:10:48 -0700 Created attachment 409326 Patch 1690539 10 ews-watchlist 2020-09-21 15:11:51 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1690541 11 aperez 2020-09-21 15:14:00 -0700 CC'ing Don Olmstead as well… is this okay for the PlayStation port? In “OptionsPlayStation.cmake” there is no minimum version being requested for Cairo, should I add 1.14.0 there as well? 1690626 12 ews-feeder 2020-09-21 23:08:23 -0700 Committed r267398: <https://trac.webkit.org/changeset/267398> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409326. 409326 2020-09-21 15:10:48 -0700 2020-09-21 23:08:24 -0700 Patch bug-133378-20200922011046.patch text/plain 12802 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBlZGI0YTQ0Y2NlODZh MTllZjFhZTZmNmU2NGJhZGY4M2EyZTgyNC4uMTVlOWJjN2UyYjY2YWM1YmJmYTk1YWMyZGFjYTVm NWQxMjRlNmJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA5LTIxICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10g QnVtcCBjYWlybyB2ZXJzaW9uIHRvIHN1cHBvcnQgSGlEUEkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzM3OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBjb25kaXRpb25hbCBjb21waWxhdGlv biBhcm91bmQgY2Fpcm9fe2csc31ldF9kZXZpY2Vfc2NhbGUoKSBhcyB0aGVyZSBpcyBubyBuZWVk IHRvCisgICAgICAgIHN1cHBvcnQgb2xkZXIgdmVyc2lvbnMgb2YgQ2Fpcm8gd2hpY2ggbGFjayB0 aGUgZnVuY3Rpb25zLiBUaGUgbWluaW11bSB2ZXJzaW9uIG9mIENhaXJvCisgICAgICAgIGJlaW5n IHJlcXVpcmVkIGJ5IENNYWtlIGlzIDEuMTQuMCwgd2hpY2ggYWxyZWFkeSBpbmNsdWRlcyB0aGVt LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fpcm9JbXBsLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmNyZWF0ZUNhaXJvSW1hZ2VTdXJmYWNlV2l0aEZhc3RNYWxsb2MpOiBVc2UgY2Fp cm9fc3VyZmFjZV9zZXRfZGV2aWNlX3NjYWxlKCkKKyAgICAgICAgZGlyZWN0bHkuCisgICAgICAg IChXZWJDb3JlOjpCYWNraW5nU3RvcmVCYWNrZW5kQ2Fpcm9JbXBsOjpzY3JvbGwpOiBVc2UgY2Fp cm9fc3VyZmFjZV9nZXRfZGV2aWNlX3NjYWxlKCkKKyAgICAgICAgZGlyZWN0bHkuCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQmFja2luZ1N0b3JlQmFja2VuZENhaXJvWDExLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkJhY2tpbmdTdG9yZUJhY2tlbmRDYWlyb1gxMTo6QmFja2lu Z1N0b3JlQmFja2VuZENhaXJvWDExKTogVXNlCisgICAgICAgIGNhaXJvX3N1cmZhY2Vfc2V0X2Rl dmljZV9zY2FsZSgpIGRpcmVjdGx5LgorICAgICAgICAoV2ViQ29yZTo6QmFja2luZ1N0b3JlQmFj a2VuZENhaXJvWDExOjpzY3JvbGwpOiBVc2UgY2Fpcm9fc3VyZmFjZV9nZXRfZGV2aWNlX3NjYWxl KCkKKyAgICAgICAgZGlyZWN0bHkuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v Q2Fpcm9VdGlsaXRpZXMuY3BwOiBSZW1vdmUgaGVscGVyIGZ1bmN0aW9ucworICAgICAgICBjYWly b1N1cmZhY2VTZXREZXZpY2VTY2FsZSgpIGFuZCBjYWlyb1N1cmZhY2VHZXREZXZpY2VTY2FsZSgp LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvVXRpbGl0aWVzLmg6IERp dHRvLgorCiAyMDIwLTA5LTIxICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1dlYkF1dGhuXSBEb24ndCBzZXQgdGhlIFVWIG9wdGlvbiBpZiB0aGUgYXV0aGVu dGljYXRvciBkb2Vzbid0IHN1cHBvcnQgaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMjQ2MDNlYmQ0ZGNlOTVjZmQ1 ZTcyMDkxZTU4NTYzNDUxNGUzMmM5OC4uYzM0MmFhYzcyZjUzNWIxY2FmY2YxMzNjNzJmODYyYTY5 ZDYxMWU4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAyMC0wOS0yMSAgQWRyaWFuIFBl cmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEJ1bXAg Y2Fpcm8gdmVyc2lvbiB0byBzdXBwb3J0IEhpRFBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMzNzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgY29uZGl0aW9uYWwgY29tcGlsYXRpb24gYXJv dW5kIGNhaXJvX3tnLHN9ZXRfZGV2aWNlX3NjYWxlKCkgYXMgdGhlcmUgaXMgbm8gbmVlZCB0bwor ICAgICAgICBzdXBwb3J0IG9sZGVyIHZlcnNpb25zIG9mIENhaXJvIHdoaWNoIGxhY2sgdGhlIGZ1 bmN0aW9ucy4gVGhlIG1pbmltdW0gdmVyc2lvbiBvZiBDYWlybworICAgICAgICBiZWluZyByZXF1 aXJlZCBieSBDTWFrZSBpcyAxLjE0LjAsIHdoaWNoIGFscmVhZHkgaW5jbHVkZXMgdGhlbS4KKwor ICAgICAgICAqIFNoYXJlZC9jYWlyby9TaGFyZWFibGVCaXRtYXBDYWlyby5jcHA6CisgICAgICAg IChXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcDo6cGFpbnQpOiB1c2UgY2Fpcm9fc3VyZmFjZV9zZXRf ZGV2aWNlX3NjYWxlKCkgZGlyZWN0bHkuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld0Jhc2UuY3BwOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VUYWtlVmlld1Nu YXBzaG90KTogRGl0dG8uCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tp bmdTdG9yZVdheWxhbmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQ6OmRpc3BsYXlCdWZmZXIpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6QWNj ZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXlsYW5kOjpkb3dubG9hZFRleHR1cmUpOiBEaXR0by4KKyAg ICAgICAgKiBVSVByb2Nlc3MvZ3RrL0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlWDExLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVYMTE6OnVwZGF0ZSk6IERpdHRv LgorCiAyMDIwLTA5LTIxICBCYXN1a2UgU3V6dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4K IAogICAgICAgICBbV2luQ2Fpcm9dW1BsYXlTdGF0aW9uXSBTdXBwb3J0IGRpZmZlcmVudCBpbnN0 YW5jZXMgb2YgbGlzdGVuZXIgY2xpZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQmFja2luZ1N0b3JlQmFja2VuZENhaXJvSW1wbC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5k Q2Fpcm9JbXBsLmNwcAppbmRleCAxMjU2YWM3ZWUxM2I3N2M3ZWZmMzA0ZTY3ZDZhNTk0ZGVmZTZk MWM0Li5jMmJhYzY3ZDgwYzY1N2IzNGFlYTBmYTljMTA0N2YxNTk3Zjg3ZDMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNr ZW5kQ2Fpcm9JbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fpcm9JbXBsLmNwcApAQCAtMzUsNyArMzUsNyBAQCBz dGF0aWMgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gY3JlYXRlQ2Fpcm9JbWFnZVN1cmZhY2VXaXRo RmFzdE1hbGxvYyhjb25zdCBJbnRTaQogICAgIGF1dG8qIHN1cmZhY2VEYXRhID0gZmFzdFplcm9l ZE1hbGxvYyhzaXplLmhlaWdodCgpICogc3RyaWRlKTsKICAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFj ZV90PiBzdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2Rh dGEoc3RhdGljX2Nhc3Q8dW5zaWduZWQgY2hhcio+KHN1cmZhY2VEYXRhKSwgQ0FJUk9fRk9STUFU X0FSR0IzMiwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpLCBzdHJpZGUpKTsKICAgICBjYWly b19zdXJmYWNlX3NldF91c2VyX2RhdGEoc3VyZmFjZS5nZXQoKSwgJnNfc3VyZmFjZURhdGFLZXks IHN1cmZhY2VEYXRhLCBbXSh2b2lkKiBkYXRhKSB7IGZhc3RGcmVlKGRhdGEpOyB9KTsKLSAgICBj YWlyb1N1cmZhY2VTZXREZXZpY2VTY2FsZShzdXJmYWNlLmdldCgpLCBkZXZpY2VTY2FsZUZhY3Rv ciwgZGV2aWNlU2NhbGVGYWN0b3IpOworICAgIGNhaXJvX3N1cmZhY2Vfc2V0X2RldmljZV9zY2Fs ZShzdXJmYWNlLmdldCgpLCBkZXZpY2VTY2FsZUZhY3RvciwgZGV2aWNlU2NhbGVGYWN0b3IpOwog ICAgIHJldHVybiBzdXJmYWNlOwogfQogCkBAIC02MSw3ICs2MSw3IEBAIHZvaWQgQmFja2luZ1N0 b3JlQmFja2VuZENhaXJvSW1wbDo6c2Nyb2xsKGNvbnN0IEludFJlY3QmIHNjcm9sbFJlY3QsIGNv bnN0IEludFNpCiAgICAgaWYgKCFtX3Njcm9sbFN1cmZhY2UpIHsKICAgICAgICAgSW50U2l6ZSBz aXplKGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKG1fc3VyZmFjZS5nZXQoKSksIGNhaXJv X2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdodChtX3N1cmZhY2UuZ2V0KCkpKTsKICAgICAgICAgZG91 YmxlIHhTY2FsZSwgeVNjYWxlOwotICAgICAgICBjYWlyb1N1cmZhY2VHZXREZXZpY2VTY2FsZSht X3N1cmZhY2UuZ2V0KCksIHhTY2FsZSwgeVNjYWxlKTsKKyAgICAgICAgY2Fpcm9fc3VyZmFjZV9n ZXRfZGV2aWNlX3NjYWxlKG1fc3VyZmFjZS5nZXQoKSwgJnhTY2FsZSwgJnlTY2FsZSk7CiAgICAg ICAgIEFTU0VSVCh4U2NhbGUgPT0geVNjYWxlKTsKICAgICAgICAgbV9zY3JvbGxTdXJmYWNlID0g Y3JlYXRlQ2Fpcm9JbWFnZVN1cmZhY2VXaXRoRmFzdE1hbGxvYyhzaXplLCB4U2NhbGUpOwogICAg IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0Jh Y2tpbmdTdG9yZUJhY2tlbmRDYWlyb1gxMS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fpcm9YMTEuY3BwCmluZGV4IDQzN2Rh ZmM4MmZkMjJlY2JmMDYwNDdhM2MyODY4OWViZTAyMjM2ZDIuLjdkM2Y1NTg3MjA0NTVhNGNhM2Q3 ZDQ5ZDQzYjExZWRmNTBlN2UzYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0JhY2tpbmdTdG9yZUJhY2tlbmRDYWlyb1gxMS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQmFja2luZ1N0b3JlQmFja2VuZENh aXJvWDExLmNwcApAQCAtMzcsNyArMzcsNyBAQCBCYWNraW5nU3RvcmVCYWNrZW5kQ2Fpcm9YMTE6 OkJhY2tpbmdTdG9yZUJhY2tlbmRDYWlyb1gxMSh1bnNpZ25lZCBsb25nIHJvb3RXaW5kbwogICAg IG1fZ2MucmVzZXQoWENyZWF0ZUdDKGRpc3BsYXksIG1fcGl4bWFwLmdldCgpLCAwLCBudWxscHRy KSk7CiAKICAgICBtX3N1cmZhY2UgPSBhZG9wdFJlZihjYWlyb194bGliX3N1cmZhY2VfY3JlYXRl KGRpc3BsYXksIG1fcGl4bWFwLmdldCgpLCB2aXN1YWwsIHNjYWxlZFNpemUud2lkdGgoKSwgc2Nh bGVkU2l6ZS5oZWlnaHQoKSkpOwotICAgIGNhaXJvU3VyZmFjZVNldERldmljZVNjYWxlKG1fc3Vy ZmFjZS5nZXQoKSwgZGV2aWNlU2NhbGVGYWN0b3IsIGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICBj YWlyb19zdXJmYWNlX3NldF9kZXZpY2Vfc2NhbGUobV9zdXJmYWNlLmdldCgpLCBkZXZpY2VTY2Fs ZUZhY3RvciwgZGV2aWNlU2NhbGVGYWN0b3IpOwogfQogCiBCYWNraW5nU3RvcmVCYWNrZW5kQ2Fp cm9YMTE6On5CYWNraW5nU3RvcmVCYWNrZW5kQ2Fpcm9YMTEoKQpAQCAtNTUsNyArNTUsNyBAQCB2 b2lkIEJhY2tpbmdTdG9yZUJhY2tlbmRDYWlyb1gxMTo6c2Nyb2xsKGNvbnN0IEludFJlY3QmIHNj cm9sbFJlY3QsIGNvbnN0IEludFNpegogICAgICAgICByZXR1cm47CiAKICAgICBkb3VibGUgeFNj YWxlLCB5U2NhbGU7Ci0gICAgY2Fpcm9TdXJmYWNlR2V0RGV2aWNlU2NhbGUobV9zdXJmYWNlLmdl dCgpLCB4U2NhbGUsIHlTY2FsZSk7CisgICAgY2Fpcm9fc3VyZmFjZV9nZXRfZGV2aWNlX3NjYWxl KG1fc3VyZmFjZS5nZXQoKSwgJnhTY2FsZSwgJnlTY2FsZSk7CiAgICAgQVNTRVJUKHhTY2FsZSA9 PSB5U2NhbGUpOwogCiAgICAgSW50U2l6ZSBzY2FsZWRTY3JvbGxPZmZzZXQgPSBzY3JvbGxPZmZz ZXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9D YWlyb1V0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWly by9DYWlyb1V0aWxpdGllcy5jcHAKaW5kZXggZDczMmRjZGI5NTY0MTkxYmVmMzVkY2QwYWQ4OGYy ZDFjMDg1Njg1My4uMDg1YzcwZGZmZDQ5NzgwOWM3NTQwM2I1ZWI0ODk3MmQ2ODc0ZTA4NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9VdGls aXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0Nh aXJvVXRpbGl0aWVzLmNwcApAQCAtMzYxLDI5ICszNjEsNiBAQCB2b2lkIGZsaXBJbWFnZVN1cmZh Y2VWZXJ0aWNhbGx5KGNhaXJvX3N1cmZhY2VfdCogc3VyZmFjZSkKICAgICB9CiB9CiAKLXZvaWQg Y2Fpcm9TdXJmYWNlU2V0RGV2aWNlU2NhbGUoY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlLCBkb3Vi bGUgeFNjYWxlLCBkb3VibGUgeVNjYWxlKQotewotICAgIC8vIFRoaXMgZnVuY3Rpb24gd2FzIGFk ZGVkIHByZXR0eSBtdWNoIHNpbXVsdGFuZW91cyB0byB3aGVuIDEuMTMgd2FzIGJyYW5jaGVkLgot I2lmIEhBVkUoQ0FJUk9fU1VSRkFDRV9TRVRfREVWSUNFX1NDQUxFKQotICAgIGNhaXJvX3N1cmZh Y2Vfc2V0X2RldmljZV9zY2FsZShzdXJmYWNlLCB4U2NhbGUsIHlTY2FsZSk7Ci0jZWxzZQotICAg IFVOVVNFRF9QQVJBTShzdXJmYWNlKTsKLSAgICBBU1NFUlRfVU5VU0VEKHhTY2FsZSwgMSA9PSB4 U2NhbGUpOwotICAgIEFTU0VSVF9VTlVTRUQoeVNjYWxlLCAxID09IHlTY2FsZSk7Ci0jZW5kaWYK LX0KLQotdm9pZCBjYWlyb1N1cmZhY2VHZXREZXZpY2VTY2FsZShjYWlyb19zdXJmYWNlX3QqIHN1 cmZhY2UsIGRvdWJsZSYgeFNjYWxlLCBkb3VibGUmIHlTY2FsZSkKLXsKLSNpZiBIQVZFKENBSVJP X1NVUkZBQ0VfU0VUX0RFVklDRV9TQ0FMRSkKLSAgICBjYWlyb19zdXJmYWNlX2dldF9kZXZpY2Vf c2NhbGUoc3VyZmFjZSwgJnhTY2FsZSwgJnlTY2FsZSk7Ci0jZWxzZQotICAgIFVOVVNFRF9QQVJB TShzdXJmYWNlKTsKLSAgICB4U2NhbGUgPSAxOwotICAgIHlTY2FsZSA9IDE7Ci0jZW5kaWYKLX0K LQogUmVmUHRyPGNhaXJvX3JlZ2lvbl90PiB0b0NhaXJvUmVnaW9uKGNvbnN0IFJlZ2lvbiYgcmVn aW9uKQogewogICAgIFJlZlB0cjxjYWlyb19yZWdpb25fdD4gY2Fpcm9SZWdpb24gPSBhZG9wdFJl ZihjYWlyb19yZWdpb25fY3JlYXRlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vQ2Fpcm9VdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhaXJvL0NhaXJvVXRpbGl0aWVzLmgKaW5kZXggNWY3NWU4ODE1NTY2 Yjk2OTc1ZDhkZGYyMGVjNWZkZDE4MmYxOGFkYi4uMzNiZjhmZDFiMjVlNDUwNzZiOThkYWMzYzQ0 Y2Q5YWI1MmE4MjM1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2Fpcm8vQ2Fpcm9VdGlsaXRpZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9DYWlyb1V0aWxpdGllcy5oCkBAIC0zMiw5ICszMiw2IEBACiAjaW5jbHVk ZSAiSW50U2l6ZS5oIgogI2luY2x1ZGUgPGNhaXJvLmg+CiAKLS8vIFRoaXMgZnVuY3Rpb24gd2Fz IGFkZGVkIHByZXR0eSBtdWNoIHNpbXVsdGFuZW91cyB0byB3aGVuIDEuMTMgd2FzIGJyYW5jaGVk LgotI2RlZmluZSBIQVZFX0NBSVJPX1NVUkZBQ0VfU0VUX0RFVklDRV9TQ0FMRSBDQUlST19WRVJT SU9OX01BSk9SID4gMSB8fCAoQ0FJUk9fVkVSU0lPTl9NQUpPUiA9PSAxICYmIENBSVJPX1ZFUlNJ T05fTUlOT1IgPj0gMTMpCi0KICNpZiBVU0UoRlJFRVRZUEUpCiAjaW5jbHVkZSA8Y2Fpcm8tZnQu aD4KICNlbmRpZgpAQCAtOTIsOCArODksNiBAQCB2b2lkIGNvcHlSZWN0RnJvbU9uZVN1cmZhY2VU b0Fub3RoZXIoY2Fpcm9fc3VyZmFjZV90KiBmcm9tLCBjYWlyb19zdXJmYWNlX3QqIHRvLAogCiBJ bnRTaXplIGNhaXJvU3VyZmFjZVNpemUoY2Fpcm9fc3VyZmFjZV90Kik7CiB2b2lkIGZsaXBJbWFn ZVN1cmZhY2VWZXJ0aWNhbGx5KGNhaXJvX3N1cmZhY2VfdCopOwotdm9pZCBjYWlyb1N1cmZhY2VT ZXREZXZpY2VTY2FsZShjYWlyb19zdXJmYWNlX3QqLCBkb3VibGUgeFNjYWxlLCBkb3VibGUgeVNj YWxlKTsKLXZvaWQgY2Fpcm9TdXJmYWNlR2V0RGV2aWNlU2NhbGUoY2Fpcm9fc3VyZmFjZV90Kiwg ZG91YmxlJiB4U2NhbGUsIGRvdWJsZSYgeVNjYWxlKTsKIAogUmVmUHRyPGNhaXJvX3JlZ2lvbl90 PiB0b0NhaXJvUmVnaW9uKGNvbnN0IFJlZ2lvbiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9jYWlyby9TaGFyZWFibGVCaXRtYXBDYWlyby5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9jYWlyby9TaGFyZWFibGVCaXRtYXBDYWlyby5jcHAKaW5kZXggODQyY2JmYWU4YzU1 ZjlhYjJkOWRkMTk4MTNkMTE3MGEzYTFhMTY1Mi4uMGRjZTgwYTM3YmY4MDI3MjVmZDQwYzU0NGNi MDdiNWQ3ZjhiMmUyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvY2Fpcm8vU2hh cmVhYmxlQml0bWFwQ2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2NhaXJvL1No YXJlYWJsZUJpdG1hcENhaXJvLmNwcApAQCAtNzEsNyArNzEsNyBAQCB2b2lkIFNoYXJlYWJsZUJp dG1hcDo6cGFpbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJbnRQb2ludCYgZHN0 UG9pbnQsCiB2b2lkIFNoYXJlYWJsZUJpdG1hcDo6cGFpbnQoR3JhcGhpY3NDb250ZXh0JiBjb250 ZXh0LCBmbG9hdCBzY2FsZUZhY3RvciwgY29uc3QgSW50UG9pbnQmIGRzdFBvaW50LCBjb25zdCBJ bnRSZWN0JiBzcmNSZWN0KQogewogICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IHN1cmZhY2Ug PSBjcmVhdGVTdXJmYWNlRnJvbURhdGEoZGF0YSgpLCBtX3NpemUpOwotICAgIGNhaXJvU3VyZmFj ZVNldERldmljZVNjYWxlKHN1cmZhY2UuZ2V0KCksIHNjYWxlRmFjdG9yLCBzY2FsZUZhY3Rvcik7 CisgICAgY2Fpcm9fc3VyZmFjZV9zZXRfZGV2aWNlX3NjYWxlKHN1cmZhY2UuZ2V0KCksIHNjYWxl RmFjdG9yLCBzY2FsZUZhY3Rvcik7CiAgICAgRmxvYXRSZWN0IGRlc3RSZWN0KGRzdFBvaW50LCBz cmNSZWN0LnNpemUoKSk7CiAKICAgICBBU1NFUlQoY29udGV4dC5oYXNQbGF0Zm9ybUNvbnRleHQo KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2UuY3BwCmluZGV4IDUwN2FkNWE1NTZkYzI5OTQ3YzBjMzI0M2ViMThiZTg0MDdlYTNm YmEuLmZiZDg4ZGVjOTUyZmY5ZGE2MTgxMDBkNjYyYzgxZGE0ZmViMWI5MjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3Bw CkBAIC0yMzQxLDcgKzIzNDEsNyBAQCBSZWZQdHI8V2ViS2l0OjpWaWV3U25hcHNob3Q+IHdlYmtp dFdlYlZpZXdCYXNlVGFrZVZpZXdTbmFwc2hvdChXZWJLaXRXZWJWaWV3QmFzZQogICAgIHNpemUu c2NhbGUoZGV2aWNlU2NhbGUpOwogCiAgICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gc3VyZmFj ZSA9IGFkb3B0UmVmKGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlKENBSVJPX0ZPUk1BVF9SR0Iy NCwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKSk7Ci0gICAgY2Fpcm9TdXJmYWNlU2V0RGV2 aWNlU2NhbGUoc3VyZmFjZS5nZXQoKSwgZGV2aWNlU2NhbGUsIGRldmljZVNjYWxlKTsKKyAgICBj YWlyb19zdXJmYWNlX3NldF9kZXZpY2Vfc2NhbGUoc3VyZmFjZS5nZXQoKSwgZGV2aWNlU2NhbGUs IGRldmljZVNjYWxlKTsKIAogICAgIFJlZlB0cjxjYWlyb190PiBjciA9IGFkb3B0UmVmKGNhaXJv X2NyZWF0ZShzdXJmYWNlLmdldCgpKSk7CiAgICAgaWYgKGNsaXBSZWN0KSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0ZWRCYWNraW5nU3RvcmVXYXls YW5kLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdT dG9yZVdheWxhbmQuY3BwCmluZGV4IDIxMzBiNTE3ZDU5ZTE3NTUyZTIwMjFhMmVlYjcyOGU1YjQ2 NTMwMDguLjAyYWU3ZjM2MTAyNWNkOGNjMTJiYTgzNjUxMDk2NDdiZmE2NWU1MmUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJhY2tpbmdTdG9yZVdh eWxhbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9BY2NlbGVyYXRlZEJh Y2tpbmdTdG9yZVdheWxhbmQuY3BwCkBAIC00MDEsNyArNDAxLDcgQEAgdm9pZCBBY2NlbGVyYXRl ZEJhY2tpbmdTdG9yZVdheWxhbmQ6OmRpc3BsYXlCdWZmZXIoc3RydWN0IHdwZV9mZG9fc2htX2V4 cG9ydGVkX2IKICAgICAgICAgY2Fpcm9fc3VyZmFjZV9zZXRfdXNlcl9kYXRhKG1fc3VyZmFjZS5n ZXQoKSwgJnNfc3VyZmFjZURhdGFLZXksIHN1cmZhY2VEYXRhLCBbXSh2b2lkKiBkYXRhKSB7CiAg ICAgICAgICAgICBmYXN0RnJlZShkYXRhKTsKICAgICAgICAgfSk7Ci0gICAgICAgIGNhaXJvU3Vy ZmFjZVNldERldmljZVNjYWxlKG1fc3VyZmFjZS5nZXQoKSwgbV93ZWJQYWdlLmRldmljZVNjYWxl RmFjdG9yKCksIG1fd2ViUGFnZS5kZXZpY2VTY2FsZUZhY3RvcigpKTsKKyAgICAgICAgY2Fpcm9f c3VyZmFjZV9zZXRfZGV2aWNlX3NjYWxlKG1fc3VyZmFjZS5nZXQoKSwgbV93ZWJQYWdlLmRldmlj ZVNjYWxlRmFjdG9yKCksIG1fd2ViUGFnZS5kZXZpY2VTY2FsZUZhY3RvcigpKTsKICAgICB9CiAK ICAgICB1bnNpZ25lZCBjaGFyKiBzdXJmYWNlRGF0YSA9IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0 X2RhdGEobV9zdXJmYWNlLmdldCgpKTsKQEAgLTQ3Miw3ICs0NzIsNyBAQCB2b2lkIEFjY2VsZXJh dGVkQmFja2luZ1N0b3JlV2F5bGFuZDo6ZG93bmxvYWRUZXh0dXJlKHVuc2lnbmVkIHRleHR1cmUs IGNvbnN0IEludAogICAgIGlmICghbV9zdXJmYWNlIHx8IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0 X3dpZHRoKG1fc3VyZmFjZS5nZXQoKSkgIT0gdGV4dHVyZVNpemUud2lkdGgoKSB8fCBjYWlyb19p bWFnZV9zdXJmYWNlX2dldF9oZWlnaHQobV9zdXJmYWNlLmdldCgpKSAhPSB0ZXh0dXJlU2l6ZS5o ZWlnaHQoKSkKICAgICAgICAgbV9zdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9faW1hZ2Vfc3VyZmFj ZV9jcmVhdGUoQ0FJUk9fRk9STUFUX0FSR0IzMiwgdGV4dHVyZVNpemUud2lkdGgoKSwgdGV4dHVy ZVNpemUuaGVpZ2h0KCkpKTsKIAotICAgIGNhaXJvU3VyZmFjZVNldERldmljZVNjYWxlKG1fc3Vy ZmFjZS5nZXQoKSwgbV93ZWJQYWdlLmRldmljZVNjYWxlRmFjdG9yKCksIG1fd2ViUGFnZS5kZXZp Y2VTY2FsZUZhY3RvcigpKTsKKyAgICBjYWlyb19zdXJmYWNlX3NldF9kZXZpY2Vfc2NhbGUobV9z dXJmYWNlLmdldCgpLCBtX3dlYlBhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV93ZWJQYWdlLmRl dmljZVNjYWxlRmFjdG9yKCkpOwogCiAgICAgR0x1aW50IGZiOwogICAgIGdsR2VuRnJhbWVidWZm ZXJzKDEsICZmYik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNj ZWxlcmF0ZWRCYWNraW5nU3RvcmVYMTEuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3Rr L0FjY2VsZXJhdGVkQmFja2luZ1N0b3JlWDExLmNwcAppbmRleCBiNmVlMmYwYmI3ZjE0NDMzMDc1 MTlhNDBlMzYwZmJlMWIzZTBlNDhiLi45NzEwYmY5NTExODBiNDVmZmE0NTIzMjg5YjQwMzNjMzVm Y2VlMTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvQWNjZWxlcmF0 ZWRCYWNraW5nU3RvcmVYMTEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9B Y2NlbGVyYXRlZEJhY2tpbmdTdG9yZVgxMS5jcHAKQEAgLTIwOSw3ICsyMDksNyBAQCB2b2lkIEFj Y2VsZXJhdGVkQmFja2luZ1N0b3JlWDExOjp1cGRhdGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYg bGF5ZXJUcmVlQ29udGV4dAogICAgIGF1dG8qIHZpc3VhbCA9IEdES19WSVNVQUxfWFZJU1VBTChn ZGtWaXN1YWwpOwogI2VuZGlmCiAgICAgbV9zdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9feGxpYl9z dXJmYWNlX2NyZWF0ZShkaXNwbGF5LCBwaXhtYXAsIHZpc3VhbCwgc2l6ZS53aWR0aCgpLCBzaXpl LmhlaWdodCgpKSk7Ci0gICAgV2ViQ29yZTo6Y2Fpcm9TdXJmYWNlU2V0RGV2aWNlU2NhbGUobV9z dXJmYWNlLmdldCgpLCBkZXZpY2VTY2FsZUZhY3RvciwgZGV2aWNlU2NhbGVGYWN0b3IpOworICAg IGNhaXJvX3N1cmZhY2Vfc2V0X2RldmljZV9zY2FsZShtX3N1cmZhY2UuZ2V0KCksIGRldmljZVNj YWxlRmFjdG9yLCBkZXZpY2VTY2FsZUZhY3Rvcik7CiAgICAgbV9kYW1hZ2UgPSBYRGFtYWdlQ3Jl YXRlKGRpc3BsYXksIHBpeG1hcCwgWERhbWFnZVJlcG9ydE5vbkVtcHR5KTsKICAgICBYRGFtYWdl Tm90aWZpZXI6OnNpbmdsZXRvbigpLmFkZChtX2RhbWFnZS5nZXQoKSwgW3RoaXNdIHsKICAgICAg ICAgaWYgKG1fd2ViUGFnZS5pc1ZpZXdWaXNpYmxlKCkpCg==