137905 2014-10-20 18:19:38 -0700 Use std::unique_ptr | std::make_unique in FontCacheFoo 2014-11-23 18:25:59 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128007 1 gyuyoung.kim gyuyoung.kim commit-queue mmaxfield thorton oldest_to_newest 1043051 0 gyuyoung.kim 2014-10-20 18:19:38 -0700 SSIA 1043057 1 240171 gyuyoung.kim 2014-10-20 18:43:26 -0700 Created attachment 240171 Patch 1043058 2 commit-queue 2014-10-20 18:44:12 -0700 Attachment 240171 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/mac/FontCacheMac.mm:243: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1043066 3 240171 darin 2014-10-20 18:58:13 -0700 Comment on attachment 240171 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240171&action=review > Source/WebCore/platform/graphics/mac/ComplexTextController.cpp:87 > +std::unique_ptr<TextLayout> Font::createLayout(RenderText* text, float xPos, bool collapseWhiteSpace) const Need to update this in Font.h too. > Source/WebCore/platform/graphics/mac/ComplexTextController.cpp:91 > + return std::make_unique<TextLayout>(text, *this, xPos)); Extra end parenthesis on this line. > Source/WebCore/platform/graphics/mac/FontCacheMac.mm:243 > + auto platformData = std::make_unique<FontPlatformData>(platformFont, size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant())); > + return platformData; No need for a local variable here. Just return make_unique. 1043089 4 240181 gyuyoung.kim 2014-10-20 20:44:12 -0700 Created attachment 240181 Patch 1043091 5 gyuyoung.kim 2014-10-20 20:47:29 -0700 (In reply to comment #3) > Comment on attachment 240171 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240171&action=review > > > Source/WebCore/platform/graphics/mac/ComplexTextController.cpp:87 > > +std::unique_ptr<TextLayout> Font::createLayout(RenderText* text, float xPos, bool collapseWhiteSpace) const > > Need to update this in Font.h too. It is hard to touch createLayout() in this patch, because Font::createLayout() of Font.cpp generates build error as below, std::unique_ptr<TextLayout> Font::createLayout(RenderText*, float, bool) const { return nullptr; } /platform/graphics/Font.cpp.o -c ../../Source/WebCore/platform/graphics/Font.cpp In file included from /usr/include/c++/4.8/memory:81:0, from ../../Source/WTF/wtf/StdLibExtras.h:31, from ../../Source/WTF/wtf/FastMalloc.h:27, from ../../Source/WebCore/config.h:75, from ../../Source/WebCore/platform/graphics/Font.cpp:24: /usr/include/c++/4.8/bits/unique_ptr.h: In instantiation of ‘void std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = WebCore::TextLayout]’: /usr/include/c++/4.8/bits/unique_ptr.h:184:16: required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = WebCore::TextLayout; _Dp = std::default_delete<WebCore::TextLayout>]’ /usr/include/c++/4.8/bits/unique_ptr.h:157:61: required from ‘constexpr std::unique_ptr<_Tp, _Dp>::unique_ptr(std::nullptr_t) [with _Tp = WebCore::TextLayout; _Dp = std::default_delete<WebCore::TextLayout>; std::nullptr_t = std::nullptr_t]’ ../../Source/WebCore/platform/graphics/Font.cpp:420:12: required from here /usr/include/c++/4.8/bits/unique_ptr.h:65:22: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::TextLayout’ static_assert(sizeof(_Tp)>0, I would like to handle createLayout() in new bug. > > Source/WebCore/platform/graphics/mac/ComplexTextController.cpp:91 > > + return std::make_unique<TextLayout>(text, *this, xPos)); > > Extra end parenthesis on this line. > > > Source/WebCore/platform/graphics/mac/FontCacheMac.mm:243 > > + auto platformData = std::make_unique<FontPlatformData>(platformFont, size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant())); > > + return platformData; > > No need for a local variable here. Just return make_unique. I'm sorry, I missed to love mac port files. 1043097 6 240183 gyuyoung.kim 2014-10-20 21:30:33 -0700 Created attachment 240183 Patch 1043183 7 240183 darin 2014-10-21 08:45:30 -0700 Comment on attachment 240183 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240183&action=review > Source/WebCore/platform/graphics/win/FontCacheWin.cpp:589 > + result = nullptr; Wait, I didn’t notice. This line of code is not needed and can just be omitted. 1043308 8 240229 gyuyoung.kim 2014-10-21 16:54:31 -0700 Created attachment 240229 Patch for landing 1043309 9 gyuyoung.kim 2014-10-21 16:55:23 -0700 (In reply to comment #7) > Comment on attachment 240183 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240183&action=review > > > Source/WebCore/platform/graphics/win/FontCacheWin.cpp:589 > > + result = nullptr; > > Wait, I didn’t notice. This line of code is not needed and can just be > omitted. Ok, removed it. 1043335 10 240229 commit-queue 2014-10-21 18:53:05 -0700 Comment on attachment 240229 Patch for landing Clearing flags on attachment: 240229 Committed r175013: <http://trac.webkit.org/changeset/175013> 1043336 11 commit-queue 2014-10-21 18:53:09 -0700 All reviewed patches have been landed. Closing bug. 1043345 12 thorton 2014-10-21 19:57:24 -0700 Hopeful iOS build fix in http://trac.webkit.org/changeset/175017. 1043353 13 gyuyoung.kim 2014-10-21 20:44:09 -0700 (In reply to comment #12) > Hopeful iOS build fix in http://trac.webkit.org/changeset/175017. Oops, thank you for fixing it. 240171 2014-10-20 18:43:26 -0700 2014-10-20 20:44:04 -0700 Patch bug-137905-20141021104331.patch text/plain 11574 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM0MzE2MWEzNGQ4Nzcy MjM1NjNiMjBmYzc1YjdjNDE1YzYxZDk3MC4uY2I4ZDEyNTMwNjJiZTllNWRkN2JkODRiMWZiNmFi ZWVkOWFlMWFlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE0LTEwLTIwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0ciB8IHN0ZDo6bWFrZV91bmlxdWUgaW4gRm9udENhY2hlRm9vCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MDUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCBQYXNzT3duUHRy fE93blB0ciB1c2luZyBzdGQ6OnVuaXF1ZV9wdHJ8c3RkOjptYWtlX3VuaXF1ZS4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpn ZXRDYWNoZWRGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2Fj aGVGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQ bGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURh dGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6Y3JlYXRlTGF5b3V0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tOgorICAgICAgICAoV2ViQ29y ZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRD YWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YSk6CisKKzIwMTQtMTAtMjAgIEd5dXlvdW5nIEtp bSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KKwogICAgICAgICBVc2Ugc3RkOjp1bmlxdWVf cHRyPD58bWFrZV91bmlxdWU8PiBpbiBQbHVnaW5WaWV3OjpzY2hlZHVsZVJlcXVlc3QoKQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3ODc0CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCmluZGV4IDRj NjVlYjc5OTgyZjk4NDFjMTVlNDljMGJmNmNmMDI0YTJhYjM4MTEuLmIyMjFmZDA5ZjU4YTY4ODFh MWRmZGU5NmNmZWY0ZTYwODY2YTg0YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udENhY2hlLmNwcApAQCAtMTQxLDcgKzE0MSw3IEBAIHN0cnVjdCBGb250UGxh dGZvcm1EYXRhQ2FjaGVLZXlIYXNoIHsKIAogc3RydWN0IEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtl eVRyYWl0cyA6IFdURjo6U2ltcGxlQ2xhc3NIYXNoVHJhaXRzPEZvbnRQbGF0Zm9ybURhdGFDYWNo ZUtleT4geyB9OwogCi10eXBlZGVmIEhhc2hNYXA8Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5LCBP d25QdHI8Rm9udFBsYXRmb3JtRGF0YT4sIEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleUhhc2gsIEZv bnRQbGF0Zm9ybURhdGFDYWNoZUtleVRyYWl0cz4gRm9udFBsYXRmb3JtRGF0YUNhY2hlOwordHlw ZWRlZiBIYXNoTWFwPEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleSwgc3RkOjp1bmlxdWVfcHRyPEZv bnRQbGF0Zm9ybURhdGE+LCBGb250UGxhdGZvcm1EYXRhQ2FjaGVLZXlIYXNoLCBGb250UGxhdGZv cm1EYXRhQ2FjaGVLZXlUcmFpdHM+IEZvbnRQbGF0Zm9ybURhdGFDYWNoZTsKIAogc3RhdGljIEZv bnRQbGF0Zm9ybURhdGFDYWNoZSogZ0ZvbnRQbGF0Zm9ybURhdGFDYWNoZSA9IDA7CiAKQEAgLTI1 Nyw3ICsyNTcsNyBAQCBGb250UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmdldENhY2hlZEZvbnRQ bGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmbwogICAgICAgICAgICAgICAgIGl0 ID0gZ0ZvbnRQbGF0Zm9ybURhdGFDYWNoZS0+ZmluZChrZXkpOwogICAgICAgICAgICAgICAgIEFT U0VSVChpdCAhPSBnRm9udFBsYXRmb3JtRGF0YUNhY2hlLT5lbmQoKSk7CiAgICAgICAgICAgICAg ICAgaWYgKGZvbnRQbGF0Zm9ybURhdGFGb3JBbHRlcm5hdGVOYW1lKQotICAgICAgICAgICAgICAg ICAgICBpdC0+dmFsdWUgPSBhZG9wdFB0cihuZXcgRm9udFBsYXRmb3JtRGF0YSgqZm9udFBsYXRm b3JtRGF0YUZvckFsdGVybmF0ZU5hbWUpKTsKKyAgICAgICAgICAgICAgICAgICAgaXQtPnZhbHVl ID0gc3RkOjptYWtlX3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPigqZm9udFBsYXRmb3JtRGF0YUZv ckFsdGVybmF0ZU5hbWUpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAppbmRleCA0YmM5ZGZhMTAz NGQ1ZTlkMDQ2ZTNjMzVkZThlOGRkYWM1YmJlZWY0Li43YjBlYjdiMTZiMWYxYTJjZGZlYTQ4ZmI5 MGY4MTY1ZWNmZDVhYzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9Gb250Q2FjaGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FjaGUuaApAQCAtMTg1LDcgKzE4NSw3IEBAIHByaXZhdGU6CiAgICAgRm9udFBsYXRmb3Jt RGF0YSogZ2V0Q3VzdG9tRmFsbGJhY2tGb250KGNvbnN0IFVJbnQzMiwgY29uc3QgRm9udERlc2Ny aXB0aW9uJik7CiAgICAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gZ2V0U3lzdGVtRm9udEZh bGxiYWNrRm9yQ2hhcmFjdGVycyhjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBTaW1wbGVG b250RGF0YSosIGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBpbnQgbGVuZ3RoKTsKICNlbmRpZgot ICAgIFBhc3NPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gY3JlYXRlRm9udFBsYXRmb3JtRGF0YShj b25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSk7CisgICAg c3RkOjp1bmlxdWVfcHRyPEZvbnRQbGF0Zm9ybURhdGE+IGNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEo Y29uc3QgRm9udERlc2NyaXB0aW9uJiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpOwogI2lm IFBMQVRGT1JNKENPQ09BKQogICAgIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IHNpbWlsYXJG b250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYpOwogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVG cmVlVHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9G b250Q2FjaGVGcmVlVHlwZS5jcHAKaW5kZXggY2QyNWY3ZDczOWI2OWUzNmM4YjZhNWMwZGI0MzAy OWZjMzlkYjY5Ni4uZjljODE3NTYxNDQ2NTY4ZjNiZWYzMzllZDZhY2EyYjIyNzllY2IwYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udENh Y2hlRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcApAQCAtMTY0LDcgKzE2NCw3IEBAIGludCBmb250 V2VpZ2h0VG9Gb250Y29uZmlnV2VpZ2h0KEZvbnRXZWlnaHQgd2VpZ2h0KQogICAgIH0KIH0KIAot UGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9y bURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21p Y1N0cmluZyYgZmFtaWx5KQorc3RkOjp1bmlxdWVfcHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRD YWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnRE ZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCiB7CiAgICAgLy8gVGhlIENT UyBmb250IG1hdGNoaW5nIGFsZ29yaXRobSAoaHR0cDovL3d3dy53My5vcmcvVFIvY3NzMy1mb250 cy8jZm9udC1tYXRjaGluZy1hbGdvcml0aG0pCiAgICAgLy8gc2F5cyB0aGF0IHdlIG11c3QgZmlu ZCBhbiBleGFjdCBtYXRjaCBmb3IgZm9udCBmYW1pbHksIHNsYW50IChpdGFsaWMgb3Igb2JsaXF1 ZSBjYW4gYmUgdXNlZCkKQEAgLTIxNSwxMSArMjE1LDExIEBAIFBhc3NPd25QdHI8Rm9udFBsYXRm b3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNj cmlwCiAgICAgLy8gVmVyaWZ5IHRoYXQgdGhpcyBmb250IGhhcyBhbiBlbmNvZGluZyBjb21wYXRp YmxlIHdpdGggRm9udGNvbmZpZy4gRm9udGNvbmZpZyBjdXJyZW50bHkKICAgICAvLyBzdXBwb3J0 cyB0aHJlZSBlbmNvZGluZ3MgaW4gRmNGcmVlVHlwZUNoYXJJbmRleDogVW5pY29kZSwgU3ltYm9s IGFuZCBBcHBsZVJvbWFuLgogICAgIC8vIElmIHRoaXMgZm9udCBkb2Vzbid0IGhhdmUgb25lIG9m IHRoZXNlIHRocmVlIGVuY29kaW5ncywgZG9uJ3Qgc2VsZWN0IGl0LgotICAgIE93blB0cjxGb250 UGxhdGZvcm1EYXRhPiBwbGF0Zm9ybURhdGEgPSBhZG9wdFB0cihuZXcgRm9udFBsYXRmb3JtRGF0 YShyZXN1bHRQYXR0ZXJuLmdldCgpLCBmb250RGVzY3JpcHRpb24pKTsKKyAgICBhdXRvIHBsYXRm b3JtRGF0YSA9IHN0ZDo6bWFrZV91bmlxdWU8Rm9udFBsYXRmb3JtRGF0YT4ocmVzdWx0UGF0dGVy bi5nZXQoKSwgZm9udERlc2NyaXB0aW9uKTsKICAgICBpZiAoIXBsYXRmb3JtRGF0YS0+aGFzQ29t cGF0aWJsZUNoYXJtYXAoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICByZXR1cm4g cGxhdGZvcm1EYXRhLnJlbGVhc2UoKTsKKyAgICByZXR1cm4gcGxhdGZvcm1EYXRhOwogfQogCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENh Y2hlSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNo ZUlPUy5tbQppbmRleCA0ZmI4NDViOGJlNzI0NjE0MTMzNTM2YzM5MTljMzM0ZTEwYzg2MmU1Li4y OTUwZDAzM2ZjNjA5ZTFmMjZkNmUxNWE3YzI2Y2YyZDg1NDI3MTQyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9TLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1MubW0KQEAgLTYy MSw3ICs2MjEsNyBAQCBzdGF0aWMgdWludDE2X3QgdG9DVEZvbnRXZWlnaHQoRm9udFdlaWdodCBm b250V2VpZ2h0KQogICAgIH0KIH0KIAotUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBGb250 Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250 RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KQorc3RkOjp1bmlxdWVfcHRy PEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25z dCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBm YW1pbHkpCiB7CiAgICAgLy8gU3BlY2lhbCBjYXNlIGZvciAiQ291cmllciIgZm9udC4gV2UgdXNl ZCB0byBoYXZlIG9ubHkgYW4gb2JsaXF1ZSB2YXJpYW50IG9uIGlPUywgc28gcHJpb3IgdG8KICAg ICAvLyBpT1MgNi4wLCB3ZSBkaXNhbGxvd2VkIGl0cyB1c2UgaGVyZS4gV2UnbGwgZmFsbCBiYWNr IG9uICJDb3VyaWVyIE5ldyIuIDxyZGFyOi8vcHJvYmxlbS81MTE2NDc3JjEwODUwMjI3PgpAQCAt NjU0LDcgKzY1NCw3IEBAIFBhc3NPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpj cmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwCiAgICAgYm9vbCBzeW50aGV0 aWNCb2xkID0gKHRyYWl0cyAmIGtDVEZvbnRUcmFpdEJvbGQpICYmICEoYWN0dWFsVHJhaXRzICYg a0NURm9udFRyYWl0Qm9sZCkgJiYgIWlzQXBwbGVDb2xvckVtb2ppOwogICAgIGJvb2wgc3ludGhl dGljT2JsaXF1ZSA9ICh0cmFpdHMgJiBrQ1RGb250VHJhaXRJdGFsaWMpICYmICEoYWN0dWFsVHJh aXRzICYga0NURm9udFRyYWl0SXRhbGljKSAmJiAhaXNBcHBsZUNvbG9yRW1vamk7CiAKLSAgICBG b250UGxhdGZvcm1EYXRhKiByZXN1bHQgPSBuZXcgRm9udFBsYXRmb3JtRGF0YShjdEZvbnQuZ2V0 KCksIHNpemUsIGZvbnREZXNjcmlwdGlvbi51c2VQcmludGVyRm9udCgpLCBzeW50aGV0aWNCb2xk LCBzeW50aGV0aWNPYmxpcXVlLCBmb250RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSwgZm9udERl c2NyaXB0aW9uLndpZHRoVmFyaWFudCgpKTsKKyAgICBhdXRvKiByZXN1bHQgPSBzdGQ6Om1ha2Vf dW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KGN0Rm9udC5nZXQoKSwgc2l6ZSwgZm9udERlc2NyaXB0 aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWUsIGZv bnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBmb250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50 KCkpOwogICAgIGlmIChpc0FwcGxlQ29sb3JFbW9qaSkKICAgICAgICAgcmVzdWx0LT5tX2lzRW1v amkgPSB0cnVlOwogICAgIHJldHVybiBhZG9wdFB0cihyZXN1bHQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250 cm9sbGVyLmNwcAppbmRleCA1ZWJkNDNlNzgzMzFiYjA1MzZlNGY4NWY5ZmUzNTA3YTUwZGNmMDE3 Li5mMmIwMTRhNzU4ZGZkYjQ3YTM2MTU0NzVkNjdhYjlkZTFhZjA1Y2QwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRl eHRDb250cm9sbGVyLmNwcApAQCAtODQsMTEgKzg0LDExIEBAIHByaXZhdGU6CiAgICAgc3RkOjp1 bmlxdWVfcHRyPENvbXBsZXhUZXh0Q29udHJvbGxlcj4gbV9jb250cm9sbGVyOwogfTsKIAotUGFz c093blB0cjxUZXh0TGF5b3V0PiBGb250OjpjcmVhdGVMYXlvdXQoUmVuZGVyVGV4dCogdGV4dCwg ZmxvYXQgeFBvcywgYm9vbCBjb2xsYXBzZVdoaXRlU3BhY2UpIGNvbnN0CitzdGQ6OnVuaXF1ZV9w dHI8VGV4dExheW91dD4gRm9udDo6Y3JlYXRlTGF5b3V0KFJlbmRlclRleHQqIHRleHQsIGZsb2F0 IHhQb3MsIGJvb2wgY29sbGFwc2VXaGl0ZVNwYWNlKSBjb25zdAogewogICAgIGlmICghY29sbGFw c2VXaGl0ZVNwYWNlIHx8ICFUZXh0TGF5b3V0Ojppc05lZWRlZCh0ZXh0LCAqdGhpcykpCiAgICAg ICAgIHJldHVybiBudWxscHRyOwotICAgIHJldHVybiBhZG9wdFB0cihuZXcgVGV4dExheW91dCh0 ZXh0LCAqdGhpcywgeFBvcykpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFRleHRMYXlv dXQ+KHRleHQsICp0aGlzLCB4UG9zKSk7CiB9CiAKIHZvaWQgRm9udDo6ZGVsZXRlTGF5b3V0KFRl eHRMYXlvdXQqIGxheW91dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udENhY2hlTWFjLm1tCmluZGV4IGE4NzdmMjYzNDY0NWRjYjc5OTY2MWMxMjEx ZDdjMWY0YzFjMjAwNzMuLmQxZjhjZWQwY2QxZTliYjExOWVkOTk5MjVhZGVkMzI0MmM4NzEyOGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2Fj aGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRD YWNoZU1hYy5tbQpAQCAtMjE5LDcgKzIxOSw3IEBAIHZvaWQgRm9udENhY2hlOjpnZXRUcmFpdHNJ bkZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseU5hbWUsIFZlY3Rvcjx1bnNpZ25lCiAg ICAgW1dlYkZvbnRDYWNoZSBnZXRUcmFpdHM6dHJhaXRzTWFza3MgaW5GYW1pbHk6ZmFtaWx5TmFt ZV07CiB9CiAKLVBhc3NPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVG b250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBj b25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSkKK3N0ZDo6dW5pcXVlX3B0cjxGb250UGxhdGZvcm1E YXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0 aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KQogewogICAg IE5TRm9udFRyYWl0TWFzayB0cmFpdHMgPSBmb250RGVzY3JpcHRpb24uaXRhbGljKCkgPyBOU0Zv bnRJdGFsaWNUcmFpdCA6IDA7CiAgICAgTlNJbnRlZ2VyIHdlaWdodCA9IHRvQXBwS2l0Rm9udFdl aWdodChmb250RGVzY3JpcHRpb24ud2VpZ2h0KCkpOwpAQCAtMjM5LDggKzIzOSw4IEBAIFBhc3NP d25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRh KGNvbnN0IEZvbnREZXNjcmlwCiAgICAgYm9vbCBzeW50aGV0aWNCb2xkID0gaXNBcHBLaXRGb250 V2VpZ2h0Qm9sZCh3ZWlnaHQpICYmICFpc0FwcEtpdEZvbnRXZWlnaHRCb2xkKGFjdHVhbFdlaWdo dCk7CiAgICAgYm9vbCBzeW50aGV0aWNPYmxpcXVlID0gKHRyYWl0cyAmIE5TRm9udEl0YWxpY1Ry YWl0KSAmJiAhKGFjdHVhbFRyYWl0cyAmIE5TRm9udEl0YWxpY1RyYWl0KTsKIAotICAgIE93blB0 cjxGb250UGxhdGZvcm1EYXRhPiBwbGF0Zm9ybURhdGEgPSBhZG9wdFB0cihuZXcgRm9udFBsYXRm b3JtRGF0YShwbGF0Zm9ybUZvbnQsIHNpemUsIGZvbnREZXNjcmlwdGlvbi51c2VQcmludGVyRm9u dCgpLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNPYmxpcXVlLCBmb250RGVzY3JpcHRpb24ub3Jp ZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpKSk7Ci0gICAgcmV0dXJu IHBsYXRmb3JtRGF0YS5yZWxlYXNlKCk7CisgICAgYXV0byBwbGF0Zm9ybURhdGEgPSBzdGQ6Om1h a2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KHBsYXRmb3JtRm9udCwgc2l6ZSwgZm9udERlc2Ny aXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWUs IGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBmb250RGVzY3JpcHRpb24ud2lkdGhWYXJp YW50KCkpKTsKKyAgICByZXR1cm4gcGxhdGZvcm1EYXRhOwogfQogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4v Rm9udENhY2hlV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9G b250Q2FjaGVXaW4uY3BwCmluZGV4IGU4Y2FmYTAxMjNiYTYwMGQ1MDgwZTJhNDZiYjkxM2Y5MDU0 YWIyY2MuLjc2MjRiNWM4NmQ5ZDMyMzNjYjE1MzlkYTk5MDE1NmJlZmQ4MWJmMWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4u Y3BwCkBAIC01NDUsNyArNTQ1LDcgQEAgdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5 KGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSwgVmVjdG9yPHVuc2lnbmUKICAgICBjb3B5 VG9WZWN0b3IocHJvY0RhdGEubV90cmFpdHNNYXNrcywgdHJhaXRzTWFza3MpOwogfQogCi1QYXNz T3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3Ry aW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hl OjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2Ny aXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBib29sIGlzTHVjaWRh R3JhbmRlID0gZmFsc2U7CiAgICAgc3RhdGljIEF0b21pY1N0cmluZyBsdWNpZGFTdHIoIkx1Y2lk YSBHcmFuZGUiKTsKQEAgLTU3NCw3ICs1NzQsNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURh dGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAog ICAgIGJvb2wgc3ludGhlc2l6ZUJvbGQgPSBpc0dESUZvbnRXZWlnaHRCb2xkKHdlaWdodCkgJiYg IWlzR0RJRm9udFdlaWdodEJvbGQobG9nRm9udC5sZldlaWdodCk7CiAgICAgYm9vbCBzeW50aGVz aXplSXRhbGljID0gZm9udERlc2NyaXB0aW9uLml0YWxpYygpICYmICFsb2dGb250LmxmSXRhbGlj OwogCi0gICAgRm9udFBsYXRmb3JtRGF0YSogcmVzdWx0ID0gbmV3IEZvbnRQbGF0Zm9ybURhdGEo V1RGOjptb3ZlKGhmb250KSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5 bnRoZXNpemVCb2xkLCBzeW50aGVzaXplSXRhbGljLCB1c2VHREkpOworICAgIGF1dG8gcmVzdWx0 ID0gc3RkOjptYWtlX3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihXVEY6Om1vdmUoaGZvbnQpLCBm b250RGVzY3JpcHRpb24uY29tcHV0ZWRQaXhlbFNpemUoKSwgc3ludGhlc2l6ZUJvbGQsIHN5bnRo ZXNpemVJdGFsaWMsIHVzZUdESSk7CiAKICNpZiBVU0UoQ0cpCiAgICAgYm9vbCBmb250Q3JlYXRp b25GYWlsZWQgPSAhcmVzdWx0LT5jZ0ZvbnQoKTsKQEAgLTU5MCw3ICs1OTAsNyBAQCBQYXNzT3du UHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShj b25zdCBGb250RGVzY3JpcAogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9ICAgICAgICAK IAotICAgIHJldHVybiBhZG9wdFB0cihyZXN1bHQpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAK IH0K 240181 2014-10-20 20:44:12 -0700 2014-10-20 21:30:25 -0700 Patch bug-137905-20141021124417.patch text/plain 10422 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0OTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJjNmQzOTZhOWIyMzU3 MzA3Yzg4MWNjMTVhZWNiZjFjMDA3NTAzMC4uZmRhNThmMjc0YzUzYzFlYzE4NmEwYzkxNzZkMGQ3 NzI2YjA0MjA4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTEwLTIwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0ciB8IHN0ZDo6bWFrZV91bmlxdWUgaW4gRm9udENhY2hlRm9vCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MDUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCBQYXNzT3duUHRy fE93blB0ciB1c2luZyBzdGQ6OnVuaXF1ZV9wdHJ8c3RkOjptYWtlX3VuaXF1ZS4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpn ZXRDYWNoZWRGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2Fj aGVGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQ bGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURh dGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06Cisg ICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKwogMjAxNC0xMC0x NyAgSmVmZnJleSBQZmF1ICA8anBmYXVAYXBwbGUuY29tPgogCiAgICAgICAgIEVuc3VyZSBhdHRh Y2hlZCBmcmFtZSBjb3VudCBkb2Vzbid0IGV4Y2VlZCB0aGUgbWF4aW11bSBhbGxvd2VkIGZyYW1l cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKaW5k ZXggNGM2NWViNzk5ODJmOTg0MWMxNWU0OWMwYmY2Y2YwMjRhMmFiMzgxMS4uYjIyMWZkMDlmNThh Njg4MWExZGZkZTk2Y2ZlZjRlNjA4NjZhODRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RydWN0IEZv bnRQbGF0Zm9ybURhdGFDYWNoZUtleUhhc2ggewogCiBzdHJ1Y3QgRm9udFBsYXRmb3JtRGF0YUNh Y2hlS2V5VHJhaXRzIDogV1RGOjpTaW1wbGVDbGFzc0hhc2hUcmFpdHM8Rm9udFBsYXRmb3JtRGF0 YUNhY2hlS2V5PiB7IH07CiAKLXR5cGVkZWYgSGFzaE1hcDxGb250UGxhdGZvcm1EYXRhQ2FjaGVL ZXksIE93blB0cjxGb250UGxhdGZvcm1EYXRhPiwgRm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5SGFz aCwgRm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5VHJhaXRzPiBGb250UGxhdGZvcm1EYXRhQ2FjaGU7 Cit0eXBlZGVmIEhhc2hNYXA8Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5LCBzdGQ6OnVuaXF1ZV9w dHI8Rm9udFBsYXRmb3JtRGF0YT4sIEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleUhhc2gsIEZvbnRQ bGF0Zm9ybURhdGFDYWNoZUtleVRyYWl0cz4gRm9udFBsYXRmb3JtRGF0YUNhY2hlOwogCiBzdGF0 aWMgRm9udFBsYXRmb3JtRGF0YUNhY2hlKiBnRm9udFBsYXRmb3JtRGF0YUNhY2hlID0gMDsKIApA QCAtMjU3LDcgKzI1Nyw3IEBAIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Z2V0Q2FjaGVk Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvCiAgICAgICAgICAgICAg ICAgaXQgPSBnRm9udFBsYXRmb3JtRGF0YUNhY2hlLT5maW5kKGtleSk7CiAgICAgICAgICAgICAg ICAgQVNTRVJUKGl0ICE9IGdGb250UGxhdGZvcm1EYXRhQ2FjaGUtPmVuZCgpKTsKICAgICAgICAg ICAgICAgICBpZiAoZm9udFBsYXRmb3JtRGF0YUZvckFsdGVybmF0ZU5hbWUpCi0gICAgICAgICAg ICAgICAgICAgIGl0LT52YWx1ZSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZvcm1EYXRhKCpmb250 UGxhdGZvcm1EYXRhRm9yQWx0ZXJuYXRlTmFtZSkpOworICAgICAgICAgICAgICAgICAgICBpdC0+ dmFsdWUgPSBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KCpmb250UGxhdGZvcm1E YXRhRm9yQWx0ZXJuYXRlTmFtZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDRiYzlk ZmExMDM0ZDVlOWQwNDZlM2MzNWRlOGU4ZGRhYzViYmVlZjQuLjdiMGViN2IxNmIxZjFhMmNkZmVh NDhmYjkwZjgxNjVlY2ZkNWFjNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ZvbnRDYWNoZS5oCkBAIC0xODUsNyArMTg1LDcgQEAgcHJpdmF0ZToKICAgICBGb250UGxh dGZvcm1EYXRhKiBnZXRDdXN0b21GYWxsYmFja0ZvbnQoY29uc3QgVUludDMyLCBjb25zdCBGb250 RGVzY3JpcHRpb24mKTsKICAgICBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBnZXRTeXN0ZW1G b250RmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IFNp bXBsZUZvbnREYXRhKiwgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIGludCBsZW5ndGgpOwogI2Vu ZGlmCi0gICAgUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBjcmVhdGVGb250UGxhdGZvcm1E YXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KTsK KyAgICBzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gY3JlYXRlRm9udFBsYXRmb3Jt RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSk7 CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gc2lt aWxhckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJik7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRD YWNoZUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0 eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcAppbmRleCBjZDI1ZjdkNzM5YjY5ZTM2YzhiNmE1YzBk YjQzMDI5ZmMzOWRiNjk2Li5mOWM4MTc1NjE0NDY1NjhmM2JlZjMzOWVkNmFjYTJiMjI3OWVjYjBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9G b250Q2FjaGVGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCkBAIC0xNjQsNyArMTY0LDcgQEAgaW50 IGZvbnRXZWlnaHRUb0ZvbnRjb25maWdXZWlnaHQoRm9udFdlaWdodCB3ZWlnaHQpCiAgICAgfQog fQogCi1QYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBs YXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3Qg QXRvbWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4g Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYg Zm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICAvLyBU aGUgQ1NTIGZvbnQgbWF0Y2hpbmcgYWxnb3JpdGhtIChodHRwOi8vd3d3LnczLm9yZy9UUi9jc3Mz LWZvbnRzLyNmb250LW1hdGNoaW5nLWFsZ29yaXRobSkKICAgICAvLyBzYXlzIHRoYXQgd2UgbXVz dCBmaW5kIGFuIGV4YWN0IG1hdGNoIGZvciBmb250IGZhbWlseSwgc2xhbnQgKGl0YWxpYyBvciBv YmxpcXVlIGNhbiBiZSB1c2VkKQpAQCAtMjE1LDExICsyMTUsMTEgQEAgUGFzc093blB0cjxGb250 UGxhdGZvcm1EYXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9u dERlc2NyaXAKICAgICAvLyBWZXJpZnkgdGhhdCB0aGlzIGZvbnQgaGFzIGFuIGVuY29kaW5nIGNv bXBhdGlibGUgd2l0aCBGb250Y29uZmlnLiBGb250Y29uZmlnIGN1cnJlbnRseQogICAgIC8vIHN1 cHBvcnRzIHRocmVlIGVuY29kaW5ncyBpbiBGY0ZyZWVUeXBlQ2hhckluZGV4OiBVbmljb2RlLCBT eW1ib2wgYW5kIEFwcGxlUm9tYW4uCiAgICAgLy8gSWYgdGhpcyBmb250IGRvZXNuJ3QgaGF2ZSBv bmUgb2YgdGhlc2UgdGhyZWUgZW5jb2RpbmdzLCBkb24ndCBzZWxlY3QgaXQuCi0gICAgT3duUHRy PEZvbnRQbGF0Zm9ybURhdGE+IHBsYXRmb3JtRGF0YSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZv cm1EYXRhKHJlc3VsdFBhdHRlcm4uZ2V0KCksIGZvbnREZXNjcmlwdGlvbikpOworICAgIGF1dG8g cGxhdGZvcm1EYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihyZXN1bHRQ YXR0ZXJuLmdldCgpLCBmb250RGVzY3JpcHRpb24pOwogICAgIGlmICghcGxhdGZvcm1EYXRhLT5o YXNDb21wYXRpYmxlQ2hhcm1hcCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIHJl dHVybiBwbGF0Zm9ybURhdGEucmVsZWFzZSgpOworICAgIHJldHVybiBwbGF0Zm9ybURhdGE7CiB9 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9G b250Q2FjaGVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9u dENhY2hlSU9TLm1tCmluZGV4IDRmYjg0NWI4YmU3MjQ2MTQxMzM1MzZjMzkxOWMzMzRlMTBjODYy ZTUuLjI5NTBkMDMzZmM2MDllMWYyNmQ2ZTE1YTdjMjZjZjJkODU0MjcxNDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1MubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNoZUlPUy5tbQpA QCAtNjIxLDcgKzYyMSw3IEBAIHN0YXRpYyB1aW50MTZfdCB0b0NURm9udFdlaWdodChGb250V2Vp Z2h0IGZvbnRXZWlnaHQpCiAgICAgfQogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+ IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24m IGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1 ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJp bmcmIGZhbWlseSkKIHsKICAgICAvLyBTcGVjaWFsIGNhc2UgZm9yICJDb3VyaWVyIiBmb250LiBX ZSB1c2VkIHRvIGhhdmUgb25seSBhbiBvYmxpcXVlIHZhcmlhbnQgb24gaU9TLCBzbyBwcmlvciB0 bwogICAgIC8vIGlPUyA2LjAsIHdlIGRpc2FsbG93ZWQgaXRzIHVzZSBoZXJlLiBXZSdsbCBmYWxs IGJhY2sgb24gIkNvdXJpZXIgTmV3Ii4gPHJkYXI6Ly9wcm9ibGVtLzUxMTY0NzcmMTA4NTAyMjc+ CkBAIC02NTQsNyArNjU0LDcgQEAgUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBGb250Q2Fj aGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXAKICAgICBib29sIHN5 bnRoZXRpY0JvbGQgPSAodHJhaXRzICYga0NURm9udFRyYWl0Qm9sZCkgJiYgIShhY3R1YWxUcmFp dHMgJiBrQ1RGb250VHJhaXRCb2xkKSAmJiAhaXNBcHBsZUNvbG9yRW1vamk7CiAgICAgYm9vbCBz eW50aGV0aWNPYmxpcXVlID0gKHRyYWl0cyAmIGtDVEZvbnRUcmFpdEl0YWxpYykgJiYgIShhY3R1 YWxUcmFpdHMgJiBrQ1RGb250VHJhaXRJdGFsaWMpICYmICFpc0FwcGxlQ29sb3JFbW9qaTsKIAot ICAgIEZvbnRQbGF0Zm9ybURhdGEqIHJlc3VsdCA9IG5ldyBGb250UGxhdGZvcm1EYXRhKGN0Rm9u dC5nZXQoKSwgc2l6ZSwgZm9udERlc2NyaXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRp Y0JvbGQsIHN5bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBm b250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCkpOworICAgIGF1dG8qIHJlc3VsdCA9IHN0ZDo6 bWFrZV91bmlxdWU8Rm9udFBsYXRmb3JtRGF0YT4oY3RGb250LmdldCgpLCBzaXplLCBmb250RGVz Y3JpcHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1 ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0aFZh cmlhbnQoKSk7CiAgICAgaWYgKGlzQXBwbGVDb2xvckVtb2ppKQogICAgICAgICByZXN1bHQtPm1f aXNFbW9qaSA9IHRydWU7CiAgICAgcmV0dXJuIGFkb3B0UHRyKHJlc3VsdCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQppbmRl eCBhODc3ZjI2MzQ2NDVkY2I3OTk2NjFjMTIxMWQ3YzFmNGMxYzIwMDczLi40ZGU1NDFjNGEwOGMw YWQwODNjNTgyZjFlMWRlNGQ3NDI3ZGJlMTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KQEAgLTIxOSw3ICsyMTksNyBA QCB2b2lkIEZvbnRDYWNoZTo6Z2V0VHJhaXRzSW5GYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBm YW1pbHlOYW1lLCBWZWN0b3I8dW5zaWduZQogICAgIFtXZWJGb250Q2FjaGUgZ2V0VHJhaXRzOnRy YWl0c01hc2tzIGluRmFtaWx5OmZhbWlseU5hbWVdOwogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0 Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVz Y3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitz dGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxh dGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBB dG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gZm9u dERlc2NyaXB0aW9uLml0YWxpYygpID8gTlNGb250SXRhbGljVHJhaXQgOiAwOwogICAgIE5TSW50 ZWdlciB3ZWlnaHQgPSB0b0FwcEtpdEZvbnRXZWlnaHQoZm9udERlc2NyaXB0aW9uLndlaWdodCgp KTsKQEAgLTIzOSw4ICsyMzksNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRD YWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAogICAgIGJvb2wg c3ludGhldGljQm9sZCA9IGlzQXBwS2l0Rm9udFdlaWdodEJvbGQod2VpZ2h0KSAmJiAhaXNBcHBL aXRGb250V2VpZ2h0Qm9sZChhY3R1YWxXZWlnaHQpOwogICAgIGJvb2wgc3ludGhldGljT2JsaXF1 ZSA9ICh0cmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFpdCkgJiYgIShhY3R1YWxUcmFpdHMgJiBOU0Zv bnRJdGFsaWNUcmFpdCk7CiAKLSAgICBPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gcGxhdGZvcm1E YXRhID0gYWRvcHRQdHIobmV3IEZvbnRQbGF0Zm9ybURhdGEocGxhdGZvcm1Gb250LCBzaXplLCBm b250RGVzY3JpcHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhldGlj T2JsaXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53 aWR0aFZhcmlhbnQoKSkpOwotICAgIHJldHVybiBwbGF0Zm9ybURhdGEucmVsZWFzZSgpOworICAg IHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KHBsYXRmb3JtRm9udCwg c2l6ZSwgZm9udERlc2NyaXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRpY0JvbGQsIHN5 bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBmb250RGVzY3Jp cHRpb24ud2lkdGhWYXJpYW50KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2lu LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4u Y3BwCmluZGV4IGU4Y2FmYTAxMjNiYTYwMGQ1MDgwZTJhNDZiYjkxM2Y5MDU0YWIyY2MuLjc2MjRi NWM4NmQ5ZDMyMzNjYjE1MzlkYTk5MDE1NmJlZmQ4MWJmMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCkBAIC01NDUs NyArNTQ1LDcgQEAgdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21p Y1N0cmluZyYgZmFtaWx5TmFtZSwgVmVjdG9yPHVuc2lnbmUKICAgICBjb3B5VG9WZWN0b3IocHJv Y0RhdGEubV90cmFpdHNNYXNrcywgdHJhaXRzTWFza3MpOwogfQogCi1QYXNzT3duUHRyPEZvbnRQ bGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250 RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkp CitzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250 UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25z dCBBdG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBib29sIGlzTHVjaWRhR3JhbmRlID0gZmFs c2U7CiAgICAgc3RhdGljIEF0b21pY1N0cmluZyBsdWNpZGFTdHIoIkx1Y2lkYSBHcmFuZGUiKTsK QEAgLTU3NCw3ICs1NzQsNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNo ZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAogICAgIGJvb2wgc3lu dGhlc2l6ZUJvbGQgPSBpc0dESUZvbnRXZWlnaHRCb2xkKHdlaWdodCkgJiYgIWlzR0RJRm9udFdl aWdodEJvbGQobG9nRm9udC5sZldlaWdodCk7CiAgICAgYm9vbCBzeW50aGVzaXplSXRhbGljID0g Zm9udERlc2NyaXB0aW9uLml0YWxpYygpICYmICFsb2dGb250LmxmSXRhbGljOwogCi0gICAgRm9u dFBsYXRmb3JtRGF0YSogcmVzdWx0ID0gbmV3IEZvbnRQbGF0Zm9ybURhdGEoV1RGOjptb3ZlKGhm b250KSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5bnRoZXNpemVCb2xk LCBzeW50aGVzaXplSXRhbGljLCB1c2VHREkpOworICAgIGF1dG8gcmVzdWx0ID0gc3RkOjptYWtl X3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihXVEY6Om1vdmUoaGZvbnQpLCBmb250RGVzY3JpcHRp b24uY29tcHV0ZWRQaXhlbFNpemUoKSwgc3ludGhlc2l6ZUJvbGQsIHN5bnRoZXNpemVJdGFsaWMs IHVzZUdESSk7CiAKICNpZiBVU0UoQ0cpCiAgICAgYm9vbCBmb250Q3JlYXRpb25GYWlsZWQgPSAh cmVzdWx0LT5jZ0ZvbnQoKTsKQEAgLTU5MCw3ICs1OTAsNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0 Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVz Y3JpcAogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9ICAgICAgICAKIAotICAgIHJldHVy biBhZG9wdFB0cihyZXN1bHQpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIH0K 240183 2014-10-20 21:30:33 -0700 2014-10-21 16:54:23 -0700 Patch bug-137905-20141021133039.patch text/plain 10725 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0OTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJjNmQzOTZhOWIyMzU3 MzA3Yzg4MWNjMTVhZWNiZjFjMDA3NTAzMC4uZmRhNThmMjc0YzUzYzFlYzE4NmEwYzkxNzZkMGQ3 NzI2YjA0MjA4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTEwLTIwICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0ciB8IHN0ZDo6bWFrZV91bmlxdWUgaW4gRm9udENhY2hlRm9vCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MDUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCBQYXNzT3duUHRy fE93blB0ciB1c2luZyBzdGQ6OnVuaXF1ZV9wdHJ8c3RkOjptYWtlX3VuaXF1ZS4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpn ZXRDYWNoZWRGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2Fj aGVGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQ bGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURh dGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06Cisg ICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKwogMjAxNC0xMC0x NyAgSmVmZnJleSBQZmF1ICA8anBmYXVAYXBwbGUuY29tPgogCiAgICAgICAgIEVuc3VyZSBhdHRh Y2hlZCBmcmFtZSBjb3VudCBkb2Vzbid0IGV4Y2VlZCB0aGUgbWF4aW11bSBhbGxvd2VkIGZyYW1l cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKaW5k ZXggNGM2NWViNzk5ODJmOTg0MWMxNWU0OWMwYmY2Y2YwMjRhMmFiMzgxMS4uYjIyMWZkMDlmNThh Njg4MWExZGZkZTk2Y2ZlZjRlNjA4NjZhODRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RydWN0IEZv bnRQbGF0Zm9ybURhdGFDYWNoZUtleUhhc2ggewogCiBzdHJ1Y3QgRm9udFBsYXRmb3JtRGF0YUNh Y2hlS2V5VHJhaXRzIDogV1RGOjpTaW1wbGVDbGFzc0hhc2hUcmFpdHM8Rm9udFBsYXRmb3JtRGF0 YUNhY2hlS2V5PiB7IH07CiAKLXR5cGVkZWYgSGFzaE1hcDxGb250UGxhdGZvcm1EYXRhQ2FjaGVL ZXksIE93blB0cjxGb250UGxhdGZvcm1EYXRhPiwgRm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5SGFz aCwgRm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5VHJhaXRzPiBGb250UGxhdGZvcm1EYXRhQ2FjaGU7 Cit0eXBlZGVmIEhhc2hNYXA8Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5LCBzdGQ6OnVuaXF1ZV9w dHI8Rm9udFBsYXRmb3JtRGF0YT4sIEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleUhhc2gsIEZvbnRQ bGF0Zm9ybURhdGFDYWNoZUtleVRyYWl0cz4gRm9udFBsYXRmb3JtRGF0YUNhY2hlOwogCiBzdGF0 aWMgRm9udFBsYXRmb3JtRGF0YUNhY2hlKiBnRm9udFBsYXRmb3JtRGF0YUNhY2hlID0gMDsKIApA QCAtMjU3LDcgKzI1Nyw3IEBAIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Z2V0Q2FjaGVk Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvCiAgICAgICAgICAgICAg ICAgaXQgPSBnRm9udFBsYXRmb3JtRGF0YUNhY2hlLT5maW5kKGtleSk7CiAgICAgICAgICAgICAg ICAgQVNTRVJUKGl0ICE9IGdGb250UGxhdGZvcm1EYXRhQ2FjaGUtPmVuZCgpKTsKICAgICAgICAg ICAgICAgICBpZiAoZm9udFBsYXRmb3JtRGF0YUZvckFsdGVybmF0ZU5hbWUpCi0gICAgICAgICAg ICAgICAgICAgIGl0LT52YWx1ZSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZvcm1EYXRhKCpmb250 UGxhdGZvcm1EYXRhRm9yQWx0ZXJuYXRlTmFtZSkpOworICAgICAgICAgICAgICAgICAgICBpdC0+ dmFsdWUgPSBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KCpmb250UGxhdGZvcm1E YXRhRm9yQWx0ZXJuYXRlTmFtZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDRiYzlk ZmExMDM0ZDVlOWQwNDZlM2MzNWRlOGU4ZGRhYzViYmVlZjQuLjdiMGViN2IxNmIxZjFhMmNkZmVh NDhmYjkwZjgxNjVlY2ZkNWFjNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ZvbnRDYWNoZS5oCkBAIC0xODUsNyArMTg1LDcgQEAgcHJpdmF0ZToKICAgICBGb250UGxh dGZvcm1EYXRhKiBnZXRDdXN0b21GYWxsYmFja0ZvbnQoY29uc3QgVUludDMyLCBjb25zdCBGb250 RGVzY3JpcHRpb24mKTsKICAgICBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBnZXRTeXN0ZW1G b250RmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IFNp bXBsZUZvbnREYXRhKiwgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIGludCBsZW5ndGgpOwogI2Vu ZGlmCi0gICAgUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBjcmVhdGVGb250UGxhdGZvcm1E YXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KTsK KyAgICBzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gY3JlYXRlRm9udFBsYXRmb3Jt RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSk7 CiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gc2lt aWxhckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJik7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRD YWNoZUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0 eXBlL0ZvbnRDYWNoZUZyZWVUeXBlLmNwcAppbmRleCBjZDI1ZjdkNzM5YjY5ZTM2YzhiNmE1YzBk YjQzMDI5ZmMzOWRiNjk2Li5mOWM4MTc1NjE0NDY1NjhmM2JlZjMzOWVkNmFjYTJiMjI3OWVjYjBj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9G b250Q2FjaGVGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCkBAIC0xNjQsNyArMTY0LDcgQEAgaW50 IGZvbnRXZWlnaHRUb0ZvbnRjb25maWdXZWlnaHQoRm9udFdlaWdodCB3ZWlnaHQpCiAgICAgfQog fQogCi1QYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBs YXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3Qg QXRvbWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4g Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYg Zm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICAvLyBU aGUgQ1NTIGZvbnQgbWF0Y2hpbmcgYWxnb3JpdGhtIChodHRwOi8vd3d3LnczLm9yZy9UUi9jc3Mz LWZvbnRzLyNmb250LW1hdGNoaW5nLWFsZ29yaXRobSkKICAgICAvLyBzYXlzIHRoYXQgd2UgbXVz dCBmaW5kIGFuIGV4YWN0IG1hdGNoIGZvciBmb250IGZhbWlseSwgc2xhbnQgKGl0YWxpYyBvciBv YmxpcXVlIGNhbiBiZSB1c2VkKQpAQCAtMjE1LDExICsyMTUsMTEgQEAgUGFzc093blB0cjxGb250 UGxhdGZvcm1EYXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9u dERlc2NyaXAKICAgICAvLyBWZXJpZnkgdGhhdCB0aGlzIGZvbnQgaGFzIGFuIGVuY29kaW5nIGNv bXBhdGlibGUgd2l0aCBGb250Y29uZmlnLiBGb250Y29uZmlnIGN1cnJlbnRseQogICAgIC8vIHN1 cHBvcnRzIHRocmVlIGVuY29kaW5ncyBpbiBGY0ZyZWVUeXBlQ2hhckluZGV4OiBVbmljb2RlLCBT eW1ib2wgYW5kIEFwcGxlUm9tYW4uCiAgICAgLy8gSWYgdGhpcyBmb250IGRvZXNuJ3QgaGF2ZSBv bmUgb2YgdGhlc2UgdGhyZWUgZW5jb2RpbmdzLCBkb24ndCBzZWxlY3QgaXQuCi0gICAgT3duUHRy PEZvbnRQbGF0Zm9ybURhdGE+IHBsYXRmb3JtRGF0YSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZv cm1EYXRhKHJlc3VsdFBhdHRlcm4uZ2V0KCksIGZvbnREZXNjcmlwdGlvbikpOworICAgIGF1dG8g cGxhdGZvcm1EYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihyZXN1bHRQ YXR0ZXJuLmdldCgpLCBmb250RGVzY3JpcHRpb24pOwogICAgIGlmICghcGxhdGZvcm1EYXRhLT5o YXNDb21wYXRpYmxlQ2hhcm1hcCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIHJl dHVybiBwbGF0Zm9ybURhdGEucmVsZWFzZSgpOworICAgIHJldHVybiBwbGF0Zm9ybURhdGE7CiB9 CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9G b250Q2FjaGVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9u dENhY2hlSU9TLm1tCmluZGV4IDRmYjg0NWI4YmU3MjQ2MTQxMzM1MzZjMzkxOWMzMzRlMTBjODYy ZTUuLjI5NTBkMDMzZmM2MDllMWYyNmQ2ZTE1YTdjMjZjZjJkODU0MjcxNDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1MubW0KKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNoZUlPUy5tbQpA QCAtNjIxLDcgKzYyMSw3IEBAIHN0YXRpYyB1aW50MTZfdCB0b0NURm9udFdlaWdodChGb250V2Vp Z2h0IGZvbnRXZWlnaHQpCiAgICAgfQogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+ IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24m IGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1 ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJp bmcmIGZhbWlseSkKIHsKICAgICAvLyBTcGVjaWFsIGNhc2UgZm9yICJDb3VyaWVyIiBmb250LiBX ZSB1c2VkIHRvIGhhdmUgb25seSBhbiBvYmxpcXVlIHZhcmlhbnQgb24gaU9TLCBzbyBwcmlvciB0 bwogICAgIC8vIGlPUyA2LjAsIHdlIGRpc2FsbG93ZWQgaXRzIHVzZSBoZXJlLiBXZSdsbCBmYWxs IGJhY2sgb24gIkNvdXJpZXIgTmV3Ii4gPHJkYXI6Ly9wcm9ibGVtLzUxMTY0NzcmMTA4NTAyMjc+ CkBAIC02NTQsNyArNjU0LDcgQEAgUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBGb250Q2Fj aGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXAKICAgICBib29sIHN5 bnRoZXRpY0JvbGQgPSAodHJhaXRzICYga0NURm9udFRyYWl0Qm9sZCkgJiYgIShhY3R1YWxUcmFp dHMgJiBrQ1RGb250VHJhaXRCb2xkKSAmJiAhaXNBcHBsZUNvbG9yRW1vamk7CiAgICAgYm9vbCBz eW50aGV0aWNPYmxpcXVlID0gKHRyYWl0cyAmIGtDVEZvbnRUcmFpdEl0YWxpYykgJiYgIShhY3R1 YWxUcmFpdHMgJiBrQ1RGb250VHJhaXRJdGFsaWMpICYmICFpc0FwcGxlQ29sb3JFbW9qaTsKIAot ICAgIEZvbnRQbGF0Zm9ybURhdGEqIHJlc3VsdCA9IG5ldyBGb250UGxhdGZvcm1EYXRhKGN0Rm9u dC5nZXQoKSwgc2l6ZSwgZm9udERlc2NyaXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRp Y0JvbGQsIHN5bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBm b250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCkpOworICAgIGF1dG8qIHJlc3VsdCA9IHN0ZDo6 bWFrZV91bmlxdWU8Rm9udFBsYXRmb3JtRGF0YT4oY3RGb250LmdldCgpLCBzaXplLCBmb250RGVz Y3JpcHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1 ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0aFZh cmlhbnQoKSk7CiAgICAgaWYgKGlzQXBwbGVDb2xvckVtb2ppKQogICAgICAgICByZXN1bHQtPm1f aXNFbW9qaSA9IHRydWU7CiAgICAgcmV0dXJuIGFkb3B0UHRyKHJlc3VsdCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQppbmRl eCBhODc3ZjI2MzQ2NDVkY2I3OTk2NjFjMTIxMWQ3YzFmNGMxYzIwMDczLi40ZGU1NDFjNGEwOGMw YWQwODNjNTgyZjFlMWRlNGQ3NDI3ZGJlMTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KQEAgLTIxOSw3ICsyMTksNyBA QCB2b2lkIEZvbnRDYWNoZTo6Z2V0VHJhaXRzSW5GYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBm YW1pbHlOYW1lLCBWZWN0b3I8dW5zaWduZQogICAgIFtXZWJGb250Q2FjaGUgZ2V0VHJhaXRzOnRy YWl0c01hc2tzIGluRmFtaWx5OmZhbWlseU5hbWVdOwogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0 Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVz Y3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitz dGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxh dGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBB dG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gZm9u dERlc2NyaXB0aW9uLml0YWxpYygpID8gTlNGb250SXRhbGljVHJhaXQgOiAwOwogICAgIE5TSW50 ZWdlciB3ZWlnaHQgPSB0b0FwcEtpdEZvbnRXZWlnaHQoZm9udERlc2NyaXB0aW9uLndlaWdodCgp KTsKQEAgLTIzOSw4ICsyMzksNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRD YWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAogICAgIGJvb2wg c3ludGhldGljQm9sZCA9IGlzQXBwS2l0Rm9udFdlaWdodEJvbGQod2VpZ2h0KSAmJiAhaXNBcHBL aXRGb250V2VpZ2h0Qm9sZChhY3R1YWxXZWlnaHQpOwogICAgIGJvb2wgc3ludGhldGljT2JsaXF1 ZSA9ICh0cmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFpdCkgJiYgIShhY3R1YWxUcmFpdHMgJiBOU0Zv bnRJdGFsaWNUcmFpdCk7CiAKLSAgICBPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gcGxhdGZvcm1E YXRhID0gYWRvcHRQdHIobmV3IEZvbnRQbGF0Zm9ybURhdGEocGxhdGZvcm1Gb250LCBzaXplLCBm b250RGVzY3JpcHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhldGlj T2JsaXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53 aWR0aFZhcmlhbnQoKSkpOwotICAgIHJldHVybiBwbGF0Zm9ybURhdGEucmVsZWFzZSgpOworICAg IHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KHBsYXRmb3JtRm9udCwg c2l6ZSwgZm9udERlc2NyaXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRpY0JvbGQsIHN5 bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBmb250RGVzY3Jp cHRpb24ud2lkdGhWYXJpYW50KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2lu LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4u Y3BwCmluZGV4IGU4Y2FmYTAxMjNiYTYwMGQ1MDgwZTJhNDZiYjkxM2Y5MDU0YWIyY2MuLjk3ODQz M2Y3ZTg0NDdjZDY4MGE5YWRhZGU0ODUxZTIzYmQ4ZTM0NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCkBAIC01NDUs NyArNTQ1LDcgQEAgdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21p Y1N0cmluZyYgZmFtaWx5TmFtZSwgVmVjdG9yPHVuc2lnbmUKICAgICBjb3B5VG9WZWN0b3IocHJv Y0RhdGEubV90cmFpdHNNYXNrcywgdHJhaXRzTWFza3MpOwogfQogCi1QYXNzT3duUHRyPEZvbnRQ bGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250 RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkp CitzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250 UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25z dCBBdG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBib29sIGlzTHVjaWRhR3JhbmRlID0gZmFs c2U7CiAgICAgc3RhdGljIEF0b21pY1N0cmluZyBsdWNpZGFTdHIoIkx1Y2lkYSBHcmFuZGUiKTsK QEAgLTU3NCw3ICs1NzQsNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNo ZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAogICAgIGJvb2wgc3lu dGhlc2l6ZUJvbGQgPSBpc0dESUZvbnRXZWlnaHRCb2xkKHdlaWdodCkgJiYgIWlzR0RJRm9udFdl aWdodEJvbGQobG9nRm9udC5sZldlaWdodCk7CiAgICAgYm9vbCBzeW50aGVzaXplSXRhbGljID0g Zm9udERlc2NyaXB0aW9uLml0YWxpYygpICYmICFsb2dGb250LmxmSXRhbGljOwogCi0gICAgRm9u dFBsYXRmb3JtRGF0YSogcmVzdWx0ID0gbmV3IEZvbnRQbGF0Zm9ybURhdGEoV1RGOjptb3ZlKGhm b250KSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5bnRoZXNpemVCb2xk LCBzeW50aGVzaXplSXRhbGljLCB1c2VHREkpOworICAgIGF1dG8gcmVzdWx0ID0gc3RkOjptYWtl X3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihXVEY6Om1vdmUoaGZvbnQpLCBmb250RGVzY3JpcHRp b24uY29tcHV0ZWRQaXhlbFNpemUoKSwgc3ludGhlc2l6ZUJvbGQsIHN5bnRoZXNpemVJdGFsaWMs IHVzZUdESSk7CiAKICNpZiBVU0UoQ0cpCiAgICAgYm9vbCBmb250Q3JlYXRpb25GYWlsZWQgPSAh cmVzdWx0LT5jZ0ZvbnQoKTsKQEAgLTU4NiwxMSArNTg2LDExIEBAIFBhc3NPd25QdHI8Rm9udFBs YXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnRE ZXNjcmlwCiAgICAgICAgIC8vIFRoZSBjcmVhdGlvbiBvZiB0aGUgQ0dGb250UmVmIGZhaWxlZCBm b3Igc29tZSByZWFzb24uICBXZSBhbHJlYWR5IGFzc2VydGVkIGluIGRlYnVnIGJ1aWxkcywgYnV0 IHRvIG1ha2UKICAgICAgICAgLy8gYWJzb2x1dGVseSBzdXJlIHRoYXQgd2UgZG9uJ3QgdXNlIHRo aXMgZm9udCwgZ28gYWhlYWQgYW5kIHJldHVybiAwIHNvIHRoYXQgd2UgY2FuIGZhbGwgYmFjayB0 byB0aGUgbmV4dAogICAgICAgICAvLyBmb250LgotICAgICAgICBkZWxldGUgcmVzdWx0OworICAg ICAgICByZXN1bHQgPSBudWxscHRyOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9ICAg ICAgICAKIAotICAgIHJldHVybiBhZG9wdFB0cihyZXN1bHQpOworICAgIHJldHVybiByZXN1bHQ7 CiB9CiAKIH0K 240229 2014-10-21 16:54:31 -0700 2014-10-21 18:53:05 -0700 Patch for landing bug-137905-20141022085437.patch text/plain 10702 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmMwNWE3ZDY2Y2M3MTA4 MzJhYjA2MTgwNDEzNDVlODBiYmUzYTMzYy4uYWE3OWYzODcwNmQ5NDg4MzY2ZGZlN2E1NGU2MmFj OTlkNDIyYTBlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTEwLTIxICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHN0ZDo6 dW5pcXVlX3B0ciB8IHN0ZDo6bWFrZV91bmlxdWUgaW4gRm9udENhY2hlRm9vCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc5MDUKKworICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBDbGVhbiB1cCBQYXNzT3duUHRyfE93 blB0ciB1c2luZyBzdGQ6OnVuaXF1ZV9wdHJ8c3RkOjptYWtlX3VuaXF1ZS4KKworICAgICAgICBO byBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRD YWNoZWRGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250Q2FjaGVG cmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0 Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1Mu bW06CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06CisgICAg ICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKToKKwogMjAxNC0xMC0yMSAg SmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbRU1FXVtNYWNdIFVw ZGF0ZSB0byBtYXRjaCBuZXcgQVZTdHJlYW1TZXNzaW9uIEFQSSBhbmQgcmVxdWlyZW1lbnRzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5jcHAKaW5kZXgg NGM2NWViNzk5ODJmOTg0MWMxNWU0OWMwYmY2Y2YwMjRhMmFiMzgxMS4uYjIyMWZkMDlmNThhNjg4 MWExZGZkZTk2Y2ZlZjRlNjA4NjZhODRhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FjaGUuY3BwCkBAIC0xNDEsNyArMTQxLDcgQEAgc3RydWN0IEZvbnRQ bGF0Zm9ybURhdGFDYWNoZUtleUhhc2ggewogCiBzdHJ1Y3QgRm9udFBsYXRmb3JtRGF0YUNhY2hl S2V5VHJhaXRzIDogV1RGOjpTaW1wbGVDbGFzc0hhc2hUcmFpdHM8Rm9udFBsYXRmb3JtRGF0YUNh Y2hlS2V5PiB7IH07CiAKLXR5cGVkZWYgSGFzaE1hcDxGb250UGxhdGZvcm1EYXRhQ2FjaGVLZXks IE93blB0cjxGb250UGxhdGZvcm1EYXRhPiwgRm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5SGFzaCwg Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5VHJhaXRzPiBGb250UGxhdGZvcm1EYXRhQ2FjaGU7Cit0 eXBlZGVmIEhhc2hNYXA8Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5LCBzdGQ6OnVuaXF1ZV9wdHI8 Rm9udFBsYXRmb3JtRGF0YT4sIEZvbnRQbGF0Zm9ybURhdGFDYWNoZUtleUhhc2gsIEZvbnRQbGF0 Zm9ybURhdGFDYWNoZUtleVRyYWl0cz4gRm9udFBsYXRmb3JtRGF0YUNhY2hlOwogCiBzdGF0aWMg Rm9udFBsYXRmb3JtRGF0YUNhY2hlKiBnRm9udFBsYXRmb3JtRGF0YUNhY2hlID0gMDsKIApAQCAt MjU3LDcgKzI1Nyw3IEBAIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Z2V0Q2FjaGVkRm9u dFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvCiAgICAgICAgICAgICAgICAg aXQgPSBnRm9udFBsYXRmb3JtRGF0YUNhY2hlLT5maW5kKGtleSk7CiAgICAgICAgICAgICAgICAg QVNTRVJUKGl0ICE9IGdGb250UGxhdGZvcm1EYXRhQ2FjaGUtPmVuZCgpKTsKICAgICAgICAgICAg ICAgICBpZiAoZm9udFBsYXRmb3JtRGF0YUZvckFsdGVybmF0ZU5hbWUpCi0gICAgICAgICAgICAg ICAgICAgIGl0LT52YWx1ZSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZvcm1EYXRhKCpmb250UGxh dGZvcm1EYXRhRm9yQWx0ZXJuYXRlTmFtZSkpOworICAgICAgICAgICAgICAgICAgICBpdC0+dmFs dWUgPSBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KCpmb250UGxhdGZvcm1EYXRh Rm9yQWx0ZXJuYXRlTmFtZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDRiYzlkZmEx MDM0ZDVlOWQwNDZlM2MzNWRlOGU4ZGRhYzViYmVlZjQuLjdiMGViN2IxNmIxZjFhMmNkZmVhNDhm YjkwZjgxNjVlY2ZkNWFjNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ZvbnRDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnRDYWNoZS5oCkBAIC0xODUsNyArMTg1LDcgQEAgcHJpdmF0ZToKICAgICBGb250UGxhdGZv cm1EYXRhKiBnZXRDdXN0b21GYWxsYmFja0ZvbnQoY29uc3QgVUludDMyLCBjb25zdCBGb250RGVz Y3JpcHRpb24mKTsKICAgICBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBnZXRTeXN0ZW1Gb250 RmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IFNpbXBs ZUZvbnREYXRhKiwgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIGludCBsZW5ndGgpOwogI2VuZGlm Ci0gICAgUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBjcmVhdGVGb250UGxhdGZvcm1EYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5KTsKKyAg ICBzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gY3JlYXRlRm9udFBsYXRmb3JtRGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSk7CiAj aWYgUExBVEZPUk0oQ09DT0EpCiAgICAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gc2ltaWxh ckZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJik7CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRDYWNo ZUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBl L0ZvbnRDYWNoZUZyZWVUeXBlLmNwcAppbmRleCBjZDI1ZjdkNzM5YjY5ZTM2YzhiNmE1YzBkYjQz MDI5ZmMzOWRiNjk2Li5mOWM4MTc1NjE0NDY1NjhmM2JlZjMzOWVkNmFjYTJiMjI3OWVjYjBjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250 Q2FjaGVGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZnJlZXR5cGUvRm9udENhY2hlRnJlZVR5cGUuY3BwCkBAIC0xNjQsNyArMTY0LDcgQEAgaW50IGZv bnRXZWlnaHRUb0ZvbnRjb25maWdXZWlnaHQoRm9udFdlaWdodCB3ZWlnaHQpCiAgICAgfQogfQog Ci1QYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRm b3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRv bWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9u dENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9u dERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICAvLyBUaGUg Q1NTIGZvbnQgbWF0Y2hpbmcgYWxnb3JpdGhtIChodHRwOi8vd3d3LnczLm9yZy9UUi9jc3MzLWZv bnRzLyNmb250LW1hdGNoaW5nLWFsZ29yaXRobSkKICAgICAvLyBzYXlzIHRoYXQgd2UgbXVzdCBm aW5kIGFuIGV4YWN0IG1hdGNoIGZvciBmb250IGZhbWlseSwgc2xhbnQgKGl0YWxpYyBvciBvYmxp cXVlIGNhbiBiZSB1c2VkKQpAQCAtMjE1LDExICsyMTUsMTEgQEAgUGFzc093blB0cjxGb250UGxh dGZvcm1EYXRhPiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERl c2NyaXAKICAgICAvLyBWZXJpZnkgdGhhdCB0aGlzIGZvbnQgaGFzIGFuIGVuY29kaW5nIGNvbXBh dGlibGUgd2l0aCBGb250Y29uZmlnLiBGb250Y29uZmlnIGN1cnJlbnRseQogICAgIC8vIHN1cHBv cnRzIHRocmVlIGVuY29kaW5ncyBpbiBGY0ZyZWVUeXBlQ2hhckluZGV4OiBVbmljb2RlLCBTeW1i b2wgYW5kIEFwcGxlUm9tYW4uCiAgICAgLy8gSWYgdGhpcyBmb250IGRvZXNuJ3QgaGF2ZSBvbmUg b2YgdGhlc2UgdGhyZWUgZW5jb2RpbmdzLCBkb24ndCBzZWxlY3QgaXQuCi0gICAgT3duUHRyPEZv bnRQbGF0Zm9ybURhdGE+IHBsYXRmb3JtRGF0YSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZvcm1E YXRhKHJlc3VsdFBhdHRlcm4uZ2V0KCksIGZvbnREZXNjcmlwdGlvbikpOworICAgIGF1dG8gcGxh dGZvcm1EYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxGb250UGxhdGZvcm1EYXRhPihyZXN1bHRQYXR0 ZXJuLmdldCgpLCBmb250RGVzY3JpcHRpb24pOwogICAgIGlmICghcGxhdGZvcm1EYXRhLT5oYXND b21wYXRpYmxlQ2hhcm1hcCgpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIHJldHVy biBwbGF0Zm9ybURhdGEucmVsZWFzZSgpOworICAgIHJldHVybiBwbGF0Zm9ybURhdGE7CiB9CiAK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250 Q2FjaGVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENh Y2hlSU9TLm1tCmluZGV4IDRmYjg0NWI4YmU3MjQ2MTQxMzM1MzZjMzkxOWMzMzRlMTBjODYyZTUu LjI5NTBkMDMzZmM2MDllMWYyNmQ2ZTE1YTdjMjZjZjJkODU0MjcxNDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJT1MubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRDYWNoZUlPUy5tbQpAQCAt NjIxLDcgKzYyMSw3IEBAIHN0YXRpYyB1aW50MTZfdCB0b0NURm9udFdlaWdodChGb250V2VpZ2h0 IGZvbnRXZWlnaHQpCiAgICAgfQogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZv bnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZv bnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6OnVuaXF1ZV9w dHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNv bnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9taWNTdHJpbmcm IGZhbWlseSkKIHsKICAgICAvLyBTcGVjaWFsIGNhc2UgZm9yICJDb3VyaWVyIiBmb250LiBXZSB1 c2VkIHRvIGhhdmUgb25seSBhbiBvYmxpcXVlIHZhcmlhbnQgb24gaU9TLCBzbyBwcmlvciB0bwog ICAgIC8vIGlPUyA2LjAsIHdlIGRpc2FsbG93ZWQgaXRzIHVzZSBoZXJlLiBXZSdsbCBmYWxsIGJh Y2sgb24gIkNvdXJpZXIgTmV3Ii4gPHJkYXI6Ly9wcm9ibGVtLzUxMTY0NzcmMTA4NTAyMjc+CkBA IC02NTQsNyArNjU0LDcgQEAgUGFzc093blB0cjxGb250UGxhdGZvcm1EYXRhPiBGb250Q2FjaGU6 OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXAKICAgICBib29sIHN5bnRo ZXRpY0JvbGQgPSAodHJhaXRzICYga0NURm9udFRyYWl0Qm9sZCkgJiYgIShhY3R1YWxUcmFpdHMg JiBrQ1RGb250VHJhaXRCb2xkKSAmJiAhaXNBcHBsZUNvbG9yRW1vamk7CiAgICAgYm9vbCBzeW50 aGV0aWNPYmxpcXVlID0gKHRyYWl0cyAmIGtDVEZvbnRUcmFpdEl0YWxpYykgJiYgIShhY3R1YWxU cmFpdHMgJiBrQ1RGb250VHJhaXRJdGFsaWMpICYmICFpc0FwcGxlQ29sb3JFbW9qaTsKIAotICAg IEZvbnRQbGF0Zm9ybURhdGEqIHJlc3VsdCA9IG5ldyBGb250UGxhdGZvcm1EYXRhKGN0Rm9udC5n ZXQoKSwgc2l6ZSwgZm9udERlc2NyaXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRpY0Jv bGQsIHN5bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBmb250 RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCkpOworICAgIGF1dG8qIHJlc3VsdCA9IHN0ZDo6bWFr ZV91bmlxdWU8Rm9udFBsYXRmb3JtRGF0YT4oY3RGb250LmdldCgpLCBzaXplLCBmb250RGVzY3Jp cHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZSwg Zm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0aFZhcmlh bnQoKSk7CiAgICAgaWYgKGlzQXBwbGVDb2xvckVtb2ppKQogICAgICAgICByZXN1bHQtPm1faXNF bW9qaSA9IHRydWU7CiAgICAgcmV0dXJuIGFkb3B0UHRyKHJlc3VsdCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQppbmRleCBh ODc3ZjI2MzQ2NDVkY2I3OTk2NjFjMTIxMWQ3YzFmNGMxYzIwMDczLi40ZGU1NDFjNGEwOGMwYWQw ODNjNTgyZjFlMWRlNGQ3NDI3ZGJlMTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KQEAgLTIxOSw3ICsyMTksNyBAQCB2 b2lkIEZvbnRDYWNoZTo6Z2V0VHJhaXRzSW5GYW1pbHkoY29uc3QgQXRvbWljU3RyaW5nJiBmYW1p bHlOYW1lLCBWZWN0b3I8dW5zaWduZQogICAgIFtXZWJGb250Q2FjaGUgZ2V0VHJhaXRzOnRyYWl0 c01hc2tzIGluRmFtaWx5OmZhbWlseU5hbWVdOwogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0Zm9y bURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitzdGQ6 OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZv cm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBBdG9t aWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gZm9udERl c2NyaXB0aW9uLml0YWxpYygpID8gTlNGb250SXRhbGljVHJhaXQgOiAwOwogICAgIE5TSW50ZWdl ciB3ZWlnaHQgPSB0b0FwcEtpdEZvbnRXZWlnaHQoZm9udERlc2NyaXB0aW9uLndlaWdodCgpKTsK QEAgLTIzOSw4ICsyMzksNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNo ZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAogICAgIGJvb2wgc3lu dGhldGljQm9sZCA9IGlzQXBwS2l0Rm9udFdlaWdodEJvbGQod2VpZ2h0KSAmJiAhaXNBcHBLaXRG b250V2VpZ2h0Qm9sZChhY3R1YWxXZWlnaHQpOwogICAgIGJvb2wgc3ludGhldGljT2JsaXF1ZSA9 ICh0cmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFpdCkgJiYgIShhY3R1YWxUcmFpdHMgJiBOU0ZvbnRJ dGFsaWNUcmFpdCk7CiAKLSAgICBPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gcGxhdGZvcm1EYXRh ID0gYWRvcHRQdHIobmV3IEZvbnRQbGF0Zm9ybURhdGEocGxhdGZvcm1Gb250LCBzaXplLCBmb250 RGVzY3JpcHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2Js aXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0 aFZhcmlhbnQoKSkpOwotICAgIHJldHVybiBwbGF0Zm9ybURhdGEucmVsZWFzZSgpOworICAgIHJl dHVybiBzdGQ6Om1ha2VfdW5pcXVlPEZvbnRQbGF0Zm9ybURhdGE+KHBsYXRmb3JtRm9udCwgc2l6 ZSwgZm9udERlc2NyaXB0aW9uLnVzZVByaW50ZXJGb250KCksIHN5bnRoZXRpY0JvbGQsIHN5bnRo ZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBmb250RGVzY3JpcHRp b24ud2lkdGhWYXJpYW50KCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3Bw CmluZGV4IGU4Y2FmYTAxMjNiYTYwMGQ1MDgwZTJhNDZiYjkxM2Y5MDU0YWIyY2MuLjIwZWRiMTU5 ZWFiNzQzMjJjYWZiZmFiYmRkMjQwY2Y4MTYxY2ZkYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCkBAIC01NDUsNyAr NTQ1LDcgQEAgdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21pY1N0 cmluZyYgZmFtaWx5TmFtZSwgVmVjdG9yPHVuc2lnbmUKICAgICBjb3B5VG9WZWN0b3IocHJvY0Rh dGEubV90cmFpdHNNYXNrcywgdHJhaXRzTWFza3MpOwogfQogCi1QYXNzT3duUHRyPEZvbnRQbGF0 Zm9ybURhdGE+IEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVz Y3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgY29uc3QgQXRvbWljU3RyaW5nJiBmYW1pbHkpCitz dGQ6OnVuaXF1ZV9wdHI8Rm9udFBsYXRmb3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxh dGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBB dG9taWNTdHJpbmcmIGZhbWlseSkKIHsKICAgICBib29sIGlzTHVjaWRhR3JhbmRlID0gZmFsc2U7 CiAgICAgc3RhdGljIEF0b21pY1N0cmluZyBsdWNpZGFTdHIoIkx1Y2lkYSBHcmFuZGUiKTsKQEAg LTU3NCw3ICs1NzQsNyBAQCBQYXNzT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IEZvbnRDYWNoZTo6 Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcAogICAgIGJvb2wgc3ludGhl c2l6ZUJvbGQgPSBpc0dESUZvbnRXZWlnaHRCb2xkKHdlaWdodCkgJiYgIWlzR0RJRm9udFdlaWdo dEJvbGQobG9nRm9udC5sZldlaWdodCk7CiAgICAgYm9vbCBzeW50aGVzaXplSXRhbGljID0gZm9u dERlc2NyaXB0aW9uLml0YWxpYygpICYmICFsb2dGb250LmxmSXRhbGljOwogCi0gICAgRm9udFBs YXRmb3JtRGF0YSogcmVzdWx0ID0gbmV3IEZvbnRQbGF0Zm9ybURhdGEoV1RGOjptb3ZlKGhmb250 KSwgZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkUGl4ZWxTaXplKCksIHN5bnRoZXNpemVCb2xkLCBz eW50aGVzaXplSXRhbGljLCB1c2VHREkpOworICAgIGF1dG8gcmVzdWx0ID0gc3RkOjptYWtlX3Vu aXF1ZTxGb250UGxhdGZvcm1EYXRhPihXVEY6Om1vdmUoaGZvbnQpLCBmb250RGVzY3JpcHRpb24u Y29tcHV0ZWRQaXhlbFNpemUoKSwgc3ludGhlc2l6ZUJvbGQsIHN5bnRoZXNpemVJdGFsaWMsIHVz ZUdESSk7CiAKICNpZiBVU0UoQ0cpCiAgICAgYm9vbCBmb250Q3JlYXRpb25GYWlsZWQgPSAhcmVz dWx0LT5jZ0ZvbnQoKTsKQEAgLTU4NiwxMSArNTg2LDEwIEBAIFBhc3NPd25QdHI8Rm9udFBsYXRm b3JtRGF0YT4gRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNj cmlwCiAgICAgICAgIC8vIFRoZSBjcmVhdGlvbiBvZiB0aGUgQ0dGb250UmVmIGZhaWxlZCBmb3Ig c29tZSByZWFzb24uICBXZSBhbHJlYWR5IGFzc2VydGVkIGluIGRlYnVnIGJ1aWxkcywgYnV0IHRv IG1ha2UKICAgICAgICAgLy8gYWJzb2x1dGVseSBzdXJlIHRoYXQgd2UgZG9uJ3QgdXNlIHRoaXMg Zm9udCwgZ28gYWhlYWQgYW5kIHJldHVybiAwIHNvIHRoYXQgd2UgY2FuIGZhbGwgYmFjayB0byB0 aGUgbmV4dAogICAgICAgICAvLyBmb250LgotICAgICAgICBkZWxldGUgcmVzdWx0OwogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKLSAgICB9ICAgICAgICAKKyAgICB9CiAKLSAgICByZXR1cm4gYWRv cHRQdHIocmVzdWx0KTsKKyAgICByZXR1cm4gcmVzdWx0OwogfQogCiB9Cg==