45053 2010-09-01 13:08:18 -0700 [Cairo] Remove glib dependency (caused by use of GOwnPtr) 2010-09-05 04:10:23 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 antognolli+webkit webkit-unassigned commit-queue gustavo leandro mrobinson ryuan.choi oldest_to_newest 272960 0 antognolli+webkit 2010-09-01 13:08:18 -0700 The use of GOwnPtr was introduced on platform/graphics/cairo/FontCacheCairo.cpp in order to keep references for Fc* functions. But this implies on a dependency on glib headers, since the forwarded declarations are now specific to Gtk. Maybe the GOwnPtrCairo could be based on OwnPtr instead of GOwnPtr. What do you think about this? I'm attaching a patch that implements this, but I didn't add the name change and fixed all the builds yet. Please tell me what you think about this, then I'll finish it. 272961 1 66251 antognolli+webkit 2010-09-01 13:09:08 -0700 Created attachment 66251 Patch 272962 2 mrobinson 2010-09-01 13:10:59 -0700 I approve of this change. 272987 3 66260 antognolli+webkit 2010-09-01 13:48:53 -0700 Created attachment 66260 Patch 273444 4 mrobinson 2010-09-02 10:45:47 -0700 A related comment about RefPtr: https://bugs.webkit.org/show_bug.cgi?id=44354#c17 In my opinion, we should use OwnPtr specializations for everything that isn't a void*. For things that are void*, we should find some other solution. 273446 5 66260 mrobinson 2010-09-02 10:46:58 -0700 Comment on attachment 66260 Patch I think this is the right direction to go in. 273720 6 66260 commit-queue 2010-09-02 18:39:16 -0700 Comment on attachment 66260 Patch Clearing flags on attachment: 66260 Committed r66700: <http://trac.webkit.org/changeset/66700> 273721 7 commit-queue 2010-09-02 18:39:20 -0700 All reviewed patches have been landed. Closing bug. 274422 8 ryuan.choi 2010-09-05 04:10:23 -0700 *** Bug 45089 has been marked as a duplicate of this bug. *** 66251 2010-09-01 13:09:08 -0700 2010-09-01 13:48:47 -0700 Patch webkit-fix-glib-build.patch text/plain 2832 antognolli+webkit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fp cm8uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q2FjaGVDYWlyby5j cHAKaW5kZXggY2I1NDU0OS4uZWQyOTdjZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9Gb250Q2FjaGVDYWlyby5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9Gb250Q2FjaGVDYWlyby5jcHAKQEAgLTExNSwxNSArMTE1LDE1IEBAIEZv bnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBG b250RGVzY3JpcHRpb24mIGZvbnRECiAgICAgQ1N0cmluZyBmYW1pbHlOYW1lU3RyaW5nID0gZmFt aWx5LnN0cmluZygpLnV0ZjgoKTsKICAgICBjb25zdCBjaGFyKiBmY2ZhbWlseSA9IGZhbWlseU5h bWVTdHJpbmcuZGF0YSgpOwogCi0gICAgR093blB0cjxGY1BhdHRlcm4+IHBhdHRlcm4oRmNQYXR0 ZXJuQ3JlYXRlKCkpOworICAgIE93blB0cjxGY1BhdHRlcm4+IHBhdHRlcm4oRmNQYXR0ZXJuQ3Jl YXRlKCkpOwogICAgIGlmICghRmNQYXR0ZXJuQWRkU3RyaW5nKHBhdHRlcm4uZ2V0KCksIEZDX0ZB TUlMWSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0NoYXI4Kj4oZmNmYW1pbHkpKSkKICAgICAg ICAgcmV0dXJuIDA7CiAKLSAgICBHT3duUHRyPEZjT2JqZWN0U2V0PiBvYmplY3RTZXQoRmNPYmpl Y3RTZXRDcmVhdGUoKSk7CisgICAgT3duUHRyPEZjT2JqZWN0U2V0PiBvYmplY3RTZXQoRmNPYmpl Y3RTZXRDcmVhdGUoKSk7CiAgICAgaWYgKCFGY09iamVjdFNldEFkZChvYmplY3RTZXQuZ2V0KCks IEZDX0ZBTUlMWSkpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgR093blB0cjxGY0ZvbnRTZXQ+ IGZvbnRTZXQoRmNGb250TGlzdCgwLCBwYXR0ZXJuLmdldCgpLCBvYmplY3RTZXQuZ2V0KCkpKTsK KyAgICBPd25QdHI8RmNGb250U2V0PiBmb250U2V0KEZjRm9udExpc3QoMCwgcGF0dGVybi5nZXQo KSwgb2JqZWN0U2V0LmdldCgpKSk7CiAKICAgICBpZiAoIWZvbnRTZXQpCiAgICAgICAgIHJldHVy biAwOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3duUHRy Q2Fpcm8uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3duUHRyQ2Fpcm8u Y3BwCmluZGV4IDEyZGYzY2YuLmM5N2UzN2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5jcHAKQEAgLTI4LDE5ICsyOCwxOSBAQAogbmFtZXNw YWNlIFdURiB7CiAKICNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQRSkKLXRlbXBsYXRlIDw+IHZvaWQg ZnJlZU93bmVkR1B0cjxGY1BhdHRlcm4+KEZjUGF0dGVybiogcHRyKQordGVtcGxhdGUgPD4gdm9p ZCBkZWxldGVPd25lZFB0cjxGY1BhdHRlcm4+KEZjUGF0dGVybiogcHRyKQogewogICAgIGlmIChw dHIpCiAgICAgICAgIEZjUGF0dGVybkRlc3Ryb3kocHRyKTsKIH0KIAotdGVtcGxhdGUgPD4gdm9p ZCBmcmVlT3duZWRHUHRyPEZjT2JqZWN0U2V0PihGY09iamVjdFNldCogcHRyKQordGVtcGxhdGUg PD4gdm9pZCBkZWxldGVPd25lZFB0cjxGY09iamVjdFNldD4oRmNPYmplY3RTZXQqIHB0cikKIHsK ICAgICBpZiAocHRyKQogICAgICAgICBGY09iamVjdFNldERlc3Ryb3kocHRyKTsKIH0KIAotdGVt cGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEZjRm9udFNldD4oRmNGb250U2V0KiBwdHIpCit0 ZW1wbGF0ZSA8PiB2b2lkIGRlbGV0ZU93bmVkUHRyPEZjRm9udFNldD4oRmNGb250U2V0KiBwdHIp CiB7CiAgICAgaWYgKHB0cikKICAgICAgICAgRmNGb250U2V0RGVzdHJveShwdHIpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uaCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmgKaW5kZXggYjA5OTcw Ny4uNmE0OTk4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9H T3duUHRyQ2Fpcm8uaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dPd25Q dHJDYWlyby5oCkBAIC0yMCw3ICsyMCw3IEBACiAjaWZuZGVmIEdPd25QdHJDYWlyb19oCiAjZGVm aW5lIEdPd25QdHJDYWlyb19oCiAKLSNpbmNsdWRlICJHT3duUHRyLmgiCisjaW5jbHVkZSAiT3du UHRyLmgiCiAKICNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQRSkKIHR5cGVkZWYgc3RydWN0IF9GY1Bh dHRlcm4gRmNQYXR0ZXJuOwpAQCAtMzEsOSArMzEsOSBAQCB0eXBlZGVmIHN0cnVjdCBfRmNGb250 U2V0IEZjRm9udFNldDsKIG5hbWVzcGFjZSBXVEYgewogCiAjaWYgZGVmaW5lZChVU0VfRlJFRVRZ UEUpCi10ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8RmNQYXR0ZXJuPihGY1BhdHRlcm4q KTsKLXRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxGY09iamVjdFNldD4oRmNPYmplY3RT ZXQqKTsKLXRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxGY0ZvbnRTZXQ+KEZjRm9udFNl dCopOwordGVtcGxhdGUgPD4gdm9pZCBkZWxldGVPd25lZFB0cjxGY1BhdHRlcm4+KEZjUGF0dGVy biopOwordGVtcGxhdGUgPD4gdm9pZCBkZWxldGVPd25lZFB0cjxGY09iamVjdFNldD4oRmNPYmpl Y3RTZXQqKTsKK3RlbXBsYXRlIDw+IHZvaWQgZGVsZXRlT3duZWRQdHI8RmNGb250U2V0PihGY0Zv bnRTZXQqKTsKICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXVEYK 66260 2010-09-01 13:48:53 -0700 2010-09-02 18:39:15 -0700 Patch bug-45053-20100901174856.patch text/plain 6457 antognolli+webkit ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ01ha2VMaXN0c0VmbC50eHQgYi9XZWJDb3JlL0NNYWtlTGlz dHNFZmwudHh0CmluZGV4IDE3NDFiYWFmOWIwNzlhZmU3YzA1OTM4NTI3NjczMzNiNzAxNTI5ZjUu LjkxYjZiMjM2MDU5ZmEwYWE0ZGI0MTQ4Y2NiYWNkNzk4MmMyMmM5NzAgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ01ha2VMaXN0c0VmbC50eHQKKysrIGIvV2ViQ29yZS9DTWFrZUxpc3RzRWZsLnR4dApA QCAtNjksNyArNjksNyBAQCBJRiAoV1RGX1BMQVRGT1JNX0NBSVJPKQogICAgIHBsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9G b250Q3VzdG9tUGxhdGZvcm1EYXRhLmNwcAogICAgIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0Zv bnRQbGF0Zm9ybURhdGFDYWlyby5jcHAKLSAgICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HT3du UHRyQ2Fpcm8uY3BwCisgICAgcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8uY3Bw CiAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGxhdGZvcm1SZWZQdHJDYWlyby5jcHAKICAg ICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HbHlwaFBhZ2VUcmVlTm9kZUNhaXJvLmNwcAogICAg IHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYWRpZW50Q2Fpcm8uY3BwCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDBiZGFiZWMwZTU0OTJh ODgxZGFkYmI3M2NmMDBhMzgyM2Q5ZTM2NDIuLjJjMWE2ZjM3NzU2OGIyYWE1NWNjN2YyNjAxNmI1 ZjMwYWE4ODZkMjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMDktMDEgIFJhZmFlbCBBbnRvZ25vbGxp ICA8YW50b2dub2xsaUBwcm9mdXNpb24ubW9iaT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQ2Fpcm9dIFJlbW92ZSBnbGliIGRlcGVuZGVuY3kgKGNh dXNlZCBieSB1c2Ugb2YgR093blB0cikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ1MDUzCisKKyAgICAgICAgVXNlIE93blB0ciBpbnN0ZWFkIG9mIEdP d25QdHIgdG8ga2VlcCB0cmFjayBvZiBGYyogcmVmZXJlbmNlcworICAgICAgICBpbiBGb250Q2Fj aGVDYWlyby5jcHAuCisKKyAgICAgICAgTm8gZmVhdHVyZXMgYWRkZWQsIHNvIG5vIG5ldyB0ZXN0 cy4KKworICAgICAgICAqIENNYWtlTGlzdHNFZmwudHh0OiBVcGRhdGluZyBidWlsZCBzeXN0ZW0g dG8gbG9vayBmb3IgR093blB0ckNhaXJvLioKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbTogRGl0 dG8uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhY2hlQ2Fpcm8uY3Bw OiBVc2luZyBPd25QdHIgaW5zdGVhZCBvZiBHT3duUHRyLgorICAgICAgICAoV2ViQ29yZTo6Rm9u dENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uY3BwOiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5oOiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2NhaXJvL093blB0ckNhaXJvLmNwcDogQWRkZWQuCisgICAgICAgIChXVEY6 OkZjUGF0dGVybik6CisgICAgICAgIChXVEY6OkZjT2JqZWN0U2V0KToKKyAgICAgICAgKFdURjo6 RmNGb250U2V0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Pd25QdHJDYWly by5oOiBBZGRlZC4KKwogMjAxMC0wOC0zMSAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9HTlVtYWtlZmlsZS5hbSBiL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KaW5kZXggNzZmOGJl MjBmMzgwNGFmNjFhMDkxNzEzNGQxYzA2YzNmY2JjYmVlNC4uOWY3ZWVmM2IwNDY0MWI5NzZiMjAx Yzk3ODdlZWY2NWQyMzAxMTkyNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQor KysgYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCkBAIC0yNDQ5LDggKzI0NDksOCBAQCB3ZWJjb3Jl Z3RrX3NvdXJjZXMgKz0gXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENh aXJvLmNwcCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250Q3VzdG9tUGxh dGZvcm1EYXRhLmggXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udFBsYXRm b3JtRGF0YS5oIFwKLQlXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWly by5jcHAgXAotCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmgg XAorCVdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8uY3BwIFwKKwlX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL093blB0ckNhaXJvLmggXAogCVdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhZGllbnRDYWlyby5jcHAgXAogCVdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwIFwKIAlXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZUNh aXJvLmggXApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Gb250 Q2FjaGVDYWlyby5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNo ZUNhaXJvLmNwcAppbmRleCBjYjU0NTQ5ZTFjN2FhZDQxYzljM2M3NjE1ZDRmNDU1NjJiNzYyOTU5 Li41ZDMyNjNlOTk1MWY5ZDQ5MTdhODA2ZTRlYjI3Zjk0MWIyMDczYmUwIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWNoZUNhaXJvLmNwcApAQCAtMjMs NyArMjMsNyBAQAogCiAjaW5jbHVkZSAiQ1N0cmluZy5oIgogI2luY2x1ZGUgIkZvbnQuaCIKLSNp bmNsdWRlICJHT3duUHRyQ2Fpcm8uaCIKKyNpbmNsdWRlICJPd25QdHJDYWlyby5oIgogI2luY2x1 ZGUgIlNpbXBsZUZvbnREYXRhLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIApAQCAt MTE1LDE1ICsxMTUsMTUgQEAgRm9udFBsYXRmb3JtRGF0YSogRm9udENhY2hlOjpjcmVhdGVGb250 UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udEQKICAgICBDU3RyaW5nIGZh bWlseU5hbWVTdHJpbmcgPSBmYW1pbHkuc3RyaW5nKCkudXRmOCgpOwogICAgIGNvbnN0IGNoYXIq IGZjZmFtaWx5ID0gZmFtaWx5TmFtZVN0cmluZy5kYXRhKCk7CiAKLSAgICBHT3duUHRyPEZjUGF0 dGVybj4gcGF0dGVybihGY1BhdHRlcm5DcmVhdGUoKSk7CisgICAgT3duUHRyPEZjUGF0dGVybj4g cGF0dGVybihGY1BhdHRlcm5DcmVhdGUoKSk7CiAgICAgaWYgKCFGY1BhdHRlcm5BZGRTdHJpbmco cGF0dGVybi5nZXQoKSwgRkNfRkFNSUxZLCByZWludGVycHJldF9jYXN0PGNvbnN0IEZjQ2hhcjgq PihmY2ZhbWlseSkpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIEdPd25QdHI8RmNPYmplY3RT ZXQ+IG9iamVjdFNldChGY09iamVjdFNldENyZWF0ZSgpKTsKKyAgICBPd25QdHI8RmNPYmplY3RT ZXQ+IG9iamVjdFNldChGY09iamVjdFNldENyZWF0ZSgpKTsKICAgICBpZiAoIUZjT2JqZWN0U2V0 QWRkKG9iamVjdFNldC5nZXQoKSwgRkNfRkFNSUxZKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAg ICBHT3duUHRyPEZjRm9udFNldD4gZm9udFNldChGY0ZvbnRMaXN0KDAsIHBhdHRlcm4uZ2V0KCks IG9iamVjdFNldC5nZXQoKSkpOworICAgIE93blB0cjxGY0ZvbnRTZXQ+IGZvbnRTZXQoRmNGb250 TGlzdCgwLCBwYXR0ZXJuLmdldCgpLCBvYmplY3RTZXQuZ2V0KCkpKTsKIAogICAgIGlmICghZm9u dFNldCkKICAgICAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhaXJvL093blB0ckNhaXJvLmNwcApzaW1pbGFyaXR5IGluZGV4IDg0JQpyZW5hbWUgZnJvbSBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5jcHAKcmVuYW1lIHRv IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8uY3BwCmluZGV4IDEy ZGYzY2ZmMTA2ZDhmYjA4MWViMWVlZmIxZTI1YzIwZDlhOTExODcuLjliZTg2NzBlNDY2N2M4Nzg2 MjMwNzQ1ZWFjODUyOTYwMGQxMWE2MzMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vR093blB0ckNhaXJvLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NhaXJvL093blB0ckNhaXJvLmNwcApAQCAtMTgsNyArMTgsNyBAQAogICovCiAKICNpbmNs dWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJHT3duUHRyQ2Fpcm8uaCIKKyNpbmNsdWRlICJPd25Q dHJDYWlyby5oIgogCiAjaWYgZGVmaW5lZChVU0VfRlJFRVRZUEUpCiAjaW5jbHVkZSA8Y2Fpcm8t ZnQuaD4KQEAgLTI4LDE5ICsyOCwxOSBAQAogbmFtZXNwYWNlIFdURiB7CiAKICNpZiBkZWZpbmVk KFVTRV9GUkVFVFlQRSkKLXRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxGY1BhdHRlcm4+ KEZjUGF0dGVybiogcHRyKQordGVtcGxhdGUgPD4gdm9pZCBkZWxldGVPd25lZFB0cjxGY1BhdHRl cm4+KEZjUGF0dGVybiogcHRyKQogewogICAgIGlmIChwdHIpCiAgICAgICAgIEZjUGF0dGVybkRl c3Ryb3kocHRyKTsKIH0KIAotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEZjT2JqZWN0 U2V0PihGY09iamVjdFNldCogcHRyKQordGVtcGxhdGUgPD4gdm9pZCBkZWxldGVPd25lZFB0cjxG Y09iamVjdFNldD4oRmNPYmplY3RTZXQqIHB0cikKIHsKICAgICBpZiAocHRyKQogICAgICAgICBG Y09iamVjdFNldERlc3Ryb3kocHRyKTsKIH0KIAotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRH UHRyPEZjRm9udFNldD4oRmNGb250U2V0KiBwdHIpCit0ZW1wbGF0ZSA8PiB2b2lkIGRlbGV0ZU93 bmVkUHRyPEZjRm9udFNldD4oRmNGb250U2V0KiBwdHIpCiB7CiAgICAgaWYgKHB0cikKICAgICAg ICAgRmNGb250U2V0RGVzdHJveShwdHIpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9HT3duUHRyQ2Fpcm8uaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vT3duUHRyQ2Fpcm8uaApzaW1pbGFyaXR5IGluZGV4IDgxJQpyZW5hbWUgZnJvbSBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dPd25QdHJDYWlyby5oCnJlbmFtZSB0byBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL093blB0ckNhaXJvLmgKaW5kZXggYjA5OTcwN2U1 ZjNlNTcxMTFjMTQzOWIyZGRiZmVmMjg1Njc0YTVlMC4uMjlmNDU2Mjg1NTdjZDQ5N2E3ZDJmZDJi NzgxMDJiMzhkMzJiNTkwNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HT3duUHRyQ2Fpcm8uaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L093blB0ckNhaXJvLmgKQEAgLTE3LDEwICsxNywxMCBAQAogICogIEJvc3RvbiwgTUEgMDIxMTAt MTMwMSBVU0EKICAqLwogCi0jaWZuZGVmIEdPd25QdHJDYWlyb19oCi0jZGVmaW5lIEdPd25QdHJD YWlyb19oCisjaWZuZGVmIE93blB0ckNhaXJvX2gKKyNkZWZpbmUgT3duUHRyQ2Fpcm9faAogCi0j aW5jbHVkZSAiR093blB0ci5oIgorI2luY2x1ZGUgIk93blB0ci5oIgogCiAjaWYgZGVmaW5lZChV U0VfRlJFRVRZUEUpCiB0eXBlZGVmIHN0cnVjdCBfRmNQYXR0ZXJuIEZjUGF0dGVybjsKQEAgLTMx LDkgKzMxLDkgQEAgdHlwZWRlZiBzdHJ1Y3QgX0ZjRm9udFNldCBGY0ZvbnRTZXQ7CiBuYW1lc3Bh Y2UgV1RGIHsKIAogI2lmIGRlZmluZWQoVVNFX0ZSRUVUWVBFKQotdGVtcGxhdGUgPD4gdm9pZCBm cmVlT3duZWRHUHRyPEZjUGF0dGVybj4oRmNQYXR0ZXJuKik7Ci10ZW1wbGF0ZSA8PiB2b2lkIGZy ZWVPd25lZEdQdHI8RmNPYmplY3RTZXQ+KEZjT2JqZWN0U2V0Kik7Ci10ZW1wbGF0ZSA8PiB2b2lk IGZyZWVPd25lZEdQdHI8RmNGb250U2V0PihGY0ZvbnRTZXQqKTsKK3RlbXBsYXRlIDw+IHZvaWQg ZGVsZXRlT3duZWRQdHI8RmNQYXR0ZXJuPihGY1BhdHRlcm4qKTsKK3RlbXBsYXRlIDw+IHZvaWQg ZGVsZXRlT3duZWRQdHI8RmNPYmplY3RTZXQ+KEZjT2JqZWN0U2V0Kik7Cit0ZW1wbGF0ZSA8PiB2 b2lkIGRlbGV0ZU93bmVkUHRyPEZjRm9udFNldD4oRmNGb250U2V0Kik7CiAjZW5kaWYKIAogfSAv LyBuYW1lc3BhY2UgV1RGCg==