112438 2013-03-15 05:58:03 -0700 [BlackBerry] Remove PlatformSupport 2013-03-15 06:54:36 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111729 0 berto webkit-unassigned cgarcia mifenton rwlbuis tonikitoo webkit.review.bot xan.lopez oldest_to_newest 855924 0 berto 2013-03-15 05:58:03 -0700 That class only contains getFontFamilyForCharacters(), which was moved from PlatformSupport to FontCache in r129257 (see bug 96282). 855927 1 193291 berto 2013-03-15 06:03:37 -0700 Created attachment 193291 Patch Here's the patch. The problem is that we change the API, so if we cannot revert it we need an #ifdef in FontCache.h 855942 2 193291 rwlbuis 2013-03-15 06:24:31 -0700 Comment on attachment 193291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193291&action=review > Source/WebCore/platform/graphics/FontCache.h:132 > +#endif Do we really need a different signature? 855947 3 193291 rwlbuis 2013-03-15 06:35:24 -0700 Comment on attachment 193291 Patch Good idea! 855958 4 193291 webkit.review.bot 2013-03-15 06:54:32 -0700 Comment on attachment 193291 Patch Clearing flags on attachment: 193291 Committed r145903: <http://trac.webkit.org/changeset/145903> 855959 5 webkit.review.bot 2013-03-15 06:54:36 -0700 All reviewed patches have been landed. Closing bug. 193291 2013-03-15 06:03:37 -0700 2013-03-15 06:54:32 -0700 Patch 112438.diff text/plain 14642 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZWI0NzM2Li5hMzY1ZGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDMtMTUgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgUGxhdGZvcm1TdXBwb3J0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI0MzgKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNsYXNzIG9ubHkgY29udGFp bnMgZ2V0Rm9udEZhbWlseUZvckNoYXJhY3RlcnMoKSwgd2hpY2ggd2FzCisgICAgICAgIG1vdmVk IGZyb20gUGxhdGZvcm1TdXBwb3J0IHRvIEZvbnRDYWNoZSBpbiByMTI5MjU3LgorCisgICAgICAg IFRoaXMgcGF0Y2ggZG9lcyB0aGUgc2FtZSBmb3IgdGhlIEJsYWNrQmVycnkgcG9ydC4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAoRm9udENhY2hl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ZvbnRDYWNoZUJsYWNr QmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRGb250RmFtaWx5Rm9y Q2hhcmFjdGVycyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRD YWNoZTo6Z2V0Rm9udERhdGFGb3JDaGFyYWN0ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9ibGFja2JlcnJ5L1BsYXRmb3JtU3VwcG9ydC5jcHA6IFJlbW92ZWQuCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbGF0Zm9ybVN1cHBvcnQuaDogUmVtb3ZlZC4K KwogMjAxMy0wMy0xNSAgTWFyamEgSMO2bHR0w6QgIDxtYXJqYUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW1Y4XSBBZGQgbWFjaGluZXJ5IGZvciBnZW5lcmF0aW5nIHNwZWNpYWxpemVkIGJpbmRp bmdzIGZvciB0aGUgbWFpbiB3b3JsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udENhY2hlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250Q2FjaGUuaAppbmRleCBmYzc2MjNlLi4yMGYwZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaApAQCAtMTI1LDcgKzEyNSwxMSBAQCBwdWJs aWM6CiAgICAgICAgIGJvb2wgaXNCb2xkOwogICAgICAgICBib29sIGlzSXRhbGljOwogICAgIH07 CisjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKKyAgICBzdGF0aWMgdm9pZCBnZXRGb250RmFtaWx5 Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3Rl cnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExvY2FsZSwgY29uc3QgRm9udERlc2NyaXB0aW9uJiwg U2ltcGxlRm9udEZhbWlseSopOworI2Vsc2UKICAgICBzdGF0aWMgdm9pZCBnZXRGb250RmFtaWx5 Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3Rl cnMsIGNvbnN0IGNoYXIqIHByZWZlcnJlZExvY2FsZSwgU2ltcGxlRm9udEZhbWlseSopOworI2Vu ZGlmCiAKIHByaXZhdGU6CiAgICAgRm9udENhY2hlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ZvbnRDYWNoZUJsYWNrQmVycnkuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9Gb250Q2FjaGVC bGFja0JlcnJ5LmNwcAppbmRleCA1OTNlOWZmLi5hYWZjZWZlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0ZvbnRDYWNoZUJsYWNrQmVycnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvRm9u dENhY2hlQmxhY2tCZXJyeS5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICogQ29weXJpZ2h0IChD KSAyMDA4IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIDIwMDkt MjAxMCwgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykg MjAxMCBJZ2FsaWEgUy5MLgogICogQ29weXJpZ2h0IChDKSAyMDEyLCAyMDEzIFJlc2VhcmNoIElu IE1vdGlvbiBMaW1pdGVkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKQEAgLTMwLDEzICszMSwx MyBAQAogI2luY2x1ZGUgIklUeXBlVXRpbHMuaCIKICNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5j bHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKLSNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKICNp bmNsdWRlICJTaW1wbGVGb250RGF0YS5oIgogCiAjaW5jbHVkZSA8QmxhY2tCZXJyeVBsYXRmb3Jt R3JhcGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVkZSA8Zm9udGNvbmZpZy9mb250Y29uZmlnLmg+CiAj aW5jbHVkZSA8ZnNfYXBpLmg+CiAjaW5jbHVkZSA8dW5pY29kZS9sb2NpZC5oPgorI2luY2x1ZGUg PHVuaXN0ZC5oPgogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSA8d3RmL3Rl eHQvQXRvbWljU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtNTAs MTEgKzUxLDEwMSBAQCB2b2lkIEZvbnRDYWNoZTo6cGxhdGZvcm1Jbml0KCkKICAgICAgICAgQ1JB U0goKTsKIH0KIAordm9pZCBGb250Q2FjaGU6OmdldEZvbnRGYW1pbHlGb3JDaGFyYWN0ZXJzKGNv bnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbnVtQ2hhcmFjdGVycywgY29uc3QgY2hhcios IGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24sIFNpbXBsZUZvbnRGYW1pbHkqIGZh bWlseSkKK3sKKyAgICBGY0NoYXJTZXQqIGNzZXQgPSBGY0NoYXJTZXRDcmVhdGUoKTsKKyAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IG51bUNoYXJhY3RlcnM7ICsraSkgeworICAgICAgICBpZiAo VTE2X0lTX1NVUlJPR0FURShjaGFyYWN0ZXJzW2ldKQorICAgICAgICAgICAgJiYgVTE2X0lTX1NV UlJPR0FURV9MRUFEKGNoYXJhY3RlcnNbaV0pCisgICAgICAgICAgICAmJiBpICE9IG51bUNoYXJh Y3RlcnMgLSAxCisgICAgICAgICAgICAmJiBVMTZfSVNfVFJBSUwoY2hhcmFjdGVyc1tpICsgMV0p KSB7CisgICAgICAgICAgICBGY0NoYXJTZXRBZGRDaGFyKGNzZXQsIFUxNl9HRVRfU1VQUExFTUVO VEFSWShjaGFyYWN0ZXJzW2ldLCBjaGFyYWN0ZXJzW2krMV0pKTsKKyAgICAgICAgICAgIGkrKzsK KyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBGY0NoYXJTZXRBZGRDaGFyKGNzZXQsIGNoYXJh Y3RlcnNbaV0pOworICAgIH0KKyAgICBGY1BhdHRlcm4qIHBhdHRlcm4gPSBGY1BhdHRlcm5DcmVh dGUoKTsKKworICAgIEZjVmFsdWUgZmN2YWx1ZTsKKyAgICBmY3ZhbHVlLnR5cGUgPSBGY1R5cGVD aGFyU2V0OworICAgIGZjdmFsdWUudS5jID0gY3NldDsKKyAgICBGY1BhdHRlcm5BZGQocGF0dGVy biwgRkNfQ0hBUlNFVCwgZmN2YWx1ZSwgRmNGYWxzZSk7CisKKyAgICBmY3ZhbHVlLnR5cGUgPSBG Y1R5cGVCb29sOworICAgIGZjdmFsdWUudS5iID0gRmNUcnVlOworICAgIEZjUGF0dGVybkFkZChw YXR0ZXJuLCBGQ19TQ0FMQUJMRSwgZmN2YWx1ZSwgRmNGYWxzZSk7CisKKyAgICBmY3ZhbHVlLnR5 cGUgPSBGY1R5cGVJbnRlZ2VyOworICAgIGZjdmFsdWUudS5pID0gKGRlc2NyaXB0aW9uLndlaWdo dCgpID49IEZvbnRXZWlnaHRCb2xkKSA/IEZDX1dFSUdIVF9CT0xEIDogRkNfV0VJR0hUX05PUk1B TDsKKyAgICBGY1BhdHRlcm5BZGQocGF0dGVybiwgRkNfV0VJR0hULCBmY3ZhbHVlLCBGY0ZhbHNl KTsKKworICAgIGZjdmFsdWUudHlwZSA9IEZjVHlwZUludGVnZXI7CisgICAgZmN2YWx1ZS51Lmkg PSAoZGVzY3JpcHRpb24uaXRhbGljKCkgPT0gRm9udEl0YWxpY09uKSA/IEZDX1NMQU5UX0lUQUxJ QyA6IEZDX1NMQU5UX1JPTUFOOworICAgIEZjUGF0dGVybkFkZChwYXR0ZXJuLCBGQ19TTEFOVCwg ZmN2YWx1ZSwgRmNGYWxzZSk7CisKKyAgICBGY0NvbmZpZ1N1YnN0aXR1dGUoMCwgcGF0dGVybiwg RmNNYXRjaFBhdHRlcm4pOworICAgIEZjRGVmYXVsdFN1YnN0aXR1dGUocGF0dGVybik7CisKKyAg ICBGY1Jlc3VsdCByZXN1bHQ7CisgICAgRmNGb250U2V0KiBmb250U2V0ID0gRmNGb250U29ydCgw LCBwYXR0ZXJuLCAwLCAwLCAmcmVzdWx0KTsKKyAgICBGY1BhdHRlcm5EZXN0cm95KHBhdHRlcm4p OworICAgIEZjQ2hhclNldERlc3Ryb3koY3NldCk7CisKKyAgICBpZiAoIWZvbnRTZXQpIHsKKyAg ICAgICAgZmFtaWx5LT5uYW1lID0gU3RyaW5nKCk7CisgICAgICAgIGZhbWlseS0+aXNCb2xkID0g ZmFsc2U7CisgICAgICAgIGZhbWlseS0+aXNJdGFsaWMgPSBmYWxzZTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIC8vIE9sZGVyIHZlcnNpb25zIG9mIGZvbnRjb25maWcgaGF2ZSBhIGJ1 ZyB3aGVyZSB0aGV5IGNhbm5vdCBzZWxlY3QKKyAgICAvLyBvbmx5IHNjYWxhYmxlIGZvbnRzIHNv IHdlIGhhdmUgdG8gbWFudWFsbHkgZmlsdGVyIHRoZSByZXN1bHRzLgorICAgIGZvciAoaW50IGkg PSAwOyBpIDwgZm9udFNldC0+bmZvbnQ7ICsraSkgeworICAgICAgICBGY1BhdHRlcm4qIGN1cnJl bnQgPSBmb250U2V0LT5mb250c1tpXTsKKyAgICAgICAgRmNCb29sIGlzU2NhbGFibGU7CisKKyAg ICAgICAgaWYgKEZjUGF0dGVybkdldEJvb2woY3VycmVudCwgRkNfU0NBTEFCTEUsIDAsICZpc1Nj YWxhYmxlKSAhPSBGY1Jlc3VsdE1hdGNoCisgICAgICAgICAgICB8fCAhaXNTY2FsYWJsZSkKKyAg ICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIC8vIGZvbnRjb25maWcgY2FuIGFsc28gcmV0 dXJuIGZvbnRzIHdoaWNoIGFyZSB1bnJlYWRhYmxlCisgICAgICAgIEZjQ2hhcjgqIGNGaWxlbmFt ZTsKKyAgICAgICAgaWYgKEZjUGF0dGVybkdldFN0cmluZyhjdXJyZW50LCBGQ19GSUxFLCAwLCAm Y0ZpbGVuYW1lKSAhPSBGY1Jlc3VsdE1hdGNoKQorICAgICAgICAgICAgY29udGludWU7CisKKyAg ICAgICAgaWYgKGFjY2VzcyhyZWludGVycHJldF9jYXN0PGNoYXIqPihjRmlsZW5hbWUpLCBSX09L KSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIEZjQ2hhcjgqIGZhbWlseU5hbWU7 CisgICAgICAgIGlmIChGY1BhdHRlcm5HZXRTdHJpbmcoY3VycmVudCwgRkNfRkFNSUxZLCAwLCAm ZmFtaWx5TmFtZSkgPT0gRmNSZXN1bHRNYXRjaCkgeworICAgICAgICAgICAgY29uc3QgY2hhciog Y2hhckZhbWlseSA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGZhbWlseU5hbWUpOworICAgICAg ICAgICAgZmFtaWx5LT5uYW1lID0gU3RyaW5nOjpmcm9tVVRGOChjaGFyRmFtaWx5LCBzdHJsZW4o Y2hhckZhbWlseSkpOworICAgICAgICB9CisKKyAgICAgICAgaW50IHdlaWdodDsKKyAgICAgICAg aWYgKEZjUGF0dGVybkdldEludGVnZXIoY3VycmVudCwgRkNfV0VJR0hULCAwLCAmd2VpZ2h0KSA9 PSBGY1Jlc3VsdE1hdGNoKQorICAgICAgICAgICAgZmFtaWx5LT5pc0JvbGQgPSB3ZWlnaHQgPj0g RkNfV0VJR0hUX0JPTEQ7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGZhbWlseS0+aXNCb2xk ID0gZmFsc2U7CisKKyAgICAgICAgaW50IHNsYW50OworICAgICAgICBpZiAoRmNQYXR0ZXJuR2V0 SW50ZWdlcihjdXJyZW50LCBGQ19TTEFOVCwgMCwgJnNsYW50KSA9PSBGY1Jlc3VsdE1hdGNoKQor ICAgICAgICAgICAgZmFtaWx5LT5pc0l0YWxpYyA9IHNsYW50ICE9IEZDX1NMQU5UX1JPTUFOOwor ICAgICAgICBlbHNlCisgICAgICAgICAgICBmYW1pbHktPmlzSXRhbGljID0gZmFsc2U7CisKKyAg ICAgICAgRmNGb250U2V0RGVzdHJveShmb250U2V0KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIEZjRm9udFNldERlc3Ryb3koZm9udFNldCk7Cit9CisKIFBhc3NSZWZQdHI8U2ltcGxl Rm9udERhdGE+IEZvbnRDYWNoZTo6Z2V0Rm9udERhdGFGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnQm IGZvbnQsIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBpbnQgbGVuZ3RoKQogewogICAgIGljdTo6 TG9jYWxlIGxvY2FsZSA9IGljdTo6TG9jYWxlOjpnZXREZWZhdWx0KCk7Ci0gICAgUGxhdGZvcm1T dXBwb3J0OjpGb250RmFtaWx5IGZhbWlseTsKLSAgICBQbGF0Zm9ybVN1cHBvcnQ6OmdldEZvbnRG YW1pbHlGb3JDaGFyYWN0ZXJzKGNoYXJhY3RlcnMsIGxlbmd0aCwgbG9jYWxlLmdldExhbmd1YWdl KCksIGZvbnQuZm9udERlc2NyaXB0aW9uKCksICZmYW1pbHkpOworICAgIEZvbnRDYWNoZTo6U2lt cGxlRm9udEZhbWlseSBmYW1pbHk7CisgICAgRm9udENhY2hlOjpnZXRGb250RmFtaWx5Rm9yQ2hh cmFjdGVycyhjaGFyYWN0ZXJzLCBsZW5ndGgsIGxvY2FsZS5nZXRMYW5ndWFnZSgpLCBmb250LmZv bnREZXNjcmlwdGlvbigpLCAmZmFtaWx5KTsKICAgICBpZiAoZmFtaWx5Lm5hbWUuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbGF0Zm9ybVN1cHBvcnQuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbGF0Zm9ybVN1cHBvcnQuY3BwCmRlbGV0 ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBkYTU5NDY4Li4wMDAwMDAwCi0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGxhdGZvcm1TdXBwb3J0LmNwcAor KysgL2Rldi9udWxsCkBAIC0xLDEzNSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChjKSAyMDA5 LTIwMTAsIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMp IDIwMTEsIDIwMTIsIDIwMTMgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCi0gKiBtZXQ6Ci0g KgotICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKLSAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKLSAqIGNvcHlyaWdodCBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKLSAq IGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUKLSAqIGRpc3RyaWJ1dGlvbi4KLSAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29v Z2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKLSAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNl ZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCi0gKiB0aGlzIHNv ZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgotICoKLSAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBD T05UUklCVVRPUlMKLSAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UCi0gKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKLSAqIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hU Ci0gKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwKLSAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKLSAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAotICogREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZCi0gKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSAqIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0g Ki8KLQotI2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgot Ci0jaW5jbHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCi0KLSNpbmNsdWRlIDxmb250Y29uZmlnL2Zv bnRjb25maWcuaD4KLSNpbmNsdWRlIDxzdHJpbmcuaD4KLSNpbmNsdWRlIDx1bmljb2RlL3V0ZjE2 Lmg+Ci0jaW5jbHVkZSA8dW5pc3RkLmg+Ci0jaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgot Ci1uYW1lc3BhY2UgV2ViQ29yZSB7Ci0KLXZvaWQgUGxhdGZvcm1TdXBwb3J0OjpnZXRGb250RmFt aWx5Rm9yQ2hhcmFjdGVycyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJh Y3RlcnMsIGNvbnN0IGNoYXIqLCBjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBG b250RmFtaWx5KiBmYW1pbHkpCi17Ci0gICAgRmNDaGFyU2V0KiBjc2V0ID0gRmNDaGFyU2V0Q3Jl YXRlKCk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1DaGFyYWN0ZXJzOyArK2kpIHsK LSAgICAgICAgaWYgKFUxNl9JU19TVVJST0dBVEUoY2hhcmFjdGVyc1tpXSkKLSAgICAgICAgICAg ICYmIFUxNl9JU19TVVJST0dBVEVfTEVBRChjaGFyYWN0ZXJzW2ldKQotICAgICAgICAgICAgJiYg aSAhPSBudW1DaGFyYWN0ZXJzIC0gMQotICAgICAgICAgICAgJiYgVTE2X0lTX1RSQUlMKGNoYXJh Y3RlcnNbaSArIDFdKSkgewotICAgICAgICAgICAgRmNDaGFyU2V0QWRkQ2hhcihjc2V0LCBVMTZf R0VUX1NVUFBMRU1FTlRBUlkoY2hhcmFjdGVyc1tpXSwgY2hhcmFjdGVyc1tpKzFdKSk7Ci0gICAg ICAgICAgICBpKys7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgRmNDaGFyU2V0QWRkQ2hh cihjc2V0LCBjaGFyYWN0ZXJzW2ldKTsKLSAgICB9Ci0gICAgRmNQYXR0ZXJuKiBwYXR0ZXJuID0g RmNQYXR0ZXJuQ3JlYXRlKCk7Ci0KLSAgICBGY1ZhbHVlIGZjdmFsdWU7Ci0gICAgZmN2YWx1ZS50 eXBlID0gRmNUeXBlQ2hhclNldDsKLSAgICBmY3ZhbHVlLnUuYyA9IGNzZXQ7Ci0gICAgRmNQYXR0 ZXJuQWRkKHBhdHRlcm4sIEZDX0NIQVJTRVQsIGZjdmFsdWUsIEZjRmFsc2UpOwotCi0gICAgZmN2 YWx1ZS50eXBlID0gRmNUeXBlQm9vbDsKLSAgICBmY3ZhbHVlLnUuYiA9IEZjVHJ1ZTsKLSAgICBG Y1BhdHRlcm5BZGQocGF0dGVybiwgRkNfU0NBTEFCTEUsIGZjdmFsdWUsIEZjRmFsc2UpOwotCi0g ICAgZmN2YWx1ZS50eXBlID0gRmNUeXBlSW50ZWdlcjsKLSAgICBmY3ZhbHVlLnUuaSA9IChkZXNj cmlwdGlvbi53ZWlnaHQoKSA+PSBGb250V2VpZ2h0Qm9sZCkgPyBGQ19XRUlHSFRfQk9MRCA6IEZD X1dFSUdIVF9OT1JNQUw7Ci0gICAgRmNQYXR0ZXJuQWRkKHBhdHRlcm4sIEZDX1dFSUdIVCwgZmN2 YWx1ZSwgRmNGYWxzZSk7Ci0KLSAgICBmY3ZhbHVlLnR5cGUgPSBGY1R5cGVJbnRlZ2VyOwotICAg IGZjdmFsdWUudS5pID0gKGRlc2NyaXB0aW9uLml0YWxpYygpID09IEZvbnRJdGFsaWNPbikgPyBG Q19TTEFOVF9JVEFMSUMgOiBGQ19TTEFOVF9ST01BTjsKLSAgICBGY1BhdHRlcm5BZGQocGF0dGVy biwgRkNfU0xBTlQsIGZjdmFsdWUsIEZjRmFsc2UpOwotCi0gICAgRmNDb25maWdTdWJzdGl0dXRl KDAsIHBhdHRlcm4sIEZjTWF0Y2hQYXR0ZXJuKTsKLSAgICBGY0RlZmF1bHRTdWJzdGl0dXRlKHBh dHRlcm4pOwotCi0gICAgRmNSZXN1bHQgcmVzdWx0OwotICAgIEZjRm9udFNldCogZm9udFNldCA9 IEZjRm9udFNvcnQoMCwgcGF0dGVybiwgMCwgMCwgJnJlc3VsdCk7Ci0gICAgRmNQYXR0ZXJuRGVz dHJveShwYXR0ZXJuKTsKLSAgICBGY0NoYXJTZXREZXN0cm95KGNzZXQpOwotCi0gICAgaWYgKCFm b250U2V0KSB7Ci0gICAgICAgIGZhbWlseS0+bmFtZSA9IFN0cmluZygpOwotICAgICAgICBmYW1p bHktPmlzQm9sZCA9IGZhbHNlOwotICAgICAgICBmYW1pbHktPmlzSXRhbGljID0gZmFsc2U7Ci0g ICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICAvLyBPbGRlciB2ZXJzaW9ucyBvZiBmb250Y29u ZmlnIGhhdmUgYSBidWcgd2hlcmUgdGhleSBjYW5ub3Qgc2VsZWN0Ci0gICAgLy8gb25seSBzY2Fs YWJsZSBmb250cyBzbyB3ZSBoYXZlIHRvIG1hbnVhbGx5IGZpbHRlciB0aGUgcmVzdWx0cy4KLSAg ICBmb3IgKGludCBpID0gMDsgaSA8IGZvbnRTZXQtPm5mb250OyArK2kpIHsKLSAgICAgICAgRmNQ YXR0ZXJuKiBjdXJyZW50ID0gZm9udFNldC0+Zm9udHNbaV07Ci0gICAgICAgIEZjQm9vbCBpc1Nj YWxhYmxlOwotCi0gICAgICAgIGlmIChGY1BhdHRlcm5HZXRCb29sKGN1cnJlbnQsIEZDX1NDQUxB QkxFLCAwLCAmaXNTY2FsYWJsZSkgIT0gRmNSZXN1bHRNYXRjaAotICAgICAgICAgICAgfHwgIWlz U2NhbGFibGUpCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAvLyBmb250Y29uZmln IGNhbiBhbHNvIHJldHVybiBmb250cyB3aGljaCBhcmUgdW5yZWFkYWJsZQotICAgICAgICBGY0No YXI4KiBjRmlsZW5hbWU7Ci0gICAgICAgIGlmIChGY1BhdHRlcm5HZXRTdHJpbmcoY3VycmVudCwg RkNfRklMRSwgMCwgJmNGaWxlbmFtZSkgIT0gRmNSZXN1bHRNYXRjaCkKLSAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgIGlmIChhY2Nlc3MocmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oY0Zp bGVuYW1lKSwgUl9PSykpCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBGY0NoYXI4 KiBmYW1pbHlOYW1lOwotICAgICAgICBpZiAoRmNQYXR0ZXJuR2V0U3RyaW5nKGN1cnJlbnQsIEZD X0ZBTUlMWSwgMCwgJmZhbWlseU5hbWUpID09IEZjUmVzdWx0TWF0Y2gpIHsKLSAgICAgICAgICAg IGNvbnN0IGNoYXIqIGNoYXJGYW1pbHkgPSByZWludGVycHJldF9jYXN0PGNoYXIqPihmYW1pbHlO YW1lKTsKLSAgICAgICAgICAgIGZhbWlseS0+bmFtZSA9IFN0cmluZzo6ZnJvbVVURjgoY2hhckZh bWlseSwgc3RybGVuKGNoYXJGYW1pbHkpKTsKLSAgICAgICAgfQotCi0gICAgICAgIGludCB3ZWln aHQ7Ci0gICAgICAgIGlmIChGY1BhdHRlcm5HZXRJbnRlZ2VyKGN1cnJlbnQsIEZDX1dFSUdIVCwg MCwgJndlaWdodCkgPT0gRmNSZXN1bHRNYXRjaCkKLSAgICAgICAgICAgIGZhbWlseS0+aXNCb2xk ID0gd2VpZ2h0ID49IEZDX1dFSUdIVF9CT0xEOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBm YW1pbHktPmlzQm9sZCA9IGZhbHNlOwotCi0gICAgICAgIGludCBzbGFudDsKLSAgICAgICAgaWYg KEZjUGF0dGVybkdldEludGVnZXIoY3VycmVudCwgRkNfU0xBTlQsIDAsICZzbGFudCkgPT0gRmNS ZXN1bHRNYXRjaCkKLSAgICAgICAgICAgIGZhbWlseS0+aXNJdGFsaWMgPSBzbGFudCAhPSBGQ19T TEFOVF9ST01BTjsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgZmFtaWx5LT5pc0l0YWxpYyA9 IGZhbHNlOwotCi0gICAgICAgIEZjRm9udFNldERlc3Ryb3koZm9udFNldCk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9Ci0KLSAgICBGY0ZvbnRTZXREZXN0cm95KGZvbnRTZXQpOwotfQotCi19OyAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYmxhY2tiZXJyeS9QbGF0Zm9ybVN1cHBvcnQuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGxhdGZvcm1TdXBwb3J0LmgKZGVsZXRlZCBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDkxNjZlYTQuLjAwMDAwMDAKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QbGF0Zm9ybVN1cHBvcnQuaAorKysgL2Rldi9u dWxsCkBAIC0xLDU1ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKGMpIDIwMTAsIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKGMpIDIwMTEsIFJlc2VhcmNo IEluIE1vdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucyBhcmUKLSAqIG1ldDoKLSAqCi0gKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291 cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotICogbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogICAg ICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZQotICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lcgotICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVy IG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQotICogZGlzdHJpYnV0aW9uLgotICogICAgICog TmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cwotICog Y29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBk ZXJpdmVkIGZyb20KLSAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0 dGVuIHBlcm1pc3Npb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUg Q09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwotICogIkFTIElTIiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSAqIExJTUlU RUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUgotICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVW RU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKLSAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAotICogU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAotICog TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsCi0gKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKLSAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaWZuZGVmIFBsYXRmb3JtU3VwcG9ydF9oCi0j ZGVmaW5lIFBsYXRmb3JtU3VwcG9ydF9oCi0KLSNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1zdHJ1Y3QgRm9udFJlbmRlclN0eWxlOwotY2xh c3MgRm9udERlc2NyaXB0aW9uOwotCi0vLyBUaGlzIGlzIGEgbWluaW1hbCB2ZXJzaW9uIG9mIHRo ZSBDaHJvbWl1bSBQbGF0Zm9ybVN1cHBvcnQvV2ViRm9udEluZm8gY2xhc3NlcyB1c2VkIGZvciBm b250IHN1cHBvcnQuCi1jbGFzcyBQbGF0Zm9ybVN1cHBvcnQgewotcHVibGljOgotICAgIHN0cnVj dCBGb250RmFtaWx5IHsKLSAgICAgICAgU3RyaW5nIG5hbWU7Ci0gICAgICAgIGJvb2wgaXNCb2xk OwotICAgICAgICBib29sIGlzSXRhbGljOwotICAgIH07Ci0gICAgc3RhdGljIHZvaWQgZ2V0Rm9u dEZhbWlseUZvckNoYXJhY3RlcnMoY29uc3QgVUNoYXIqLCBzaXplX3QgbnVtQ2hhcmFjdGVycywg Y29uc3QgY2hhciogcHJlZmVycmVkTG9jYWxlLCBjb25zdCBGb250RGVzY3JpcHRpb24mLCBGb250 RmFtaWx5Kik7Ci19OwotCi19IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0KLSNlbmRpZgo=