50732 2010-12-08 20:36:13 -0800 Allow disabling of font smoothing in compositing layers to be overridden by style 2010-12-15 15:37:06 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 50733 1 simon.fraser simon.fraser bdakin dglazkov eric mitz simon.fraser webkit.review.bot oldest_to_newest 319240 0 simon.fraser 2010-12-08 20:36:13 -0800 It should be possible for a web developer to override the non-smoothed fonts in compositing layers via CSS, which they might want to do if they know the layer background is opaque. 319244 1 simon.fraser 2010-12-08 20:38:22 -0800 <rdar://problem/8747953> 321598 2 76479 simon.fraser 2010-12-13 18:17:37 -0800 Created attachment 76479 Patch 321605 3 webkit.review.bot 2010-12-13 18:31:56 -0800 Attachment 76479 did not build on chromium: Build output: http://queues.webkit.org/results/6960105 321609 4 76480 simon.fraser 2010-12-13 18:37:07 -0800 Created attachment 76480 Patch 321647 5 eric 2010-12-13 20:52:18 -0800 Attachment 76480 did not build on mac: Build output: http://queues.webkit.org/results/7048009 321655 6 eric 2010-12-13 21:12:11 -0800 Attachment 76480 did not build on mac: Build output: http://queues.webkit.org/results/6901116 321734 7 eric 2010-12-14 01:01:22 -0800 Attachment 76480 did not build on chromium: Build output: http://queues.webkit.org/results/7023110 322075 8 76551 simon.fraser 2010-12-14 11:35:50 -0800 Created attachment 76551 Patch 322097 9 eric 2010-12-14 12:05:34 -0800 Attachment 76551 did not build on chromium: Build output: http://queues.webkit.org/results/6944123 322153 10 eric 2010-12-14 13:19:24 -0800 Attachment 76551 did not build on mac: Build output: http://queues.webkit.org/results/6921149 322272 11 76579 simon.fraser 2010-12-14 15:15:52 -0800 Created attachment 76579 Patch 322784 12 simon.fraser 2010-12-15 13:29:01 -0800 Dan has a valuable point here. This patch (and existing webkit, actually), allows CSS to turn on font smoothing when the user may have disabled it system-wide via the System Preferences. However, that issue is not new with this patch. We should address is separately. 322795 13 76579 mitz 2010-12-15 13:48:25 -0800 Comment on attachment 76579 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76579&action=review Why isn’t the Font code using the new GraphicsContext methods? I choose to r- what I don’t understand :) > WebCore/ChangeLog:39 > +2010-12-13 Simon Fraser <simon.fraser@apple.com> > + > + GraphicsContextPrivate.h was removed. Nuke it from the project. > + > + * WebCore.xcodeproj/project.pbxproj: > + Old change log entry 322796 14 simon.fraser 2010-12-15 13:48:52 -0800 (In reply to comment #12) > Dan has a valuable point here. This patch (and existing webkit, actually), allows CSS to turn on font smoothing when the user may have disabled it system-wide via the System Preferences. Testing shows that this is not actually true, before or after this patch. The System Preference setting trumps all. 322884 15 simon.fraser 2010-12-15 15:37:06 -0800 http://trac.webkit.org/changeset/74151 76479 2010-12-13 18:17:37 -0800 2010-12-13 18:37:03 -0800 Patch bug-50732-20101213181736.patch text/plain 10050 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmZmMjQzMTE5OWNjM2U2NDA4ODQ1YjY2MTM4OGQwMWFmMTU5ZjI2ZC4uOGM3M2QwNWI1MGNlODZm YTlhYTJlYjdlMTk2NWZmZTY3ZTVkMmYwMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0xMi0xMyAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBkaXNhYmxpbmcgb2YgZm9udCBzbW9v dGhpbmcgaW4gY29tcG9zaXRpbmcgbGF5ZXJzIHRvIGJlIG92ZXJyaWRkZW4gYnkgc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzMyCisKKyAg ICAgICAgQWRkIG1ldGhvZHMgdG8gR3JhcGhpY3NDb250ZXh0IHRvIGdldCBhbmQgc2V0IGZvbnQg c21vb3RoaW5nLAorICAgICAgICBhbmQgaGF2ZSB0aGVtIGJlIHBhcnQgb2YgdGhlIGdyYXBoaWNz IHN0YXRlLgorICAgICAgICAKKyAgICAgICAgRml4IEZvbnQ6OmRyYXdHbHlwaHMoKSB0byBhbGxv dyB0aGUgZm9udCdzIHNtb290aGluZyBtb2RlIChmcm9tIHN0eWxlKQorICAgICAgICB0byBvdmVy cmlkZSB0aGUgY3VycmVudCBzbW9vdGhpbmcgbW9kZSBvZiB0aGUgY29udGV4dC4gVGhlIGdsb2Jh bAorICAgICAgICBzaG91bGRVc2VTbW9vdGhpbmcoKSBzdGlsbCBoYXMgZmluYWwgc2F5LgorICAg ICAgICAKKyAgICAgICAgVHVybiBvZmYgc21vb3RoaW5nIGluIGNvbXBvc2l0aW5nIGxheWVycyB3 aXRoIHRoaXMsIHJhdGhlciB0aGFuCisgICAgICAgIHRoZSBub24tc3RhdGVmdWwgJ2FsbG93JyBt ZXRob2QuCisgICAgICAgIAorICAgICAgICAqIG1hbnVhbC10ZXN0cy9jb21wb3NpdGluZy9mb250 LXNtb290aGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgTWFudWFsIHRlc3QgYmVjYXVzZSBEUlQg ZGlzYWJsZXMgZm9udCBzbW9vdGhpbmcuCisgICAgICAgIAorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OnNldFNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDo6c2hvdWxkU21vb3RoRm9udHMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dFN0YXRlOjpHcmFwaGljc0NvbnRleHRTdGF0ZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6 OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5t bToKKyAgICAgICAgKGRyYXdMYXllckNvbnRlbnRzKToKKworMjAxMC0xMi0xMyAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBHcmFwaGljc0NvbnRleHRQ cml2YXRlLmggd2FzIHJlbW92ZWQuIE51a2UgaXQgZnJvbSB0aGUgcHJvamVjdC4KICAgICAgICAg CiAgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9tYW51YWwtdGVzdHMvY29tcG9zaXRpbmcvZm9udC1zbW9vdGhpbmcuaHRtbCBi L1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBvc2l0aW5nL2ZvbnQtc21vb3RoaW5nLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZmNlNDQ0ZTI2Y2RiZjAyZGU0NmZlNWU2ZmUzMTZmYTlhYjY3ZmI5YwotLS0gL2Rl di9udWxsCisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBvc2l0aW5nL2ZvbnQtc21vb3Ro aW5nLmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorICA8 c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgIGRpdiB7CisgICAgICBt YXJnaW46IDIwcHg7CisgICAgICBmb250LXNpemU6IDI0cHQ7CisgICAgfQorCisgICAgLmNvbXBv c2l0ZWQgeworICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICB9CisgICAgCisgICAgLnNtb290aGVkIHsKKyAg ICAgIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IHN1YnBpeGVsLWFudGlhbGlhc2VkOworICAgIH0K KyAgPC9zdHlsZT4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+CisgIDxkaXYgY2xhc3M9ImNvbXBv c2l0ZWQiPgorICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQsIGJ1dCBub3Qgc21v b3RoZWQuCisgIDwvZGl2PgorCisgIDxkaXYgY2xhc3M9InNtb290aGVkIGNvbXBvc2l0ZWQiPgor ICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQgYW5kIHNtb290aGVkLgorICA8L2Rp dj4KKworICA8ZGl2PgorICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQgYW5kIHNt b290aGVkIGluIHRoZSBicm93c2VyLCBhbmQgYW50aWFsaWFzZWQgaW4gcGl4ZWwgcmVzdWx0cy4K KyAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXggNmQzMjE2MWZhNjY2NmQ2YjFmMDM2Njk2NWViMDkz NDE2MGJhYjVlNS4uMTMzM2YzOTVlM2QwY2EyMzE3OTE1NzE1NWNhZTg5MTVmZTJiNmUxZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtMjE1 LDYgKzIxNSwxNyBAQCBib29sIEdyYXBoaWNzQ29udGV4dDo6c2hvdWxkQW50aWFsaWFzKCkgY29u c3QKICAgICByZXR1cm4gbV9zdGF0ZS5zaG91bGRBbnRpYWxpYXM7CiB9CiAKK3ZvaWQgR3JhcGhp Y3NDb250ZXh0OjpzZXRTaG91bGRTbW9vdGhGb250cyhib29sIGIpCit7CisgICAgbV9zdGF0ZS5z aG91bGRTbW9vdGhGb250cyA9IGI7CisgICAgc2V0UGxhdGZvcm1TaG91bGRTbW9vdGhGb250cyhi KTsKK30KKworYm9vbCBHcmFwaGljc0NvbnRleHQ6OnNob3VsZFNtb290aEZvbnRzKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9zdGF0ZS5zaG91bGRTbW9vdGhGb250czsKK30KKwogY29uc3QgR3Jh cGhpY3NDb250ZXh0U3RhdGUmIEdyYXBoaWNzQ29udGV4dDo6c3RhdGUoKSBjb25zdAogewogICAg IHJldHVybiBtX3N0YXRlOwpAQCAtNTk0LDYgKzYwNSwxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6c2V0UGxhdGZvcm1TdHJva2VTdHlsZShjb25zdCBTdHJva2VTdHlsZSYpCiB9CiAjZW5kaWYK IAorI2lmICFQTEFURk9STShDRykKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNo b3VsZFNtb290aEZvbnRzKCkKK3sKK30KKyNlbmRpZgorCiAjaWYgIVBMQVRGT1JNKFNLSUEpCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoU2hhcmVkR3Jh cGhpY3NDb250ZXh0M0QqLCBEcmF3aW5nQnVmZmVyKiwgY29uc3QgSW50U2l6ZSYpCiB7CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCA2ODcyZDhhOGYw ZDcyZDJkNTVkYjk5NjBmNjEzNzNiMDQzYzhiYzBkLi5hOWI4Y2Q5MDc4MTA4NTAyMTlkMjQ4M2E1 OTU3MjFhNGU5OTdlNTgwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0LmgKQEAgLTE2NCw2ICsxNjQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAg ICAgICAsIGZpbGxDb2xvclNwYWNlKENvbG9yU3BhY2VEZXZpY2VSR0IpCiAgICAgICAgICAgICAs IGNvbXBvc2l0ZU9wZXJhdG9yKENvbXBvc2l0ZVNvdXJjZU92ZXIpCiAgICAgICAgICAgICAsIHNo b3VsZEFudGlhbGlhcyh0cnVlKQorICAgICAgICAgICAgLCBzaG91bGRTbW9vdGhGb250cyh0cnVl KQogICAgICAgICAgICAgLCBwYWludGluZ0Rpc2FibGVkKGZhbHNlKQogICAgICAgICAgICAgLCBz aGFkb3dzSWdub3JlVHJhbnNmb3JtcyhmYWxzZSkKICAgICAgICAgewpAQCAtMTk3LDkgKzE5OCwx MCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgQ29tcG9zaXRlT3BlcmF0b3IgY29t cG9zaXRlT3BlcmF0b3I7CiAKLSAgICAgICAgYm9vbCBzaG91bGRBbnRpYWxpYXM7Ci0gICAgICAg IGJvb2wgcGFpbnRpbmdEaXNhYmxlZDsKLSAgICAgICAgYm9vbCBzaGFkb3dzSWdub3JlVHJhbnNm b3JtczsKKyAgICAgICAgYm9vbCBzaG91bGRBbnRpYWxpYXMgOiAxOworICAgICAgICBib29sIHNo b3VsZFNtb290aEZvbnRzIDogMTsKKyAgICAgICAgYm9vbCBwYWludGluZ0Rpc2FibGVkIDogMTsK KyAgICAgICAgYm9vbCBzaGFkb3dzSWdub3JlVHJhbnNmb3JtcyA6IDE7CiAgICAgfTsKIAogICAg IGNsYXNzIEdyYXBoaWNzQ29udGV4dCA6IHB1YmxpYyBOb25jb3B5YWJsZSB7CkBAIC0yNDIsNiAr MjQ0LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldFNob3VsZEFudGlh bGlhcyhib29sKTsKICAgICAgICAgYm9vbCBzaG91bGRBbnRpYWxpYXMoKSBjb25zdDsKIAorICAg ICAgICB2b2lkIHNldFNob3VsZFNtb290aEZvbnRzKGJvb2wpOworICAgICAgICBib29sIHNob3Vs ZFNtb290aEZvbnRzKCkgY29uc3Q7CisKICAgICAgICAgY29uc3QgR3JhcGhpY3NDb250ZXh0U3Rh dGUmIHN0YXRlKCkgY29uc3Q7CiAKICNpZiBQTEFURk9STShDRykKQEAgLTQ5Nyw3ICs1MDIsOCBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0UGxhdGZvcm1GaWxsR3JhZGll bnQoR3JhZGllbnQqKTsKICAgICAgICAgdm9pZCBzZXRQbGF0Zm9ybUZpbGxQYXR0ZXJuKFBhdHRl cm4qKTsKIAotICAgICAgICB2b2lkIHNldFBsYXRmb3JtU2hvdWxkQW50aWFsaWFzKGJvb2wgYik7 CisgICAgICAgIHZvaWQgc2V0UGxhdGZvcm1TaG91bGRBbnRpYWxpYXMoYm9vbCk7CisgICAgICAg IHZvaWQgc2V0UGxhdGZvcm1TaG91bGRTbW9vdGhGb250cyhib29sKTsKIAogICAgICAgICB2b2lk IHNldFBsYXRmb3JtU2hhZG93KGNvbnN0IEZsb2F0U2l6ZSYsIGZsb2F0IGJsdXIsIGNvbnN0IENv bG9yJiwgQ29sb3JTcGFjZSk7CiAgICAgICAgIHZvaWQgY2xlYXJQbGF0Zm9ybVNoYWRvdygpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRD Ry5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNw cAppbmRleCAzZDcwZmMyYWI4OWNlZDI4ZTY1NjdlYWNhOGI3M2IyOTYyYTMxNzY3Li43ODk4ZDYy YWMyMjVhMjVhZDk3YjdhYjIxZTBhYjdjY2NiMTg2MmY5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAorKysgYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcApAQCAtMTE4OCw2ICsxMTg4 LDEzIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZEFudGlhbGlhcyhi b29sIGVuYWJsZSkKICAgICBDR0NvbnRleHRTZXRTaG91bGRBbnRpYWxpYXMocGxhdGZvcm1Db250 ZXh0KCksIGVuYWJsZSk7CiB9CiAKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNo b3VsZFNtb290aEZvbnRzKGJvb2wgZW5hYmxlKQoreworICAgIGlmIChwYWludGluZ0Rpc2FibGVk KCkpCisgICAgICAgIHJldHVybjsKKyAgICBDR0NvbnRleHRTZXRTaG91bGRTbW9vdGhGb250cyhw bGF0Zm9ybUNvbnRleHQoKSwgZW5hYmxlKTsKK30KKwogI2lmbmRlZiBCVUlMRElOR19PTl9USUdF UiAvLyBUaWdlcidzIHNldFBsYXRmb3JtQ29tcG9zaXRlT3BlcmF0aW9uKCkgaXMgZGVmaW5lZCBp biBHcmFwaGljc0NvbnRleHRNYWMubW0uCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZv cm1Db21wb3NpdGVPcGVyYXRpb24oQ29tcG9zaXRlT3BlcmF0b3IgbW9kZSkKIHsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0gYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tCmluZGV4IDhmMTVjYjMwOWU4NjU1N2ZlYTZj ZmE4ZWQyMDM3OTlhMjRhNzIxMmMuLjVhN2I4N2M4OTBmZmIzNDFiOTcxN2EyZmI4NDU3NTllMGVm MDEzY2MgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMu bW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQpAQCAtOTEs MjIgKzkxLDI3IEBAIHN0YXRpYyB2b2lkIHNob3dHbHlwaHNXaXRoQWR2YW5jZXMoY29uc3QgU2lt cGxlRm9udERhdGEqIGZvbnQsIENHQ29udGV4dFJlZiBjb250CiB2b2lkIEZvbnQ6OmRyYXdHbHlw aHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCwg Y29uc3QgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCBpbnQgZnJvbSwgaW50IG51bUdseXBocywg Y29uc3QgRmxvYXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgQ0dDb250ZXh0UmVmIGNnQ29u dGV4dCA9IGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpOwotICAgIGJvb2wgbmV3U2hvdWxkVXNl Rm9udFNtb290aGluZyA9IHNob3VsZFVzZVNtb290aGluZygpOwogCisgICAgYm9vbCBzaG91bGRT bW9vdGhGb250czsKKyAgICBib29sIGNoYW5nZUZvbnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAK ICAgICBzd2l0Y2goZm9udERlc2NyaXB0aW9uKCkuZm9udFNtb290aGluZygpKSB7CiAgICAgY2Fz ZSBBbnRpYWxpYXNlZDogewogICAgICAgICBjb250ZXh0LT5zZXRTaG91bGRBbnRpYWxpYXModHJ1 ZSk7Ci0gICAgICAgIG5ld1Nob3VsZFVzZUZvbnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAgICAg c2hvdWxkU21vb3RoRm9udHMgPSBmYWxzZTsKKyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9 IHRydWU7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIFN1YnBpeGVsQW50aWFsaWFz ZWQ6IHsKICAgICAgICAgY29udGV4dC0+c2V0U2hvdWxkQW50aWFsaWFzKHRydWUpOwotICAgICAg ICBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nID0gdHJ1ZTsKKyAgICAgICAgc2hvdWxkU21vb3Ro Rm9udHMgPSB0cnVlOworICAgICAgICBjaGFuZ2VGb250U21vb3RoaW5nID0gdHJ1ZTsKICAgICAg ICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgTm9TbW9vdGhpbmc6IHsKICAgICAgICAgY29udGV4 dC0+c2V0U2hvdWxkQW50aWFsaWFzKGZhbHNlKTsKLSAgICAgICAgbmV3U2hvdWxkVXNlRm9udFNt b290aGluZyA9IGZhbHNlOworICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IGZhbHNlOworICAg ICAgICBjaGFuZ2VGb250U21vb3RoaW5nID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQog ICAgIGNhc2UgQXV0b1Ntb290aGluZzogewpAQCAtMTE2LDExICsxMjEsMTggQEAgdm9pZCBGb250 OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERh dGEqIGZvbnQsIGNvbnMKICAgICBkZWZhdWx0OiAKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAgICAgfQotCi0gICAgYm9vbCBvcmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcgPSB3 a0NHQ29udGV4dEdldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCk7Ci0gICAgaWYgKG9yaWdp bmFsU2hvdWxkVXNlRm9udFNtb290aGluZyAhPSBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nKQot ICAgICAgICBDR0NvbnRleHRTZXRTaG91bGRTbW9vdGhGb250cyhjZ0NvbnRleHQsIG5ld1Nob3Vs ZFVzZUZvbnRTbW9vdGhpbmcpOwogICAgIAorICAgIGlmICghc2hvdWxkVXNlU21vb3RoaW5nKCkp IHsKKyAgICAgICAgc2hvdWxkU21vb3RoRm9udHMgPSBmYWxzZTsKKyAgICAgICAgY2hhbmdlRm9u dFNtb290aGluZyA9IHRydWU7CisgICAgfQorCisgICAgYm9vbCBvcmlnaW5hbFNob3VsZFVzZUZv bnRTbW9vdGhpbmc7CisgICAgaWYgKGNoYW5nZUZvbnRTbW9vdGhpbmcpIHsKKyAgICAgICAgb3Jp Z2luYWxTaG91bGRVc2VGb250U21vb3RoaW5nID0gd2tDR0NvbnRleHRHZXRTaG91bGRTbW9vdGhG b250cyhjZ0NvbnRleHQpOworICAgICAgICBDR0NvbnRleHRTZXRTaG91bGRTbW9vdGhGb250cyhj Z0NvbnRleHQsIHNob3VsZFNtb290aEZvbnRzKTsKKyAgICB9CisKICAgICBjb25zdCBGb250UGxh dGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEgPSBmb250LT5wbGF0Zm9ybURhdGEoKTsKICAgICBOU0Zv bnQqIGRyYXdGb250OwogICAgIGlmICghaXNQcmludGVyRm9udCgpKSB7CkBAIC0xODYsNyArMTk4 LDcgQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29u c3QgU2ltcGxlRm9udERhdGEqIGZvbnQsIGNvbnMKICAgICBpZiAoaGFzU2ltcGxlU2hhZG93KQog ICAgICAgICBjb250ZXh0LT5zZXRTaGFkb3coc2hhZG93T2Zmc2V0LCBzaGFkb3dCbHVyLCBzaGFk b3dDb2xvciwgZmlsbENvbG9yU3BhY2UpOwogCi0gICAgaWYgKG9yaWdpbmFsU2hvdWxkVXNlRm9u dFNtb290aGluZyAhPSBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nKQorICAgIGlmIChjaGFuZ2VG b250U21vb3RoaW5nKQogICAgICAgICBDR0NvbnRleHRTZXRTaG91bGRTbW9vdGhGb250cyhjZ0Nv bnRleHQsIG9yaWdpbmFsU2hvdWxkVXNlRm9udFNtb290aGluZyk7CiB9CiAKZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1tIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvV2ViTGF5ZXIubW0KaW5kZXggMDEwYjQ4ODdmZDU3ZjliNGI5YjIy Y2ZhMDg4YmEyOWFmNTk5MmQ1NS4uNzBkYjQ0ZTE2ZmMxYmU4MzBmMmMxZDMwOGIzNWQyYzQ4YmU4 NzM4MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvV2ViTGF5ZXIu bW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvV2ViTGF5ZXIubW0KQEAgLTY0 LDcgKzY0LDcgQEAgdm9pZCBkcmF3TGF5ZXJDb250ZW50cyhDR0NvbnRleHRSZWYgY29udGV4dCwg Q0FMYXllciAqbGF5ZXIsIFdlYkNvcmU6OkdyYXBoaWNzTGEKICAgICAgICAgR3JhcGhpY3NDb250 ZXh0IGdyYXBoaWNzQ29udGV4dChjb250ZXh0KTsKIAogICAgICAgICAvLyBUdXJuIG9mZiBmb250 IHNtb290aGluZyB0byBpbXByb3ZlIHRoZSBhcHBlYXJhbmNlIG9mIHRleHQgcmVuZGVyZWQgb250 byBhIHRyYW5zcGFyZW50IGJhY2tncm91bmQuCi0gICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRB bGxvd3NGb250U21vb3RoaW5nKGZhbHNlKTsKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNo b3VsZFNtb290aEZvbnRzKGZhbHNlKTsKICAgICAgICAgCiAgICAgICAgIC8vIEl0J3MgaW1wb3J0 YW50IHRvIGdldCB0aGUgY2xpcCBmcm9tIHRoZSBjb250ZXh0LCBiZWNhdXNlIGl0IG1heSBiZSBz aWduaWZpY2FudGx5CiAgICAgICAgIC8vIHNtYWxsZXIgdGhhbiB0aGUgbGF5ZXIgYm91bmRzIChl LmcuIHRpbGVkIGxheWVycykK 76480 2010-12-13 18:37:07 -0800 2010-12-14 11:35:47 -0800 Patch bug-50732-20101213183705.patch text/plain 10054 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmZmMjQzMTE5OWNjM2U2NDA4ODQ1YjY2MTM4OGQwMWFmMTU5ZjI2ZC4uOGM3M2QwNWI1MGNlODZm YTlhYTJlYjdlMTk2NWZmZTY3ZTVkMmYwMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0xMi0xMyAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBkaXNhYmxpbmcgb2YgZm9udCBzbW9v dGhpbmcgaW4gY29tcG9zaXRpbmcgbGF5ZXJzIHRvIGJlIG92ZXJyaWRkZW4gYnkgc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzMyCisKKyAg ICAgICAgQWRkIG1ldGhvZHMgdG8gR3JhcGhpY3NDb250ZXh0IHRvIGdldCBhbmQgc2V0IGZvbnQg c21vb3RoaW5nLAorICAgICAgICBhbmQgaGF2ZSB0aGVtIGJlIHBhcnQgb2YgdGhlIGdyYXBoaWNz IHN0YXRlLgorICAgICAgICAKKyAgICAgICAgRml4IEZvbnQ6OmRyYXdHbHlwaHMoKSB0byBhbGxv dyB0aGUgZm9udCdzIHNtb290aGluZyBtb2RlIChmcm9tIHN0eWxlKQorICAgICAgICB0byBvdmVy cmlkZSB0aGUgY3VycmVudCBzbW9vdGhpbmcgbW9kZSBvZiB0aGUgY29udGV4dC4gVGhlIGdsb2Jh bAorICAgICAgICBzaG91bGRVc2VTbW9vdGhpbmcoKSBzdGlsbCBoYXMgZmluYWwgc2F5LgorICAg ICAgICAKKyAgICAgICAgVHVybiBvZmYgc21vb3RoaW5nIGluIGNvbXBvc2l0aW5nIGxheWVycyB3 aXRoIHRoaXMsIHJhdGhlciB0aGFuCisgICAgICAgIHRoZSBub24tc3RhdGVmdWwgJ2FsbG93JyBt ZXRob2QuCisgICAgICAgIAorICAgICAgICAqIG1hbnVhbC10ZXN0cy9jb21wb3NpdGluZy9mb250 LXNtb290aGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgTWFudWFsIHRlc3QgYmVjYXVzZSBEUlQg ZGlzYWJsZXMgZm9udCBzbW9vdGhpbmcuCisgICAgICAgIAorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OnNldFNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDo6c2hvdWxkU21vb3RoRm9udHMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dFN0YXRlOjpHcmFwaGljc0NvbnRleHRTdGF0ZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6 OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5t bToKKyAgICAgICAgKGRyYXdMYXllckNvbnRlbnRzKToKKworMjAxMC0xMi0xMyAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBHcmFwaGljc0NvbnRleHRQ cml2YXRlLmggd2FzIHJlbW92ZWQuIE51a2UgaXQgZnJvbSB0aGUgcHJvamVjdC4KICAgICAgICAg CiAgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9tYW51YWwtdGVzdHMvY29tcG9zaXRpbmcvZm9udC1zbW9vdGhpbmcuaHRtbCBi L1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBvc2l0aW5nL2ZvbnQtc21vb3RoaW5nLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZmNlNDQ0ZTI2Y2RiZjAyZGU0NmZlNWU2ZmUzMTZmYTlhYjY3ZmI5YwotLS0gL2Rl di9udWxsCisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBvc2l0aW5nL2ZvbnQtc21vb3Ro aW5nLmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorICA8 c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgIGRpdiB7CisgICAgICBt YXJnaW46IDIwcHg7CisgICAgICBmb250LXNpemU6IDI0cHQ7CisgICAgfQorCisgICAgLmNvbXBv c2l0ZWQgeworICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICB9CisgICAgCisgICAgLnNtb290aGVkIHsKKyAg ICAgIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IHN1YnBpeGVsLWFudGlhbGlhc2VkOworICAgIH0K KyAgPC9zdHlsZT4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+CisgIDxkaXYgY2xhc3M9ImNvbXBv c2l0ZWQiPgorICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQsIGJ1dCBub3Qgc21v b3RoZWQuCisgIDwvZGl2PgorCisgIDxkaXYgY2xhc3M9InNtb290aGVkIGNvbXBvc2l0ZWQiPgor ICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQgYW5kIHNtb290aGVkLgorICA8L2Rp dj4KKworICA8ZGl2PgorICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQgYW5kIHNt b290aGVkIGluIHRoZSBicm93c2VyLCBhbmQgYW50aWFsaWFzZWQgaW4gcGl4ZWwgcmVzdWx0cy4K KyAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXggNmQzMjE2MWZhNjY2NmQ2YjFmMDM2Njk2NWViMDkz NDE2MGJhYjVlNS4uZjdkY2M2MjAwMzBmYzRiZWQzNDE3OTlmZmRhOTgwNjFlMDFiNjU5MCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtMjE1 LDYgKzIxNSwxNyBAQCBib29sIEdyYXBoaWNzQ29udGV4dDo6c2hvdWxkQW50aWFsaWFzKCkgY29u c3QKICAgICByZXR1cm4gbV9zdGF0ZS5zaG91bGRBbnRpYWxpYXM7CiB9CiAKK3ZvaWQgR3JhcGhp Y3NDb250ZXh0OjpzZXRTaG91bGRTbW9vdGhGb250cyhib29sIGIpCit7CisgICAgbV9zdGF0ZS5z aG91bGRTbW9vdGhGb250cyA9IGI7CisgICAgc2V0UGxhdGZvcm1TaG91bGRTbW9vdGhGb250cyhi KTsKK30KKworYm9vbCBHcmFwaGljc0NvbnRleHQ6OnNob3VsZFNtb290aEZvbnRzKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9zdGF0ZS5zaG91bGRTbW9vdGhGb250czsKK30KKwogY29uc3QgR3Jh cGhpY3NDb250ZXh0U3RhdGUmIEdyYXBoaWNzQ29udGV4dDo6c3RhdGUoKSBjb25zdAogewogICAg IHJldHVybiBtX3N0YXRlOwpAQCAtNTk0LDYgKzYwNSwxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6c2V0UGxhdGZvcm1TdHJva2VTdHlsZShjb25zdCBTdHJva2VTdHlsZSYpCiB9CiAjZW5kaWYK IAorI2lmICFQTEFURk9STShDRykKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNo b3VsZFNtb290aEZvbnRzKGJvb2wpCit7Cit9CisjZW5kaWYKKwogI2lmICFQTEFURk9STShTS0lB KQogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKFNoYXJl ZEdyYXBoaWNzQ29udGV4dDNEKiwgRHJhd2luZ0J1ZmZlciosIGNvbnN0IEludFNpemUmKQogewpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggNjg3MmQ4 YThmMGQ3MmQyZDU1ZGI5OTYwZjYxMzczYjA0M2M4YmMwZC4uYTliOGNkOTA3ODEwODUwMjE5ZDI0 ODNhNTk1NzIxYTRlOTk3ZTU4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dC5oCkBAIC0xNjQsNiArMTY0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICAgICAgLCBmaWxsQ29sb3JTcGFjZShDb2xvclNwYWNlRGV2aWNlUkdCKQogICAgICAgICAg ICAgLCBjb21wb3NpdGVPcGVyYXRvcihDb21wb3NpdGVTb3VyY2VPdmVyKQogICAgICAgICAgICAg LCBzaG91bGRBbnRpYWxpYXModHJ1ZSkKKyAgICAgICAgICAgICwgc2hvdWxkU21vb3RoRm9udHMo dHJ1ZSkKICAgICAgICAgICAgICwgcGFpbnRpbmdEaXNhYmxlZChmYWxzZSkKICAgICAgICAgICAg ICwgc2hhZG93c0lnbm9yZVRyYW5zZm9ybXMoZmFsc2UpCiAgICAgICAgIHsKQEAgLTE5Nyw5ICsx OTgsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIENvbXBvc2l0ZU9wZXJhdG9y IGNvbXBvc2l0ZU9wZXJhdG9yOwogCi0gICAgICAgIGJvb2wgc2hvdWxkQW50aWFsaWFzOwotICAg ICAgICBib29sIHBhaW50aW5nRGlzYWJsZWQ7Ci0gICAgICAgIGJvb2wgc2hhZG93c0lnbm9yZVRy YW5zZm9ybXM7CisgICAgICAgIGJvb2wgc2hvdWxkQW50aWFsaWFzIDogMTsKKyAgICAgICAgYm9v bCBzaG91bGRTbW9vdGhGb250cyA6IDE7CisgICAgICAgIGJvb2wgcGFpbnRpbmdEaXNhYmxlZCA6 IDE7CisgICAgICAgIGJvb2wgc2hhZG93c0lnbm9yZVRyYW5zZm9ybXMgOiAxOwogICAgIH07CiAK ICAgICBjbGFzcyBHcmFwaGljc0NvbnRleHQgOiBwdWJsaWMgTm9uY29weWFibGUgewpAQCAtMjQy LDYgKzI0NCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRTaG91bGRB bnRpYWxpYXMoYm9vbCk7CiAgICAgICAgIGJvb2wgc2hvdWxkQW50aWFsaWFzKCkgY29uc3Q7CiAK KyAgICAgICAgdm9pZCBzZXRTaG91bGRTbW9vdGhGb250cyhib29sKTsKKyAgICAgICAgYm9vbCBz aG91bGRTbW9vdGhGb250cygpIGNvbnN0OworCiAgICAgICAgIGNvbnN0IEdyYXBoaWNzQ29udGV4 dFN0YXRlJiBzdGF0ZSgpIGNvbnN0OwogCiAjaWYgUExBVEZPUk0oQ0cpCkBAIC00OTcsNyArNTAy LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldFBsYXRmb3JtRmlsbEdy YWRpZW50KEdyYWRpZW50Kik7CiAgICAgICAgIHZvaWQgc2V0UGxhdGZvcm1GaWxsUGF0dGVybihQ YXR0ZXJuKik7CiAKLSAgICAgICAgdm9pZCBzZXRQbGF0Zm9ybVNob3VsZEFudGlhbGlhcyhib29s IGIpOworICAgICAgICB2b2lkIHNldFBsYXRmb3JtU2hvdWxkQW50aWFsaWFzKGJvb2wpOworICAg ICAgICB2b2lkIHNldFBsYXRmb3JtU2hvdWxkU21vb3RoRm9udHMoYm9vbCk7CiAKICAgICAgICAg dm9pZCBzZXRQbGF0Zm9ybVNoYWRvdyhjb25zdCBGbG9hdFNpemUmLCBmbG9hdCBibHVyLCBjb25z dCBDb2xvciYsIENvbG9yU3BhY2UpOwogICAgICAgICB2b2lkIGNsZWFyUGxhdGZvcm1TaGFkb3co KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250 ZXh0Q0cuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRD Ry5jcHAKaW5kZXggM2Q3MGZjMmFiODljZWQyOGU2NTY3ZWFjYThiNzNiMjk2MmEzMTc2Ny4uNzg5 OGQ2MmFjMjI1YTI1YWQ5N2I3YWIyMWUwYWI3Y2NjYjE4NjJmOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKQEAgLTExODgsNiAr MTE4OCwxMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1TaG91bGRBbnRpYWxp YXMoYm9vbCBlbmFibGUpCiAgICAgQ0dDb250ZXh0U2V0U2hvdWxkQW50aWFsaWFzKHBsYXRmb3Jt Q29udGV4dCgpLCBlbmFibGUpOwogfQogCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZv cm1TaG91bGRTbW9vdGhGb250cyhib29sIGVuYWJsZSkKK3sKKyAgICBpZiAocGFpbnRpbmdEaXNh YmxlZCgpKQorICAgICAgICByZXR1cm47CisgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9u dHMocGxhdGZvcm1Db250ZXh0KCksIGVuYWJsZSk7Cit9CisKICNpZm5kZWYgQlVJTERJTkdfT05f VElHRVIgLy8gVGlnZXIncyBzZXRQbGF0Zm9ybUNvbXBvc2l0ZU9wZXJhdGlvbigpIGlzIGRlZmlu ZWQgaW4gR3JhcGhpY3NDb250ZXh0TWFjLm1tLgogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFBs YXRmb3JtQ29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZU9wZXJhdG9yIG1vZGUpCiB7CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQppbmRleCA4ZjE1Y2IzMDllODY1NTdm ZWE2Y2ZhOGVkMjAzNzk5YTI0YTcyMTJjLi41YTdiODdjODkwZmZiMzQxYjk3MTdhMmZiODQ1NzU5 ZTBlZjAxM2NjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250 TWFjLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0KQEAg LTkxLDIyICs5MSwyNyBAQCBzdGF0aWMgdm9pZCBzaG93R2x5cGhzV2l0aEFkdmFuY2VzKGNvbnN0 IFNpbXBsZUZvbnREYXRhKiBmb250LCBDR0NvbnRleHRSZWYgY29udAogdm9pZCBGb250OjpkcmF3 R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZv bnQsIGNvbnN0IEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwgaW50IGZyb20sIGludCBudW1HbHlw aHMsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIENHQ29udGV4dFJlZiBj Z0NvbnRleHQgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBib29sIG5ld1Nob3Vs ZFVzZUZvbnRTbW9vdGhpbmcgPSBzaG91bGRVc2VTbW9vdGhpbmcoKTsKIAorICAgIGJvb2wgc2hv dWxkU21vb3RoRm9udHM7CisgICAgYm9vbCBjaGFuZ2VGb250U21vb3RoaW5nID0gZmFsc2U7Cisg ICAgCiAgICAgc3dpdGNoKGZvbnREZXNjcmlwdGlvbigpLmZvbnRTbW9vdGhpbmcoKSkgewogICAg IGNhc2UgQW50aWFsaWFzZWQ6IHsKICAgICAgICAgY29udGV4dC0+c2V0U2hvdWxkQW50aWFsaWFz KHRydWUpOwotICAgICAgICBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nID0gZmFsc2U7CisgICAg ICAgIHNob3VsZFNtb290aEZvbnRzID0gZmFsc2U7CisgICAgICAgIGNoYW5nZUZvbnRTbW9vdGhp bmcgPSB0cnVlOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBTdWJwaXhlbEFudGlh bGlhc2VkOiB7CiAgICAgICAgIGNvbnRleHQtPnNldFNob3VsZEFudGlhbGlhcyh0cnVlKTsKLSAg ICAgICAgbmV3U2hvdWxkVXNlRm9udFNtb290aGluZyA9IHRydWU7CisgICAgICAgIHNob3VsZFNt b290aEZvbnRzID0gdHJ1ZTsKKyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7CiAg ICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIE5vU21vb3RoaW5nOiB7CiAgICAgICAgIGNv bnRleHQtPnNldFNob3VsZEFudGlhbGlhcyhmYWxzZSk7Ci0gICAgICAgIG5ld1Nob3VsZFVzZUZv bnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAgICAgc2hvdWxkU21vb3RoRm9udHMgPSBmYWxzZTsK KyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7CiAgICAgICAgIGJyZWFrOwogICAg IH0KICAgICBjYXNlIEF1dG9TbW9vdGhpbmc6IHsKQEAgLTExNiwxMSArMTIxLDE4IEBAIHZvaWQg Rm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBsZUZv bnREYXRhKiBmb250LCBjb25zCiAgICAgZGVmYXVsdDogCiAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogICAgIH0KLQotICAgIGJvb2wgb3JpZ2luYWxTaG91bGRVc2VGb250U21vb3RoaW5n ID0gd2tDR0NvbnRleHRHZXRTaG91bGRTbW9vdGhGb250cyhjZ0NvbnRleHQpOwotICAgIGlmIChv cmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcgIT0gbmV3U2hvdWxkVXNlRm9udFNtb290aGlu ZykKLSAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9udHMoY2dDb250ZXh0LCBuZXdT aG91bGRVc2VGb250U21vb3RoaW5nKTsKICAgICAKKyAgICBpZiAoIXNob3VsZFVzZVNtb290aGlu ZygpKSB7CisgICAgICAgIHNob3VsZFNtb290aEZvbnRzID0gZmFsc2U7CisgICAgICAgIGNoYW5n ZUZvbnRTbW9vdGhpbmcgPSB0cnVlOworICAgIH0KKworICAgIGJvb2wgb3JpZ2luYWxTaG91bGRV c2VGb250U21vb3RoaW5nOworICAgIGlmIChjaGFuZ2VGb250U21vb3RoaW5nKSB7CisgICAgICAg IG9yaWdpbmFsU2hvdWxkVXNlRm9udFNtb290aGluZyA9IHdrQ0dDb250ZXh0R2V0U2hvdWxkU21v b3RoRm9udHMoY2dDb250ZXh0KTsKKyAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9u dHMoY2dDb250ZXh0LCBzaG91bGRTbW9vdGhGb250cyk7CisgICAgfQorCiAgICAgY29uc3QgRm9u dFBsYXRmb3JtRGF0YSYgcGxhdGZvcm1EYXRhID0gZm9udC0+cGxhdGZvcm1EYXRhKCk7CiAgICAg TlNGb250KiBkcmF3Rm9udDsKICAgICBpZiAoIWlzUHJpbnRlckZvbnQoKSkgewpAQCAtMTg2LDcg KzE5OCw3IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQs IGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LCBjb25zCiAgICAgaWYgKGhhc1NpbXBsZVNoYWRv dykKICAgICAgICAgY29udGV4dC0+c2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hhZG93Qmx1ciwg c2hhZG93Q29sb3IsIGZpbGxDb2xvclNwYWNlKTsKIAotICAgIGlmIChvcmlnaW5hbFNob3VsZFVz ZUZvbnRTbW9vdGhpbmcgIT0gbmV3U2hvdWxkVXNlRm9udFNtb290aGluZykKKyAgICBpZiAoY2hh bmdlRm9udFNtb290aGluZykKICAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9udHMo Y2dDb250ZXh0LCBvcmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcpOwogfQogCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5tbSBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1tCmluZGV4IDAxMGI0ODg3ZmQ1N2Y5YjRi OWIyMmNmYTA4OGJhMjlhZjU5OTJkNTUuLjcwZGI0NGUxNmZjMWJlODMwZjJjMWQzMDhiMzVkMmM0 OGJlODczODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxh eWVyLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1tCkBA IC02NCw3ICs2NCw3IEBAIHZvaWQgZHJhd0xheWVyQ29udGVudHMoQ0dDb250ZXh0UmVmIGNvbnRl eHQsIENBTGF5ZXIgKmxheWVyLCBXZWJDb3JlOjpHcmFwaGljc0xhCiAgICAgICAgIEdyYXBoaWNz Q29udGV4dCBncmFwaGljc0NvbnRleHQoY29udGV4dCk7CiAKICAgICAgICAgLy8gVHVybiBvZmYg Zm9udCBzbW9vdGhpbmcgdG8gaW1wcm92ZSB0aGUgYXBwZWFyYW5jZSBvZiB0ZXh0IHJlbmRlcmVk IG9udG8gYSB0cmFuc3BhcmVudCBiYWNrZ3JvdW5kLgotICAgICAgICBncmFwaGljc0NvbnRleHQu c2V0QWxsb3dzRm9udFNtb290aGluZyhmYWxzZSk7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5z ZXRTaG91bGRTbW9vdGhGb250cyhmYWxzZSk7CiAgICAgICAgIAogICAgICAgICAvLyBJdCdzIGlt cG9ydGFudCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUgY29udGV4dCwgYmVjYXVzZSBpdCBtYXkg YmUgc2lnbmlmaWNhbnRseQogICAgICAgICAvLyBzbWFsbGVyIHRoYW4gdGhlIGxheWVyIGJvdW5k cyAoZS5nLiB0aWxlZCBsYXllcnMpCg== 76551 2010-12-14 11:35:50 -0800 2010-12-14 15:15:48 -0800 Patch bug-50732-20101214113549.patch text/plain 10054 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmZmMjQzMTE5OWNjM2U2NDA4ODQ1YjY2MTM4OGQwMWFmMTU5ZjI2ZC4uOGM3M2QwNWI1MGNlODZm YTlhYTJlYjdlMTk2NWZmZTY3ZTVkMmYwMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0xMi0xMyAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBkaXNhYmxpbmcgb2YgZm9udCBzbW9v dGhpbmcgaW4gY29tcG9zaXRpbmcgbGF5ZXJzIHRvIGJlIG92ZXJyaWRkZW4gYnkgc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzMyCisKKyAg ICAgICAgQWRkIG1ldGhvZHMgdG8gR3JhcGhpY3NDb250ZXh0IHRvIGdldCBhbmQgc2V0IGZvbnQg c21vb3RoaW5nLAorICAgICAgICBhbmQgaGF2ZSB0aGVtIGJlIHBhcnQgb2YgdGhlIGdyYXBoaWNz IHN0YXRlLgorICAgICAgICAKKyAgICAgICAgRml4IEZvbnQ6OmRyYXdHbHlwaHMoKSB0byBhbGxv dyB0aGUgZm9udCdzIHNtb290aGluZyBtb2RlIChmcm9tIHN0eWxlKQorICAgICAgICB0byBvdmVy cmlkZSB0aGUgY3VycmVudCBzbW9vdGhpbmcgbW9kZSBvZiB0aGUgY29udGV4dC4gVGhlIGdsb2Jh bAorICAgICAgICBzaG91bGRVc2VTbW9vdGhpbmcoKSBzdGlsbCBoYXMgZmluYWwgc2F5LgorICAg ICAgICAKKyAgICAgICAgVHVybiBvZmYgc21vb3RoaW5nIGluIGNvbXBvc2l0aW5nIGxheWVycyB3 aXRoIHRoaXMsIHJhdGhlciB0aGFuCisgICAgICAgIHRoZSBub24tc3RhdGVmdWwgJ2FsbG93JyBt ZXRob2QuCisgICAgICAgIAorICAgICAgICAqIG1hbnVhbC10ZXN0cy9jb21wb3NpdGluZy9mb250 LXNtb290aGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgTWFudWFsIHRlc3QgYmVjYXVzZSBEUlQg ZGlzYWJsZXMgZm9udCBzbW9vdGhpbmcuCisgICAgICAgIAorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OnNldFNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDo6c2hvdWxkU21vb3RoRm9udHMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dFN0YXRlOjpHcmFwaGljc0NvbnRleHRTdGF0ZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6 OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5t bToKKyAgICAgICAgKGRyYXdMYXllckNvbnRlbnRzKToKKworMjAxMC0xMi0xMyAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBHcmFwaGljc0NvbnRleHRQ cml2YXRlLmggd2FzIHJlbW92ZWQuIE51a2UgaXQgZnJvbSB0aGUgcHJvamVjdC4KICAgICAgICAg CiAgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9tYW51YWwtdGVzdHMvY29tcG9zaXRpbmcvZm9udC1zbW9vdGhpbmcuaHRtbCBi L1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBvc2l0aW5nL2ZvbnQtc21vb3RoaW5nLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uZmNlNDQ0ZTI2Y2RiZjAyZGU0NmZlNWU2ZmUzMTZmYTlhYjY3ZmI5YwotLS0gL2Rl di9udWxsCisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBvc2l0aW5nL2ZvbnQtc21vb3Ro aW5nLmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxodG1sPgorICA8 c3R5bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgIGRpdiB7CisgICAgICBt YXJnaW46IDIwcHg7CisgICAgICBmb250LXNpemU6IDI0cHQ7CisgICAgfQorCisgICAgLmNvbXBv c2l0ZWQgeworICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRyYW5zbGF0ZVooMCk7CisgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAgICB9CisgICAgCisgICAgLnNtb290aGVkIHsKKyAg ICAgIC13ZWJraXQtZm9udC1zbW9vdGhpbmc6IHN1YnBpeGVsLWFudGlhbGlhc2VkOworICAgIH0K KyAgPC9zdHlsZT4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+CisgIDxkaXYgY2xhc3M9ImNvbXBv c2l0ZWQiPgorICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQsIGJ1dCBub3Qgc21v b3RoZWQuCisgIDwvZGl2PgorCisgIDxkaXYgY2xhc3M9InNtb290aGVkIGNvbXBvc2l0ZWQiPgor ICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQgYW5kIHNtb290aGVkLgorICA8L2Rp dj4KKworICA8ZGl2PgorICAgIFRoaXMgdGV4dCBzaG91bGQgYmUgYW50aWFsaWFzZWQgYW5kIHNt b290aGVkIGluIHRoZSBicm93c2VyLCBhbmQgYW50aWFsaWFzZWQgaW4gcGl4ZWwgcmVzdWx0cy4K KyAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXggNmQzMjE2MWZhNjY2NmQ2YjFmMDM2Njk2NWViMDkz NDE2MGJhYjVlNS4uZjdkY2M2MjAwMzBmYzRiZWQzNDE3OTlmZmRhOTgwNjFlMDFiNjU5MCAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtMjE1 LDYgKzIxNSwxNyBAQCBib29sIEdyYXBoaWNzQ29udGV4dDo6c2hvdWxkQW50aWFsaWFzKCkgY29u c3QKICAgICByZXR1cm4gbV9zdGF0ZS5zaG91bGRBbnRpYWxpYXM7CiB9CiAKK3ZvaWQgR3JhcGhp Y3NDb250ZXh0OjpzZXRTaG91bGRTbW9vdGhGb250cyhib29sIGIpCit7CisgICAgbV9zdGF0ZS5z aG91bGRTbW9vdGhGb250cyA9IGI7CisgICAgc2V0UGxhdGZvcm1TaG91bGRTbW9vdGhGb250cyhi KTsKK30KKworYm9vbCBHcmFwaGljc0NvbnRleHQ6OnNob3VsZFNtb290aEZvbnRzKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9zdGF0ZS5zaG91bGRTbW9vdGhGb250czsKK30KKwogY29uc3QgR3Jh cGhpY3NDb250ZXh0U3RhdGUmIEdyYXBoaWNzQ29udGV4dDo6c3RhdGUoKSBjb25zdAogewogICAg IHJldHVybiBtX3N0YXRlOwpAQCAtNTk0LDYgKzYwNSwxMiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6c2V0UGxhdGZvcm1TdHJva2VTdHlsZShjb25zdCBTdHJva2VTdHlsZSYpCiB9CiAjZW5kaWYK IAorI2lmICFQTEFURk9STShDRykKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNo b3VsZFNtb290aEZvbnRzKGJvb2wpCit7Cit9CisjZW5kaWYKKwogI2lmICFQTEFURk9STShTS0lB KQogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKFNoYXJl ZEdyYXBoaWNzQ29udGV4dDNEKiwgRHJhd2luZ0J1ZmZlciosIGNvbnN0IEludFNpemUmKQogewpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggNjg3MmQ4 YThmMGQ3MmQyZDU1ZGI5OTYwZjYxMzczYjA0M2M4YmMwZC4uYTliOGNkOTA3ODEwODUwMjE5ZDI0 ODNhNTk1NzIxYTRlOTk3ZTU4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dC5oCkBAIC0xNjQsNiArMTY0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICAgICAgLCBmaWxsQ29sb3JTcGFjZShDb2xvclNwYWNlRGV2aWNlUkdCKQogICAgICAgICAg ICAgLCBjb21wb3NpdGVPcGVyYXRvcihDb21wb3NpdGVTb3VyY2VPdmVyKQogICAgICAgICAgICAg LCBzaG91bGRBbnRpYWxpYXModHJ1ZSkKKyAgICAgICAgICAgICwgc2hvdWxkU21vb3RoRm9udHMo dHJ1ZSkKICAgICAgICAgICAgICwgcGFpbnRpbmdEaXNhYmxlZChmYWxzZSkKICAgICAgICAgICAg ICwgc2hhZG93c0lnbm9yZVRyYW5zZm9ybXMoZmFsc2UpCiAgICAgICAgIHsKQEAgLTE5Nyw5ICsx OTgsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIENvbXBvc2l0ZU9wZXJhdG9y IGNvbXBvc2l0ZU9wZXJhdG9yOwogCi0gICAgICAgIGJvb2wgc2hvdWxkQW50aWFsaWFzOwotICAg ICAgICBib29sIHBhaW50aW5nRGlzYWJsZWQ7Ci0gICAgICAgIGJvb2wgc2hhZG93c0lnbm9yZVRy YW5zZm9ybXM7CisgICAgICAgIGJvb2wgc2hvdWxkQW50aWFsaWFzIDogMTsKKyAgICAgICAgYm9v bCBzaG91bGRTbW9vdGhGb250cyA6IDE7CisgICAgICAgIGJvb2wgcGFpbnRpbmdEaXNhYmxlZCA6 IDE7CisgICAgICAgIGJvb2wgc2hhZG93c0lnbm9yZVRyYW5zZm9ybXMgOiAxOwogICAgIH07CiAK ICAgICBjbGFzcyBHcmFwaGljc0NvbnRleHQgOiBwdWJsaWMgTm9uY29weWFibGUgewpAQCAtMjQy LDYgKzI0NCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRTaG91bGRB bnRpYWxpYXMoYm9vbCk7CiAgICAgICAgIGJvb2wgc2hvdWxkQW50aWFsaWFzKCkgY29uc3Q7CiAK KyAgICAgICAgdm9pZCBzZXRTaG91bGRTbW9vdGhGb250cyhib29sKTsKKyAgICAgICAgYm9vbCBz aG91bGRTbW9vdGhGb250cygpIGNvbnN0OworCiAgICAgICAgIGNvbnN0IEdyYXBoaWNzQ29udGV4 dFN0YXRlJiBzdGF0ZSgpIGNvbnN0OwogCiAjaWYgUExBVEZPUk0oQ0cpCkBAIC00OTcsNyArNTAy LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldFBsYXRmb3JtRmlsbEdy YWRpZW50KEdyYWRpZW50Kik7CiAgICAgICAgIHZvaWQgc2V0UGxhdGZvcm1GaWxsUGF0dGVybihQ YXR0ZXJuKik7CiAKLSAgICAgICAgdm9pZCBzZXRQbGF0Zm9ybVNob3VsZEFudGlhbGlhcyhib29s IGIpOworICAgICAgICB2b2lkIHNldFBsYXRmb3JtU2hvdWxkQW50aWFsaWFzKGJvb2wpOworICAg ICAgICB2b2lkIHNldFBsYXRmb3JtU2hvdWxkU21vb3RoRm9udHMoYm9vbCk7CiAKICAgICAgICAg dm9pZCBzZXRQbGF0Zm9ybVNoYWRvdyhjb25zdCBGbG9hdFNpemUmLCBmbG9hdCBibHVyLCBjb25z dCBDb2xvciYsIENvbG9yU3BhY2UpOwogICAgICAgICB2b2lkIGNsZWFyUGxhdGZvcm1TaGFkb3co KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250 ZXh0Q0cuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRD Ry5jcHAKaW5kZXggM2Q3MGZjMmFiODljZWQyOGU2NTY3ZWFjYThiNzNiMjk2MmEzMTc2Ny4uNzg5 OGQ2MmFjMjI1YTI1YWQ5N2I3YWIyMWUwYWI3Y2NjYjE4NjJmOSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKQEAgLTExODgsNiAr MTE4OCwxMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1TaG91bGRBbnRpYWxp YXMoYm9vbCBlbmFibGUpCiAgICAgQ0dDb250ZXh0U2V0U2hvdWxkQW50aWFsaWFzKHBsYXRmb3Jt Q29udGV4dCgpLCBlbmFibGUpOwogfQogCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0UGxhdGZv cm1TaG91bGRTbW9vdGhGb250cyhib29sIGVuYWJsZSkKK3sKKyAgICBpZiAocGFpbnRpbmdEaXNh YmxlZCgpKQorICAgICAgICByZXR1cm47CisgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9u dHMocGxhdGZvcm1Db250ZXh0KCksIGVuYWJsZSk7Cit9CisKICNpZm5kZWYgQlVJTERJTkdfT05f VElHRVIgLy8gVGlnZXIncyBzZXRQbGF0Zm9ybUNvbXBvc2l0ZU9wZXJhdGlvbigpIGlzIGRlZmlu ZWQgaW4gR3JhcGhpY3NDb250ZXh0TWFjLm1tLgogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFBs YXRmb3JtQ29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZU9wZXJhdG9yIG1vZGUpCiB7CmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250TWFjLm1tIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQppbmRleCA4ZjE1Y2IzMDllODY1NTdm ZWE2Y2ZhOGVkMjAzNzk5YTI0YTcyMTJjLi41YTdiODdjODkwZmZiMzQxYjk3MTdhMmZiODQ1NzU5 ZTBlZjAxM2NjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Gb250 TWFjLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRNYWMubW0KQEAg LTkxLDIyICs5MSwyNyBAQCBzdGF0aWMgdm9pZCBzaG93R2x5cGhzV2l0aEFkdmFuY2VzKGNvbnN0 IFNpbXBsZUZvbnREYXRhKiBmb250LCBDR0NvbnRleHRSZWYgY29udAogdm9pZCBGb250OjpkcmF3 R2x5cGhzKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZv bnQsIGNvbnN0IEdseXBoQnVmZmVyJiBnbHlwaEJ1ZmZlciwgaW50IGZyb20sIGludCBudW1HbHlw aHMsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50KSBjb25zdAogewogICAgIENHQ29udGV4dFJlZiBj Z0NvbnRleHQgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBib29sIG5ld1Nob3Vs ZFVzZUZvbnRTbW9vdGhpbmcgPSBzaG91bGRVc2VTbW9vdGhpbmcoKTsKIAorICAgIGJvb2wgc2hv dWxkU21vb3RoRm9udHM7CisgICAgYm9vbCBjaGFuZ2VGb250U21vb3RoaW5nID0gZmFsc2U7Cisg ICAgCiAgICAgc3dpdGNoKGZvbnREZXNjcmlwdGlvbigpLmZvbnRTbW9vdGhpbmcoKSkgewogICAg IGNhc2UgQW50aWFsaWFzZWQ6IHsKICAgICAgICAgY29udGV4dC0+c2V0U2hvdWxkQW50aWFsaWFz KHRydWUpOwotICAgICAgICBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nID0gZmFsc2U7CisgICAg ICAgIHNob3VsZFNtb290aEZvbnRzID0gZmFsc2U7CisgICAgICAgIGNoYW5nZUZvbnRTbW9vdGhp bmcgPSB0cnVlOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBTdWJwaXhlbEFudGlh bGlhc2VkOiB7CiAgICAgICAgIGNvbnRleHQtPnNldFNob3VsZEFudGlhbGlhcyh0cnVlKTsKLSAg ICAgICAgbmV3U2hvdWxkVXNlRm9udFNtb290aGluZyA9IHRydWU7CisgICAgICAgIHNob3VsZFNt b290aEZvbnRzID0gdHJ1ZTsKKyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7CiAg ICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIE5vU21vb3RoaW5nOiB7CiAgICAgICAgIGNv bnRleHQtPnNldFNob3VsZEFudGlhbGlhcyhmYWxzZSk7Ci0gICAgICAgIG5ld1Nob3VsZFVzZUZv bnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAgICAgc2hvdWxkU21vb3RoRm9udHMgPSBmYWxzZTsK KyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7CiAgICAgICAgIGJyZWFrOwogICAg IH0KICAgICBjYXNlIEF1dG9TbW9vdGhpbmc6IHsKQEAgLTExNiwxMSArMTIxLDE4IEBAIHZvaWQg Rm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFNpbXBsZUZv bnREYXRhKiBmb250LCBjb25zCiAgICAgZGVmYXVsdDogCiAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogICAgIH0KLQotICAgIGJvb2wgb3JpZ2luYWxTaG91bGRVc2VGb250U21vb3RoaW5n ID0gd2tDR0NvbnRleHRHZXRTaG91bGRTbW9vdGhGb250cyhjZ0NvbnRleHQpOwotICAgIGlmIChv cmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcgIT0gbmV3U2hvdWxkVXNlRm9udFNtb290aGlu ZykKLSAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9udHMoY2dDb250ZXh0LCBuZXdT aG91bGRVc2VGb250U21vb3RoaW5nKTsKICAgICAKKyAgICBpZiAoIXNob3VsZFVzZVNtb290aGlu ZygpKSB7CisgICAgICAgIHNob3VsZFNtb290aEZvbnRzID0gZmFsc2U7CisgICAgICAgIGNoYW5n ZUZvbnRTbW9vdGhpbmcgPSB0cnVlOworICAgIH0KKworICAgIGJvb2wgb3JpZ2luYWxTaG91bGRV c2VGb250U21vb3RoaW5nOworICAgIGlmIChjaGFuZ2VGb250U21vb3RoaW5nKSB7CisgICAgICAg IG9yaWdpbmFsU2hvdWxkVXNlRm9udFNtb290aGluZyA9IHdrQ0dDb250ZXh0R2V0U2hvdWxkU21v b3RoRm9udHMoY2dDb250ZXh0KTsKKyAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9u dHMoY2dDb250ZXh0LCBzaG91bGRTbW9vdGhGb250cyk7CisgICAgfQorCiAgICAgY29uc3QgRm9u dFBsYXRmb3JtRGF0YSYgcGxhdGZvcm1EYXRhID0gZm9udC0+cGxhdGZvcm1EYXRhKCk7CiAgICAg TlNGb250KiBkcmF3Rm9udDsKICAgICBpZiAoIWlzUHJpbnRlckZvbnQoKSkgewpAQCAtMTg2LDcg KzE5OCw3IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQs IGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LCBjb25zCiAgICAgaWYgKGhhc1NpbXBsZVNoYWRv dykKICAgICAgICAgY29udGV4dC0+c2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hhZG93Qmx1ciwg c2hhZG93Q29sb3IsIGZpbGxDb2xvclNwYWNlKTsKIAotICAgIGlmIChvcmlnaW5hbFNob3VsZFVz ZUZvbnRTbW9vdGhpbmcgIT0gbmV3U2hvdWxkVXNlRm9udFNtb290aGluZykKKyAgICBpZiAoY2hh bmdlRm9udFNtb290aGluZykKICAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9udHMo Y2dDb250ZXh0LCBvcmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcpOwogfQogCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5tbSBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1tCmluZGV4IDAxMGI0ODg3ZmQ1N2Y5YjRi OWIyMmNmYTA4OGJhMjlhZjU5OTJkNTUuLjcwZGI0NGUxNmZjMWJlODMwZjJjMWQzMDhiMzVkMmM0 OGJlODczODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxh eWVyLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1tCkBA IC02NCw3ICs2NCw3IEBAIHZvaWQgZHJhd0xheWVyQ29udGVudHMoQ0dDb250ZXh0UmVmIGNvbnRl eHQsIENBTGF5ZXIgKmxheWVyLCBXZWJDb3JlOjpHcmFwaGljc0xhCiAgICAgICAgIEdyYXBoaWNz Q29udGV4dCBncmFwaGljc0NvbnRleHQoY29udGV4dCk7CiAKICAgICAgICAgLy8gVHVybiBvZmYg Zm9udCBzbW9vdGhpbmcgdG8gaW1wcm92ZSB0aGUgYXBwZWFyYW5jZSBvZiB0ZXh0IHJlbmRlcmVk IG9udG8gYSB0cmFuc3BhcmVudCBiYWNrZ3JvdW5kLgotICAgICAgICBncmFwaGljc0NvbnRleHQu c2V0QWxsb3dzRm9udFNtb290aGluZyhmYWxzZSk7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC5z ZXRTaG91bGRTbW9vdGhGb250cyhmYWxzZSk7CiAgICAgICAgIAogICAgICAgICAvLyBJdCdzIGlt cG9ydGFudCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUgY29udGV4dCwgYmVjYXVzZSBpdCBtYXkg YmUgc2lnbmlmaWNhbnRseQogICAgICAgICAvLyBzbWFsbGVyIHRoYW4gdGhlIGxheWVyIGJvdW5k cyAoZS5nLiB0aWxlZCBsYXllcnMpCg== 76579 2010-12-14 15:15:52 -0800 2010-12-15 13:50:59 -0800 Patch bug-50732-20101214151550.patch text/plain 10154 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzJlNWMwY2VkMmRmOTdkYWUyNDEzZjNmNTNiZjhkNjIwNzY5YzU0OC4uMTAwY2VlNjc4NjRmZGIz YTEwZjIxZWRlMjlhZTA1YmEwY2QzM2Y0NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMC0xMi0xNCAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBkaXNhYmxpbmcgb2YgZm9udCBzbW9v dGhpbmcgaW4gY29tcG9zaXRpbmcgbGF5ZXJzIHRvIGJlIG92ZXJyaWRkZW4gYnkgc3R5bGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNzMyCisKKyAg ICAgICAgQWRkIG1ldGhvZHMgdG8gR3JhcGhpY3NDb250ZXh0IHRvIGdldCBhbmQgc2V0IGZvbnQg c21vb3RoaW5nLAorICAgICAgICBhbmQgaGF2ZSB0aGVtIGJlIHBhcnQgb2YgdGhlIGdyYXBoaWNz IHN0YXRlLgorICAgICAgICAKKyAgICAgICAgRml4IEZvbnQ6OmRyYXdHbHlwaHMoKSB0byBhbGxv dyB0aGUgZm9udCdzIHNtb290aGluZyBtb2RlIChmcm9tIHN0eWxlKQorICAgICAgICB0byBvdmVy cmlkZSB0aGUgY3VycmVudCBzbW9vdGhpbmcgbW9kZSBvZiB0aGUgY29udGV4dC4gVGhlIGdsb2Jh bAorICAgICAgICBzaG91bGRVc2VTbW9vdGhpbmcoKSBzdGlsbCBoYXMgZmluYWwgc2F5LgorICAg ICAgICAKKyAgICAgICAgVHVybiBvZmYgc21vb3RoaW5nIGluIGNvbXBvc2l0aW5nIGxheWVycyB3 aXRoIHRoaXMsIHJhdGhlciB0aGFuCisgICAgICAgIHRoZSBub24tc3RhdGVmdWwgJ2FsbG93JyBt ZXRob2QuCisgICAgICAgIAorICAgICAgICAqIG1hbnVhbC10ZXN0cy9jb21wb3NpdGluZy9mb250 LXNtb290aGluZy5odG1sOiBBZGRlZC4KKyAgICAgICAgTWFudWFsIHRlc3QgYmVjYXVzZSBEUlQg ZGlzYWJsZXMgZm9udCBzbW9vdGhpbmcuCisgICAgICAgIAorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OnNldFNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDo6c2hvdWxkU21vb3RoRm9udHMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dFN0YXRlOjpHcmFwaGljc0NvbnRleHRTdGF0ZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybVNob3VsZFNtb290aEZvbnRzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6 OmRyYXdHbHlwaHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5t bToKKyAgICAgICAgKGRyYXdMYXllckNvbnRlbnRzKToKKworMjAxMC0xMi0xMyAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBHcmFwaGljc0NvbnRleHRQ cml2YXRlLmggd2FzIHJlbW92ZWQuIE51a2UgaXQgZnJvbSB0aGUgcHJvamVjdC4KKyAgICAgICAg CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDEwLTEy LTE0ICBLeW91bmdhIFJhICA8a3lvdW5nYS5yYUBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFsLXRlc3RzL2NvbXBv c2l0aW5nL2ZvbnQtc21vb3RoaW5nLmh0bWwgYi9XZWJDb3JlL21hbnVhbC10ZXN0cy9jb21wb3Np dGluZy9mb250LXNtb290aGluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZjZTQ0NGUyNmNkYmYwMmRlNDZm ZTVlNmZlMzE2ZmE5YWI2N2ZiOWMKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJDb3JlL21hbnVhbC10 ZXN0cy9jb21wb3NpdGluZy9mb250LXNtb290aGluZy5odG1sCkBAIC0wLDAgKzEsMzQgQEAKKzwh RE9DVFlQRSBodG1sPgorCis8aHRtbD4KKyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIiBtZWRpYT0i c2NyZWVuIj4KKyAgICBkaXYgeworICAgICAgbWFyZ2luOiAyMHB4OworICAgICAgZm9udC1zaXpl OiAyNHB0OworICAgIH0KKworICAgIC5jb21wb3NpdGVkIHsKKyAgICAgIC13ZWJraXQtdHJhbnNm b3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7CisgICAg fQorICAgIAorICAgIC5zbW9vdGhlZCB7CisgICAgICAtd2Via2l0LWZvbnQtc21vb3RoaW5nOiBz dWJwaXhlbC1hbnRpYWxpYXNlZDsKKyAgICB9CisgIDwvc3R5bGU+Cis8aGVhZD4KKzwvaGVhZD4K Kzxib2R5PgorICA8ZGl2IGNsYXNzPSJjb21wb3NpdGVkIj4KKyAgICBUaGlzIHRleHQgc2hvdWxk IGJlIGFudGlhbGlhc2VkLCBidXQgbm90IHNtb290aGVkLgorICA8L2Rpdj4KKworICA8ZGl2IGNs YXNzPSJzbW9vdGhlZCBjb21wb3NpdGVkIj4KKyAgICBUaGlzIHRleHQgc2hvdWxkIGJlIGFudGlh bGlhc2VkIGFuZCBzbW9vdGhlZC4KKyAgPC9kaXY+CisKKyAgPGRpdj4KKyAgICBUaGlzIHRleHQg c2hvdWxkIGJlIGFudGlhbGlhc2VkIGFuZCBzbW9vdGhlZCBpbiB0aGUgYnJvd3NlciwgYW5kIGFu dGlhbGlhc2VkIGluIHBpeGVsIHJlc3VsdHMuCisgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3Bw IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCmluZGV4IDZk MzIxNjFmYTY2NjZkNmIxZjAzNjY5NjVlYjA5MzQxNjBiYWI1ZTUuLmY3ZGNjNjIwMDMwZmM0YmVk MzQxNzk5ZmZkYTk4MDYxZTAxYjY1OTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKQEAgLTIxNSw2ICsyMTUsMTcgQEAgYm9vbCBHcmFwaGljc0Nv bnRleHQ6OnNob3VsZEFudGlhbGlhcygpIGNvbnN0CiAgICAgcmV0dXJuIG1fc3RhdGUuc2hvdWxk QW50aWFsaWFzOwogfQogCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6c2V0U2hvdWxkU21vb3RoRm9u dHMoYm9vbCBiKQoreworICAgIG1fc3RhdGUuc2hvdWxkU21vb3RoRm9udHMgPSBiOworICAgIHNl dFBsYXRmb3JtU2hvdWxkU21vb3RoRm9udHMoYik7Cit9CisKK2Jvb2wgR3JhcGhpY3NDb250ZXh0 OjpzaG91bGRTbW9vdGhGb250cygpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc3RhdGUuc2hvdWxk U21vb3RoRm9udHM7Cit9CisKIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0YXRlJiBHcmFwaGljc0Nv bnRleHQ6OnN0YXRlKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9zdGF0ZTsKQEAgLTU5NCw2ICs2 MDUsMTIgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtU3Ryb2tlU3R5bGUoY29u c3QgU3Ryb2tlU3R5bGUmKQogfQogI2VuZGlmCiAKKyNpZiAhUExBVEZPUk0oQ0cpCit2b2lkIEdy YXBoaWNzQ29udGV4dDo6c2V0UGxhdGZvcm1TaG91bGRTbW9vdGhGb250cyhib29sKQoreworfQor I2VuZGlmCisKICNpZiAhUExBVEZPUk0oU0tJQSkKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRT aGFyZWRHcmFwaGljc0NvbnRleHQzRChTaGFyZWRHcmFwaGljc0NvbnRleHQzRCosIERyYXdpbmdC dWZmZXIqLCBjb25zdCBJbnRTaXplJikKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oCmluZGV4IDY4NzJkOGE4ZjBkNzJkMmQ1NWRiOTk2MGY2MTM3M2IwNDNj OGJjMGQuLmE5YjhjZDkwNzgxMDg1MDIxOWQyNDgzYTU5NTcyMWE0ZTk5N2U1ODAgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtMTY0LDYgKzE2NCw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgZmlsbENvbG9yU3BhY2UoQ29s b3JTcGFjZURldmljZVJHQikKICAgICAgICAgICAgICwgY29tcG9zaXRlT3BlcmF0b3IoQ29tcG9z aXRlU291cmNlT3ZlcikKICAgICAgICAgICAgICwgc2hvdWxkQW50aWFsaWFzKHRydWUpCisgICAg ICAgICAgICAsIHNob3VsZFNtb290aEZvbnRzKHRydWUpCiAgICAgICAgICAgICAsIHBhaW50aW5n RGlzYWJsZWQoZmFsc2UpCiAgICAgICAgICAgICAsIHNoYWRvd3NJZ25vcmVUcmFuc2Zvcm1zKGZh bHNlKQogICAgICAgICB7CkBAIC0xOTcsOSArMTk4LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogICAgICAgICBDb21wb3NpdGVPcGVyYXRvciBjb21wb3NpdGVPcGVyYXRvcjsKIAotICAgICAg ICBib29sIHNob3VsZEFudGlhbGlhczsKLSAgICAgICAgYm9vbCBwYWludGluZ0Rpc2FibGVkOwot ICAgICAgICBib29sIHNoYWRvd3NJZ25vcmVUcmFuc2Zvcm1zOworICAgICAgICBib29sIHNob3Vs ZEFudGlhbGlhcyA6IDE7CisgICAgICAgIGJvb2wgc2hvdWxkU21vb3RoRm9udHMgOiAxOworICAg ICAgICBib29sIHBhaW50aW5nRGlzYWJsZWQgOiAxOworICAgICAgICBib29sIHNoYWRvd3NJZ25v cmVUcmFuc2Zvcm1zIDogMTsKICAgICB9OwogCiAgICAgY2xhc3MgR3JhcGhpY3NDb250ZXh0IDog cHVibGljIE5vbmNvcHlhYmxlIHsKQEAgLTI0Miw2ICsyNDQsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIHZvaWQgc2V0U2hvdWxkQW50aWFsaWFzKGJvb2wpOwogICAgICAgICBib29s IHNob3VsZEFudGlhbGlhcygpIGNvbnN0OwogCisgICAgICAgIHZvaWQgc2V0U2hvdWxkU21vb3Ro Rm9udHMoYm9vbCk7CisgICAgICAgIGJvb2wgc2hvdWxkU21vb3RoRm9udHMoKSBjb25zdDsKKwog ICAgICAgICBjb25zdCBHcmFwaGljc0NvbnRleHRTdGF0ZSYgc3RhdGUoKSBjb25zdDsKIAogI2lm IFBMQVRGT1JNKENHKQpAQCAtNDk3LDcgKzUwMiw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICAgICAgdm9pZCBzZXRQbGF0Zm9ybUZpbGxHcmFkaWVudChHcmFkaWVudCopOwogICAgICAgICB2 b2lkIHNldFBsYXRmb3JtRmlsbFBhdHRlcm4oUGF0dGVybiopOwogCi0gICAgICAgIHZvaWQgc2V0 UGxhdGZvcm1TaG91bGRBbnRpYWxpYXMoYm9vbCBiKTsKKyAgICAgICAgdm9pZCBzZXRQbGF0Zm9y bVNob3VsZEFudGlhbGlhcyhib29sKTsKKyAgICAgICAgdm9pZCBzZXRQbGF0Zm9ybVNob3VsZFNt b290aEZvbnRzKGJvb2wpOwogCiAgICAgICAgIHZvaWQgc2V0UGxhdGZvcm1TaGFkb3coY29uc3Qg RmxvYXRTaXplJiwgZmxvYXQgYmx1ciwgY29uc3QgQ29sb3ImLCBDb2xvclNwYWNlKTsKICAgICAg ICAgdm9pZCBjbGVhclBsYXRmb3JtU2hhZG93KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IDNkNzBmYzJhYjg5Y2VkMjhl NjU2N2VhY2E4YjczYjI5NjJhMzE3NjcuLjc4OThkNjJhYzIyNWEyNWFkOTdiN2FiMjFlMGFiN2Nj Y2IxODYyZjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhp Y3NDb250ZXh0Q0cuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhp Y3NDb250ZXh0Q0cuY3BwCkBAIC0xMTg4LDYgKzExODgsMTMgQEAgdm9pZCBHcmFwaGljc0NvbnRl eHQ6OnNldFBsYXRmb3JtU2hvdWxkQW50aWFsaWFzKGJvb2wgZW5hYmxlKQogICAgIENHQ29udGV4 dFNldFNob3VsZEFudGlhbGlhcyhwbGF0Zm9ybUNvbnRleHQoKSwgZW5hYmxlKTsKIH0KIAordm9p ZCBHcmFwaGljc0NvbnRleHQ6OnNldFBsYXRmb3JtU2hvdWxkU21vb3RoRm9udHMoYm9vbCBlbmFi bGUpCit7CisgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKKyAgICAgICAgcmV0dXJuOworICAg IENHQ29udGV4dFNldFNob3VsZFNtb290aEZvbnRzKHBsYXRmb3JtQ29udGV4dCgpLCBlbmFibGUp OworfQorCiAjaWZuZGVmIEJVSUxESU5HX09OX1RJR0VSIC8vIFRpZ2VyJ3Mgc2V0UGxhdGZvcm1D b21wb3NpdGVPcGVyYXRpb24oKSBpcyBkZWZpbmVkIGluIEdyYXBoaWNzQ29udGV4dE1hYy5tbS4K IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRQbGF0Zm9ybUNvbXBvc2l0ZU9wZXJhdGlvbihDb21w b3NpdGVPcGVyYXRvciBtb2RlKQogewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9tYWMvRm9udE1hYy5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0ZvbnRN YWMubW0KaW5kZXggOGYxNWNiMzA5ZTg2NTU3ZmVhNmNmYThlZDIwMzc5OWEyNGE3MjEyYy4uNDAz ZmJlMDhmYzJlYTZkNzg1ZmUzZTA0MDcxMjM5MWU0YmZmNGM2YiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvRm9udE1hYy5tbQorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9Gb250TWFjLm1tCkBAIC05MSwyMiArOTEsMjcgQEAgc3RhdGljIHZvaWQg c2hvd0dseXBoc1dpdGhBZHZhbmNlcyhjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCwgQ0dDb250 ZXh0UmVmIGNvbnQKIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGNvbnRl eHQsIGNvbnN0IFNpbXBsZUZvbnREYXRhKiBmb250LCBjb25zdCBHbHlwaEJ1ZmZlciYgZ2x5cGhC dWZmZXIsIGludCBmcm9tLCBpbnQgbnVtR2x5cGhzLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkg Y29uc3QKIHsKICAgICBDR0NvbnRleHRSZWYgY2dDb250ZXh0ID0gY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCk7Ci0gICAgYm9vbCBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nID0gc2hvdWxkVXNl U21vb3RoaW5nKCk7CiAKKyAgICBib29sIHNob3VsZFNtb290aEZvbnRzID0gdHJ1ZTsKKyAgICBi b29sIGNoYW5nZUZvbnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAKICAgICBzd2l0Y2goZm9udERl c2NyaXB0aW9uKCkuZm9udFNtb290aGluZygpKSB7CiAgICAgY2FzZSBBbnRpYWxpYXNlZDogewog ICAgICAgICBjb250ZXh0LT5zZXRTaG91bGRBbnRpYWxpYXModHJ1ZSk7Ci0gICAgICAgIG5ld1No b3VsZFVzZUZvbnRTbW9vdGhpbmcgPSBmYWxzZTsKKyAgICAgICAgc2hvdWxkU21vb3RoRm9udHMg PSBmYWxzZTsKKyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7CiAgICAgICAgIGJy ZWFrOwogICAgIH0KICAgICBjYXNlIFN1YnBpeGVsQW50aWFsaWFzZWQ6IHsKICAgICAgICAgY29u dGV4dC0+c2V0U2hvdWxkQW50aWFsaWFzKHRydWUpOwotICAgICAgICBuZXdTaG91bGRVc2VGb250 U21vb3RoaW5nID0gdHJ1ZTsKKyAgICAgICAgc2hvdWxkU21vb3RoRm9udHMgPSB0cnVlOworICAg ICAgICBjaGFuZ2VGb250U21vb3RoaW5nID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQog ICAgIGNhc2UgTm9TbW9vdGhpbmc6IHsKICAgICAgICAgY29udGV4dC0+c2V0U2hvdWxkQW50aWFs aWFzKGZhbHNlKTsKLSAgICAgICAgbmV3U2hvdWxkVXNlRm9udFNtb290aGluZyA9IGZhbHNlOwor ICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IGZhbHNlOworICAgICAgICBjaGFuZ2VGb250U21v b3RoaW5nID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgQXV0b1Ntb290 aGluZzogewpAQCAtMTE2LDExICsxMjEsMTggQEAgdm9pZCBGb250OjpkcmF3R2x5cGhzKEdyYXBo aWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnQsIGNvbnMKICAg ICBkZWZhdWx0OiAKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQotCi0gICAg Ym9vbCBvcmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcgPSB3a0NHQ29udGV4dEdldFNob3Vs ZFNtb290aEZvbnRzKGNnQ29udGV4dCk7Ci0gICAgaWYgKG9yaWdpbmFsU2hvdWxkVXNlRm9udFNt b290aGluZyAhPSBuZXdTaG91bGRVc2VGb250U21vb3RoaW5nKQotICAgICAgICBDR0NvbnRleHRT ZXRTaG91bGRTbW9vdGhGb250cyhjZ0NvbnRleHQsIG5ld1Nob3VsZFVzZUZvbnRTbW9vdGhpbmcp OwogICAgIAorICAgIGlmICghc2hvdWxkVXNlU21vb3RoaW5nKCkpIHsKKyAgICAgICAgc2hvdWxk U21vb3RoRm9udHMgPSBmYWxzZTsKKyAgICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7 CisgICAgfQorCisgICAgYm9vbCBvcmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcgPSBmYWxz ZTsKKyAgICBpZiAoY2hhbmdlRm9udFNtb290aGluZykgeworICAgICAgICBvcmlnaW5hbFNob3Vs ZFVzZUZvbnRTbW9vdGhpbmcgPSB3a0NHQ29udGV4dEdldFNob3VsZFNtb290aEZvbnRzKGNnQ29u dGV4dCk7CisgICAgICAgIENHQ29udGV4dFNldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCwg c2hvdWxkU21vb3RoRm9udHMpOworICAgIH0KKwogICAgIGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEm IHBsYXRmb3JtRGF0YSA9IGZvbnQtPnBsYXRmb3JtRGF0YSgpOwogICAgIE5TRm9udCogZHJhd0Zv bnQ7CiAgICAgaWYgKCFpc1ByaW50ZXJGb250KCkpIHsKQEAgLTE4Niw3ICsxOTgsNyBAQCB2b2lk IEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBTaW1wbGVG b250RGF0YSogZm9udCwgY29ucwogICAgIGlmIChoYXNTaW1wbGVTaGFkb3cpCiAgICAgICAgIGNv bnRleHQtPnNldFNoYWRvdyhzaGFkb3dPZmZzZXQsIHNoYWRvd0JsdXIsIHNoYWRvd0NvbG9yLCBm aWxsQ29sb3JTcGFjZSk7CiAKLSAgICBpZiAob3JpZ2luYWxTaG91bGRVc2VGb250U21vb3RoaW5n ICE9IG5ld1Nob3VsZFVzZUZvbnRTbW9vdGhpbmcpCisgICAgaWYgKGNoYW5nZUZvbnRTbW9vdGhp bmcpCiAgICAgICAgIENHQ29udGV4dFNldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCwgb3Jp Z2luYWxTaG91bGRVc2VGb250U21vb3RoaW5nKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvV2ViTGF5ZXIubW0gYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9XZWJMYXllci5tbQppbmRleCAwMTBiNDg4N2ZkNTdmOWI0YjliMjJjZmEwODhiYTI5 YWY1OTkyZDU1Li43MGRiNDRlMTZmYzFiZTgzMGYyYzFkMzA4YjM1ZDJjNDhiZTg3MzgyIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5tbQorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5tbQpAQCAtNjQsNyArNjQsNyBA QCB2b2lkIGRyYXdMYXllckNvbnRlbnRzKENHQ29udGV4dFJlZiBjb250ZXh0LCBDQUxheWVyICps YXllciwgV2ViQ29yZTo6R3JhcGhpY3NMYQogICAgICAgICBHcmFwaGljc0NvbnRleHQgZ3JhcGhp Y3NDb250ZXh0KGNvbnRleHQpOwogCiAgICAgICAgIC8vIFR1cm4gb2ZmIGZvbnQgc21vb3RoaW5n IHRvIGltcHJvdmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGV4dCByZW5kZXJlZCBvbnRvIGEgdHJhbnNw YXJlbnQgYmFja2dyb3VuZC4KLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEFsbG93c0ZvbnRT bW9vdGhpbmcoZmFsc2UpOworICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0U2hvdWxkU21vb3Ro Rm9udHMoZmFsc2UpOwogICAgICAgICAKICAgICAgICAgLy8gSXQncyBpbXBvcnRhbnQgdG8gZ2V0 IHRoZSBjbGlwIGZyb20gdGhlIGNvbnRleHQsIGJlY2F1c2UgaXQgbWF5IGJlIHNpZ25pZmljYW50 bHkKICAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBsYXllciBib3VuZHMgKGUuZy4gdGlsZWQg bGF5ZXJzKQo=