111588 2013-03-06 09:27:43 -0800 Use SkTypeface API directly, rather than (soon to be private) SkFontHost 2013-03-06 13:40:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reed reed dglazkov d-r junov peter+ews senorblanco webkit.review.bot oldest_to_newest 848939 0 reed 2013-03-06 09:27:43 -0800 Use SkTypeface API directly, rather than (soon to be private) SkFontHost 848942 1 191767 reed 2013-03-06 09:29:00 -0800 Created attachment 191767 Patch 848948 2 191767 webkit.review.bot 2013-03-06 09:31:35 -0800 Comment on attachment 191767 Patch Attachment 191767 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17045275 848957 3 191767 peter+ews 2013-03-06 09:39:05 -0800 Comment on attachment 191767 Patch Attachment 191767 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/17088001 848964 4 191767 webkit.review.bot 2013-03-06 09:42:01 -0800 Comment on attachment 191767 Patch Attachment 191767 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17086065 849000 5 191780 reed 2013-03-06 09:57:42 -0800 Created attachment 191780 Patch 849004 6 191780 webkit.review.bot 2013-03-06 10:04:02 -0800 Comment on attachment 191780 Patch Attachment 191780 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17082245 849015 7 191783 reed 2013-03-06 10:16:35 -0800 Created attachment 191783 Patch 849201 8 reed 2013-03-06 12:45:33 -0800 PTAL 849208 9 191783 senorblanco 2013-03-06 12:50:57 -0800 Comment on attachment 191783 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=191783&action=review Okie doke. r=me > Source/WebCore/ChangeLog:8 > + No new tests. existing tests apply Nit: please indicate which ones. 849216 10 191814 reed 2013-03-06 12:58:55 -0800 Created attachment 191814 Patch 849219 11 reed 2013-03-06 12:59:30 -0800 updated changelog to specify some of the layouttests that exercise the table getter code. 849220 12 191814 senorblanco 2013-03-06 12:59:40 -0800 Comment on attachment 191814 Patch Great, thanks! r=me 849261 13 191814 webkit.review.bot 2013-03-06 13:40:25 -0800 Comment on attachment 191814 Patch Clearing flags on attachment: 191814 Committed r144976: <http://trac.webkit.org/changeset/144976> 849262 14 webkit.review.bot 2013-03-06 13:40:29 -0800 All reviewed patches have been landed. Closing bug. 191767 2013-03-06 09:29:00 -0800 2013-03-06 09:57:38 -0800 Patch bug-111588-20130306122505.patch text/plain 6915 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDkzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA2ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgVXNlIFNrVHlwZWZhY2UgQVBJIGRpcmVj dGx5LCByYXRoZXIgdGhhbiAoc29vbiB0byBiZSBwcml2YXRlKSBTa0ZvbnRIb3N0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1ODgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIGV4 aXN0aW5nIHRlc3RzIGFwcGx5CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6 ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6ZW1TaXplSW5Gb250VW5pdHMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6b3BlblR5cGVUYWJsZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv aGFyZmJ1enovSGFyZkJ1enpGYWNlU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYXJmQnV6 elNraWFHZXRUYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpIYXJmQnV6ekZhY2U6OmNyZWF0ZUZh Y2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFTa2lh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQpOgor CiAyMDEzLTAzLTA2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBbc291cF0gc2Vzc2lvbiBjb29raWVzIGFyZSBub3QgY29ycmVjdGx5IHJl cG9ydGVkIGluIGdldFJhd0Nvb2tpZXMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZv cm1EYXRhSGFyZkJ1enouY3BwCShyZXZpc2lvbiAxNDQ5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw2IEBACiAjaW5jbHVkZSAiSGFyZkJ1enpGYWNlLmgi CiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJTa0FkdmFuY2VkVHlwZWZh Y2VNZXRyaWNzLmgiCi0jaW5jbHVkZSAiU2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFpbnQu aCIKICNpbmNsdWRlICJTa1R5cGVmYWNlLmgiCiAKQEAgLTE3MSw3ICsxNzAsNyBAQCBpbnQgRm9u dFBsYXRmb3JtRGF0YTo6ZW1TaXplSW5Gb250VW5pdHMoCiAjaWYgT1MoQU5EUk9JRCkKICAgICAv LyBBbmRyb2lkIGRvZXNuJ3QgY3VycmVudGx5IHN1cHBvcnQgU2tpYSdzIGdldEFkdmFuY2VkVHlw ZWZhY2VNZXRyaWNzKCksCiAgICAgLy8gYnV0IGl0IGhhcyBhY2Nlc3MgdG8gYW5vdGhlciBtZXRo b2QgdG8gcmVwbGFjZSB0aGlzIGZ1bmN0aW9uYWxpdHkuCi0gICAgbV9lbVNpemVJbkZvbnRVbml0 cyA9IFNrRm9udEhvc3Q6OkdldFVuaXRzUGVyRW0obV90eXBlZmFjZS0+dW5pcXVlSUQoKSk7Cisg ICAgbV9lbVNpemVJbkZvbnRVbml0cyA9IG1fdHlwZWZhY2UtPmdldFVuaXRzUGVyRW0oKTsKICNl bHNlCiAgICAgU2tBZHZhbmNlZFR5cGVmYWNlTWV0cmljcyogbWV0cmljcyA9IG1fdHlwZWZhY2Ut PmdldEFkdmFuY2VkVHlwZWZhY2VNZXRyaWNzKFNrQWR2YW5jZWRUeXBlZmFjZU1ldHJpY3M6OmtO b19QZXJHbHlwaEluZm8pOwogICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBtZXRyaWNzLT5mRW1T aXplOwpAQCAtMzM1LDEwICszMzQsMTAgQEAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IEZvbnRQ bGF0Zm9ybURhdAogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlcjsKIAogICAgIFNrRm9u dFRhYmxlVGFnIHRhZyA9IHJldmVyc2VCeXRlT3JkZXIodGFibGUpOwotICAgIGNvbnN0IHNpemVf dCB0YWJsZVNpemUgPSBTa0ZvbnRIb3N0OjpHZXRUYWJsZVNpemUodW5pcXVlSUQoKSwgdGFnKTsK KyAgICBjb25zdCBzaXplX3QgdGFibGVTaXplID0gbV90eXBlZmFjZS0+Z2V0VGFibGVTaXplKHRh Zyk7CiAgICAgaWYgKHRhYmxlU2l6ZSkgewogICAgICAgICBWZWN0b3I8Y2hhcj4gdGFibGVCdWZm ZXIodGFibGVTaXplKTsKLSAgICAgICAgU2tGb250SG9zdDo6R2V0VGFibGVEYXRhKHVuaXF1ZUlE KCksIHRhZywgMCwgdGFibGVTaXplLCAmdGFibGVCdWZmZXJbMF0pOworICAgICAgICBtX3R5cGVm YWNlLT5nZXRUYWJsZURhdGEodGFnLCAwLCB0YWJsZVNpemUsICZ0YWJsZUJ1ZmZlclswXSk7CiAg ICAgICAgIGJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6YWRvcHRWZWN0b3IodGFibGVCdWZmZXIpOwog ICAgIH0KICAgICByZXR1cm4gYnVmZmVyLnJlbGVhc2UoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZVNraWEuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6 RmFjZVNraWEuY3BwCShyZXZpc2lvbiAxNDQ5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VTa2lhLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzUsMTEgKzM1LDExIEBACiAjaW5jbHVkZSAiR2x5cGhCdWZmZXIuaCIKICNpbmNsdWRlICJI YXJmQnV6elNoYXBlci5oIgogI2luY2x1ZGUgIlNpbXBsZUZvbnREYXRhLmgiCi0jaW5jbHVkZSAi U2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFpbnQuaCIKICNpbmNsdWRlICJTa1BhdGguaCIK ICNpbmNsdWRlICJTa1BvaW50LmgiCiAjaW5jbHVkZSAiU2tSZWN0LmgiCisjaW5jbHVkZSAiU2tU eXBlZmFjZS5oIgogI2luY2x1ZGUgIlNrVXRpbHMuaCIKIAogI2luY2x1ZGUgImhiLmgiCkBAIC0x NDQsMTYgKzE0NCwxNiBAQCBzdGF0aWMgaGJfZm9udF9mdW5jc190KiBoYXJmQnV6elNraWFHZXRG CiAKIHN0YXRpYyBoYl9ibG9iX3QqIGhhcmZCdXp6U2tpYUdldFRhYmxlKGhiX2ZhY2VfdCogZmFj ZSwgaGJfdGFnX3QgdGFnLCB2b2lkKiB1c2VyRGF0YSkKIHsKLSAgICBTa0ZvbnRJRCB1bmlxdWVJ RCA9IHN0YXRpY19jYXN0PFNrRm9udElEPihyZWludGVycHJldF9jYXN0PHVpbnQ2NF90Pih1c2Vy RGF0YSkpOworICAgIFNrVHlwZWZhY2UqIGZhY2UgPSByZWludGVycHJldF9jYXN0PFNrVHlwZWZh Y2UqPih1c2VyRGF0YSk7CiAKLSAgICBjb25zdCBzaXplX3QgdGFibGVTaXplID0gU2tGb250SG9z dDo6R2V0VGFibGVTaXplKHVuaXF1ZUlELCB0YWcpOworICAgIGNvbnN0IHNpemVfdCB0YWJsZVNp emUgPSBmYWNlLT5nZXRUYWJsZVNpemUodGFnKTsKICAgICBpZiAoIXRhYmxlU2l6ZSkKICAgICAg ICAgcmV0dXJuIDA7CiAKICAgICBjaGFyKiBidWZmZXIgPSByZWludGVycHJldF9jYXN0PGNoYXIq PihmYXN0TWFsbG9jKHRhYmxlU2l6ZSkpOwogICAgIGlmICghYnVmZmVyKQogICAgICAgICByZXR1 cm4gMDsKLSAgICBzaXplX3QgYWN0dWFsU2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRhYmxlRGF0YSh1 bmlxdWVJRCwgdGFnLCAwLCB0YWJsZVNpemUsIGJ1ZmZlcik7CisgICAgc2l6ZV90IGFjdHVhbFNp emUgPSBmYWNlLT5nZXRUYWJsZURhdGEodGFnLCAwLCB0YWJsZVNpemUsIGJ1ZmZlcik7CiAgICAg aWYgKHRhYmxlU2l6ZSAhPSBhY3R1YWxTaXplKSB7CiAgICAgICAgIGZhc3RGcmVlKGJ1ZmZlcik7 CiAgICAgICAgIHJldHVybiAwOwpAQCAtMTcwLDcgKzE3MCw4IEBAIHN0YXRpYyB2b2lkIGRlc3Ry b3lIYXJmQnV6ekZvbnREYXRhKHZvaWQKIAogaGJfZmFjZV90KiBIYXJmQnV6ekZhY2U6OmNyZWF0 ZUZhY2UoKQogewotICAgIGhiX2ZhY2VfdCogZmFjZSA9IGhiX2ZhY2VfY3JlYXRlX2Zvcl90YWJs ZXMoaGFyZkJ1enpTa2lhR2V0VGFibGUsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KG1fcGxhdGZv cm1EYXRhLT51bmlxdWVJRCgpKSwgMCk7CisgICAgU2tUeXBlZmFjZSogZmFjZSA9IG1fcGxhdGZv cm1EYXRhLT5tX3R5cGVmYWNlOworICAgIGhiX2ZhY2VfdCogZmFjZSA9IGhiX2ZhY2VfY3JlYXRl X2Zvcl90YWJsZXMoaGFyZkJ1enpTa2lhR2V0VGFibGUsIGZhY2UsIDApOwogICAgIEFTU0VSVChm YWNlKTsKICAgICByZXR1cm4gZmFjZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NpbXBsZUZvbnREYXRhU2tpYS5jcHAJ KHJldmlzaW9uIDE0NDkzNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvU2ltcGxlRm9udERhdGFTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNiBA QAogI2luY2x1ZGUgIkZvbnRDYWNoZS5oIgogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgog I2luY2x1ZGUgIkxvZ2dpbmcuaCIKLSNpbmNsdWRlICJTa0ZvbnRIb3N0LmgiCiAjaW5jbHVkZSAi U2tQYWludC5oIgogI2luY2x1ZGUgIlNrVGltZS5oIgogI2luY2x1ZGUgIlNrVHlwZWZhY2UuaCIK QEAgLTY0LDE4ICs2MywxOCBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQog CiAgICAgbV9wbGF0Zm9ybURhdGEuc2V0dXBQYWludCgmcGFpbnQpOwogICAgIHBhaW50LmdldEZv bnRNZXRyaWNzKCZtZXRyaWNzKTsKLSAgICBjb25zdCBTa0ZvbnRJRCBmb250SUQgPSBtX3BsYXRm b3JtRGF0YS51bmlxdWVJRCgpOworICAgIFNrVHlwZWZhY2UqIGZhY2UgPSBwYWludC5nZXRUeXBl ZmFjZSgpOwogCiAgICAgc3RhdGljIGNvbnN0IHVpbnQzMl90IHZkbXhUYWcgPSBTa1NldEZvdXJC eXRlVGFnKCdWJywgJ0QnLCAnTScsICdYJyk7CiAgICAgaW50IHBpeGVsU2l6ZSA9IG1fcGxhdGZv cm1EYXRhLnNpemUoKSArIDAuNTsKICAgICBpbnQgdmRteEFzY2VudCwgdmRteERlc2NlbnQ7CiAg ICAgYm9vbCBpc1ZETVhWYWxpZCA9IGZhbHNlOwogCi0gICAgc2l6ZV90IHZkbXhTaXplID0gU2tG b250SG9zdDo6R2V0VGFibGVTaXplKGZvbnRJRCwgdmRteFRhZyk7CisgICAgc2l6ZV90IHZkbXhT aXplID0gZmFjZS0+Z2V0VGFibGVTaXplKHZkbXhUYWcpOwogICAgIGlmICh2ZG14U2l6ZSAmJiB2 ZG14U2l6ZSA8IG1heFZETVhUYWJsZVNpemUpIHsKICAgICAgICAgdWludDhfdCogdmRteFRhYmxl ID0gKHVpbnQ4X3QqKSBmYXN0TWFsbG9jKHZkbXhTaXplKTsKICAgICAgICAgaWYgKHZkbXhUYWJs ZQotICAgICAgICAgICAgJiYgU2tGb250SG9zdDo6R2V0VGFibGVEYXRhKGZvbnRJRCwgdmRteFRh ZywgMCwgdmRteFNpemUsIHZkbXhUYWJsZSkgPT0gdmRteFNpemUKKyAgICAgICAgICAgICYmIGZh Y2UtPmdldFRhYmxlRGF0YSh2ZG14VGFnLCAwLCB2ZG14U2l6ZSwgdmRteFRhYmxlKSA9PSB2ZG14 U2l6ZQogICAgICAgICAgICAgJiYgcGFyc2VWRE1YKCZ2ZG14QXNjZW50LCAmdmRteERlc2NlbnQs IHZkbXhUYWJsZSwgdmRteFNpemUsIHBpeGVsU2l6ZSkpCiAgICAgICAgICAgICBpc1ZETVhWYWxp ZCA9IHRydWU7CiAgICAgICAgIGZhc3RGcmVlKHZkbXhUYWJsZSk7CkBAIC0xMjYsOCArMTI1LDgg QEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAgICBpZiAocGxhdGZvcm1E YXRhKCkub3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbCAmJiAhaXNUZXh0T3JpZW50YXRpb25GYWxs YmFjaygpKSB7CiAgICAgICAgIHN0YXRpYyBjb25zdCB1aW50MzJfdCB2aGVhVGFnID0gU2tTZXRG b3VyQnl0ZVRhZygndicsICdoJywgJ2UnLCAnYScpOwogICAgICAgICBzdGF0aWMgY29uc3QgdWlu dDMyX3Qgdm9yZ1RhZyA9IFNrU2V0Rm91ckJ5dGVUYWcoJ1YnLCAnTycsICdSJywgJ0cnKTsKLSAg ICAgICAgc2l6ZV90IHZoZWFTaXplID0gU2tGb250SG9zdDo6R2V0VGFibGVTaXplKGZvbnRJRCwg dmhlYVRhZyk7Ci0gICAgICAgIHNpemVfdCB2b3JnU2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRhYmxl U2l6ZShmb250SUQsIHZvcmdUYWcpOworICAgICAgICBzaXplX3QgdmhlYVNpemUgPSBmYWNlLT5n ZXRUYWJsZVNpemUodmhlYVRhZyk7CisgICAgICAgIHNpemVfdCB2b3JnU2l6ZSA9IGZhY2UtPmdl dFRhYmxlU2l6ZSh2b3JnVGFnKTsKICAgICAgICAgaWYgKCh2aGVhU2l6ZSA+IDApIHx8ICh2b3Jn U2l6ZSA+IDApKQogICAgICAgICAgICAgbV9oYXNWZXJ0aWNhbEdseXBocyA9IHRydWU7CiAgICAg fQpAQCAtMTYxLDcgKzE2MCw3IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgp CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoaW50IHVuaXRzUGVyRW0gPSBwYWludC5nZXRU eXBlZmFjZSgpLT5nZXRVbml0c1BlckVtKCkpCisgICAgaWYgKGludCB1bml0c1BlckVtID0gZmFj ZS0+Z2V0VW5pdHNQZXJFbSgpKQogICAgICAgICBtX2ZvbnRNZXRyaWNzLnNldFVuaXRzUGVyRW0o dW5pdHNQZXJFbSk7CiB9CiAK 191780 2013-03-06 09:57:42 -0800 2013-03-06 10:16:30 -0800 Patch bug-111588-20130306125347.patch text/plain 6897 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDkzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA2ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgVXNlIFNrVHlwZWZhY2UgQVBJIGRpcmVj dGx5LCByYXRoZXIgdGhhbiAoc29vbiB0byBiZSBwcml2YXRlKSBTa0ZvbnRIb3N0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1ODgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIGV4 aXN0aW5nIHRlc3RzIGFwcGx5CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6 ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6ZW1TaXplSW5Gb250VW5pdHMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6b3BlblR5cGVUYWJsZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv aGFyZmJ1enovSGFyZkJ1enpGYWNlU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYXJmQnV6 elNraWFHZXRUYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpIYXJmQnV6ekZhY2U6OmNyZWF0ZUZh Y2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFTa2lh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQpOgor CiAyMDEzLTAzLTA2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBbc291cF0gc2Vzc2lvbiBjb29raWVzIGFyZSBub3QgY29ycmVjdGx5IHJl cG9ydGVkIGluIGdldFJhd0Nvb2tpZXMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZv cm1EYXRhSGFyZkJ1enouY3BwCShyZXZpc2lvbiAxNDQ5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw2IEBACiAjaW5jbHVkZSAiSGFyZkJ1enpGYWNlLmgi CiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJTa0FkdmFuY2VkVHlwZWZh Y2VNZXRyaWNzLmgiCi0jaW5jbHVkZSAiU2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFpbnQu aCIKICNpbmNsdWRlICJTa1R5cGVmYWNlLmgiCiAKQEAgLTE3MSw3ICsxNzAsNyBAQCBpbnQgRm9u dFBsYXRmb3JtRGF0YTo6ZW1TaXplSW5Gb250VW5pdHMoCiAjaWYgT1MoQU5EUk9JRCkKICAgICAv LyBBbmRyb2lkIGRvZXNuJ3QgY3VycmVudGx5IHN1cHBvcnQgU2tpYSdzIGdldEFkdmFuY2VkVHlw ZWZhY2VNZXRyaWNzKCksCiAgICAgLy8gYnV0IGl0IGhhcyBhY2Nlc3MgdG8gYW5vdGhlciBtZXRo b2QgdG8gcmVwbGFjZSB0aGlzIGZ1bmN0aW9uYWxpdHkuCi0gICAgbV9lbVNpemVJbkZvbnRVbml0 cyA9IFNrRm9udEhvc3Q6OkdldFVuaXRzUGVyRW0obV90eXBlZmFjZS0+dW5pcXVlSUQoKSk7Cisg ICAgbV9lbVNpemVJbkZvbnRVbml0cyA9IG1fdHlwZWZhY2UtPmdldFVuaXRzUGVyRW0oKTsKICNl bHNlCiAgICAgU2tBZHZhbmNlZFR5cGVmYWNlTWV0cmljcyogbWV0cmljcyA9IG1fdHlwZWZhY2Ut PmdldEFkdmFuY2VkVHlwZWZhY2VNZXRyaWNzKFNrQWR2YW5jZWRUeXBlZmFjZU1ldHJpY3M6OmtO b19QZXJHbHlwaEluZm8pOwogICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBtZXRyaWNzLT5mRW1T aXplOwpAQCAtMzM1LDEwICszMzQsMTAgQEAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IEZvbnRQ bGF0Zm9ybURhdAogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlcjsKIAogICAgIFNrRm9u dFRhYmxlVGFnIHRhZyA9IHJldmVyc2VCeXRlT3JkZXIodGFibGUpOwotICAgIGNvbnN0IHNpemVf dCB0YWJsZVNpemUgPSBTa0ZvbnRIb3N0OjpHZXRUYWJsZVNpemUodW5pcXVlSUQoKSwgdGFnKTsK KyAgICBjb25zdCBzaXplX3QgdGFibGVTaXplID0gbV90eXBlZmFjZS0+Z2V0VGFibGVTaXplKHRh Zyk7CiAgICAgaWYgKHRhYmxlU2l6ZSkgewogICAgICAgICBWZWN0b3I8Y2hhcj4gdGFibGVCdWZm ZXIodGFibGVTaXplKTsKLSAgICAgICAgU2tGb250SG9zdDo6R2V0VGFibGVEYXRhKHVuaXF1ZUlE KCksIHRhZywgMCwgdGFibGVTaXplLCAmdGFibGVCdWZmZXJbMF0pOworICAgICAgICBtX3R5cGVm YWNlLT5nZXRUYWJsZURhdGEodGFnLCAwLCB0YWJsZVNpemUsICZ0YWJsZUJ1ZmZlclswXSk7CiAg ICAgICAgIGJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6YWRvcHRWZWN0b3IodGFibGVCdWZmZXIpOwog ICAgIH0KICAgICByZXR1cm4gYnVmZmVyLnJlbGVhc2UoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZVNraWEuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6 RmFjZVNraWEuY3BwCShyZXZpc2lvbiAxNDQ5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VTa2lhLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzUsMTEgKzM1LDExIEBACiAjaW5jbHVkZSAiR2x5cGhCdWZmZXIuaCIKICNpbmNsdWRlICJI YXJmQnV6elNoYXBlci5oIgogI2luY2x1ZGUgIlNpbXBsZUZvbnREYXRhLmgiCi0jaW5jbHVkZSAi U2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFpbnQuaCIKICNpbmNsdWRlICJTa1BhdGguaCIK ICNpbmNsdWRlICJTa1BvaW50LmgiCiAjaW5jbHVkZSAiU2tSZWN0LmgiCisjaW5jbHVkZSAiU2tU eXBlZmFjZS5oIgogI2luY2x1ZGUgIlNrVXRpbHMuaCIKIAogI2luY2x1ZGUgImhiLmgiCkBAIC0x NDQsMTYgKzE0NCwxNiBAQCBzdGF0aWMgaGJfZm9udF9mdW5jc190KiBoYXJmQnV6elNraWFHZXRG CiAKIHN0YXRpYyBoYl9ibG9iX3QqIGhhcmZCdXp6U2tpYUdldFRhYmxlKGhiX2ZhY2VfdCogZmFj ZSwgaGJfdGFnX3QgdGFnLCB2b2lkKiB1c2VyRGF0YSkKIHsKLSAgICBTa0ZvbnRJRCB1bmlxdWVJ RCA9IHN0YXRpY19jYXN0PFNrRm9udElEPihyZWludGVycHJldF9jYXN0PHVpbnQ2NF90Pih1c2Vy RGF0YSkpOworICAgIFNrVHlwZWZhY2UqIHR5cGVmYWNlID0gcmVpbnRlcnByZXRfY2FzdDxTa1R5 cGVmYWNlKj4odXNlckRhdGEpOwogCi0gICAgY29uc3Qgc2l6ZV90IHRhYmxlU2l6ZSA9IFNrRm9u dEhvc3Q6OkdldFRhYmxlU2l6ZSh1bmlxdWVJRCwgdGFnKTsKKyAgICBjb25zdCBzaXplX3QgdGFi bGVTaXplID0gdHlwZWZhY2UtPmdldFRhYmxlU2l6ZSh0YWcpOwogICAgIGlmICghdGFibGVTaXpl KQogICAgICAgICByZXR1cm4gMDsKIAogICAgIGNoYXIqIGJ1ZmZlciA9IHJlaW50ZXJwcmV0X2Nh c3Q8Y2hhcio+KGZhc3RNYWxsb2ModGFibGVTaXplKSk7CiAgICAgaWYgKCFidWZmZXIpCiAgICAg ICAgIHJldHVybiAwOwotICAgIHNpemVfdCBhY3R1YWxTaXplID0gU2tGb250SG9zdDo6R2V0VGFi bGVEYXRhKHVuaXF1ZUlELCB0YWcsIDAsIHRhYmxlU2l6ZSwgYnVmZmVyKTsKKyAgICBzaXplX3Qg YWN0dWFsU2l6ZSA9IHR5cGVmYWNlLT5nZXRUYWJsZURhdGEodGFnLCAwLCB0YWJsZVNpemUsIGJ1 ZmZlcik7CiAgICAgaWYgKHRhYmxlU2l6ZSAhPSBhY3R1YWxTaXplKSB7CiAgICAgICAgIGZhc3RG cmVlKGJ1ZmZlcik7CiAgICAgICAgIHJldHVybiAwOwpAQCAtMTcwLDcgKzE3MCw3IEBAIHN0YXRp YyB2b2lkIGRlc3Ryb3lIYXJmQnV6ekZvbnREYXRhKHZvaWQKIAogaGJfZmFjZV90KiBIYXJmQnV6 ekZhY2U6OmNyZWF0ZUZhY2UoKQogewotICAgIGhiX2ZhY2VfdCogZmFjZSA9IGhiX2ZhY2VfY3Jl YXRlX2Zvcl90YWJsZXMoaGFyZkJ1enpTa2lhR2V0VGFibGUsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9p ZCo+KG1fcGxhdGZvcm1EYXRhLT51bmlxdWVJRCgpKSwgMCk7CisgICAgaGJfZmFjZV90KiBmYWNl ID0gaGJfZmFjZV9jcmVhdGVfZm9yX3RhYmxlcyhoYXJmQnV6elNraWFHZXRUYWJsZSwgbV9wbGF0 Zm9ybURhdGEtPm1fdHlwZWZhY2UsIDApOwogICAgIEFTU0VSVChmYWNlKTsKICAgICByZXR1cm4g ZmFjZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2lt cGxlRm9udERhdGFTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL1NpbXBsZUZvbnREYXRhU2tpYS5jcHAJKHJldmlzaW9uIDE0NDkzNCkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFT a2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsNyArMzYsNiBAQAogI2luY2x1ZGUgIkZvbnRD YWNoZS5oIgogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUgIkxvZ2dpbmcu aCIKLSNpbmNsdWRlICJTa0ZvbnRIb3N0LmgiCiAjaW5jbHVkZSAiU2tQYWludC5oIgogI2luY2x1 ZGUgIlNrVGltZS5oIgogI2luY2x1ZGUgIlNrVHlwZWZhY2UuaCIKQEAgLTY0LDE4ICs2MywxOCBA QCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQogCiAgICAgbV9wbGF0Zm9ybURh dGEuc2V0dXBQYWludCgmcGFpbnQpOwogICAgIHBhaW50LmdldEZvbnRNZXRyaWNzKCZtZXRyaWNz KTsKLSAgICBjb25zdCBTa0ZvbnRJRCBmb250SUQgPSBtX3BsYXRmb3JtRGF0YS51bmlxdWVJRCgp OworICAgIFNrVHlwZWZhY2UqIGZhY2UgPSBwYWludC5nZXRUeXBlZmFjZSgpOwogCiAgICAgc3Rh dGljIGNvbnN0IHVpbnQzMl90IHZkbXhUYWcgPSBTa1NldEZvdXJCeXRlVGFnKCdWJywgJ0QnLCAn TScsICdYJyk7CiAgICAgaW50IHBpeGVsU2l6ZSA9IG1fcGxhdGZvcm1EYXRhLnNpemUoKSArIDAu NTsKICAgICBpbnQgdmRteEFzY2VudCwgdmRteERlc2NlbnQ7CiAgICAgYm9vbCBpc1ZETVhWYWxp ZCA9IGZhbHNlOwogCi0gICAgc2l6ZV90IHZkbXhTaXplID0gU2tGb250SG9zdDo6R2V0VGFibGVT aXplKGZvbnRJRCwgdmRteFRhZyk7CisgICAgc2l6ZV90IHZkbXhTaXplID0gZmFjZS0+Z2V0VGFi bGVTaXplKHZkbXhUYWcpOwogICAgIGlmICh2ZG14U2l6ZSAmJiB2ZG14U2l6ZSA8IG1heFZETVhU YWJsZVNpemUpIHsKICAgICAgICAgdWludDhfdCogdmRteFRhYmxlID0gKHVpbnQ4X3QqKSBmYXN0 TWFsbG9jKHZkbXhTaXplKTsKICAgICAgICAgaWYgKHZkbXhUYWJsZQotICAgICAgICAgICAgJiYg U2tGb250SG9zdDo6R2V0VGFibGVEYXRhKGZvbnRJRCwgdmRteFRhZywgMCwgdmRteFNpemUsIHZk bXhUYWJsZSkgPT0gdmRteFNpemUKKyAgICAgICAgICAgICYmIGZhY2UtPmdldFRhYmxlRGF0YSh2 ZG14VGFnLCAwLCB2ZG14U2l6ZSwgdmRteFRhYmxlKSA9PSB2ZG14U2l6ZQogICAgICAgICAgICAg JiYgcGFyc2VWRE1YKCZ2ZG14QXNjZW50LCAmdmRteERlc2NlbnQsIHZkbXhUYWJsZSwgdmRteFNp emUsIHBpeGVsU2l6ZSkpCiAgICAgICAgICAgICBpc1ZETVhWYWxpZCA9IHRydWU7CiAgICAgICAg IGZhc3RGcmVlKHZkbXhUYWJsZSk7CkBAIC0xMjYsOCArMTI1LDggQEAgdm9pZCBTaW1wbGVGb250 RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAgICBpZiAocGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24o KSA9PSBWZXJ0aWNhbCAmJiAhaXNUZXh0T3JpZW50YXRpb25GYWxsYmFjaygpKSB7CiAgICAgICAg IHN0YXRpYyBjb25zdCB1aW50MzJfdCB2aGVhVGFnID0gU2tTZXRGb3VyQnl0ZVRhZygndicsICdo JywgJ2UnLCAnYScpOwogICAgICAgICBzdGF0aWMgY29uc3QgdWludDMyX3Qgdm9yZ1RhZyA9IFNr U2V0Rm91ckJ5dGVUYWcoJ1YnLCAnTycsICdSJywgJ0cnKTsKLSAgICAgICAgc2l6ZV90IHZoZWFT aXplID0gU2tGb250SG9zdDo6R2V0VGFibGVTaXplKGZvbnRJRCwgdmhlYVRhZyk7Ci0gICAgICAg IHNpemVfdCB2b3JnU2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRhYmxlU2l6ZShmb250SUQsIHZvcmdU YWcpOworICAgICAgICBzaXplX3QgdmhlYVNpemUgPSBmYWNlLT5nZXRUYWJsZVNpemUodmhlYVRh Zyk7CisgICAgICAgIHNpemVfdCB2b3JnU2l6ZSA9IGZhY2UtPmdldFRhYmxlU2l6ZSh2b3JnVGFn KTsKICAgICAgICAgaWYgKCh2aGVhU2l6ZSA+IDApIHx8ICh2b3JnU2l6ZSA+IDApKQogICAgICAg ICAgICAgbV9oYXNWZXJ0aWNhbEdseXBocyA9IHRydWU7CiAgICAgfQpAQCAtMTYxLDcgKzE2MCw3 IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgICAgIH0KICAgICB9 CiAKLSAgICBpZiAoaW50IHVuaXRzUGVyRW0gPSBwYWludC5nZXRUeXBlZmFjZSgpLT5nZXRVbml0 c1BlckVtKCkpCisgICAgaWYgKGludCB1bml0c1BlckVtID0gZmFjZS0+Z2V0VW5pdHNQZXJFbSgp KQogICAgICAgICBtX2ZvbnRNZXRyaWNzLnNldFVuaXRzUGVyRW0odW5pdHNQZXJFbSk7CiB9CiAK 191783 2013-03-06 10:16:35 -0800 2013-03-06 12:58:51 -0800 Patch bug-111588-20130306131239.patch text/plain 7551 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDkzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA2ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgVXNlIFNrVHlwZWZhY2UgQVBJIGRpcmVj dGx5LCByYXRoZXIgdGhhbiAoc29vbiB0byBiZSBwcml2YXRlKSBTa0ZvbnRIb3N0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1ODgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIGV4 aXN0aW5nIHRlc3RzIGFwcGx5CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6 ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6ZW1TaXplSW5Gb250VW5pdHMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6b3BlblR5cGVUYWJsZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv aGFyZmJ1enovSGFyZkJ1enpGYWNlU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYXJmQnV6 elNraWFHZXRUYWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpIYXJmQnV6ekZhY2U6OmNyZWF0ZUZh Y2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFTa2lh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQpOgor CiAyMDEzLTAzLTA2ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNv bT4KIAogICAgICAgICBbc291cF0gc2Vzc2lvbiBjb29raWVzIGFyZSBub3QgY29ycmVjdGx5IHJl cG9ydGVkIGluIGdldFJhd0Nvb2tpZXMoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZv cm1EYXRhSGFyZkJ1enouY3BwCShyZXZpc2lvbiAxNDQ5MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zNSw3ICszNSw2IEBACiAjaW5jbHVkZSAiSGFyZkJ1enpGYWNlLmgi CiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJTa0FkdmFuY2VkVHlwZWZh Y2VNZXRyaWNzLmgiCi0jaW5jbHVkZSAiU2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFpbnQu aCIKICNpbmNsdWRlICJTa1R5cGVmYWNlLmgiCiAKQEAgLTE3MSw3ICsxNzAsNyBAQCBpbnQgRm9u dFBsYXRmb3JtRGF0YTo6ZW1TaXplSW5Gb250VW5pdHMoCiAjaWYgT1MoQU5EUk9JRCkKICAgICAv LyBBbmRyb2lkIGRvZXNuJ3QgY3VycmVudGx5IHN1cHBvcnQgU2tpYSdzIGdldEFkdmFuY2VkVHlw ZWZhY2VNZXRyaWNzKCksCiAgICAgLy8gYnV0IGl0IGhhcyBhY2Nlc3MgdG8gYW5vdGhlciBtZXRo b2QgdG8gcmVwbGFjZSB0aGlzIGZ1bmN0aW9uYWxpdHkuCi0gICAgbV9lbVNpemVJbkZvbnRVbml0 cyA9IFNrRm9udEhvc3Q6OkdldFVuaXRzUGVyRW0obV90eXBlZmFjZS0+dW5pcXVlSUQoKSk7Cisg ICAgbV9lbVNpemVJbkZvbnRVbml0cyA9IG1fdHlwZWZhY2UtPmdldFVuaXRzUGVyRW0oKTsKICNl bHNlCiAgICAgU2tBZHZhbmNlZFR5cGVmYWNlTWV0cmljcyogbWV0cmljcyA9IG1fdHlwZWZhY2Ut PmdldEFkdmFuY2VkVHlwZWZhY2VNZXRyaWNzKFNrQWR2YW5jZWRUeXBlZmFjZU1ldHJpY3M6OmtO b19QZXJHbHlwaEluZm8pOwogICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBtZXRyaWNzLT5mRW1T aXplOwpAQCAtMzM1LDEwICszMzQsMTAgQEAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IEZvbnRQ bGF0Zm9ybURhdAogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IGJ1ZmZlcjsKIAogICAgIFNrRm9u dFRhYmxlVGFnIHRhZyA9IHJldmVyc2VCeXRlT3JkZXIodGFibGUpOwotICAgIGNvbnN0IHNpemVf dCB0YWJsZVNpemUgPSBTa0ZvbnRIb3N0OjpHZXRUYWJsZVNpemUodW5pcXVlSUQoKSwgdGFnKTsK KyAgICBjb25zdCBzaXplX3QgdGFibGVTaXplID0gbV90eXBlZmFjZS0+Z2V0VGFibGVTaXplKHRh Zyk7CiAgICAgaWYgKHRhYmxlU2l6ZSkgewogICAgICAgICBWZWN0b3I8Y2hhcj4gdGFibGVCdWZm ZXIodGFibGVTaXplKTsKLSAgICAgICAgU2tGb250SG9zdDo6R2V0VGFibGVEYXRhKHVuaXF1ZUlE KCksIHRhZywgMCwgdGFibGVTaXplLCAmdGFibGVCdWZmZXJbMF0pOworICAgICAgICBtX3R5cGVm YWNlLT5nZXRUYWJsZURhdGEodGFnLCAwLCB0YWJsZVNpemUsICZ0YWJsZUJ1ZmZlclswXSk7CiAg ICAgICAgIGJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6YWRvcHRWZWN0b3IodGFibGVCdWZmZXIpOwog ICAgIH0KICAgICByZXR1cm4gYnVmZmVyLnJlbGVhc2UoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRQbGF0Zm9ybURhdGFIYXJmQnV6ei5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0Zv bnRQbGF0Zm9ybURhdGFIYXJmQnV6ei5oCShyZXZpc2lvbiAxNDQ5MzQpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enou aAkod29ya2luZyBjb3B5KQpAQCAtODUsNiArODUsNyBAQCBwdWJsaWM6CiAgICAgLy8gdGhlIGZv bnQncyBmaWxlIG5hbWUgc28gcmVmZXJzIHRvIGEgc2luZ2xlIGZhY2UuCiAgICAgLy8gLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogICAgIFNrRm9udElEIHVuaXF1ZUlEKCkgY29uc3Q7CisgICAgU2tUeXBlZmFj ZSogdHlwZWZhY2UoKSBjb25zdCB7IHJldHVybiBtX3R5cGVmYWNlOyB9CiAKICAgICB1bnNpZ25l ZCBoYXNoKCkgY29uc3Q7CiAgICAgZmxvYXQgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dFNp emU7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hh cmZCdXp6RmFjZVNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZVNraWEuY3BwCShyZXZpc2lvbiAxNDQ5MzQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZh Y2VTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsMTEgKzM1LDExIEBACiAjaW5jbHVkZSAi R2x5cGhCdWZmZXIuaCIKICNpbmNsdWRlICJIYXJmQnV6elNoYXBlci5oIgogI2luY2x1ZGUgIlNp bXBsZUZvbnREYXRhLmgiCi0jaW5jbHVkZSAiU2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFp bnQuaCIKICNpbmNsdWRlICJTa1BhdGguaCIKICNpbmNsdWRlICJTa1BvaW50LmgiCiAjaW5jbHVk ZSAiU2tSZWN0LmgiCisjaW5jbHVkZSAiU2tUeXBlZmFjZS5oIgogI2luY2x1ZGUgIlNrVXRpbHMu aCIKIAogI2luY2x1ZGUgImhiLmgiCkBAIC0xNDQsMTYgKzE0NCwxNiBAQCBzdGF0aWMgaGJfZm9u dF9mdW5jc190KiBoYXJmQnV6elNraWFHZXRGCiAKIHN0YXRpYyBoYl9ibG9iX3QqIGhhcmZCdXp6 U2tpYUdldFRhYmxlKGhiX2ZhY2VfdCogZmFjZSwgaGJfdGFnX3QgdGFnLCB2b2lkKiB1c2VyRGF0 YSkKIHsKLSAgICBTa0ZvbnRJRCB1bmlxdWVJRCA9IHN0YXRpY19jYXN0PFNrRm9udElEPihyZWlu dGVycHJldF9jYXN0PHVpbnQ2NF90Pih1c2VyRGF0YSkpOworICAgIFNrVHlwZWZhY2UqIHR5cGVm YWNlID0gcmVpbnRlcnByZXRfY2FzdDxTa1R5cGVmYWNlKj4odXNlckRhdGEpOwogCi0gICAgY29u c3Qgc2l6ZV90IHRhYmxlU2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRhYmxlU2l6ZSh1bmlxdWVJRCwg dGFnKTsKKyAgICBjb25zdCBzaXplX3QgdGFibGVTaXplID0gdHlwZWZhY2UtPmdldFRhYmxlU2l6 ZSh0YWcpOwogICAgIGlmICghdGFibGVTaXplKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIGNo YXIqIGJ1ZmZlciA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGZhc3RNYWxsb2ModGFibGVTaXpl KSk7CiAgICAgaWYgKCFidWZmZXIpCiAgICAgICAgIHJldHVybiAwOwotICAgIHNpemVfdCBhY3R1 YWxTaXplID0gU2tGb250SG9zdDo6R2V0VGFibGVEYXRhKHVuaXF1ZUlELCB0YWcsIDAsIHRhYmxl U2l6ZSwgYnVmZmVyKTsKKyAgICBzaXplX3QgYWN0dWFsU2l6ZSA9IHR5cGVmYWNlLT5nZXRUYWJs ZURhdGEodGFnLCAwLCB0YWJsZVNpemUsIGJ1ZmZlcik7CiAgICAgaWYgKHRhYmxlU2l6ZSAhPSBh Y3R1YWxTaXplKSB7CiAgICAgICAgIGZhc3RGcmVlKGJ1ZmZlcik7CiAgICAgICAgIHJldHVybiAw OwpAQCAtMTcwLDcgKzE3MCw3IEBAIHN0YXRpYyB2b2lkIGRlc3Ryb3lIYXJmQnV6ekZvbnREYXRh KHZvaWQKIAogaGJfZmFjZV90KiBIYXJmQnV6ekZhY2U6OmNyZWF0ZUZhY2UoKQogewotICAgIGhi X2ZhY2VfdCogZmFjZSA9IGhiX2ZhY2VfY3JlYXRlX2Zvcl90YWJsZXMoaGFyZkJ1enpTa2lhR2V0 VGFibGUsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KG1fcGxhdGZvcm1EYXRhLT51bmlxdWVJRCgp KSwgMCk7CisgICAgaGJfZmFjZV90KiBmYWNlID0gaGJfZmFjZV9jcmVhdGVfZm9yX3RhYmxlcyho YXJmQnV6elNraWFHZXRUYWJsZSwgbV9wbGF0Zm9ybURhdGEtPnR5cGVmYWNlKCksIDApOwogICAg IEFTU0VSVChmYWNlKTsKICAgICByZXR1cm4gZmFjZTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFTa2lhLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NpbXBsZUZvbnREYXRh U2tpYS5jcHAJKHJldmlzaW9uIDE0NDkzNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3NraWEvU2ltcGxlRm9udERhdGFTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYs NyArMzYsNiBAQAogI2luY2x1ZGUgIkZvbnRDYWNoZS5oIgogI2luY2x1ZGUgIkZvbnREZXNjcmlw dGlvbi5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKLSNpbmNsdWRlICJTa0ZvbnRIb3N0LmgiCiAj aW5jbHVkZSAiU2tQYWludC5oIgogI2luY2x1ZGUgIlNrVGltZS5oIgogI2luY2x1ZGUgIlNrVHlw ZWZhY2UuaCIKQEAgLTY0LDE4ICs2MywxOCBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9y bUluaXQoKQogCiAgICAgbV9wbGF0Zm9ybURhdGEuc2V0dXBQYWludCgmcGFpbnQpOwogICAgIHBh aW50LmdldEZvbnRNZXRyaWNzKCZtZXRyaWNzKTsKLSAgICBjb25zdCBTa0ZvbnRJRCBmb250SUQg PSBtX3BsYXRmb3JtRGF0YS51bmlxdWVJRCgpOworICAgIFNrVHlwZWZhY2UqIGZhY2UgPSBwYWlu dC5nZXRUeXBlZmFjZSgpOwogCiAgICAgc3RhdGljIGNvbnN0IHVpbnQzMl90IHZkbXhUYWcgPSBT a1NldEZvdXJCeXRlVGFnKCdWJywgJ0QnLCAnTScsICdYJyk7CiAgICAgaW50IHBpeGVsU2l6ZSA9 IG1fcGxhdGZvcm1EYXRhLnNpemUoKSArIDAuNTsKICAgICBpbnQgdmRteEFzY2VudCwgdmRteERl c2NlbnQ7CiAgICAgYm9vbCBpc1ZETVhWYWxpZCA9IGZhbHNlOwogCi0gICAgc2l6ZV90IHZkbXhT aXplID0gU2tGb250SG9zdDo6R2V0VGFibGVTaXplKGZvbnRJRCwgdmRteFRhZyk7CisgICAgc2l6 ZV90IHZkbXhTaXplID0gZmFjZS0+Z2V0VGFibGVTaXplKHZkbXhUYWcpOwogICAgIGlmICh2ZG14 U2l6ZSAmJiB2ZG14U2l6ZSA8IG1heFZETVhUYWJsZVNpemUpIHsKICAgICAgICAgdWludDhfdCog dmRteFRhYmxlID0gKHVpbnQ4X3QqKSBmYXN0TWFsbG9jKHZkbXhTaXplKTsKICAgICAgICAgaWYg KHZkbXhUYWJsZQotICAgICAgICAgICAgJiYgU2tGb250SG9zdDo6R2V0VGFibGVEYXRhKGZvbnRJ RCwgdmRteFRhZywgMCwgdmRteFNpemUsIHZkbXhUYWJsZSkgPT0gdmRteFNpemUKKyAgICAgICAg ICAgICYmIGZhY2UtPmdldFRhYmxlRGF0YSh2ZG14VGFnLCAwLCB2ZG14U2l6ZSwgdmRteFRhYmxl KSA9PSB2ZG14U2l6ZQogICAgICAgICAgICAgJiYgcGFyc2VWRE1YKCZ2ZG14QXNjZW50LCAmdmRt eERlc2NlbnQsIHZkbXhUYWJsZSwgdmRteFNpemUsIHBpeGVsU2l6ZSkpCiAgICAgICAgICAgICBp c1ZETVhWYWxpZCA9IHRydWU7CiAgICAgICAgIGZhc3RGcmVlKHZkbXhUYWJsZSk7CkBAIC0xMjYs OCArMTI1LDggQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKICAgICBpZiAo cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSA9PSBWZXJ0aWNhbCAmJiAhaXNUZXh0T3JpZW50 YXRpb25GYWxsYmFjaygpKSB7CiAgICAgICAgIHN0YXRpYyBjb25zdCB1aW50MzJfdCB2aGVhVGFn ID0gU2tTZXRGb3VyQnl0ZVRhZygndicsICdoJywgJ2UnLCAnYScpOwogICAgICAgICBzdGF0aWMg Y29uc3QgdWludDMyX3Qgdm9yZ1RhZyA9IFNrU2V0Rm91ckJ5dGVUYWcoJ1YnLCAnTycsICdSJywg J0cnKTsKLSAgICAgICAgc2l6ZV90IHZoZWFTaXplID0gU2tGb250SG9zdDo6R2V0VGFibGVTaXpl KGZvbnRJRCwgdmhlYVRhZyk7Ci0gICAgICAgIHNpemVfdCB2b3JnU2l6ZSA9IFNrRm9udEhvc3Q6 OkdldFRhYmxlU2l6ZShmb250SUQsIHZvcmdUYWcpOworICAgICAgICBzaXplX3QgdmhlYVNpemUg PSBmYWNlLT5nZXRUYWJsZVNpemUodmhlYVRhZyk7CisgICAgICAgIHNpemVfdCB2b3JnU2l6ZSA9 IGZhY2UtPmdldFRhYmxlU2l6ZSh2b3JnVGFnKTsKICAgICAgICAgaWYgKCh2aGVhU2l6ZSA+IDAp IHx8ICh2b3JnU2l6ZSA+IDApKQogICAgICAgICAgICAgbV9oYXNWZXJ0aWNhbEdseXBocyA9IHRy dWU7CiAgICAgfQpAQCAtMTYxLDcgKzE2MCw3IEBAIHZvaWQgU2ltcGxlRm9udERhdGE6OnBsYXRm b3JtSW5pdCgpCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoaW50IHVuaXRzUGVyRW0gPSBw YWludC5nZXRUeXBlZmFjZSgpLT5nZXRVbml0c1BlckVtKCkpCisgICAgaWYgKGludCB1bml0c1Bl ckVtID0gZmFjZS0+Z2V0VW5pdHNQZXJFbSgpKQogICAgICAgICBtX2ZvbnRNZXRyaWNzLnNldFVu aXRzUGVyRW0odW5pdHNQZXJFbSk7CiB9CiAK 191814 2013-03-06 12:58:55 -0800 2013-03-06 13:40:25 -0800 Patch bug-111588-20130306155500.patch text/plain 7696 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDkzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAzLTA2ICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgVXNlIFNrVHlwZWZhY2UgQVBJIGRpcmVj dGx5LCByYXRoZXIgdGhhbiAoc29vbiB0byBiZSBwcml2YXRlKSBTa0ZvbnRIb3N0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1ODgKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFz IGV4aXN0aW5nIHRlc3RzIGluIGZhc3Qvd3JpdGluZy1tb2RlIGV4ZXJjaXNlIHRoaXMgY29kZS4K KworICAgICAgICBlLmcuIGphcGFuZXNlLXJsLXRleHQtd2l0aC1icm9rZW4tZm9udC5odG1sCisg ICAgICAgICAgICAgdmVydGljYWwtc3Vic3QtZm9udC12ZXJ0LW5vLWRmbHQuaHRtbAorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OmVtU2l6ZUluRm9udFVu aXRzKToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6Om9wZW5UeXBlVGFibGUp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZVNraWEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFyZkJ1enpTa2lhR2V0VGFibGUpOgorICAgICAgICAo V2ViQ29yZTo6SGFyZkJ1enpGYWNlOjpjcmVhdGVGYWNlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9za2lhL1NpbXBsZUZvbnREYXRhU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KToKKwogMjAxMy0wMy0wNiAgQ2hyaXN0b3BoZSBE dW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW3NvdXBdIHNlc3Np b24gY29va2llcyBhcmUgbm90IGNvcnJlY3RseSByZXBvcnRlZCBpbiBnZXRSYXdDb29raWVzKCkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0ZvbnRQbGF0 Zm9ybURhdGFIYXJmQnV6ei5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvaGFyZmJ1enovRm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6LmNwcAkocmV2aXNp b24gMTQ0OTM0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enov Rm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUsNyArMzUs NiBAQAogI2luY2x1ZGUgIkhhcmZCdXp6RmFjZS5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVk LmgiCiAjaW5jbHVkZSAiU2tBZHZhbmNlZFR5cGVmYWNlTWV0cmljcy5oIgotI2luY2x1ZGUgIlNr Rm9udEhvc3QuaCIKICNpbmNsdWRlICJTa1BhaW50LmgiCiAjaW5jbHVkZSAiU2tUeXBlZmFjZS5o IgogCkBAIC0xNzEsNyArMTcwLDcgQEAgaW50IEZvbnRQbGF0Zm9ybURhdGE6OmVtU2l6ZUluRm9u dFVuaXRzKAogI2lmIE9TKEFORFJPSUQpCiAgICAgLy8gQW5kcm9pZCBkb2Vzbid0IGN1cnJlbnRs eSBzdXBwb3J0IFNraWEncyBnZXRBZHZhbmNlZFR5cGVmYWNlTWV0cmljcygpLAogICAgIC8vIGJ1 dCBpdCBoYXMgYWNjZXNzIHRvIGFub3RoZXIgbWV0aG9kIHRvIHJlcGxhY2UgdGhpcyBmdW5jdGlv bmFsaXR5LgotICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBTa0ZvbnRIb3N0OjpHZXRVbml0c1Bl ckVtKG1fdHlwZWZhY2UtPnVuaXF1ZUlEKCkpOworICAgIG1fZW1TaXplSW5Gb250VW5pdHMgPSBt X3R5cGVmYWNlLT5nZXRVbml0c1BlckVtKCk7CiAjZWxzZQogICAgIFNrQWR2YW5jZWRUeXBlZmFj ZU1ldHJpY3MqIG1ldHJpY3MgPSBtX3R5cGVmYWNlLT5nZXRBZHZhbmNlZFR5cGVmYWNlTWV0cmlj cyhTa0FkdmFuY2VkVHlwZWZhY2VNZXRyaWNzOjprTm9fUGVyR2x5cGhJbmZvKTsKICAgICBtX2Vt U2l6ZUluRm9udFVuaXRzID0gbWV0cmljcy0+ZkVtU2l6ZTsKQEAgLTMzNSwxMCArMzM0LDEwIEBA IFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBGb250UGxhdGZvcm1EYXQKICAgICBSZWZQdHI8U2hh cmVkQnVmZmVyPiBidWZmZXI7CiAKICAgICBTa0ZvbnRUYWJsZVRhZyB0YWcgPSByZXZlcnNlQnl0 ZU9yZGVyKHRhYmxlKTsKLSAgICBjb25zdCBzaXplX3QgdGFibGVTaXplID0gU2tGb250SG9zdDo6 R2V0VGFibGVTaXplKHVuaXF1ZUlEKCksIHRhZyk7CisgICAgY29uc3Qgc2l6ZV90IHRhYmxlU2l6 ZSA9IG1fdHlwZWZhY2UtPmdldFRhYmxlU2l6ZSh0YWcpOwogICAgIGlmICh0YWJsZVNpemUpIHsK ICAgICAgICAgVmVjdG9yPGNoYXI+IHRhYmxlQnVmZmVyKHRhYmxlU2l6ZSk7Ci0gICAgICAgIFNr Rm9udEhvc3Q6OkdldFRhYmxlRGF0YSh1bmlxdWVJRCgpLCB0YWcsIDAsIHRhYmxlU2l6ZSwgJnRh YmxlQnVmZmVyWzBdKTsKKyAgICAgICAgbV90eXBlZmFjZS0+Z2V0VGFibGVEYXRhKHRhZywgMCwg dGFibGVTaXplLCAmdGFibGVCdWZmZXJbMF0pOwogICAgICAgICBidWZmZXIgPSBTaGFyZWRCdWZm ZXI6OmFkb3B0VmVjdG9yKHRhYmxlQnVmZmVyKTsKICAgICB9CiAgICAgcmV0dXJuIGJ1ZmZlci5y ZWxlYXNlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6 ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9Gb250UGxhdGZvcm1EYXRhSGFyZkJ1enouaAko cmV2aXNpb24gMTQ0OTM0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFy ZmJ1enovRm9udFBsYXRmb3JtRGF0YUhhcmZCdXp6LmgJKHdvcmtpbmcgY29weSkKQEAgLTg1LDYg Kzg1LDcgQEAgcHVibGljOgogICAgIC8vIHRoZSBmb250J3MgZmlsZSBuYW1lIHNvIHJlZmVycyB0 byBhIHNpbmdsZSBmYWNlLgogICAgIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICBTa0ZvbnRJRCB1 bmlxdWVJRCgpIGNvbnN0OworICAgIFNrVHlwZWZhY2UqIHR5cGVmYWNlKCkgY29uc3QgeyByZXR1 cm4gbV90eXBlZmFjZTsgfQogCiAgICAgdW5zaWduZWQgaGFzaCgpIGNvbnN0OwogICAgIGZsb2F0 IHNpemUoKSBjb25zdCB7IHJldHVybiBtX3RleHRTaXplOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VTa2lhLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6 ekZhY2VTa2lhLmNwcAkocmV2aXNpb24gMTQ0OTM0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlU2tpYS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTM1LDExICszNSwxMSBAQAogI2luY2x1ZGUgIkdseXBoQnVmZmVyLmgiCiAjaW5jbHVkZSAi SGFyZkJ1enpTaGFwZXIuaCIKICNpbmNsdWRlICJTaW1wbGVGb250RGF0YS5oIgotI2luY2x1ZGUg IlNrRm9udEhvc3QuaCIKICNpbmNsdWRlICJTa1BhaW50LmgiCiAjaW5jbHVkZSAiU2tQYXRoLmgi CiAjaW5jbHVkZSAiU2tQb2ludC5oIgogI2luY2x1ZGUgIlNrUmVjdC5oIgorI2luY2x1ZGUgIlNr VHlwZWZhY2UuaCIKICNpbmNsdWRlICJTa1V0aWxzLmgiCiAKICNpbmNsdWRlICJoYi5oIgpAQCAt MTQ0LDE2ICsxNDQsMTYgQEAgc3RhdGljIGhiX2ZvbnRfZnVuY3NfdCogaGFyZkJ1enpTa2lhR2V0 RgogCiBzdGF0aWMgaGJfYmxvYl90KiBoYXJmQnV6elNraWFHZXRUYWJsZShoYl9mYWNlX3QqIGZh Y2UsIGhiX3RhZ190IHRhZywgdm9pZCogdXNlckRhdGEpCiB7Ci0gICAgU2tGb250SUQgdW5pcXVl SUQgPSBzdGF0aWNfY2FzdDxTa0ZvbnRJRD4ocmVpbnRlcnByZXRfY2FzdDx1aW50NjRfdD4odXNl ckRhdGEpKTsKKyAgICBTa1R5cGVmYWNlKiB0eXBlZmFjZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8U2tU eXBlZmFjZSo+KHVzZXJEYXRhKTsKIAotICAgIGNvbnN0IHNpemVfdCB0YWJsZVNpemUgPSBTa0Zv bnRIb3N0OjpHZXRUYWJsZVNpemUodW5pcXVlSUQsIHRhZyk7CisgICAgY29uc3Qgc2l6ZV90IHRh YmxlU2l6ZSA9IHR5cGVmYWNlLT5nZXRUYWJsZVNpemUodGFnKTsKICAgICBpZiAoIXRhYmxlU2l6 ZSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBjaGFyKiBidWZmZXIgPSByZWludGVycHJldF9j YXN0PGNoYXIqPihmYXN0TWFsbG9jKHRhYmxlU2l6ZSkpOwogICAgIGlmICghYnVmZmVyKQogICAg ICAgICByZXR1cm4gMDsKLSAgICBzaXplX3QgYWN0dWFsU2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRh YmxlRGF0YSh1bmlxdWVJRCwgdGFnLCAwLCB0YWJsZVNpemUsIGJ1ZmZlcik7CisgICAgc2l6ZV90 IGFjdHVhbFNpemUgPSB0eXBlZmFjZS0+Z2V0VGFibGVEYXRhKHRhZywgMCwgdGFibGVTaXplLCBi dWZmZXIpOwogICAgIGlmICh0YWJsZVNpemUgIT0gYWN0dWFsU2l6ZSkgewogICAgICAgICBmYXN0 RnJlZShidWZmZXIpOwogICAgICAgICByZXR1cm4gMDsKQEAgLTE3MCw3ICsxNzAsNyBAQCBzdGF0 aWMgdm9pZCBkZXN0cm95SGFyZkJ1enpGb250RGF0YSh2b2lkCiAKIGhiX2ZhY2VfdCogSGFyZkJ1 enpGYWNlOjpjcmVhdGVGYWNlKCkKIHsKLSAgICBoYl9mYWNlX3QqIGZhY2UgPSBoYl9mYWNlX2Ny ZWF0ZV9mb3JfdGFibGVzKGhhcmZCdXp6U2tpYUdldFRhYmxlLCByZWludGVycHJldF9jYXN0PHZv aWQqPihtX3BsYXRmb3JtRGF0YS0+dW5pcXVlSUQoKSksIDApOworICAgIGhiX2ZhY2VfdCogZmFj ZSA9IGhiX2ZhY2VfY3JlYXRlX2Zvcl90YWJsZXMoaGFyZkJ1enpTa2lhR2V0VGFibGUsIG1fcGxh dGZvcm1EYXRhLT50eXBlZmFjZSgpLCAwKTsKICAgICBBU1NFUlQoZmFjZSk7CiAgICAgcmV0dXJu IGZhY2U7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1Np bXBsZUZvbnREYXRhU2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9TaW1wbGVGb250RGF0YVNraWEuY3BwCShyZXZpc2lvbiAxNDQ5MzQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1NpbXBsZUZvbnREYXRh U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDcgKzM2LDYgQEAKICNpbmNsdWRlICJGb250 Q2FjaGUuaCIKICNpbmNsdWRlICJGb250RGVzY3JpcHRpb24uaCIKICNpbmNsdWRlICJMb2dnaW5n LmgiCi0jaW5jbHVkZSAiU2tGb250SG9zdC5oIgogI2luY2x1ZGUgIlNrUGFpbnQuaCIKICNpbmNs dWRlICJTa1RpbWUuaCIKICNpbmNsdWRlICJTa1R5cGVmYWNlLmgiCkBAIC02NCwxOCArNjMsMTgg QEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1Jbml0KCkKIAogICAgIG1fcGxhdGZvcm1E YXRhLnNldHVwUGFpbnQoJnBhaW50KTsKICAgICBwYWludC5nZXRGb250TWV0cmljcygmbWV0cmlj cyk7Ci0gICAgY29uc3QgU2tGb250SUQgZm9udElEID0gbV9wbGF0Zm9ybURhdGEudW5pcXVlSUQo KTsKKyAgICBTa1R5cGVmYWNlKiBmYWNlID0gcGFpbnQuZ2V0VHlwZWZhY2UoKTsKIAogICAgIHN0 YXRpYyBjb25zdCB1aW50MzJfdCB2ZG14VGFnID0gU2tTZXRGb3VyQnl0ZVRhZygnVicsICdEJywg J00nLCAnWCcpOwogICAgIGludCBwaXhlbFNpemUgPSBtX3BsYXRmb3JtRGF0YS5zaXplKCkgKyAw LjU7CiAgICAgaW50IHZkbXhBc2NlbnQsIHZkbXhEZXNjZW50OwogICAgIGJvb2wgaXNWRE1YVmFs aWQgPSBmYWxzZTsKIAotICAgIHNpemVfdCB2ZG14U2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRhYmxl U2l6ZShmb250SUQsIHZkbXhUYWcpOworICAgIHNpemVfdCB2ZG14U2l6ZSA9IGZhY2UtPmdldFRh YmxlU2l6ZSh2ZG14VGFnKTsKICAgICBpZiAodmRteFNpemUgJiYgdmRteFNpemUgPCBtYXhWRE1Y VGFibGVTaXplKSB7CiAgICAgICAgIHVpbnQ4X3QqIHZkbXhUYWJsZSA9ICh1aW50OF90KikgZmFz dE1hbGxvYyh2ZG14U2l6ZSk7CiAgICAgICAgIGlmICh2ZG14VGFibGUKLSAgICAgICAgICAgICYm IFNrRm9udEhvc3Q6OkdldFRhYmxlRGF0YShmb250SUQsIHZkbXhUYWcsIDAsIHZkbXhTaXplLCB2 ZG14VGFibGUpID09IHZkbXhTaXplCisgICAgICAgICAgICAmJiBmYWNlLT5nZXRUYWJsZURhdGEo dmRteFRhZywgMCwgdmRteFNpemUsIHZkbXhUYWJsZSkgPT0gdmRteFNpemUKICAgICAgICAgICAg ICYmIHBhcnNlVkRNWCgmdmRteEFzY2VudCwgJnZkbXhEZXNjZW50LCB2ZG14VGFibGUsIHZkbXhT aXplLCBwaXhlbFNpemUpKQogICAgICAgICAgICAgaXNWRE1YVmFsaWQgPSB0cnVlOwogICAgICAg ICBmYXN0RnJlZSh2ZG14VGFibGUpOwpAQCAtMTI2LDggKzEyNSw4IEBAIHZvaWQgU2ltcGxlRm9u dERhdGE6OnBsYXRmb3JtSW5pdCgpCiAgICAgaWYgKHBsYXRmb3JtRGF0YSgpLm9yaWVudGF0aW9u KCkgPT0gVmVydGljYWwgJiYgIWlzVGV4dE9yaWVudGF0aW9uRmFsbGJhY2soKSkgewogICAgICAg ICBzdGF0aWMgY29uc3QgdWludDMyX3QgdmhlYVRhZyA9IFNrU2V0Rm91ckJ5dGVUYWcoJ3YnLCAn aCcsICdlJywgJ2EnKTsKICAgICAgICAgc3RhdGljIGNvbnN0IHVpbnQzMl90IHZvcmdUYWcgPSBT a1NldEZvdXJCeXRlVGFnKCdWJywgJ08nLCAnUicsICdHJyk7Ci0gICAgICAgIHNpemVfdCB2aGVh U2l6ZSA9IFNrRm9udEhvc3Q6OkdldFRhYmxlU2l6ZShmb250SUQsIHZoZWFUYWcpOwotICAgICAg ICBzaXplX3Qgdm9yZ1NpemUgPSBTa0ZvbnRIb3N0OjpHZXRUYWJsZVNpemUoZm9udElELCB2b3Jn VGFnKTsKKyAgICAgICAgc2l6ZV90IHZoZWFTaXplID0gZmFjZS0+Z2V0VGFibGVTaXplKHZoZWFU YWcpOworICAgICAgICBzaXplX3Qgdm9yZ1NpemUgPSBmYWNlLT5nZXRUYWJsZVNpemUodm9yZ1Rh Zyk7CiAgICAgICAgIGlmICgodmhlYVNpemUgPiAwKSB8fCAodm9yZ1NpemUgPiAwKSkKICAgICAg ICAgICAgIG1faGFzVmVydGljYWxHbHlwaHMgPSB0cnVlOwogICAgIH0KQEAgLTE2MSw3ICsxNjAs NyBAQCB2b2lkIFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybUluaXQoKQogICAgICAgICB9CiAgICAg fQogCi0gICAgaWYgKGludCB1bml0c1BlckVtID0gcGFpbnQuZ2V0VHlwZWZhY2UoKS0+Z2V0VW5p dHNQZXJFbSgpKQorICAgIGlmIChpbnQgdW5pdHNQZXJFbSA9IGZhY2UtPmdldFVuaXRzUGVyRW0o KSkKICAgICAgICAgbV9mb250TWV0cmljcy5zZXRVbml0c1BlckVtKHVuaXRzUGVyRW0pOwogfQog Cg==