60723 2011-05-12 13:42:13 -0700 Rename SimpleFontData::scaledFontData to createScaledFontData 2011-05-12 17:07:04 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 60657 1 paroga paroga commit-queue oldest_to_newest 403112 0 paroga 2011-05-12 13:42:13 -0700 As proposed by ap in bug 60657 403149 1 93340 paroga 2011-05-12 14:14:08 -0700 Created attachment 93340 Patch 403211 2 93340 commit-queue 2011-05-12 15:34:18 -0700 Comment on attachment 93340 Patch Rejecting attachment 93340 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 1 Last 500 characters of output: autoinstalled/mechanize/_urllib2_fork.py", line 332, in _call_chain result = func(*args) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1170, in https_open return self.do_open(conn_factory, req) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1118, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://queues.webkit.org/results/8688859 403258 3 93340 commit-queue 2011-05-12 17:07:00 -0700 Comment on attachment 93340 Patch Clearing flags on attachment: 93340 Committed r86401: <http://trac.webkit.org/changeset/86401> 403259 4 commit-queue 2011-05-12 17:07:04 -0700 All reviewed patches have been landed. Closing bug. 93340 2011-05-12 14:14:08 -0700 2011-05-12 17:07:00 -0700 Patch bug-60723-20110512231405.patch text/plain 19887 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogODYzNzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlOTE4ZTc0YzZlMTA5MjNh MjAyOTFkNzg5Zjc2MzVmZTg4YTc1ZWUzLi5kMzQxODRkOGVjNGIxNWM5MTgzMjg4ODY1NDkxOTA3 NWE5YzA3NzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTEtMDUtMTIgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIFNpbXBsZUZvbnREYXRhOjpzY2FsZWRG b250RGF0YSB0byBjcmVhdGVTY2FsZWRGb250RGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA3MjMKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL1NpbXBsZUZvbnREYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vU2ltcGxlRm9udERhdGFDaHJvbWl1bVdpbi5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vU2ltcGxlRm9udERhdGFMaW51eC5jcHA6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZnJlZXR5cGUvU2ltcGxlRm9udERhdGFGcmVlVHlwZS5jcHA6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvU2ltcGxlRm9udERhdGFIYWlrdS5jcHA6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3BhbmdvL1NpbXBsZUZvbnREYXRhUGFuZ28uY3BwOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5jcHA6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHA6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvU2ltcGxlRm9udERhdGFXeC5jcHA6CisKKzIwMTEt MDUtMTIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCiAKICAgICAgICAgU2ltcGxlRm9udERhdGE6OnNjYWxl ZEZvbnREYXRhIHNob3VsZCByZXR1cm4gYSBQYXNzT3duUHRyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAppbmRleCAyYzc2MTg2YjMzODgy NzcxYTdiY2IxZTkxYTdiNzgxMDM4NDE3NmExLi44YjJiZWQzOWZhZGQyZmIyNjljNWYwZjBlOWY1 ZDA5ZDBiNjkwMWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9TaW1wbGVGb250RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L1NpbXBsZUZvbnREYXRhLmgKQEAgLTE5Myw3ICsxOTMsNyBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCBjb21tb25Jbml0KCk7CiAKLSAgICBQYXNzT3duUHRyPFNpbXBsZUZvbnREYXRhPiBzY2FsZWRG b250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3Q7 CisgICAgUGFzc093blB0cjxTaW1wbGVGb250RGF0YT4gY3JlYXRlU2NhbGVkRm9udERhdGEoY29u c3QgRm9udERlc2NyaXB0aW9uJiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNvbnN0OwogCiAjaWYgKFBM QVRGT1JNKFdJTikgJiYgIU9TKFdJTkNFKSkgXAogICAgIHx8IChPUyhXSU5ET1dTKSAmJiBQTEFU Rk9STShXWCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9TaW1wbGVGb250RGF0YUNocm9taXVtV2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhQ2hyb21pdW1XaW4uY3BwCmlu ZGV4IDhiZmVkYzYzZGUwYWQwNTRmMGMxOGNhYjZkYjI1OTQ2NzQ5ZWY3ZjYuLmMyNTExMTdlNDJh ZTUyODljODBhMjhiMDI5YjE2ZjA0OTA0ZDc1NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhQ2hyb21pdW1XaW4uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZv bnREYXRhQ2hyb21pdW1XaW4uY3BwCkBAIC0xMTIsNyArMTEyLDcgQEAgdm9pZCBTaW1wbGVGb250 RGF0YTo6cGxhdGZvcm1EZXN0cm95KCkKIHsKIH0KIAotUGFzc093blB0cjxTaW1wbGVGb250RGF0 YT4gU2ltcGxlRm9udERhdGE6OnNjYWxlZEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYg Zm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QKK1Bhc3NPd25QdHI8U2lt cGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRGb250RGF0YShjb25zdCBG b250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNvbnN0 CiB7CiAgICAgTE9HRk9OVCB3aW5Gb250OwogICAgIEdldE9iamVjdChtX3BsYXRmb3JtRGF0YS5o Zm9udCgpLCBzaXplb2YoTE9HRk9OVCksICZ3aW5Gb250KTsKQEAgLTEyNyw3ICsxMjcsNyBAQCBT aW1wbGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKGNvbnN0IEZv bnREZXNjcmlwdGlvbiYgZm9udERlcwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAg ICAgIG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21G b250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcykKLSAgICAgICAg bV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlw dGlvbiwgLjcpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gY3JlYXRl U2NhbGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNyk7CiAKICAgICByZXR1cm4gbV9kZXJp dmVkRm9udERhdGEtPnNtYWxsQ2Fwcy5nZXQoKTsKIH0KQEAgLTEzNyw3ICsxMzcsNyBAQCBTaW1w bGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6OmVtcGhhc2lzTWFya0ZvbnREYXRhKGNvbnN0IEZv bnREZXNjcmlwdGlvbiYgZm9udAogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAgICAg IG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250 KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyaykKLSAgICAgICAg bV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNj cmlwdGlvbiwgLjUpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrID0g Y3JlYXRlU2NhbGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNSk7CiAKICAgICByZXR1cm4g bV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyay5nZXQoKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1NpbXBsZUZvbnREYXRhTGlu dXguY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2ltcGxl Rm9udERhdGFMaW51eC5jcHAKaW5kZXggN2NhMTc3ZDk1NjlhOTk1NDM5NmY2YmYyMjM0MDg3MzZi NjAzY2QwMC4uMDAyOTg4ZGNhMDJmNGE4MDU4N2Q1OWMxZjk1MmViOTA3YmY4ZTI0NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vU2ltcGxlRm9u dERhdGFMaW51eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vU2ltcGxlRm9udERhdGFMaW51eC5jcHAKQEAgLTE1NSw3ICsxNTUsNyBAQCB2b2lkIFNp bXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQogewogfQogCi1QYXNzT3duUHRyPFNpbXBs ZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6c2NhbGVkRm9udERhdGEoY29uc3QgRm9udERlc2Ny aXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0IHNjYWxlRmFjdG9yKSBjb25zdAorUGFzc093 blB0cjxTaW1wbGVGb250RGF0YT4gU2ltcGxlRm9udERhdGE6OmNyZWF0ZVNjYWxlZEZvbnREYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3Rv cikgY29uc3QKIHsKICAgICBjb25zdCBmbG9hdCBzY2FsZWRTaXplID0gbHJvdW5kZihmb250RGVz Y3JpcHRpb24uY29tcHV0ZWRTaXplKCkgKiBzY2FsZUZhY3Rvcik7CiAgICAgcmV0dXJuIGFkb3B0 UHRyKG5ldyBTaW1wbGVGb250RGF0YShGb250UGxhdGZvcm1EYXRhKG1fcGxhdGZvcm1EYXRhLCBz Y2FsZWRTaXplKSwgaXNDdXN0b21Gb250KCksIGZhbHNlKSk7CkBAIC0xNjYsNyArMTY2LDcgQEAg U2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YShjb25zdCBG b250RGVzY3JpcHRpb24mIGZvbnREZXMKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQogICAg ICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IERlcml2ZWRGb250RGF0YTo6Y3JlYXRlKGlzQ3VzdG9t Rm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMpCi0gICAgICAg IG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMgPSBzY2FsZWRGb250RGF0YShmb250RGVzY3Jp cHRpb24sIHNtYWxsQ2Fwc0ZyYWN0aW9uKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnNt YWxsQ2FwcyA9IGNyZWF0ZVNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgc21hbGxDYXBz RnJhY3Rpb24pOwogCiAgICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMuZ2V0 KCk7CiB9CkBAIC0xNzYsNyArMTc2LDcgQEAgU2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnREYXRh OjplbXBoYXNpc01hcmtGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnQKICAgICBp ZiAoIW1fZGVyaXZlZEZvbnREYXRhKQogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IERlcml2 ZWRGb250RGF0YTo6Y3JlYXRlKGlzQ3VzdG9tRm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZlZEZv bnREYXRhLT5lbXBoYXNpc01hcmspCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNp c01hcmsgPSBzY2FsZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIGVtcGhhc2lzTWFya0ZyYWN0 aW9uKTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayA9IGNyZWF0ZVNj YWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZW1waGFzaXNNYXJrRnJhY3Rpb24pOwogCiAg ICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsuZ2V0KCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9TaW1wbGVG b250RGF0YUZyZWVUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCmluZGV4IDAyNDdkNzQ5ZmYyMWI5YTM2 YjlkZWFlZGY1MDM1YjRjYmI4MjUzMDIuLjUzOWUwZjVlODUyYmU4YWM1M2Q4ZjQ4ZjU3NGM5YjBh ZjBjZGFlZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zy ZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL1NpbXBsZUZvbnREYXRhRnJlZVR5cGUuY3BwCkBAIC04 Niw3ICs4Niw3IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSgpCiB7CiB9 CiAKLVBhc3NPd25QdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpzY2FsZWRGb250 RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVG YWN0b3IpIGNvbnN0CitQYXNzT3duUHRyPFNpbXBsZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6 Y3JlYXRlU2NhbGVkRm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRp b24sIGZsb2F0IHNjYWxlRmFjdG9yKSBjb25zdAogewogICAgIHJldHVybiBhZG9wdFB0cihuZXcg U2ltcGxlRm9udERhdGEoRm9udFBsYXRmb3JtRGF0YShjYWlyb19zY2FsZWRfZm9udF9nZXRfZm9u dF9mYWNlKG1fcGxhdGZvcm1EYXRhLnNjYWxlZEZvbnQoKSksCiAgICAgICAgIHNjYWxlRmFjdG9y ICogZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkU2l6ZSgpLCBtX3BsYXRmb3JtRGF0YS5zeW50aGV0 aWNCb2xkKCksIG1fcGxhdGZvcm1EYXRhLnN5bnRoZXRpY09ibGlxdWUoKSksCkBAIC05OSw3ICs5 OSw3IEBAIFNpbXBsZUZvbnREYXRhKiBTaW1wbGVGb250RGF0YTo6c21hbGxDYXBzRm9udERhdGEo Y29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRh ID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAgIC8vIEZJWE1F OiBJIHRoaW5rIHdlIHdhbnQgdG8gYXNrIEZvbnRDb25maWcgZm9yIHRoZSByaWdodCBmb250IGFn YWluLgogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcykKLSAgICAgICAgbV9k ZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlv biwgLjcpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gY3JlYXRlU2Nh bGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNyk7CiAKICAgICByZXR1cm4gbV9kZXJpdmVk Rm9udERhdGEtPnNtYWxsQ2Fwcy5nZXQoKTsKIH0KQEAgLTEwOSw3ICsxMDksNyBAQCBTaW1wbGVG b250RGF0YSogU2ltcGxlRm9udERhdGE6OmVtcGhhc2lzTWFya0ZvbnREYXRhKGNvbnN0IEZvbnRE ZXNjcmlwdGlvbiYgZm9udAogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1f ZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkp OwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyaykKLSAgICAgICAgbV9k ZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlw dGlvbiwgLjUpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrID0gY3Jl YXRlU2NhbGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNSk7CiAKICAgICByZXR1cm4gbV9k ZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyay5nZXQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhaWt1L1NpbXBsZUZvbnREYXRhSGFpa3UuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvU2ltcGxlRm9udERhdGFI YWlrdS5jcHAKaW5kZXggOGY0ZjBjM2E3YTEzYmI4OWI5MWUzZTkzYTJiMDBkOTViM2U1ZGFhZS4u NTVkNDRhZmU2ZDY3OTZkMDQ0ZTUyYzZjMjRkZDc0Mjk2MTk0ZGYwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvU2ltcGxlRm9udERhdGFIYWlrdS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFpa3UvU2ltcGxlRm9u dERhdGFIYWlrdS5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxh dGZvcm1EZXN0cm95KCkKIHsKIH0KIAotUGFzc093blB0cjxTaW1wbGVGb250RGF0YT4gU2ltcGxl Rm9udERhdGE6OnNjYWxlZEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2Ny aXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QKK1Bhc3NPd25QdHI8U2ltcGxlRm9udERh dGE+IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRGb250RGF0YShjb25zdCBGb250RGVzY3Jp cHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNvbnN0CiB7CiAgICAg Rm9udERlc2NyaXB0aW9uIGRlc2MgPSBGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsK ICAgICBkZXNjLnNldFNwZWNpZmllZFNpemUoc2NhbGVGYWN0b3IgKiBmb250RGVzY3JpcHRpb24u Y29tcHV0ZWRTaXplKCkpOwpAQCAtNzksNyArNzksNyBAQCBTaW1wbGVGb250RGF0YSogU2ltcGxl Rm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERl cwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRh ID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9k ZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcykKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnNt YWxsQ2FwcyA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgLjcpOworICAgICAgICBt X2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gY3JlYXRlU2NhbGVkRm9udERhdGEoZm9udERl c2NyaXB0aW9uLCAuNyk7CiAKICAgICByZXR1cm4gbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2Fw cy5nZXQoKTsKIH0KQEAgLTg5LDcgKzg5LDcgQEAgU2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnRE YXRhOjplbXBoYXNpc01hcmtGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnQKICAg ICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IERl cml2ZWRGb250RGF0YTo6Y3JlYXRlKGlzQ3VzdG9tRm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZl ZEZvbnREYXRhLT5lbXBoYXNpc01hcmspCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBo YXNpc01hcmsgPSBzY2FsZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIC41KTsKKyAgICAgICAg bV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayA9IGNyZWF0ZVNjYWxlZEZvbnREYXRhKGZv bnREZXNjcmlwdGlvbiwgLjUpOwogCiAgICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBo YXNpc01hcmsuZ2V0KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvU2ltcGxlRm9udERhdGFNYWMubW0KaW5kZXggMGM3YjA5YWVmNTY0NTc4 M2FiZjk0ZWMwNGU3N2U5NzI0NDI4NWZiOC4uODkzMDExNzI3OGRjZjNmYjFlZjA4OTAxZDc3YjU0 ZGVjNGI0N2U4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL1NpbXBsZUZvbnREYXRhTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL21hYy9TaW1wbGVGb250RGF0YU1hYy5tbQpAQCAtMjk2LDcgKzI5Niw3IEBAIHZvaWQg U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSgpCiAjZW5kaWYKIH0KIAotUGFzc093blB0 cjxTaW1wbGVGb250RGF0YT4gU2ltcGxlRm9udERhdGE6OnNjYWxlZEZvbnREYXRhKGNvbnN0IEZv bnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QK K1Bhc3NPd25QdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRG b250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2Nh bGVGYWN0b3IpIGNvbnN0CiB7CiAgICAgaWYgKGlzQ3VzdG9tRm9udCgpKSB7CiAgICAgICAgIEZv bnRQbGF0Zm9ybURhdGEgc2NhbGVkRm9udERhdGEobV9wbGF0Zm9ybURhdGEpOwpAQCAtMzM4LDcg KzMzOCw3IEBAIFNpbXBsZUZvbnREYXRhKiBTaW1wbGVGb250RGF0YTo6c21hbGxDYXBzRm9udERh dGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzCiAgICAgaWYgKCFtX2Rlcml2ZWRGb250 RGF0YSkKICAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBEZXJpdmVkRm9udERhdGE6OmNyZWF0 ZShpc0N1c3RvbUZvbnQoKSk7CiAgICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBz KQotICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gc2NhbGVkRm9udERhdGEo Zm9udERlc2NyaXB0aW9uLCBzbWFsbENhcHNGb250U2l6ZU11bHRpcGxpZXIpOworICAgICAgICBt X2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gY3JlYXRlU2NhbGVkRm9udERhdGEoZm9udERl c2NyaXB0aW9uLCBzbWFsbENhcHNGb250U2l6ZU11bHRpcGxpZXIpOwogCiAgICAgcmV0dXJuIG1f ZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMuZ2V0KCk7CiB9CkBAIC0zNDgsNyArMzQ4LDcgQEAg U2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnREYXRhOjplbXBoYXNpc01hcmtGb250RGF0YShjb25z dCBGb250RGVzY3JpcHRpb24mIGZvbnQKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQogICAg ICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IERlcml2ZWRGb250RGF0YTo6Y3JlYXRlKGlzQ3VzdG9t Rm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmspCi0gICAg ICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsgPSBzY2FsZWRGb250RGF0YShmb250 RGVzY3JpcHRpb24sIC41Zik7CisgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01h cmsgPSBjcmVhdGVTY2FsZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIC41Zik7CiAKICAgICBy ZXR1cm4gbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyay5nZXQoKTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3BhbmdvL1NpbXBsZUZvbnREYXRh UGFuZ28uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcGFuZ28vU2ltcGxl Rm9udERhdGFQYW5nby5jcHAKaW5kZXggYjQxY2Y1ZDhiNTY5ODg2YWYwNmVhNGQzNWE5MTkwMjlh ZmEyYjk5Ny4uZWU4ZWUwZjc0NGQ3ZDY3NWNiNDgwMjFlYzdiMTQxOWJjNjNkOGEzNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcGFuZ28vU2ltcGxlRm9udERh dGFQYW5nby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcGFuZ28v U2ltcGxlRm9udERhdGFQYW5nby5jcHAKQEAgLTg0LDcgKzg0LDcgQEAgdm9pZCBTaW1wbGVGb250 RGF0YTo6cGxhdGZvcm1EZXN0cm95KCkKIHsKIH0KIAotUGFzc093blB0cjxTaW1wbGVGb250RGF0 YT4gU2ltcGxlRm9udERhdGE6OnNjYWxlZEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYg Zm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZhY3RvcikgY29uc3QKK1Bhc3NPd25QdHI8U2lt cGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRGb250RGF0YShjb25zdCBG b250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNvbnN0 CiB7CiAgICAgRm9udERlc2NyaXB0aW9uIGRlc2MgPSBGb250RGVzY3JpcHRpb24oZm9udERlc2Ny aXB0aW9uKTsKICAgICBkZXNjLnNldFNwZWNpZmllZFNpemUoc2NhbGVGYWN0b3IgKiBmb250RGVz Y3JpcHRpb24uY29tcHV0ZWRTaXplKCkpOwpAQCAtOTcsNyArOTcsNyBAQCBTaW1wbGVGb250RGF0 YSogU2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlv biYgZm9udERlcwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1fZGVyaXZl ZEZvbnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAg IGlmICghbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcykKLSAgICAgICAgbV9kZXJpdmVkRm9u dERhdGEtPnNtYWxsQ2FwcyA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgLjcpOwor ICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gY3JlYXRlU2NhbGVkRm9udERh dGEoZm9udERlc2NyaXB0aW9uLCAuNyk7CiAKICAgICByZXR1cm4gbV9kZXJpdmVkRm9udERhdGEt PnNtYWxsQ2Fwcy5nZXQoKTsKIH0KQEAgLTEwNyw3ICsxMDcsNyBAQCBTaW1wbGVGb250RGF0YSog U2ltcGxlRm9udERhdGE6OmVtcGhhc2lzTWFya0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlv biYgZm9udAogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1fZGVyaXZlZEZv bnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAgIGlm ICghbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyaykKLSAgICAgICAgbV9kZXJpdmVkRm9u dERhdGEtPmVtcGhhc2lzTWFyayA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgLjUp OworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrID0gY3JlYXRlU2NhbGVk Rm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNSk7CiAKICAgICByZXR1cm4gbV9kZXJpdmVkRm9u dERhdGEtPmVtcGhhc2lzTWFyay5nZXQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L1NpbXBsZUZvbnREYXRhUXQuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKaW5kZXggNWQwZmE3 MDkxYjNhZDczNDk4NjYyZTMzMTFlZDRlMzA5ODVhZDdmZi4uNTllNzNmNzE0YjU1ZGY4YWZlZDBj YTg4MGFkNGJmZjk0OTJiNGU2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvcXQvU2ltcGxlRm9udERhdGFRdC5jcHAKQEAgLTcxLDcgKzcxLDcgQEAg ZmxvYXQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtV2lkdGhGb3JHbHlwaChHbHlwaCBnbHlwaCkg Y29uc3QKICAgICByZXR1cm4gYWR2YW5jZXMuYXQoMCkueCgpOwogfQogCi1QYXNzT3duUHRyPFNp bXBsZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6c2NhbGVkRm9udERhdGEoY29uc3QgRm9udERl c2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0IHNjYWxlRmFjdG9yKSBjb25zdAorUGFz c093blB0cjxTaW1wbGVGb250RGF0YT4gU2ltcGxlRm9udERhdGE6OmNyZWF0ZVNjYWxlZEZvbnRE YXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBmbG9hdCBzY2FsZUZh Y3RvcikgY29uc3QKIHsKICAgICBjb25zdCBmbG9hdCBzY2FsZWRTaXplID0gbHJvdW5kZihmb250 RGVzY3JpcHRpb24uY29tcHV0ZWRTaXplKCkgKiBzY2FsZUZhY3Rvcik7CiAgICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBTaW1wbGVGb250RGF0YShGb250UGxhdGZvcm1EYXRhKG1fcGxhdGZvcm1EYXRh LCBzY2FsZWRTaXplKSwgaXNDdXN0b21Gb250KCksIGZhbHNlKSk7CkBAIC04Miw3ICs4Miw3IEBA IFNpbXBsZUZvbnREYXRhKiBTaW1wbGVGb250RGF0YTo6c21hbGxDYXBzRm9udERhdGEoY29uc3Qg Rm9udERlc2NyaXB0aW9uJiBmb250RGVzCiAgICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YSkKICAg ICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBEZXJpdmVkRm9udERhdGE6OmNyZWF0ZShpc0N1c3Rv bUZvbnQoKSk7CiAgICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzKQotICAgICAg ICBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzID0gc2NhbGVkRm9udERhdGEoZm9udERlc2Ny aXB0aW9uLCBzbWFsbENhcHNGcmFjdGlvbik7CisgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5z bWFsbENhcHMgPSBjcmVhdGVTY2FsZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIHNtYWxsQ2Fw c0ZyYWN0aW9uKTsKIAogICAgIHJldHVybiBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzLmdl dCgpOwogfQpAQCAtOTIsNyArOTIsNyBAQCBTaW1wbGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6 OmVtcGhhc2lzTWFya0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udAogICAgIGlm ICghbV9kZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZl ZEZvbnREYXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9u dERhdGEtPmVtcGhhc2lzTWFyaykKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lz TWFyayA9IHNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZW1waGFzaXNNYXJrRnJhY3Rp b24pOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrID0gY3JlYXRlU2Nh bGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCBlbXBoYXNpc01hcmtGcmFjdGlvbik7CiAKICAg ICByZXR1cm4gbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyay5nZXQoKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0 YVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9u dERhdGFXaW4uY3BwCmluZGV4IDI2MTlhZjEwNDFhMjAzNjA5NzdiY2U4MzhmNGEyZDUwYzc2NGEy NjAuLmU3OTk4NjU1ZTdhMjlhOTcyMzU0N2RmODY4MzcxMDE3MjdkMzdjZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnRE YXRhV2luLmNwcApAQCAtMTA4LDcgKzEwOCw3IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRm b3JtRGVzdHJveSgpCiAgICAgZGVsZXRlIG1fc2NyaXB0Rm9udFByb3BlcnRpZXM7CiB9CiAKLVBh c3NPd25QdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpzY2FsZWRGb250RGF0YShj b25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3Ip IGNvbnN0CitQYXNzT3duUHRyPFNpbXBsZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6Y3JlYXRl U2NhbGVkRm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZs b2F0IHNjYWxlRmFjdG9yKSBjb25zdAogewogICAgIGZsb2F0IHNjYWxlZFNpemUgPSBzY2FsZUZh Y3RvciAqIG1fcGxhdGZvcm1EYXRhLnNpemUoKTsKICAgICBpZiAoaXNDdXN0b21Gb250KCkpIHsK QEAgLTEyOSw3ICsxMjksNyBAQCBTaW1wbGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6OnNtYWxs Q2Fwc0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlcwogICAgIGlmICghbV9k ZXJpdmVkRm9udERhdGEpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnRE YXRhOjpjcmVhdGUoaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEt PnNtYWxsQ2FwcykKLSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyA9IHNjYWxl ZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgY1NtYWxsQ2Fwc0ZvbnRTaXplTXVsdGlwbGllcik7 CisgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMgPSBjcmVhdGVTY2FsZWRGb250 RGF0YShmb250RGVzY3JpcHRpb24sIGNTbWFsbENhcHNGb250U2l6ZU11bHRpcGxpZXIpOwogCiAg ICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMuZ2V0KCk7CiB9CkBAIC0xMzks NyArMTM5LDcgQEAgU2ltcGxlRm9udERhdGEqIFNpbXBsZUZvbnREYXRhOjplbXBoYXNpc01hcmtG b250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnQKICAgICBpZiAoIW1fZGVyaXZlZEZv bnREYXRhKQogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IERlcml2ZWRGb250RGF0YTo6Y3Jl YXRlKGlzQ3VzdG9tRm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNp c01hcmspCi0gICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsgPSBzY2FsZWRG b250RGF0YShmb250RGVzY3JpcHRpb24sIC41KTsKKyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEt PmVtcGhhc2lzTWFyayA9IGNyZWF0ZVNjYWxlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgLjUp OwogCiAgICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsuZ2V0KCk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9TaW1w bGVGb250RGF0YVdpbkNFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwCmluZGV4IDg3ZmM2ODQ1YTU5ZjgxMjg1YmZjNjlj ZTk5ZGEwNTg0NWZmM2FiYTMuLmUzYjg0MjQ2M2YzOGI3YjU5MjI1MGRjZTU1NTIwYjY0ZjYxOTM0 NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL1Np bXBsZUZvbnREYXRhV2luQ0UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwCkBAIC02Myw3ICs2Myw3IEBAIHZvaWQg U2ltcGxlRm9udERhdGE6OnBsYXRmb3JtRGVzdHJveSgpCiB7CiB9CiAKLVBhc3NPd25QdHI8U2lt cGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpzY2FsZWRGb250RGF0YShjb25zdCBGb250RGVz Y3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNvbnN0CitQYXNz T3duUHRyPFNpbXBsZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6Y3JlYXRlU2NhbGVkRm9udERh dGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0IHNjYWxlRmFj dG9yKSBjb25zdAogewogICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzYyhmb250RGVzY3JpcHRp b24pOwogICAgIGZvbnREZXNjLnNldENvbXB1dGVkU2l6ZShscm91bmRmKHNjYWxlRmFjdG9yICog Zm9udERlc2MuY29tcHV0ZWRTaXplKCkpKTsKQEAgLTgwLDcgKzgwLDcgQEAgU2ltcGxlRm9udERh dGEqIFNpbXBsZUZvbnREYXRhOjpzbWFsbENhcHNGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRp b24mIGZvbnREZXMKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhKQogICAgICAgICBtX2Rlcml2 ZWRGb250RGF0YSA9IERlcml2ZWRGb250RGF0YTo6Y3JlYXRlKGlzQ3VzdG9tRm9udCgpKTsKICAg ICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMpCi0gICAgICAgIG1fZGVyaXZlZEZv bnREYXRhLT5zbWFsbENhcHMgPSBzY2FsZWRGb250RGF0YShmb250RGVzY3JpcHRpb24sIC43KTsK KyAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyA9IGNyZWF0ZVNjYWxlZEZvbnRE YXRhKGZvbnREZXNjcmlwdGlvbiwgLjcpOwogCiAgICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRh LT5zbWFsbENhcHMuZ2V0KCk7CiB9CkBAIC05MCw3ICs5MCw3IEBAIFNpbXBsZUZvbnREYXRhKiBT aW1wbGVGb250RGF0YTo6ZW1waGFzaXNNYXJrRm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9u JiBmb250CiAgICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YSkKICAgICAgICAgbV9kZXJpdmVkRm9u dERhdGEgPSBEZXJpdmVkRm9udERhdGE6OmNyZWF0ZShpc0N1c3RvbUZvbnQoKSk7CiAgICAgaWYg KCFtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrKQotICAgICAgICBtX2Rlcml2ZWRGb250 RGF0YS0+ZW1waGFzaXNNYXJrID0gc2NhbGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNSk7 CisgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmsgPSBjcmVhdGVTY2FsZWRG b250RGF0YShmb250RGVzY3JpcHRpb24sIC41KTsKIAogICAgIHJldHVybiBtX2Rlcml2ZWRGb250 RGF0YS0+ZW1waGFzaXNNYXJrLmdldCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd3gvU2ltcGxlRm9udERhdGFXeC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9TaW1wbGVGb250RGF0YVd4LmNwcAppbmRleCBjZWFiMWFi ZWI2OTI4OWJlNmE5Njk3NTc0MDJkNDM3MWVjMmFiMGNmLi5jYjdmYjNkN2E1ZmM1MTc2N2IzYzI1 OGM4YTgyMzE5MGM3M2U0ZjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93eC9TaW1wbGVGb250RGF0YVd4LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy93eC9TaW1wbGVGb250RGF0YVd4LmNwcApAQCAtOTAsNyArOTAsNyBAQCB2 b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybURlc3Ryb3koKQogI2VuZGlmCiB9CiAKLVBhc3NP d25QdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpzY2FsZWRGb250RGF0YShjb25z dCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2NhbGVGYWN0b3IpIGNv bnN0CitQYXNzT3duUHRyPFNpbXBsZUZvbnREYXRhPiBTaW1wbGVGb250RGF0YTo6Y3JlYXRlU2Nh bGVkRm9udERhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGZsb2F0 IHNjYWxlRmFjdG9yKSBjb25zdAogewogICAgIEZvbnREZXNjcmlwdGlvbiBkZXNjID0gRm9udERl c2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7CiAgICAgZGVzYy5zZXRTcGVjaWZpZWRTaXplKHNj YWxlRmFjdG9yICogZm9udERlc2NyaXB0aW9uLmNvbXB1dGVkU2l6ZSgpKTsKQEAgLTEwMyw3ICsx MDMsNyBAQCBTaW1wbGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6OnNtYWxsQ2Fwc0ZvbnREYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlcwogICAgIGlmICghbV9kZXJpdmVkRm9udERh dGEpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUo aXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcykK LSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyA9IHNjYWxlZEZvbnREYXRhKGZv bnREZXNjcmlwdGlvbiwgLjcpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBz ID0gY3JlYXRlU2NhbGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNyk7CiAKICAgICByZXR1 cm4gbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2Fwcy5nZXQoKTsKIH0KQEAgLTExMyw3ICsxMTMs NyBAQCBTaW1wbGVGb250RGF0YSogU2ltcGxlRm9udERhdGE6OmVtcGhhc2lzTWFya0ZvbnREYXRh KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udAogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEp CiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gRGVyaXZlZEZvbnREYXRhOjpjcmVhdGUoaXND dXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyaykK LSAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayA9IHNjYWxlZEZvbnREYXRh KGZvbnREZXNjcmlwdGlvbiwgLjUpOworICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFz aXNNYXJrID0gY3JlYXRlU2NhbGVkRm9udERhdGEoZm9udERlc2NyaXB0aW9uLCAuNSk7CiAKICAg ICByZXR1cm4gbV9kZXJpdmVkRm9udERhdGEtPmVtcGhhc2lzTWFyay5nZXQoKTsKIH0K