83002 2012-04-02 23:36:01 -0700 [Chromium] Out-of-process font loading garbles text 2012-05-01 17:06:11 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://crbug.com/108645 P2 Normal --- 1 bashi bashi cc-bugs eric jamesr mitz playmobil tkent webkit.review.bot oldest_to_newest 594229 0 bashi 2012-04-02 23:36:01 -0700 Original reports: http://crbug.com/108645 http://crbug.com/121351 http://crbug.com/120929 This is not a webfont-related issue. FontPlatformData::ctFont() doesn't point out the correct NSFont* if we load the font from the browser process. 594243 1 135283 bashi 2012-04-02 23:56:15 -0700 Created attachment 135283 Patch 594247 2 bashi 2012-04-03 00:00:44 -0700 Jeremy, Kent-san, could you take a look? Cc'ing mitz@ just in case because the patch modifies mac font-related files. 594417 3 135283 playmobil 2012-04-03 06:05:04 -0700 Comment on attachment 135283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135283&action=review (disclaimer: As you know, I'm not a WebKit reviewer) LGTM Thanks for fixing! Did you test on 10.6 and 10.7 ? > Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:194 > +// failed. How about: The font that was actually loaded or null if loading failed. > Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:217 > + // If we still can't load the font, set the null value to|outNSFont| so that the FontPlatformData won't be used. nit : space after "to". How about: If we still can't load the font, set |outNSFont| to null so that FontPlatformData won't be used. > Source/WebCore/platform/graphics/mac/FontCacheMac.mm:234 > + if (!platformData->font()) Can you add a comment that this this can be false for the case of Chrome OOP font loading? 595132 4 135484 bashi 2012-04-03 19:01:47 -0700 Created attachment 135484 Patch 595133 5 135283 bashi 2012-04-03 19:03:30 -0700 Comment on attachment 135283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135283&action=review Thank you for review! I confirmed the fix on SnowLeopard and Lion. >> Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:194 >> +// failed. > > How about: > The font that was actually loaded or null if loading failed. Done. >> Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:217 >> + // If we still can't load the font, set the null value to|outNSFont| so that the FontPlatformData won't be used. > > nit : space after "to". > > How about: > If we still can't load the font, set |outNSFont| to null so that FontPlatformData won't be used. Done. >> Source/WebCore/platform/graphics/mac/FontCacheMac.mm:234 >> + if (!platformData->font()) > > Can you add a comment that this this can be false for the case of Chrome OOP font loading? Done. 595134 6 135485 bashi 2012-04-03 19:06:04 -0700 Created attachment 135485 Fix comments in CrossProcessFontLoading.mm 595144 7 tkent 2012-04-03 19:13:12 -0700 EWSs are purple. 595155 8 135487 bashi 2012-04-03 19:40:03 -0700 Created attachment 135487 Revised to ToT 595172 9 135487 tkent 2012-04-03 20:04:11 -0700 Comment on attachment 135487 Revised to ToT rubber-stamped 595175 10 135487 bashi 2012-04-03 20:09:11 -0700 Comment on attachment 135487 Revised to ToT Thanks. I'll watch bots after the patch is landed. 595182 11 135487 webkit.review.bot 2012-04-03 20:15:49 -0700 Comment on attachment 135487 Revised to ToT Clearing flags on attachment: 135487 Committed r113132: <http://trac.webkit.org/changeset/113132> 595183 12 webkit.review.bot 2012-04-03 20:15:54 -0700 All reviewed patches have been landed. Closing bug. 613800 13 eric 2012-05-01 17:06:11 -0700 I wonder if this could be related to this: http://code.google.com/p/chromium/issues/detail?id=125860 135283 2012-04-02 23:56:15 -0700 2012-04-03 19:03:30 -0700 Patch bug-83002-20120403155613.patch text/plain 5553 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJmNDdhZjRlYzdjY2Zk YWFhMWNjMzRlZGIxMzU5ZmI3OWE0OGNjOC4uNmIyMmFlYzY5ZjMxOTI2NDk5YzkyNzM1NmM4OTFl YWJjYWQ0MjA5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTAyICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1d IE91dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZyBnYXJibGVzIHRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDAyCisKKyAgICAgICAgSW5pdGlh bGl6ZSBtX0NURm9udCBieSB1c2luZyBtX2NnRm9udCBpbiBGb250UGxhdGZvcm1EYXRhIHdoZW4g d2UgdXNlCisgICAgICAgIG91dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZy4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMg cHJvYmxlbSBvbmx5IG9jY3VycyB3aGVuIHRoZSB1c2VyIHVzZXMgYSB0aGlyZCBwYXJ0eQorICAg ICAgICBmb250IG1hbmFnZW1lbnQgc29mdHdhcmUgbGlrZSBGb250IEV4cGxvcmVyIHNvIGl0IGlz IGRpZmZpY3VsdCB0byBhZGQKKyAgICAgICAgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQpOiBJ ZiBmb250IGxvYWRpbmcgZmFpbHMsIHNldCBudWxsIHRvIG91dE5TRm9udCBzbyB0aGF0IHRoZSBG b250UGxhdGZvcm1EYXRhIHdvbid0IGJlIHVzZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KTogTW9kaWZpZWQgdG8gcmV0dXJuIHRoZSBhcHByb3ByaWF0 ZSBOU0ZvbnQgb2JqZWN0IHdoZW4gdGhlIGZvbnQgZnJvbSB0aGUgYnJvd3NlciBwcm9jZXNzLgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOiBSZXR1cm5zIG51 bGwgd2hlbiB0aGUgZ2VuZXJhdGVkIEZvbnRQbGF0Zm9ybURhdGEgb2JqZWN0IGRvZXNuJ3QgaGF2 ZSBOU0ZvbnQgb2JqZWN0LgorCiAyMDEyLTAzLTMwICBaYWxhbiBCdWp0YXMgIDx6YnVqdGFzQGdt YWlsLmNvbT4KIAogICAgICAgICBGaXggZGVmZWN0aXZlIHNpemVfdCBvdmVyZmxvdyBpbiBHZXN0 dXJlVGFwSGlnaGxpZ2h0ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t CmluZGV4IDQxYjlkMGZjZmZhMjYxMWE0MmU0MmRmYzMyOWJmNDNkYzYzNzc3YjIuLjk5NWUwOGY4 OTRjM2ViNTFlYTllMjFhNGEwZWZiZDk0Mzk5NDBhMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJv Y2Vzc0ZvbnRMb2FkaW5nLm1tCkBAIC0xOTAsOCArMTkwLDggQEAgTWVtb3J5QWN0aXZhdGVkRm9u dDo6fk1lbW9yeUFjdGl2YXRlZEZvbnQoKQogLy8gUGFyYW1ldGVyczoKIC8vICogbnNGb250IC0g VGhlIGZvbnQgd2Ugd2lzaCB0byBsb2FkLgogLy8gKiBmb250U2l6ZSAtIHBvaW50IHNpemUgb2Yg dGhlIGZvbnQgd2Ugd2lzaCB0byBsb2FkLgotLy8gKiBvdXROU0ZvbnQgLSBUaGUgZm9udCB0aGF0 IHdhcyBhY3R1YWxseSBsb2FkZWQsIG1heSBiZSBkaWZmZXJlbnQgZnJvbSBuc0ZvbnQKLS8vICAg aWYgYSBmYWxsYmFjayBmb250IHdhcyB1c2VkLgorLy8gKiBvdXROU0ZvbnQgLSBUaGUgZm9udCB0 aGF0IHdhcyBhY3R1YWxseSBsb2FkZWQsIGNvbGQgYmUgbnVsbCBpZiBsb2FkaW5nCisvLyAgIGZh aWxlZC4KIC8vICogY2dGb250IC0gb24gb3V0cHV0IHRoaXMgY29udGFpbnMgdGhlIENHRm9udFJl ZiBjb3JyZXNwb25kaW5nIHRvIHRoZSBOU0ZvbnQKIC8vICAgdGhhdCB3YXMgcGlja2VkIGluIHRo ZSBlbmQuICBUaGUgY2FsbGVyIGlzIHJlc3BvbnNpYmxlIGZvciBjYWxsaW5nCiAvLyAgIENGUmVs ZWFzZSgpIG9uIHRoaXMgcGFyYW1ldGVyIHdoZW4gZG9uZSB3aXRoIGl0LgpAQCAtMjA0LDcgKzIw NCw3IEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQoTlNGb250KiBuc0ZvbnQsIGZs b2F0IGZvbnRTaXplLCBOU0ZvbnQqJiBvdXROU0ZvCiAgICAgICAgIC8vIFJlbGVhc2Ugb2xkIENH Rm9udFJlZiBzaW5jZSBpdCBwb2ludHMgYXQgdGhlIExhc3RSZXNvcnQgZm9udCB3aGljaCB3ZSBk b24ndCB3YW50LgogICAgICAgICBDRlJlbGVhc2UoY2dGb250KTsKICAgICAgICAgY2dGb250ID0g MDsKLSAgICAgICAgCisKICAgICAgICAgLy8gRm9udCBsb2FkaW5nIHdhcyBibG9ja2VkIGJ5IHRo ZSBTYW5kYm94LgogICAgICAgICBtX2luTWVtb3J5Rm9udCA9IGxvYWRGb250RnJvbUJyb3dzZXJQ cm9jZXNzKG91dE5TRm9udCk7CiAgICAgICAgIGlmIChtX2luTWVtb3J5Rm9udCkgewpAQCAtMjE0 LDEwICsyMTQsOCBAQCB2b2lkIEZvbnRQbGF0Zm9ybURhdGE6OmxvYWRGb250KE5TRm9udCogbnNG b250LCBmbG9hdCBmb250U2l6ZSwgTlNGb250KiYgb3V0TlNGbwogICAgICAgICAgICAgLy8gYXJl IGNvbnNpc3RlbnQuCiAgICAgICAgICAgICBDRlJldGFpbihjZ0ZvbnQpOwogICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgLy8gSWYgd2Ugc3RpbGwgY2FuJ3QgbG9hZCB0aGUgZm9udCwgdGhl biByZXR1cm4gVGltZXMsCi0gICAgICAgICAgICAvLyByYXRoZXIgdGhhbiB0aGUgTGFzdFJlc29y dCBmb250LgotICAgICAgICAgICAgb3V0TlNGb250ID0gW05TRm9udCBmb250V2l0aE5hbWU6QCJU aW1lcyIgc2l6ZTpmb250U2l6ZV07Ci0gICAgICAgICAgICBjZ0ZvbnQgPSBDVEZvbnRDb3B5R3Jh cGhpY3NGb250KHRvQ1RGb250UmVmKG91dE5TRm9udCksIDApOworICAgICAgICAgICAgLy8gSWYg d2Ugc3RpbGwgY2FuJ3QgbG9hZCB0aGUgZm9udCwgc2V0IHRoZSBudWxsIHZhbHVlIHRvfG91dE5T Rm9udHwgc28gdGhhdCB0aGUgRm9udFBsYXRmb3JtRGF0YSB3b24ndCBiZSB1c2VkLgorICAgICAg ICAgICAgb3V0TlNGb250ID0gMDsKICAgICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2Nv YS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9y bURhdGFDb2NvYS5tbQppbmRleCA3YjEzNjA4ODM0M2FlMDg0ZTJlNGFlNDA3YmJlMDg5YWQ4Njdj NDc0Li40YzYyMjA4NDc0OGNkMzg0MGM5Yzc3MWIyODZhZGQzYmE3ZDdjNzk3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRh Q29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9u dFBsYXRmb3JtRGF0YUNvY29hLm1tCkBAIC0yNDcsNiArMjQ3LDEzIEBAIENURm9udFJlZiBGb250 UGxhdGZvcm1EYXRhOjpjdEZvbnQoKSBjb25zdAogICAgIGlmIChtX0NURm9udCkKICAgICAgICAg cmV0dXJuIG1fQ1RGb250LmdldCgpOwogCisjaWYgUExBVEZPUk0oQ0hST01JVU0pCisgICAgaWYg KG1faW5NZW1vcnlGb250KSB7CisgICAgICAgIG1fQ1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRl V2l0aEdyYXBoaWNzRm9udChtX2luTWVtb3J5Rm9udC0+Y2dGb250KCksIG1fc2l6ZSwgMCwgY2Fu U2V0Q2FzY2FkZUxpc3RGb3JDdXN0b21Gb250KCkgPyBjYXNjYWRlVG9MYXN0UmVzb3J0Rm9udERl c2NyaXB0b3IoKSA6IDApKTsKKyAgICAgICAgcmV0dXJuIG1fQ1RGb250LmdldCgpOworICAgIH0K KyNlbmRpZgorCiAgICAgbV9DVEZvbnQgPSB0b0NURm9udFJlZihtX2ZvbnQpOwogICAgIGlmICht X0NURm9udCkgewogICAgICAgICBDVEZvbnREZXNjcmlwdG9yUmVmIGZvbnREZXNjcmlwdG9yOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNo ZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVN YWMubW0KaW5kZXggYzZiOWYwZmM4NTQ2N2Y4OGE2MzI2NDM2NGQ4MGI4ODFjNWI0NmRlYy4uMjE3 NTg0MDJhNDE2MTg2ZmYzNTIxMmJhYzRkODQ3MzQyOGQ1YjI2MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCkBAIC0yMzAs NyArMjMwLDEwIEBAIEZvbnRQbGF0Zm9ybURhdGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRm b3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnRECiAgICAgYm9vbCBzeW50aGV0aWNC b2xkID0gaXNBcHBLaXRGb250V2VpZ2h0Qm9sZCh3ZWlnaHQpICYmICFpc0FwcEtpdEZvbnRXZWln aHRCb2xkKGFjdHVhbFdlaWdodCk7CiAgICAgYm9vbCBzeW50aGV0aWNPYmxpcXVlID0gKHRyYWl0 cyAmIE5TRm9udEl0YWxpY1RyYWl0KSAmJiAhKGFjdHVhbFRyYWl0cyAmIE5TRm9udEl0YWxpY1Ry YWl0KTsKIAotICAgIHJldHVybiBuZXcgRm9udFBsYXRmb3JtRGF0YShwbGF0Zm9ybUZvbnQsIHNp emUsIHN5bnRoZXRpY0JvbGQsIHN5bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmll bnRhdGlvbigpLCBmb250RGVzY3JpcHRpb24udGV4dE9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlw dGlvbi53aWR0aFZhcmlhbnQoKSk7CisgICAgT3duUHRyPEZvbnRQbGF0Zm9ybURhdGE+IHBsYXRm b3JtRGF0YSA9IGFkb3B0UHRyKG5ldyBGb250UGxhdGZvcm1EYXRhKHBsYXRmb3JtRm9udCwgc2l6 ZSwgc3ludGhldGljQm9sZCwgc3ludGhldGljT2JsaXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVu dGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi50ZXh0T3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0 aW9uLndpZHRoVmFyaWFudCgpKSk7CisgICAgaWYgKCFwbGF0Zm9ybURhdGEtPmZvbnQoKSkKKyAg ICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHBsYXRmb3JtRGF0YS5sZWFrUHRyKCk7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 135484 2012-04-03 19:01:47 -0700 2012-04-03 19:05:55 -0700 Patch bug-83002-20120404110143.patch text/plain 5698 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJmNDdhZjRlYzdjY2Zk YWFhMWNjMzRlZGIxMzU5ZmI3OWE0OGNjOC4uMjYyNTczZjJjNTAwYzM5MDVjY2NlYmVlYjczNWU5 OGVkNTNkN2M0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTAzICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1d IE91dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZyBnYXJibGVzIHRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDAyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5pdGlhbGl6ZSBtX0NURm9udCBieSB1 c2luZyBtX2NnRm9udCBpbiBGb250UGxhdGZvcm1EYXRhIHdoZW4gd2UgdXNlCisgICAgICAgIG91 dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMg cHJvYmxlbSBvbmx5IG9jY3VycyB3aGVuIHRoZSB1c2VyIHVzZXMgYSB0aGlyZCBwYXJ0eQorICAg ICAgICBmb250IG1hbmFnZW1lbnQgc29mdHdhcmUgbGlrZSBGb250IEV4cGxvcmVyIHNvIGl0IGlz IGRpZmZpY3VsdCB0byBhZGQKKyAgICAgICAgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQpOiBJ ZiBmb250IGxvYWRpbmcgZmFpbHMsIHNldCBudWxsIHRvIG91dE5TRm9udCBzbyB0aGF0IHRoZSBG b250UGxhdGZvcm1EYXRhIHdvbid0IGJlIHVzZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KTogTW9kaWZpZWQgdG8gcmV0dXJuIHRoZSBhcHByb3ByaWF0 ZSBOU0ZvbnQgb2JqZWN0IHdoZW4gdGhlIGZvbnQgZnJvbSB0aGUgYnJvd3NlciBwcm9jZXNzLgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOiBSZXR1cm5zIG51 bGwgd2hlbiB0aGUgZ2VuZXJhdGVkIEZvbnRQbGF0Zm9ybURhdGEgb2JqZWN0IGRvZXNuJ3QgaGF2 ZSBOU0ZvbnQgb2JqZWN0LgorCiAyMDEyLTAzLTMwICBaYWxhbiBCdWp0YXMgIDx6YnVqdGFzQGdt YWlsLmNvbT4KIAogICAgICAgICBGaXggZGVmZWN0aXZlIHNpemVfdCBvdmVyZmxvdyBpbiBHZXN0 dXJlVGFwSGlnaGxpZ2h0ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t CmluZGV4IDQxYjlkMGZjZmZhMjYxMWE0MmU0MmRmYzMyOWJmNDNkYzYzNzc3YjIuLjEwYjM4YjBi NWQ5M2YyNjMyNzYxZWNhNGRlYzA1ZGE4MDBiNThhZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJv Y2Vzc0ZvbnRMb2FkaW5nLm1tCkBAIC0xOTAsOCArMTkwLDggQEAgTWVtb3J5QWN0aXZhdGVkRm9u dDo6fk1lbW9yeUFjdGl2YXRlZEZvbnQoKQogLy8gUGFyYW1ldGVyczoKIC8vICogbnNGb250IC0g VGhlIGZvbnQgd2Ugd2lzaCB0byBsb2FkLgogLy8gKiBmb250U2l6ZSAtIHBvaW50IHNpemUgb2Yg dGhlIGZvbnQgd2Ugd2lzaCB0byBsb2FkLgotLy8gKiBvdXROU0ZvbnQgLSBUaGUgZm9udCB0aGF0 IHdhcyBhY3R1YWxseSBsb2FkZWQsIG1heSBiZSBkaWZmZXJlbnQgZnJvbSBuc0ZvbnQKLS8vICAg aWYgYSBmYWxsYmFjayBmb250IHdhcyB1c2VkLgorLy8gKiBvdXROU0ZvbnQgLSBUaGUgZm9udCB0 aGF0IHdhcyBhY3R1YWxseSBsb2FkZWQgb3IgbnVsbCBpZiBsb2FkaW5nIGZhaWxlZC4KKy8vICAg ZmFpbGVkLgogLy8gKiBjZ0ZvbnQgLSBvbiBvdXRwdXQgdGhpcyBjb250YWlucyB0aGUgQ0dGb250 UmVmIGNvcnJlc3BvbmRpbmcgdG8gdGhlIE5TRm9udAogLy8gICB0aGF0IHdhcyBwaWNrZWQgaW4g dGhlIGVuZC4gIFRoZSBjYWxsZXIgaXMgcmVzcG9uc2libGUgZm9yIGNhbGxpbmcKIC8vICAgQ0ZS ZWxlYXNlKCkgb24gdGhpcyBwYXJhbWV0ZXIgd2hlbiBkb25lIHdpdGggaXQuCkBAIC0yMDQsNyAr MjA0LDcgQEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpsb2FkRm9udChOU0ZvbnQqIG5zRm9udCwg ZmxvYXQgZm9udFNpemUsIE5TRm9udComIG91dE5TRm8KICAgICAgICAgLy8gUmVsZWFzZSBvbGQg Q0dGb250UmVmIHNpbmNlIGl0IHBvaW50cyBhdCB0aGUgTGFzdFJlc29ydCBmb250IHdoaWNoIHdl IGRvbid0IHdhbnQuCiAgICAgICAgIENGUmVsZWFzZShjZ0ZvbnQpOwogICAgICAgICBjZ0ZvbnQg PSAwOwotICAgICAgICAKKwogICAgICAgICAvLyBGb250IGxvYWRpbmcgd2FzIGJsb2NrZWQgYnkg dGhlIFNhbmRib3guCiAgICAgICAgIG1faW5NZW1vcnlGb250ID0gbG9hZEZvbnRGcm9tQnJvd3Nl clByb2Nlc3Mob3V0TlNGb250KTsKICAgICAgICAgaWYgKG1faW5NZW1vcnlGb250KSB7CkBAIC0y MTQsMTAgKzIxNCw4IEBAIHZvaWQgRm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQoTlNGb250KiBu c0ZvbnQsIGZsb2F0IGZvbnRTaXplLCBOU0ZvbnQqJiBvdXROU0ZvCiAgICAgICAgICAgICAvLyBh cmUgY29uc2lzdGVudC4KICAgICAgICAgICAgIENGUmV0YWluKGNnRm9udCk7CiAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAvLyBJZiB3ZSBzdGlsbCBjYW4ndCBsb2FkIHRoZSBmb250LCB0 aGVuIHJldHVybiBUaW1lcywKLSAgICAgICAgICAgIC8vIHJhdGhlciB0aGFuIHRoZSBMYXN0UmVz b3J0IGZvbnQuCi0gICAgICAgICAgICBvdXROU0ZvbnQgPSBbTlNGb250IGZvbnRXaXRoTmFtZTpA IlRpbWVzIiBzaXplOmZvbnRTaXplXTsKLSAgICAgICAgICAgIGNnRm9udCA9IENURm9udENvcHlH cmFwaGljc0ZvbnQodG9DVEZvbnRSZWYob3V0TlNGb250KSwgMCk7CisgICAgICAgICAgICAvLyBJ ZiB3ZSBzdGlsbCBjYW4ndCBsb2FkIHRoZSBmb250LCBzZXQgfG91dE5TRm9udHwgdG8gbnVsbCBz byB0aGF0IEZvbnRQbGF0Zm9ybURhdGEgd29uJ3QgYmUgdXNlZC4KKyAgICAgICAgICAgIG91dE5T Rm9udCA9IDA7CiAgICAgICAgIH0KICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2Eu bW0KaW5kZXggN2IxMzYwODgzNDNhZTA4NGUyZTRhZTQwN2JiZTA4OWFkODY3YzQ3NC4uNGM2MjIw ODQ3NDhjZDM4NDBjOWM3NzFiMjg2YWRkM2JhN2Q3Yzc5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURh dGFDb2NvYS5tbQpAQCAtMjQ3LDYgKzI0NywxMyBAQCBDVEZvbnRSZWYgRm9udFBsYXRmb3JtRGF0 YTo6Y3RGb250KCkgY29uc3QKICAgICBpZiAobV9DVEZvbnQpCiAgICAgICAgIHJldHVybiBtX0NU Rm9udC5nZXQoKTsKIAorI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorICAgIGlmIChtX2luTWVtb3J5 Rm9udCkgeworICAgICAgICBtX0NURm9udC5hZG9wdENGKENURm9udENyZWF0ZVdpdGhHcmFwaGlj c0ZvbnQobV9pbk1lbW9yeUZvbnQtPmNnRm9udCgpLCBtX3NpemUsIDAsIGNhblNldENhc2NhZGVM aXN0Rm9yQ3VzdG9tRm9udCgpID8gY2FzY2FkZVRvTGFzdFJlc29ydEZvbnREZXNjcmlwdG9yKCkg OiAwKSk7CisgICAgICAgIHJldHVybiBtX0NURm9udC5nZXQoKTsKKyAgICB9CisjZW5kaWYKKwog ICAgIG1fQ1RGb250ID0gdG9DVEZvbnRSZWYobV9mb250KTsKICAgICBpZiAobV9DVEZvbnQpIHsK ICAgICAgICAgQ1RGb250RGVzY3JpcHRvclJlZiBmb250RGVzY3JpcHRvcjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tCmluZGV4 IGM2YjlmMGZjODU0NjdmODhhNjMyNjQzNjRkODBiODgxYzViNDZkZWMuLjI5ZDA5MzVlYWViODkw ZWI4MmE1NjU2OGIyODdhOTVkNjY2ZDZlMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQpAQCAtMjMwLDcgKzIzMCwxMiBA QCBGb250UGxhdGZvcm1EYXRhKiBGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEoY29u c3QgRm9udERlc2NyaXB0aW9uJiBmb250RAogICAgIGJvb2wgc3ludGhldGljQm9sZCA9IGlzQXBw S2l0Rm9udFdlaWdodEJvbGQod2VpZ2h0KSAmJiAhaXNBcHBLaXRGb250V2VpZ2h0Qm9sZChhY3R1 YWxXZWlnaHQpOwogICAgIGJvb2wgc3ludGhldGljT2JsaXF1ZSA9ICh0cmFpdHMgJiBOU0ZvbnRJ dGFsaWNUcmFpdCkgJiYgIShhY3R1YWxUcmFpdHMgJiBOU0ZvbnRJdGFsaWNUcmFpdCk7CiAKLSAg ICByZXR1cm4gbmV3IEZvbnRQbGF0Zm9ybURhdGEocGxhdGZvcm1Gb250LCBzaXplLCBzeW50aGV0 aWNCb2xkLCBzeW50aGV0aWNPYmxpcXVlLCBmb250RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSwg Zm9udERlc2NyaXB0aW9uLnRleHRPcmllbnRhdGlvbigpLCBmb250RGVzY3JpcHRpb24ud2lkdGhW YXJpYW50KCkpOworICAgIE93blB0cjxGb250UGxhdGZvcm1EYXRhPiBwbGF0Zm9ybURhdGEgPSBh ZG9wdFB0cihuZXcgRm9udFBsYXRmb3JtRGF0YShwbGF0Zm9ybUZvbnQsIHNpemUsIHN5bnRoZXRp Y0JvbGQsIHN5bnRoZXRpY09ibGlxdWUsIGZvbnREZXNjcmlwdGlvbi5vcmllbnRhdGlvbigpLCBm b250RGVzY3JpcHRpb24udGV4dE9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlvbi53aWR0aFZh cmlhbnQoKSkpOworICAgIC8vIHBsYXRmb3JtRGF0YS0+Zm9udCgpIGNhbiBiZSBudWxsIGZvciB0 aGUgY2FzZSBvZiBDaHJvbWl1bSBvdXQtb2YtcHJvY2VzcyBmb250IGxvYWRpbmcuCisgICAgLy8g SW4gdGhhdCBjYXNlLCB3ZSBkb24ndCB3YW50IHRvIHVzZSB0aGUgcGxhdGZvcm1EYXRhLgorICAg IGlmICghcGxhdGZvcm1EYXRhLT5mb250KCkpCisgICAgICAgIHJldHVybiAwOworICAgIHJldHVy biBwbGF0Zm9ybURhdGEubGVha1B0cigpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 135485 2012-04-03 19:06:04 -0700 2012-04-03 19:39:55 -0700 Fix comments in CrossProcessFontLoading.mm bug-83002-20120404110601.patch text/plain 5684 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmJmNDdhZjRlYzdjY2Zk YWFhMWNjMzRlZGIxMzU5ZmI3OWE0OGNjOC4uMjYyNTczZjJjNTAwYzM5MDVjY2NlYmVlYjczNWU5 OGVkNTNkN2M0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTAzICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1d IE91dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZyBnYXJibGVzIHRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDAyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5pdGlhbGl6ZSBtX0NURm9udCBieSB1 c2luZyBtX2NnRm9udCBpbiBGb250UGxhdGZvcm1EYXRhIHdoZW4gd2UgdXNlCisgICAgICAgIG91 dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMg cHJvYmxlbSBvbmx5IG9jY3VycyB3aGVuIHRoZSB1c2VyIHVzZXMgYSB0aGlyZCBwYXJ0eQorICAg ICAgICBmb250IG1hbmFnZW1lbnQgc29mdHdhcmUgbGlrZSBGb250IEV4cGxvcmVyIHNvIGl0IGlz IGRpZmZpY3VsdCB0byBhZGQKKyAgICAgICAgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQpOiBJ ZiBmb250IGxvYWRpbmcgZmFpbHMsIHNldCBudWxsIHRvIG91dE5TRm9udCBzbyB0aGF0IHRoZSBG b250UGxhdGZvcm1EYXRhIHdvbid0IGJlIHVzZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KTogTW9kaWZpZWQgdG8gcmV0dXJuIHRoZSBhcHByb3ByaWF0 ZSBOU0ZvbnQgb2JqZWN0IHdoZW4gdGhlIGZvbnQgZnJvbSB0aGUgYnJvd3NlciBwcm9jZXNzLgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOiBSZXR1cm5zIG51 bGwgd2hlbiB0aGUgZ2VuZXJhdGVkIEZvbnRQbGF0Zm9ybURhdGEgb2JqZWN0IGRvZXNuJ3QgaGF2 ZSBOU0ZvbnQgb2JqZWN0LgorCiAyMDEyLTAzLTMwICBaYWxhbiBCdWp0YXMgIDx6YnVqdGFzQGdt YWlsLmNvbT4KIAogICAgICAgICBGaXggZGVmZWN0aXZlIHNpemVfdCBvdmVyZmxvdyBpbiBHZXN0 dXJlVGFwSGlnaGxpZ2h0ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t CmluZGV4IDQxYjlkMGZjZmZhMjYxMWE0MmU0MmRmYzMyOWJmNDNkYzYzNzc3YjIuLmEyN2FmNGNi ZTY1Zjk1NTY2NjdjYmZmYzQ1NzRkZmUzMjc0YmNiMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJv Y2Vzc0ZvbnRMb2FkaW5nLm1tCkBAIC0xOTAsOCArMTkwLDcgQEAgTWVtb3J5QWN0aXZhdGVkRm9u dDo6fk1lbW9yeUFjdGl2YXRlZEZvbnQoKQogLy8gUGFyYW1ldGVyczoKIC8vICogbnNGb250IC0g VGhlIGZvbnQgd2Ugd2lzaCB0byBsb2FkLgogLy8gKiBmb250U2l6ZSAtIHBvaW50IHNpemUgb2Yg dGhlIGZvbnQgd2Ugd2lzaCB0byBsb2FkLgotLy8gKiBvdXROU0ZvbnQgLSBUaGUgZm9udCB0aGF0 IHdhcyBhY3R1YWxseSBsb2FkZWQsIG1heSBiZSBkaWZmZXJlbnQgZnJvbSBuc0ZvbnQKLS8vICAg aWYgYSBmYWxsYmFjayBmb250IHdhcyB1c2VkLgorLy8gKiBvdXROU0ZvbnQgLSBUaGUgZm9udCB0 aGF0IHdhcyBhY3R1YWxseSBsb2FkZWQgb3IgbnVsbCBpZiBsb2FkaW5nIGZhaWxlZC4KIC8vICog Y2dGb250IC0gb24gb3V0cHV0IHRoaXMgY29udGFpbnMgdGhlIENHRm9udFJlZiBjb3JyZXNwb25k aW5nIHRvIHRoZSBOU0ZvbnQKIC8vICAgdGhhdCB3YXMgcGlja2VkIGluIHRoZSBlbmQuICBUaGUg Y2FsbGVyIGlzIHJlc3BvbnNpYmxlIGZvciBjYWxsaW5nCiAvLyAgIENGUmVsZWFzZSgpIG9uIHRo aXMgcGFyYW1ldGVyIHdoZW4gZG9uZSB3aXRoIGl0LgpAQCAtMjA0LDcgKzIwMyw3IEBAIHZvaWQg Rm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQoTlNGb250KiBuc0ZvbnQsIGZsb2F0IGZvbnRTaXpl LCBOU0ZvbnQqJiBvdXROU0ZvCiAgICAgICAgIC8vIFJlbGVhc2Ugb2xkIENHRm9udFJlZiBzaW5j ZSBpdCBwb2ludHMgYXQgdGhlIExhc3RSZXNvcnQgZm9udCB3aGljaCB3ZSBkb24ndCB3YW50Lgog ICAgICAgICBDRlJlbGVhc2UoY2dGb250KTsKICAgICAgICAgY2dGb250ID0gMDsKLSAgICAgICAg CisKICAgICAgICAgLy8gRm9udCBsb2FkaW5nIHdhcyBibG9ja2VkIGJ5IHRoZSBTYW5kYm94Lgog ICAgICAgICBtX2luTWVtb3J5Rm9udCA9IGxvYWRGb250RnJvbUJyb3dzZXJQcm9jZXNzKG91dE5T Rm9udCk7CiAgICAgICAgIGlmIChtX2luTWVtb3J5Rm9udCkgewpAQCAtMjE0LDEwICsyMTMsOCBA QCB2b2lkIEZvbnRQbGF0Zm9ybURhdGE6OmxvYWRGb250KE5TRm9udCogbnNGb250LCBmbG9hdCBm b250U2l6ZSwgTlNGb250KiYgb3V0TlNGbwogICAgICAgICAgICAgLy8gYXJlIGNvbnNpc3RlbnQu CiAgICAgICAgICAgICBDRlJldGFpbihjZ0ZvbnQpOwogICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgLy8gSWYgd2Ugc3RpbGwgY2FuJ3QgbG9hZCB0aGUgZm9udCwgdGhlbiByZXR1cm4gVGlt ZXMsCi0gICAgICAgICAgICAvLyByYXRoZXIgdGhhbiB0aGUgTGFzdFJlc29ydCBmb250LgotICAg ICAgICAgICAgb3V0TlNGb250ID0gW05TRm9udCBmb250V2l0aE5hbWU6QCJUaW1lcyIgc2l6ZTpm b250U2l6ZV07Ci0gICAgICAgICAgICBjZ0ZvbnQgPSBDVEZvbnRDb3B5R3JhcGhpY3NGb250KHRv Q1RGb250UmVmKG91dE5TRm9udCksIDApOworICAgICAgICAgICAgLy8gSWYgd2Ugc3RpbGwgY2Fu J3QgbG9hZCB0aGUgZm9udCwgc2V0IHxvdXROU0ZvbnR8IHRvIG51bGwgc28gdGhhdCBGb250UGxh dGZvcm1EYXRhIHdvbid0IGJlIHVzZWQuCisgICAgICAgICAgICBvdXROU0ZvbnQgPSAwOwogICAg ICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCmluZGV4IDdiMTM2 MDg4MzQzYWUwODRlMmU0YWU0MDdiYmUwODlhZDg2N2M0NzQuLjRjNjIyMDg0NzQ4Y2QzODQwYzlj NzcxYjI4NmFkZDNiYTdkN2M3OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KQEAg LTI0Nyw2ICsyNDcsMTMgQEAgQ1RGb250UmVmIEZvbnRQbGF0Zm9ybURhdGE6OmN0Rm9udCgpIGNv bnN0CiAgICAgaWYgKG1fQ1RGb250KQogICAgICAgICByZXR1cm4gbV9DVEZvbnQuZ2V0KCk7CiAK KyNpZiBQTEFURk9STShDSFJPTUlVTSkKKyAgICBpZiAobV9pbk1lbW9yeUZvbnQpIHsKKyAgICAg ICAgbV9DVEZvbnQuYWRvcHRDRihDVEZvbnRDcmVhdGVXaXRoR3JhcGhpY3NGb250KG1faW5NZW1v cnlGb250LT5jZ0ZvbnQoKSwgbV9zaXplLCAwLCBjYW5TZXRDYXNjYWRlTGlzdEZvckN1c3RvbUZv bnQoKSA/IGNhc2NhZGVUb0xhc3RSZXNvcnRGb250RGVzY3JpcHRvcigpIDogMCkpOworICAgICAg ICByZXR1cm4gbV9DVEZvbnQuZ2V0KCk7CisgICAgfQorI2VuZGlmCisKICAgICBtX0NURm9udCA9 IHRvQ1RGb250UmVmKG1fZm9udCk7CiAgICAgaWYgKG1fQ1RGb250KSB7CiAgICAgICAgIENURm9u dERlc2NyaXB0b3JSZWYgZm9udERlc2NyaXB0b3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udENhY2hlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQppbmRleCBjNmI5ZjBmYzg1NDY3 Zjg4YTYzMjY0MzY0ZDgwYjg4MWM1YjQ2ZGVjLi4yOWQwOTM1ZWFlYjg5MGViODJhNTY1NjhiMjg3 YTk1ZDY2NmQ2ZTE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvRm9udENhY2hlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9Gb250Q2FjaGVNYWMubW0KQEAgLTIzMCw3ICsyMzAsMTIgQEAgRm9udFBsYXRmb3Jt RGF0YSogRm9udENhY2hlOjpjcmVhdGVGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlw dGlvbiYgZm9udEQKICAgICBib29sIHN5bnRoZXRpY0JvbGQgPSBpc0FwcEtpdEZvbnRXZWlnaHRC b2xkKHdlaWdodCkgJiYgIWlzQXBwS2l0Rm9udFdlaWdodEJvbGQoYWN0dWFsV2VpZ2h0KTsKICAg ICBib29sIHN5bnRoZXRpY09ibGlxdWUgPSAodHJhaXRzICYgTlNGb250SXRhbGljVHJhaXQpICYm ICEoYWN0dWFsVHJhaXRzICYgTlNGb250SXRhbGljVHJhaXQpOwogCi0gICAgcmV0dXJuIG5ldyBG b250UGxhdGZvcm1EYXRhKHBsYXRmb3JtRm9udCwgc2l6ZSwgc3ludGhldGljQm9sZCwgc3ludGhl dGljT2JsaXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlv bi50ZXh0T3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpKTsKKyAg ICBPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gcGxhdGZvcm1EYXRhID0gYWRvcHRQdHIobmV3IEZv bnRQbGF0Zm9ybURhdGEocGxhdGZvcm1Gb250LCBzaXplLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0 aWNPYmxpcXVlLCBmb250RGVzY3JpcHRpb24ub3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9u LnRleHRPcmllbnRhdGlvbigpLCBmb250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCkpKTsKKyAg ICAvLyBwbGF0Zm9ybURhdGEtPmZvbnQoKSBjYW4gYmUgbnVsbCBmb3IgdGhlIGNhc2Ugb2YgQ2hy b21pdW0gb3V0LW9mLXByb2Nlc3MgZm9udCBsb2FkaW5nLgorICAgIC8vIEluIHRoYXQgY2FzZSwg d2UgZG9uJ3Qgd2FudCB0byB1c2UgdGhlIHBsYXRmb3JtRGF0YS4KKyAgICBpZiAoIXBsYXRmb3Jt RGF0YS0+Zm9udCgpKQorICAgICAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gcGxhdGZvcm1EYXRh LmxlYWtQdHIoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 135487 2012-04-03 19:40:03 -0700 2012-04-03 20:15:49 -0700 Revised to ToT bug-83002-20120404114001.patch text/plain 5757 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU4NTMwN2IwZjM4NTRh MGYwMDBlZGZkMmE2NDQyMGJlMmEzMzI0Zi4uMDVkM2FkZWY0ZGVmNDU2Y2JjNTY4MTg4NmY0MDgy YjE4ZWY3M2I0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA0LTAzICBLZW5p Y2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1d IE91dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZyBnYXJibGVzIHRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMDAyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5pdGlhbGl6ZSBtX0NURm9udCBieSB1 c2luZyBtX2NnRm9udCBpbiBGb250UGxhdGZvcm1EYXRhIHdoZW4gd2UgdXNlCisgICAgICAgIG91 dC1vZi1wcm9jZXNzIGZvbnQgbG9hZGluZy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMg cHJvYmxlbSBvbmx5IG9jY3VycyB3aGVuIHRoZSB1c2VyIHVzZXMgYSB0aGlyZCBwYXJ0eQorICAg ICAgICBmb250IG1hbmFnZW1lbnQgc29mdHdhcmUgbGlrZSBGb250IEV4cGxvcmVyIHNvIGl0IGlz IGRpZmZpY3VsdCB0byBhZGQKKyAgICAgICAgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBsYXRmb3JtRGF0YTo6bG9hZEZvbnQpOiBJ ZiBmb250IGxvYWRpbmcgZmFpbHMsIHNldCBudWxsIHRvIG91dE5TRm9udCBzbyB0aGF0IHRoZSBG b250UGxhdGZvcm1EYXRhIHdvbid0IGJlIHVzZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dFBsYXRmb3JtRGF0YTo6Y3RGb250KTogTW9kaWZpZWQgdG8gcmV0dXJuIHRoZSBhcHByb3ByaWF0 ZSBOU0ZvbnQgb2JqZWN0IHdoZW4gdGhlIGZvbnQgZnJvbSB0aGUgYnJvd3NlciBwcm9jZXNzLgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpGb250Q2FjaGU6OmNyZWF0ZUZvbnRQbGF0Zm9ybURhdGEpOiBSZXR1cm5zIG51 bGwgd2hlbiB0aGUgZ2VuZXJhdGVkIEZvbnRQbGF0Zm9ybURhdGEgb2JqZWN0IGRvZXNuJ3QgaGF2 ZSBOU0ZvbnQgb2JqZWN0LgorCiAyMDEyLTA0LTAzICBTcmlrdW1hciBCb25kYSAgPHNyaWt1bWFy LmJAZ21haWwuY29tPgogCiAgICAgICAgIFtRdF0gQ3Jhc2ggaW4gfkdyYXBoaWNzQ29udGV4dDNE KCkgd2hlbiBpbml0IGZhaWxlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ3Jvc3NQcm9jZXNzRm9udExvYWRpbmcubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5t bQppbmRleCA0MWI5ZDBmY2ZmYTI2MTFhNDJlNDJkZmMzMjliZjQzZGM2Mzc3N2IyLi5hMjdhZjRj YmU2NWY5NTU2NjY3Y2JmZmM0NTc0ZGZlMzI3NGJjYjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1By b2Nlc3NGb250TG9hZGluZy5tbQpAQCAtMTkwLDggKzE5MCw3IEBAIE1lbW9yeUFjdGl2YXRlZEZv bnQ6On5NZW1vcnlBY3RpdmF0ZWRGb250KCkKIC8vIFBhcmFtZXRlcnM6CiAvLyAqIG5zRm9udCAt IFRoZSBmb250IHdlIHdpc2ggdG8gbG9hZC4KIC8vICogZm9udFNpemUgLSBwb2ludCBzaXplIG9m IHRoZSBmb250IHdlIHdpc2ggdG8gbG9hZC4KLS8vICogb3V0TlNGb250IC0gVGhlIGZvbnQgdGhh dCB3YXMgYWN0dWFsbHkgbG9hZGVkLCBtYXkgYmUgZGlmZmVyZW50IGZyb20gbnNGb250Ci0vLyAg IGlmIGEgZmFsbGJhY2sgZm9udCB3YXMgdXNlZC4KKy8vICogb3V0TlNGb250IC0gVGhlIGZvbnQg dGhhdCB3YXMgYWN0dWFsbHkgbG9hZGVkIG9yIG51bGwgaWYgbG9hZGluZyBmYWlsZWQuCiAvLyAq IGNnRm9udCAtIG9uIG91dHB1dCB0aGlzIGNvbnRhaW5zIHRoZSBDR0ZvbnRSZWYgY29ycmVzcG9u ZGluZyB0byB0aGUgTlNGb250CiAvLyAgIHRoYXQgd2FzIHBpY2tlZCBpbiB0aGUgZW5kLiAgVGhl IGNhbGxlciBpcyByZXNwb25zaWJsZSBmb3IgY2FsbGluZwogLy8gICBDRlJlbGVhc2UoKSBvbiB0 aGlzIHBhcmFtZXRlciB3aGVuIGRvbmUgd2l0aCBpdC4KQEAgLTIwNCw3ICsyMDMsNyBAQCB2b2lk IEZvbnRQbGF0Zm9ybURhdGE6OmxvYWRGb250KE5TRm9udCogbnNGb250LCBmbG9hdCBmb250U2l6 ZSwgTlNGb250KiYgb3V0TlNGbwogICAgICAgICAvLyBSZWxlYXNlIG9sZCBDR0ZvbnRSZWYgc2lu Y2UgaXQgcG9pbnRzIGF0IHRoZSBMYXN0UmVzb3J0IGZvbnQgd2hpY2ggd2UgZG9uJ3Qgd2FudC4K ICAgICAgICAgQ0ZSZWxlYXNlKGNnRm9udCk7CiAgICAgICAgIGNnRm9udCA9IDA7Ci0gICAgICAg IAorCiAgICAgICAgIC8vIEZvbnQgbG9hZGluZyB3YXMgYmxvY2tlZCBieSB0aGUgU2FuZGJveC4K ICAgICAgICAgbV9pbk1lbW9yeUZvbnQgPSBsb2FkRm9udEZyb21Ccm93c2VyUHJvY2VzcyhvdXRO U0ZvbnQpOwogICAgICAgICBpZiAobV9pbk1lbW9yeUZvbnQpIHsKQEAgLTIxNCwxMCArMjEzLDgg QEAgdm9pZCBGb250UGxhdGZvcm1EYXRhOjpsb2FkRm9udChOU0ZvbnQqIG5zRm9udCwgZmxvYXQg Zm9udFNpemUsIE5TRm9udComIG91dE5TRm8KICAgICAgICAgICAgIC8vIGFyZSBjb25zaXN0ZW50 LgogICAgICAgICAgICAgQ0ZSZXRhaW4oY2dGb250KTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgIC8vIElmIHdlIHN0aWxsIGNhbid0IGxvYWQgdGhlIGZvbnQsIHRoZW4gcmV0dXJuIFRp bWVzLAotICAgICAgICAgICAgLy8gcmF0aGVyIHRoYW4gdGhlIExhc3RSZXNvcnQgZm9udC4KLSAg ICAgICAgICAgIG91dE5TRm9udCA9IFtOU0ZvbnQgZm9udFdpdGhOYW1lOkAiVGltZXMiIHNpemU6 Zm9udFNpemVdOwotICAgICAgICAgICAgY2dGb250ID0gQ1RGb250Q29weUdyYXBoaWNzRm9udCh0 b0NURm9udFJlZihvdXROU0ZvbnQpLCAwKTsKKyAgICAgICAgICAgIC8vIElmIHdlIHN0aWxsIGNh bid0IGxvYWQgdGhlIGZvbnQsIHNldCB8b3V0TlNGb250fCB0byBudWxsIHNvIHRoYXQgRm9udFBs YXRmb3JtRGF0YSB3b24ndCBiZSB1c2VkLgorICAgICAgICAgICAgb3V0TlNGb250ID0gMDsKICAg ICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRQbGF0Zm9ybURhdGFDb2NvYS5tbQppbmRleCA3NTQ4 YmI2NDlhODU0OTRkZGZjMTVmNjJmNjEyNTA0NzM5ZWMzMmRmLi5kMTA5OTY2OWFkMzBkNTllNDdm ZmNjOTFjNjFkZjIwYTgzNjBjNWFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9Gb250UGxhdGZvcm1EYXRhQ29jb2EubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udFBsYXRmb3JtRGF0YUNvY29hLm1tCkBA IC0yNjEsNiArMjYxLDEzIEBAIENURm9udFJlZiBGb250UGxhdGZvcm1EYXRhOjpjdEZvbnQoKSBj b25zdAogICAgIGlmIChtX0NURm9udCkKICAgICAgICAgcmV0dXJuIG1fQ1RGb250LmdldCgpOwog CisjaWYgUExBVEZPUk0oQ0hST01JVU0pCisgICAgaWYgKG1faW5NZW1vcnlGb250KSB7CisgICAg ICAgIG1fQ1RGb250LmFkb3B0Q0YoQ1RGb250Q3JlYXRlV2l0aEdyYXBoaWNzRm9udChtX2luTWVt b3J5Rm9udC0+Y2dGb250KCksIG1fc2l6ZSwgMCwgY2FuU2V0Q2FzY2FkZUxpc3RGb3JDdXN0b21G b250KCkgPyBjYXNjYWRlVG9MYXN0UmVzb3J0Rm9udERlc2NyaXB0b3IoKSA6IDApKTsKKyAgICAg ICAgcmV0dXJuIG1fQ1RGb250LmdldCgpOworICAgIH0KKyNlbmRpZgorCiAgICAgbV9DVEZvbnQg PSB0b0NURm9udFJlZihtX2ZvbnQpOwogICAgIGlmIChtX0NURm9udCkgewogICAgICAgICBDVEZv bnREZXNjcmlwdG9yUmVmIGZvbnREZXNjcmlwdG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRDYWNoZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250Q2FjaGVNYWMubW0KaW5kZXggZWQyOTVkNmZhNTU3 NjA2ZWZmODY1M2ZmZTBhN2I4MjQyOWRkNTIyMC4uOTFkZDQyNmZlOTlkNjFjMDUzMzQyZDhmNWM3 YjU4NjNkNzVhNzVmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0ZvbnRDYWNoZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udENhY2hlTWFjLm1tCkBAIC0yMzAsNyArMjMwLDEyIEBAIEZvbnRQbGF0Zm9y bURhdGEqIEZvbnRDYWNoZTo6Y3JlYXRlRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnRECiAgICAgYm9vbCBzeW50aGV0aWNCb2xkID0gaXNBcHBLaXRGb250V2VpZ2h0 Qm9sZCh3ZWlnaHQpICYmICFpc0FwcEtpdEZvbnRXZWlnaHRCb2xkKGFjdHVhbFdlaWdodCk7CiAg ICAgYm9vbCBzeW50aGV0aWNPYmxpcXVlID0gKHRyYWl0cyAmIE5TRm9udEl0YWxpY1RyYWl0KSAm JiAhKGFjdHVhbFRyYWl0cyAmIE5TRm9udEl0YWxpY1RyYWl0KTsKIAotICAgIHJldHVybiBuZXcg Rm9udFBsYXRmb3JtRGF0YShwbGF0Zm9ybUZvbnQsIHNpemUsIGZvbnREZXNjcmlwdGlvbi51c2VQ cmludGVyRm9udCgpLCBzeW50aGV0aWNCb2xkLCBzeW50aGV0aWNPYmxpcXVlLCBmb250RGVzY3Jp cHRpb24ub3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLnRleHRPcmllbnRhdGlvbigpLCBm b250RGVzY3JpcHRpb24ud2lkdGhWYXJpYW50KCkpOworICAgIC8vIEZvbnRQbGF0Zm9ybURhdGE6 OmZvbnQoKSBjYW4gYmUgbnVsbCBmb3IgdGhlIGNhc2Ugb2YgQ2hyb21pdW0gb3V0LW9mLXByb2Nl c3MgZm9udCBsb2FkaW5nLgorICAgIC8vIEluIHRoYXQgY2FzZSwgd2UgZG9uJ3Qgd2FudCB0byB1 c2UgdGhlIHBsYXRmb3JtRGF0YS4KKyAgICBPd25QdHI8Rm9udFBsYXRmb3JtRGF0YT4gcGxhdGZv cm1EYXRhID0gYWRvcHRQdHIobmV3IEZvbnRQbGF0Zm9ybURhdGEocGxhdGZvcm1Gb250LCBzaXpl LCBmb250RGVzY3JpcHRpb24udXNlUHJpbnRlckZvbnQoKSwgc3ludGhldGljQm9sZCwgc3ludGhl dGljT2JsaXF1ZSwgZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCksIGZvbnREZXNjcmlwdGlv bi50ZXh0T3JpZW50YXRpb24oKSwgZm9udERlc2NyaXB0aW9uLndpZHRoVmFyaWFudCgpKSk7Cisg ICAgaWYgKCFwbGF0Zm9ybURhdGEtPmZvbnQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0 dXJuIHBsYXRmb3JtRGF0YS5sZWFrUHRyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK