210745 2020-04-20 07:25:22 -0700 [GTK4] Adapt to GtkIconTheme API changes 2020-04-21 05:31:27 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 210100 1 csaavedra csaavedra aperez benjamin bugs-noreply cdumez cgarcia cmarcelo darin ews-watchlist oldest_to_newest 1643440 0 csaavedra 2020-04-20 07:25:22 -0700 [GTK4] Adapt to GtkIconTheme API changes 1643441 1 396974 csaavedra 2020-04-20 07:30:59 -0700 Created attachment 396974 Patch 1643500 2 396974 darin 2020-04-20 10:16:03 -0700 Comment on attachment 396974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396974&action=review Not a GTK expert, but expert enough to review this I think. > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:69 > + GRefPtr<GtkIconPaintable> iconPaintable = adoptGRef(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_for_display(gdk_display_get_default()), "image-missing", nullptr, 16, scale, gtk_widget_get_default_direction(), static_cast<GtkIconLookupFlags>(0)); > + if (iconPaintable) { I suggest using auto and putting local variable definition inside the if > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:71 > + GFile* file = gtk_icon_paintable_get_file(iconPaintable.get()); > + if (file) { Ditto. > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:73 > + auto buffer = loadResourceSharedBuffer(g_file_peek_path(file)); > + icon->setData(WTFMove(buffer), true); Given there’s no failure checking here, I would have done it as a one-liner. > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:80 > GRefPtr<GtkIconInfo> iconInfo = adoptGRef(gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), "image-missing", iconSize, GTK_ICON_LOOKUP_NO_SVG)); > if (iconInfo) { Ditto. > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:82 > auto buffer = loadResourceSharedBuffer(gtk_icon_info_get_filename(iconInfo.get())); > icon->setData(WTFMove(buffer), true); Ditto. 1643511 3 396974 aperez 2020-04-20 10:36:01 -0700 Comment on attachment 396974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396974&action=review > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:70 > + GFile* file = gtk_icon_paintable_get_file(iconPaintable.get()); We need a GRefPtr<GFile> here to avoid leaking the object. The _get_file() accessor is “transfer full”. You could even do: if (auto file = adoptGRef(gtk_icon_paintable_get_file(iconPaintable.get()))) { // Load data from file. } =) 1643522 4 darin 2020-04-20 10:51:00 -0700 Very happy to see the adoptGRef recommendations. 1643803 5 396974 cgarcia 2020-04-21 01:24:38 -0700 Comment on attachment 396974 Patch I would just remove this code for both GTK3 and GTK4 and always use the missingImage we already compile as a GResource. 1643814 6 397065 csaavedra 2020-04-21 02:49:20 -0700 Created attachment 397065 Patch 1643844 7 397065 aperez 2020-04-21 04:34:03 -0700 Comment on attachment 397065 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397065&action=review > Source/WebCore/platform/graphics/gtk/ImageGtk.cpp:53 > + return loadImageFromGResource(name); Oh, much nicer! Thanks Carlos for remembering that we had an image for this in the resource bundle already =) 1643849 8 ews-feeder 2020-04-21 05:31:26 -0700 Committed r260425: <https://trac.webkit.org/changeset/260425> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397065. 396974 2020-04-20 07:30:59 -0700 2020-04-21 02:49:16 -0700 Patch bug-210745-20200420173058.patch text/plain 3724 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDBiZTIxZDI3ODhjOTg3YzNlNjJmMzJl MmRlMzUyMjgxZDBhMjBiMDQuLmY0YzRlMTU4NjYyNjRkOWI2YzM3MzJjMjkwNjg1MWVjZDdmOGY0 NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDQtMjAgIENsYXVkaW8gU2FhdmVkcmEgIDxj c2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF0gQWRhcHQgdG8gR3RrSWNvblRo ZW1lIEFQSSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTA3NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9nbGliL0dUeXBlZGVmcy5oOiBSZW1vdmUgdW5uZWVkZWQgR3RrSWNvbklu Zm8gZGVmaW5pdGlvbi4KKwogMjAyMC0wNC0xOSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkIFdLU2NyaXB0TWVzc2FnZUhhbmRsZXIgQVBJIHRoYXQgYXN5 bmNocm9ub3VzbHkgcmVzcG9uZHMgd2l0aCBhIHByb21pc2UuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzZiNmY5 MTlhZWQzNDIzYzM4ZTA5OTA3M2Y2NTU4OTljZTMwOWVkYS4uOWQ4NzZjNTUyY2IwOTczOWU5MTZj NDA0ZTYyNzQzZTlmMTRkZjVlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA0 LTIwICBDbGF1ZGlvIFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dUSzRdIEFkYXB0IHRvIEd0a0ljb25UaGVtZSBBUEkgY2hhbmdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwNzQ1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZC4KKwor ICAgICAgICBndGtfaWNvbl90aGVtZV9sb29rdXBfaWNvbigpJ3Mgc2lnbmF0dXJlIGhhcyBjaGFu Z2VkLAorICAgICAgICBpdCBhbHNvIHJldHVybnMgYSBHdGtJY29uUGFpbnRhYmxlIGluc3RlYWQg b2YgR3RrSWNvbkluZm8uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VH dGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bG9hZE1pc3NpbmdJbWFnZUljb25Gcm9tVGhlbWUp OgorCiAyMDIwLTA0LTIwICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAg ICAgICAgU3RydWN0dXJlZENsb25lIGFsZ29yaXRobSBzaG91bGQgYmUgYXdhcmUgb2YgQmlnSW50 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dUeXBlZGVmcy5oIGIvU291cmNlL1dU Ri93dGYvZ2xpYi9HVHlwZWRlZnMuaAppbmRleCA0MDNmZmQwYTQ5MDZlY2YxYjEwZTQ5OTE0MGI2 MWI0YjkxODRkNTgzLi5hNjI2Y2MxOGJlYTExNGU4YWIwNTRmNzNhNjRjNDk1M2U0YTU3M2ZjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9nbGliL0dUeXBlZGVmcy5oCisrKyBiL1NvdXJjZS9X VEYvd3RmL2dsaWIvR1R5cGVkZWZzLmgKQEAgLTgyLDcgKzgyLDYgQEAgdHlwZWRlZiBzdHJ1Y3Qg X0d0a0FkanVzdG1lbnQgR3RrQWRqdXN0bWVudDsKIHR5cGVkZWYgc3RydWN0IF9HdGtCb3JkZXIg R3RrQm9yZGVyOwogdHlwZWRlZiBzdHJ1Y3QgX0d0a0NsaXBib2FyZCBHdGtDbGlwYm9hcmQ7CiB0 eXBlZGVmIHN0cnVjdCBfR3RrQ29udGFpbmVyIEd0a0NvbnRhaW5lcjsKLXR5cGVkZWYgc3RydWN0 IF9HdGtJY29uSW5mbyBHdGtJY29uSW5mbzsKIHR5cGVkZWYgc3RydWN0IF9HdGtNZW51IEd0a01l bnU7CiB0eXBlZGVmIHN0cnVjdCBfR3RrTWVudUl0ZW0gR3RrTWVudUl0ZW07CiB0eXBlZGVmIHN0 cnVjdCBfR3RrT2JqZWN0IEd0a09iamVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCmluZGV4IDMwZGJlODA4MzQ5MTNiMTllYTQ2MjQx MGE2NmVmMDFlOTBhMmIxODAuLjFjNzY5OTAxZjZkNzhkMzBmNjI3ZmVjNmU4MmQwYzhkZjlkMTBh MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFn ZUd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdl R3RrLmNwcApAQCAtNjIsMTQgKzYyLDI3IEBAIHZvaWQgQml0bWFwSW1hZ2U6OmludmFsaWRhdGVQ bGF0Zm9ybURhdGEoKQogCiBzdGF0aWMgUmVmPEltYWdlPiBsb2FkTWlzc2luZ0ltYWdlSWNvbkZy b21UaGVtZShjb25zdCBjaGFyKiBuYW1lKQogewotICAgIGludCBpY29uU2l6ZSA9IGdfc3RyX2hh c19zdWZmaXgobmFtZSwgIkAyeCIpID8gMzIgOiAxNjsKICAgICBhdXRvIGljb24gPSBCaXRtYXBJ bWFnZTo6Y3JlYXRlKCk7CisjaWYgVVNFKEdUSzQpCisgICAgaW50IHNjYWxlID0gZ19zdHJfaGFz X3N1ZmZpeChuYW1lLCAiQDJ4IikgPyAyIDogMTsKKyAgICBHUmVmUHRyPEd0a0ljb25QYWludGFi bGU+IGljb25QYWludGFibGUgPSBhZG9wdEdSZWYoZ3RrX2ljb25fdGhlbWVfbG9va3VwX2ljb24o Z3RrX2ljb25fdGhlbWVfZ2V0X2Zvcl9kaXNwbGF5KGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCkp LCAiaW1hZ2UtbWlzc2luZyIsIG51bGxwdHIsIDE2LCBzY2FsZSwgZ3RrX3dpZGdldF9nZXRfZGVm YXVsdF9kaXJlY3Rpb24oKSwgc3RhdGljX2Nhc3Q8R3RrSWNvbkxvb2t1cEZsYWdzPigwKSk7Cisg ICAgaWYgKGljb25QYWludGFibGUpIHsKKyAgICAgICAgR0ZpbGUqIGZpbGUgPSBndGtfaWNvbl9w YWludGFibGVfZ2V0X2ZpbGUoaWNvblBhaW50YWJsZS5nZXQoKSk7CisgICAgICAgIGlmIChmaWxl KSB7CisgICAgICAgICAgICBhdXRvIGJ1ZmZlciA9IGxvYWRSZXNvdXJjZVNoYXJlZEJ1ZmZlcihn X2ZpbGVfcGVla19wYXRoKGZpbGUpKTsKKyAgICAgICAgICAgIGljb24tPnNldERhdGEoV1RGTW92 ZShidWZmZXIpLCB0cnVlKTsKKyAgICAgICAgICAgIHJldHVybiBpY29uOworICAgICAgICB9Cisg ICAgfQorI2Vsc2UKKyAgICBpbnQgaWNvblNpemUgPSBnX3N0cl9oYXNfc3VmZml4KG5hbWUsICJA MngiKSA/IDMyIDogMTY7CiAgICAgR1JlZlB0cjxHdGtJY29uSW5mbz4gaWNvbkluZm8gPSBhZG9w dEdSZWYoZ3RrX2ljb25fdGhlbWVfbG9va3VwX2ljb24oZ3RrX2ljb25fdGhlbWVfZ2V0X2RlZmF1 bHQoKSwgImltYWdlLW1pc3NpbmciLCBpY29uU2l6ZSwgR1RLX0lDT05fTE9PS1VQX05PX1NWRykp OwogICAgIGlmIChpY29uSW5mbykgewogICAgICAgICBhdXRvIGJ1ZmZlciA9IGxvYWRSZXNvdXJj ZVNoYXJlZEJ1ZmZlcihndGtfaWNvbl9pbmZvX2dldF9maWxlbmFtZShpY29uSW5mby5nZXQoKSkp OwogICAgICAgICBpY29uLT5zZXREYXRhKFdURk1vdmUoYnVmZmVyKSwgdHJ1ZSk7CiAgICAgICAg IHJldHVybiBpY29uOwogICAgIH0KKyNlbmRpZgogCiAgICAgcmV0dXJuIGxvYWRJbWFnZUZyb21H UmVzb3VyY2UobmFtZSk7CiB9Cg== 397065 2020-04-21 02:49:20 -0700 2020-04-21 05:31:26 -0700 Patch bug-210745-20200421124919.patch text/plain 4147 csaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDUyZDhjODk4NWEwOGE2MDAzN2Y3ODcy NjViMjRkMGY4ZjMwMTJkOTcuLmYwNTY0ZGY2NjQwN2JlMGM2ZGJhMDE3NWU1NjllN2E1ODlhNjc5 OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjAtMDQtMjEgIENsYXVkaW8gU2FhdmVkcmEgIDxj c2FhdmVkcmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLNF0gQWRhcHQgdG8gR3RrSWNvblRo ZW1lIEFQSSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTA3NDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHd0Zi9nbGliL0dUeXBlZGVmcy5oOiBSZW1vdmUgdW5uZWVkZWQgR3RrSWNvbklu Zm8gZGVmaW5pdGlvbi4KKwogMjAyMC0wNC0yMCAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hv cnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5IHRvIGZpeCB0aGUgYnVpbGQgYWZ0ZXIgcjI2 MDQwNwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IGVjYWE4ZDNkNzU4ZmU1Y2U3Yzg3MDBlOTQ0OTFiMzljZWU2YzA4 NmMuLmY3YmI5ZTYyOGQ1ZWQ4M2IzMGQ2MTljMTI0NDk1YzU2MGE0MGU1YjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMiBAQAorMjAyMC0wNC0yMSAgQ2xhdWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRy YUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEs0XSBBZGFwdCB0byBHdGtJY29uVGhlbWUgQVBJ IGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMDc0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAgR3RrSWNvblRoZW1lIGNoYW5nZXMgaW4g R1RLIGFuZCBzaW5jZSB3ZSdyZSBubyBsb25nZXIgZm9sbG93aW5nCisgICAgICAgIHRoZSB0aGVt ZSB3ZSBjYW4gZHJvcCB0aGUgbWlzc2luZyBpbWFnZSBmcm9tIHRoZSBpY29uIHRoZW1lLCBzbyBy ZW1vdmUKKyAgICAgICAgbm93IHVubmVjZXNzYXJ5IGNvZGUuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2U6Omxv YWRQbGF0Zm9ybVJlc291cmNlKTogRGlyZWN0bHkgbG9hZCBpbWFnZSBmcm9tIGNvbXBpbGVkCisg ICAgICAgIEdSZXNvdXJjZS4KKyAgICAgICAgKFdlYkNvcmU6OmxvYWRSZXNvdXJjZVNoYXJlZEJ1 ZmZlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpsb2FkTWlzc2luZ0ltYWdlSWNvbkZy b21UaGVtZSk6IERlbGV0ZWQuCisKIDIwMjAtMDQtMjEgIENsYXVkaW8gU2FhdmVkcmEgIDxjc2Fh dmVkcmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLNF0gRml4IHBsYXRmb3JtIEdESyBpbmNs dWRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvZ2xpYi9HVHlwZWRlZnMuaCBiL1NvdXJj ZS9XVEYvd3RmL2dsaWIvR1R5cGVkZWZzLmgKaW5kZXggNDAzZmZkMGE0OTA2ZWNmMWIxMGU0OTkx NDBiNjFiNGI5MTg0ZDU4My4uYTYyNmNjMThiZWExMTRlOGFiMDU0ZjczYTY0YzQ5NTNlNGE1NzNm YyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvZ2xpYi9HVHlwZWRlZnMuaAorKysgYi9Tb3Vy Y2UvV1RGL3d0Zi9nbGliL0dUeXBlZGVmcy5oCkBAIC04Miw3ICs4Miw2IEBAIHR5cGVkZWYgc3Ry dWN0IF9HdGtBZGp1c3RtZW50IEd0a0FkanVzdG1lbnQ7CiB0eXBlZGVmIHN0cnVjdCBfR3RrQm9y ZGVyIEd0a0JvcmRlcjsKIHR5cGVkZWYgc3RydWN0IF9HdGtDbGlwYm9hcmQgR3RrQ2xpcGJvYXJk OwogdHlwZWRlZiBzdHJ1Y3QgX0d0a0NvbnRhaW5lciBHdGtDb250YWluZXI7Ci10eXBlZGVmIHN0 cnVjdCBfR3RrSWNvbkluZm8gR3RrSWNvbkluZm87CiB0eXBlZGVmIHN0cnVjdCBfR3RrTWVudSBH dGtNZW51OwogdHlwZWRlZiBzdHJ1Y3QgX0d0a01lbnVJdGVtIEd0a01lbnVJdGVtOwogdHlwZWRl ZiBzdHJ1Y3QgX0d0a09iamVjdCBHdGtPYmplY3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcAppbmRleCAzMGRiZTgwODM0OTEzYjE5ZWE0 NjI0MTBhNjZlZjAxZTkwYTJiMTgwLi5hZmM0MjhiNzU0MDVkYjA5MzgzMzhkZmVkOTBmMWU2YjI4 NzVlMTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv SW1hZ2VHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9J bWFnZUd0ay5jcHAKQEAgLTI2LDExICsyNiw5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKICNp bmNsdWRlICJCaXRtYXBJbWFnZS5oIgotI2luY2x1ZGUgIkdVbmlxdWVQdHJHdGsuaCIKICNpbmNs dWRlICJHZGtDYWlyb1V0aWxpdGllcy5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2lu Y2x1ZGUgPGNhaXJvLmg+Ci0jaW5jbHVkZSA8Z3RrL2d0ay5oPgogI2luY2x1ZGUgPHd0Zi9nbGli L0dSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvZ2xpYi9HVW5pcXVlUHRyLmg+CiAKQEAgLTQ2LDM3 ICs0NCwxMyBAQCBzdGF0aWMgUmVmPEltYWdlPiBsb2FkSW1hZ2VGcm9tR1Jlc291cmNlKGNvbnN0 IGNoYXIqIGljb25OYW1lKQogICAgIHJldHVybiBpY29uOwogfQogCi1zdGF0aWMgUmVmPFNoYXJl ZEJ1ZmZlcj4gbG9hZFJlc291cmNlU2hhcmVkQnVmZmVyKGNvbnN0IGNoYXIqIGZpbGVuYW1lKQot ewotICAgIEdVbmlxdWVPdXRQdHI8Z2NoYXI+IGNvbnRlbnQ7Ci0gICAgZ3NpemUgbGVuZ3RoOwot ICAgIGlmICghZ19maWxlX2dldF9jb250ZW50cyhmaWxlbmFtZSwgJmNvbnRlbnQub3V0UHRyKCks ICZsZW5ndGgsIG51bGxwdHIpKQotICAgICAgICByZXR1cm4gU2hhcmVkQnVmZmVyOjpjcmVhdGUo KTsKLQotICAgIHJldHVybiBTaGFyZWRCdWZmZXI6OmNyZWF0ZShjb250ZW50LmdldCgpLCBsZW5n dGgpOwotfQotCiB2b2lkIEJpdG1hcEltYWdlOjppbnZhbGlkYXRlUGxhdGZvcm1EYXRhKCkKIHsK IH0KIAotc3RhdGljIFJlZjxJbWFnZT4gbG9hZE1pc3NpbmdJbWFnZUljb25Gcm9tVGhlbWUoY29u c3QgY2hhciogbmFtZSkKLXsKLSAgICBpbnQgaWNvblNpemUgPSBnX3N0cl9oYXNfc3VmZml4KG5h bWUsICJAMngiKSA/IDMyIDogMTY7Ci0gICAgYXV0byBpY29uID0gQml0bWFwSW1hZ2U6OmNyZWF0 ZSgpOwotICAgIEdSZWZQdHI8R3RrSWNvbkluZm8+IGljb25JbmZvID0gYWRvcHRHUmVmKGd0a19p Y29uX3RoZW1lX2xvb2t1cF9pY29uKGd0a19pY29uX3RoZW1lX2dldF9kZWZhdWx0KCksICJpbWFn ZS1taXNzaW5nIiwgaWNvblNpemUsIEdUS19JQ09OX0xPT0tVUF9OT19TVkcpKTsKLSAgICBpZiAo aWNvbkluZm8pIHsKLSAgICAgICAgYXV0byBidWZmZXIgPSBsb2FkUmVzb3VyY2VTaGFyZWRCdWZm ZXIoZ3RrX2ljb25faW5mb19nZXRfZmlsZW5hbWUoaWNvbkluZm8uZ2V0KCkpKTsKLSAgICAgICAg aWNvbi0+c2V0RGF0YShXVEZNb3ZlKGJ1ZmZlciksIHRydWUpOwotICAgICAgICByZXR1cm4gaWNv bjsKLSAgICB9Ci0KLSAgICByZXR1cm4gbG9hZEltYWdlRnJvbUdSZXNvdXJjZShuYW1lKTsKLX0K LQogUmVmPEltYWdlPiBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoY29uc3QgY2hhciogbmFt ZSkKIHsKLSAgICByZXR1cm4gZ19zdHJfaGFzX3ByZWZpeChuYW1lLCAibWlzc2luZ0ltYWdlIikg PyBsb2FkTWlzc2luZ0ltYWdlSWNvbkZyb21UaGVtZShuYW1lKSA6IGxvYWRJbWFnZUZyb21HUmVz b3VyY2UobmFtZSk7CisgICAgcmV0dXJuIGxvYWRJbWFnZUZyb21HUmVzb3VyY2UobmFtZSk7CiB9 CiAKIEdka1BpeGJ1ZiogQml0bWFwSW1hZ2U6OmdldEdka1BpeGJ1ZigpCg==