123485 2013-10-29 17:29:50 -0700 WebKit/win/WebKitGraphics.h:void WebDrawText(WebTextRenderInfo*); is never called 2013-10-30 13:52:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield commit-queue mmaxfield webkit-bug-importer oldest_to_newest 944701 0 mmaxfield 2013-10-29 17:29:50 -0700 We should remove dead code 944702 1 webkit-bug-importer 2013-10-29 17:30:37 -0700 <rdar://problem/15347544> 944703 2 bfulgham 2013-10-29 17:31:12 -0700 It doesn't look like we use WebDrawText anymore, and the one client program that had been using it no longer needs it. This bug removes the unused code as well as the exported symbol. 945092 3 215544 mmaxfield 2013-10-30 11:53:32 -0700 Created attachment 215544 Patch 945095 4 215544 bfulgham 2013-10-30 11:55:51 -0700 Comment on attachment 215544 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215544&action=review Looks good, but you also need to tell Visual Studio to NOT look for the removed symbol when building the DLL. > Source/WebKit/win/WebKitGraphics.h:-66 > -void WebDrawText(WebTextRenderInfo*); This also needs to be removed from WebKitExports.def.in 945097 5 215545 mmaxfield 2013-10-30 11:57:40 -0700 Created attachment 215545 Patch 945102 6 215545 bfulgham 2013-10-30 12:02:58 -0700 Comment on attachment 215545 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215545&action=review Sorry -- I missed one thing, and we need a ChangeLog on the "WebKitExports.def.in" change. > Source/WebKit/win/ChangeLog:8 > + * WebKitGraphics.cpp: You should say something like "Removed unused WebDrawText implementation." > Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:-14 > - WebDrawText Unfortunately, this file is in the scope of "Source/WebKit/ChangeLog" (not just the "Source/WebKit/win/ChangeLog"), so yet ANOTHER ChangeLog is needed. "prepare-ChangeLog" should get it set up properly for you. 945106 7 215546 mmaxfield 2013-10-30 12:06:19 -0700 Created attachment 215546 Patch 945107 8 215547 mmaxfield 2013-10-30 12:07:50 -0700 Created attachment 215547 Patch 945111 9 215547 bfulgham 2013-10-30 12:11:14 -0700 Comment on attachment 215547 Patch r=me. 945114 10 215547 commit-queue 2013-10-30 12:13:40 -0700 Comment on attachment 215547 Patch Rejecting attachment 215547 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 215547, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/17038284 945122 11 215550 mmaxfield 2013-10-30 12:37:09 -0700 Created attachment 215550 Patch 945125 12 215550 bfulgham 2013-10-30 12:46:00 -0700 Comment on attachment 215550 Patch Try again! r=me 945153 13 215550 commit-queue 2013-10-30 13:30:42 -0700 Comment on attachment 215550 Patch Clearing flags on attachment: 215550 Committed r158309: <http://trac.webkit.org/changeset/158309> 945154 14 commit-queue 2013-10-30 13:30:45 -0700 All reviewed patches have been landed. Closing bug. 215544 2013-10-30 11:53:32 -0700 2013-10-30 11:57:38 -0700 Patch bug-123485-20131030115331.patch text/plain 5689 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uMzAxNmE5YWRiZWU4NGE0MDVlMWRlYjA3MjQ1MjU4 YTIxYTUzZTBlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dp bi9XZWJLaXRHcmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsg aXMgbmV2ZXIgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZWJEcmF3VGV4dCBpcyB0aGUgb25seSBjYWxsZXIgb2YgV2ViQ29yZURyYXdUZXh0 QXRQb2ludCwgc28gd2UgY2FuCisgICAgICAgIGRlbGV0ZSB0aGF0IGFzIHdlbGwuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2ViQ29y ZVRleHRSZW5kZXJlci5jcHA6CisgICAgICAgICogcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVu ZGVyZXIuaDoKKwogMjAxMy0xMC0zMCAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBGYXZpY29ucyBhcmUgZmxpcHBlZCBpbiB2ZXJ0aWNhbCBkaXJlY3Rp b24gaW4gV2luQ2Fpcm8gYnVpbGRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IGVjOTY2YjY5ZDE3MGY2 YjRmMjRjZDU3MDZhMTI1Nzk3YzllMjA4ODYuLjE0ZWJkNDNhZTdjYjY4YjA4NzAxNzFiZDcyN2Qw Mzg1NjQwMTNhMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0xMC0z MCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFdl YktpdC93aW4vV2ViS2l0R3JhcGhpY3MuaDp2b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJ bmZvKik7IGlzIG5ldmVyIGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIzNDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXZWJLaXRHcmFwaGljcy5jcHA6CisgICAgICAgICogV2ViS2l0R3Jh cGhpY3MuaDoKKwogMjAxMy0xMC0zMCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBbV0lOXSBBZGQgbWlzc2luZyBVU0UoQ0ZORVRXT1JLKSB0byBXZWJF cnJvci5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRl eHRSZW5kZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRS ZW5kZXJlci5jcHAKaW5kZXggM2QwMDdjZmY5YzY5MzkyYThkNzZiODlkYjhlYjljZWUzYTM0MmY4 NS4uYTExNTM1MGZiMzRhYzZhZGZhNWY0ZThhZWQ4MWE5OTIxZDMxMzU2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmNwcApAQCAt ODEsMTUgKzgxLDYgQEAgc3RhdGljIHZvaWQgZG9EcmF3VGV4dEF0UG9pbnQoR3JhcGhpY3NDb250 ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbnMKICAgICB9CiB9CiAKLXZvaWQg V2ViQ29yZURyYXdUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0 cmluZyYgdGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBjb25z dCBDb2xvciYgY29sb3IsIGludCB1bmRlcmxpbmVkSW5kZXgpCi17Ci0gICAgY29udGV4dC5zYXZl KCk7Ci0KLSAgICBkb0RyYXdUZXh0QXRQb2ludChjb250ZXh0LCB0ZXh0LCBwb2ludCwgZm9udCwg Y29sb3IsIHVuZGVybGluZWRJbmRleCk7Ci0KLSAgICBjb250ZXh0LnJlc3RvcmUoKTsKLX0KLQog dm9pZCBXZWJDb3JlRHJhd0RvdWJsZWRUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRl eHQsIGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250 JiBmb250LCBjb25zdCBDb2xvciYgdG9wQ29sb3IsIGNvbnN0IENvbG9yJiBib3R0b21Db2xvciwg aW50IHVuZGVybGluZWRJbmRleCkKIHsKICAgICBjb250ZXh0LnNhdmUoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oCmluZGV4IDZkZWVm NGEzNzg1NzVhMTk5MzI3ZDQyZGZhNTNiYTAwMmJlZTkzZmMuLmFkYzZjZGZhMmFhNTFlNzNkYjc1 YjIxZDliNmQ2OWVlYTQzZGU2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuaApAQCAtMzUsNyArMzUsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogICAgIGNsYXNzIEludFBvaW50Owog Ci0gICAgdm9pZCBXZWJDb3JlRHJhd1RleHRBdFBvaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0 IFN0cmluZyYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgRm9udCYsIGNvbnN0IENvbG9yJiwgaW50 IHVuZGVybGluZWRJbmRleCA9IC0xKTsKICAgICB2b2lkIFdlYkNvcmVEcmF3RG91YmxlZFRleHRB dFBvaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IEludFBvaW50Jiwg Y29uc3QgRm9udCYsIGNvbnN0IENvbG9yJiB0b3BDb2xvciwgY29uc3QgQ29sb3ImIGJvdHRvbUNv bG9yLCBpbnQgdW5kZXJsaW5lZEluZGV4ID0gLTEpOwogICAgIGZsb2F0IFdlYkNvcmVUZXh0Rmxv YXRXaWR0aChjb25zdCBTdHJpbmcmLCBjb25zdCBGb250Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYktp dEdyYXBoaWNzLmNwcAppbmRleCAyYTczNjYyOWIzNjdiMzY4ZmQwYTlkNGZmZjkwMjE2M2Y4NGM5 ZmJjLi40YzJmYjYzMjYzODkwMTlkMTBmNTk1MTVmNTU1ZWFhMWM1ZDk2NzUyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5jcHAKKysrIGIvU291cmNlL1dlYktp dC93aW4vV2ViS2l0R3JhcGhpY3MuY3BwCkBAIC04NywzOCArODcsNiBAQCBzdHJ1Y3QgV2ViVGV4 dFJlbmRlckluZm9XaXRob3V0U2hhZG93CiAgICAgaW50IG92ZXJyaWRlU21vb3RoaW5nTGV2ZWw7 IC8vIHBhc3MgaW4gLTEgaWYgY2FsbGVyIGRvZXMgbm90IHdhbnQgdG8gb3ZlcnJpZGUgc21vb3Ro aW5nIGxldmVsCiB9OwogCi12b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJbmZvKiBpbmZv KQotewotICAgIGlmICghaW5mbyB8fCBpbmZvLT5zdHJ1Y3RTaXplIDwgc2l6ZW9mKFdlYlRleHRS ZW5kZXJJbmZvV2l0aG91dFNoYWRvdykgfHwgIWluZm8tPmNnQ29udGV4dCB8fCAhaW5mby0+ZGVz Y3JpcHRpb24pCi0gICAgICAgIHJldHVybjsKLQotICAgIGludCBvbGRGb250U21vb3RoaW5nTGV2 ZWwgPSAtMTsKLSAgICBpZiAoaW5mby0+b3ZlcnJpZGVTbW9vdGhpbmdMZXZlbCA+PSAwKSB7Ci0g ICAgICAgIG9sZEZvbnRTbW9vdGhpbmdMZXZlbCA9IHdrR2V0Rm9udFNtb290aGluZ0xldmVsKCk7 Ci0gICAgICAgIHdrU2V0Rm9udFNtb290aGluZ0xldmVsKGluZm8tPm92ZXJyaWRlU21vb3RoaW5n TGV2ZWwpOwotICAgIH0KLQotICAgIHsKLSAgICAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQo aW5mby0+Y2dDb250ZXh0KTsKLSAgICAgICAgU3RyaW5nIGRyYXdTdHJpbmcoaW5mby0+dGV4dCwg aW5mby0+bGVuZ3RoKTsKLSAgICAgICAgaWYgKGluZm8tPmRyYXdBc1Bhc3N3b3JkKQotICAgICAg ICAgICAgZHJhd1N0cmluZy5maWxsKFdURjo6VW5pY29kZTo6YnVsbGV0KTsKLQotICAgICAgICBj b250ZXh0LnNhdmUoKTsKLQotICAgICAgICAvLyBTZXQgc2hhZG93IHNldHRpbmcKLSAgICAgICAg aWYgKGluZm8tPnN0cnVjdFNpemUgPT0gc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZvKSAmJgotICAg ICAgICAgICAgKGluZm8tPnNoYWRvd09mZnNldC5jeCB8fCBpbmZvLT5zaGFkb3dPZmZzZXQuY3kg fHwgaW5mby0+c2hhZG93Qmx1ciB8fCBpbmZvLT5zaGFkb3dDb2xvcikpCi0gICAgICAgICAgICBj b250ZXh0LnNldFNoYWRvdyhGbG9hdFNpemUoaW5mby0+c2hhZG93T2Zmc2V0LmN4LCBpbmZvLT5z aGFkb3dPZmZzZXQuY3kpLCBpbmZvLT5zaGFkb3dCbHVyLCBpbmZvLT5zaGFkb3dDb2xvciwgQ29s b3JTcGFjZURldmljZVJHQik7Ci0KLSAgICAgICAgV2ViQ29yZURyYXdUZXh0QXRQb2ludChjb250 ZXh0LCBkcmF3U3RyaW5nLCBpbmZvLT5wdCwgbWFrZUZvbnQoKihpbmZvLT5kZXNjcmlwdGlvbikp LCBpbmZvLT5jb2xvciwgaW5mby0+dW5kZXJsaW5lZEluZGV4KTsKLSAgICAgICAgY29udGV4dC5y ZXN0b3JlKCk7Ci0gICAgfQotCi0gICAgaWYgKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwg Pj0gMCkKLSAgICAgICAgd2tTZXRGb250U21vb3RoaW5nTGV2ZWwob2xkRm9udFNtb290aGluZ0xl dmVsKTsKLX0KLQogZmxvYXQgVGV4dEZsb2F0V2lkdGgoTFBDVFNUUiB0ZXh0LCBpbnQgbGVuZ3Ro LCBjb25zdCBXZWJGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKQogewogICAgIHJldHVybiBX ZWJDb3JlVGV4dEZsb2F0V2lkdGgoU3RyaW5nKHRleHQsIGxlbmd0aCksIG1ha2VGb250KGRlc2Ny aXB0aW9uKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5o IGIvU291cmNlL1dlYktpdC93aW4vV2ViS2l0R3JhcGhpY3MuaAppbmRleCA1OWM4NzRiNTRjMTg3 NGIyMjM1MzUwNzI4NzBiYWFhMDE1MWNiOWVhLi5jMDkwNDVmNTk3NzVmN2MyMGM1MjhiNTkwNDE4 YjJjMzU0NjFhZTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGlj cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmgKQEAgLTYzLDcgKzYz LDYgQEAgc3RydWN0IFdlYlRleHRSZW5kZXJJbmZvCiAgICAgQ0dDb2xvclJlZiBzaGFkb3dDb2xv cjsKIH07CiAKLXZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsKIGZsb2F0IFRl eHRGbG9hdFdpZHRoKExQQ1RTVFIgdGV4dCwgaW50IGxlbmd0aCwgY29uc3QgV2ViRm9udERlc2Ny aXB0aW9uJik7CiB2b2lkIEZvbnRNZXRyaWNzKGNvbnN0IFdlYkZvbnREZXNjcmlwdGlvbiYsIGlu dCogYXNjZW50LCBpbnQqIGRlc2NlbnQsIGludCogbGluZVNwYWNpbmcpOwogCg== 215545 2013-10-30 11:57:40 -0700 2013-10-30 12:06:17 -0700 Patch bug-123485-20131030115739.patch text/plain 6307 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uMzAxNmE5YWRiZWU4NGE0MDVlMWRlYjA3MjQ1MjU4 YTIxYTUzZTBlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dp bi9XZWJLaXRHcmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsg aXMgbmV2ZXIgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZWJEcmF3VGV4dCBpcyB0aGUgb25seSBjYWxsZXIgb2YgV2ViQ29yZURyYXdUZXh0 QXRQb2ludCwgc28gd2UgY2FuCisgICAgICAgIGRlbGV0ZSB0aGF0IGFzIHdlbGwuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2ViQ29y ZVRleHRSZW5kZXJlci5jcHA6CisgICAgICAgICogcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVu ZGVyZXIuaDoKKwogMjAxMy0xMC0zMCAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBGYXZpY29ucyBhcmUgZmxpcHBlZCBpbiB2ZXJ0aWNhbCBkaXJlY3Rp b24gaW4gV2luQ2Fpcm8gYnVpbGRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IGVjOTY2YjY5ZDE3MGY2 YjRmMjRjZDU3MDZhMTI1Nzk3YzllMjA4ODYuLjE0ZWJkNDNhZTdjYjY4YjA4NzAxNzFiZDcyN2Qw Mzg1NjQwMTNhMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0xMC0z MCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFdl YktpdC93aW4vV2ViS2l0R3JhcGhpY3MuaDp2b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJ bmZvKik7IGlzIG5ldmVyIGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIzNDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXZWJLaXRHcmFwaGljcy5jcHA6CisgICAgICAgICogV2ViS2l0R3Jh cGhpY3MuaDoKKwogMjAxMy0xMC0zMCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KIAogICAgICAgICBbV0lOXSBBZGQgbWlzc2luZyBVU0UoQ0ZORVRXT1JLKSB0byBXZWJF cnJvci5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRl eHRSZW5kZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRS ZW5kZXJlci5jcHAKaW5kZXggM2QwMDdjZmY5YzY5MzkyYThkNzZiODlkYjhlYjljZWUzYTM0MmY4 NS4uYTExNTM1MGZiMzRhYzZhZGZhNWY0ZThhZWQ4MWE5OTIxZDMxMzU2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmNwcApAQCAt ODEsMTUgKzgxLDYgQEAgc3RhdGljIHZvaWQgZG9EcmF3VGV4dEF0UG9pbnQoR3JhcGhpY3NDb250 ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbnMKICAgICB9CiB9CiAKLXZvaWQg V2ViQ29yZURyYXdUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0 cmluZyYgdGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBjb25z dCBDb2xvciYgY29sb3IsIGludCB1bmRlcmxpbmVkSW5kZXgpCi17Ci0gICAgY29udGV4dC5zYXZl KCk7Ci0KLSAgICBkb0RyYXdUZXh0QXRQb2ludChjb250ZXh0LCB0ZXh0LCBwb2ludCwgZm9udCwg Y29sb3IsIHVuZGVybGluZWRJbmRleCk7Ci0KLSAgICBjb250ZXh0LnJlc3RvcmUoKTsKLX0KLQog dm9pZCBXZWJDb3JlRHJhd0RvdWJsZWRUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRl eHQsIGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250 JiBmb250LCBjb25zdCBDb2xvciYgdG9wQ29sb3IsIGNvbnN0IENvbG9yJiBib3R0b21Db2xvciwg aW50IHVuZGVybGluZWRJbmRleCkKIHsKICAgICBjb250ZXh0LnNhdmUoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oCmluZGV4IDZkZWVm NGEzNzg1NzVhMTk5MzI3ZDQyZGZhNTNiYTAwMmJlZTkzZmMuLmFkYzZjZGZhMmFhNTFlNzNkYjc1 YjIxZDliNmQ2OWVlYTQzZGU2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuaApAQCAtMzUsNyArMzUsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogICAgIGNsYXNzIEludFBvaW50Owog Ci0gICAgdm9pZCBXZWJDb3JlRHJhd1RleHRBdFBvaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0 IFN0cmluZyYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgRm9udCYsIGNvbnN0IENvbG9yJiwgaW50 IHVuZGVybGluZWRJbmRleCA9IC0xKTsKICAgICB2b2lkIFdlYkNvcmVEcmF3RG91YmxlZFRleHRB dFBvaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IEludFBvaW50Jiwg Y29uc3QgRm9udCYsIGNvbnN0IENvbG9yJiB0b3BDb2xvciwgY29uc3QgQ29sb3ImIGJvdHRvbUNv bG9yLCBpbnQgdW5kZXJsaW5lZEluZGV4ID0gLTEpOwogICAgIGZsb2F0IFdlYkNvcmVUZXh0Rmxv YXRXaWR0aChjb25zdCBTdHJpbmcmLCBjb25zdCBGb250Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9y dHMuZGVmLmluIGIvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5l cmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4KaW5kZXggYjg4Yzg0OGYzYmYwMWU1MjJiZWY3ZDRk ZTMzYTY2ZjZlY2Y1MTA3MC4uODIzNTEzNmVlM2E0MjAzZTE4N2FjYjhjOWM4YjRmMGUxZTAxZmQ5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRH ZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQu dmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4KQEAgLTEx LDcgKzExLDYgQEAgRVhQT1JUUwogICAgICAgICBXZWJMb2NhbGl6ZWRTdHJpbmdVVEY4CiAgICAg ICAgIFdlYkxvY2FsaXplZExQQ1RTVFJVVEY4CiAjaWYgVVNFKENHKQotICAgICAgICBXZWJEcmF3 VGV4dAogICAgICAgICBGb250TWV0cmljcwogICAgICAgICBUZXh0RmxvYXRXaWR0aAogICAgICAg ICBDZW50ZXJUcnVuY2F0ZVN0cmluZ1RvV2lkdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv d2luL1dlYktpdEdyYXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNz LmNwcAppbmRleCAyYTczNjYyOWIzNjdiMzY4ZmQwYTlkNGZmZjkwMjE2M2Y4NGM5ZmJjLi40YzJm YjYzMjYzODkwMTlkMTBmNTk1MTVmNTU1ZWFhMWM1ZDk2NzUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2Vi S2l0R3JhcGhpY3MuY3BwCkBAIC04NywzOCArODcsNiBAQCBzdHJ1Y3QgV2ViVGV4dFJlbmRlcklu Zm9XaXRob3V0U2hhZG93CiAgICAgaW50IG92ZXJyaWRlU21vb3RoaW5nTGV2ZWw7IC8vIHBhc3Mg aW4gLTEgaWYgY2FsbGVyIGRvZXMgbm90IHdhbnQgdG8gb3ZlcnJpZGUgc21vb3RoaW5nIGxldmVs CiB9OwogCi12b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJbmZvKiBpbmZvKQotewotICAg IGlmICghaW5mbyB8fCBpbmZvLT5zdHJ1Y3RTaXplIDwgc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZv V2l0aG91dFNoYWRvdykgfHwgIWluZm8tPmNnQ29udGV4dCB8fCAhaW5mby0+ZGVzY3JpcHRpb24p Ci0gICAgICAgIHJldHVybjsKLQotICAgIGludCBvbGRGb250U21vb3RoaW5nTGV2ZWwgPSAtMTsK LSAgICBpZiAoaW5mby0+b3ZlcnJpZGVTbW9vdGhpbmdMZXZlbCA+PSAwKSB7Ci0gICAgICAgIG9s ZEZvbnRTbW9vdGhpbmdMZXZlbCA9IHdrR2V0Rm9udFNtb290aGluZ0xldmVsKCk7Ci0gICAgICAg IHdrU2V0Rm9udFNtb290aGluZ0xldmVsKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwpOwot ICAgIH0KLQotICAgIHsKLSAgICAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQoaW5mby0+Y2dD b250ZXh0KTsKLSAgICAgICAgU3RyaW5nIGRyYXdTdHJpbmcoaW5mby0+dGV4dCwgaW5mby0+bGVu Z3RoKTsKLSAgICAgICAgaWYgKGluZm8tPmRyYXdBc1Bhc3N3b3JkKQotICAgICAgICAgICAgZHJh d1N0cmluZy5maWxsKFdURjo6VW5pY29kZTo6YnVsbGV0KTsKLQotICAgICAgICBjb250ZXh0LnNh dmUoKTsKLQotICAgICAgICAvLyBTZXQgc2hhZG93IHNldHRpbmcKLSAgICAgICAgaWYgKGluZm8t PnN0cnVjdFNpemUgPT0gc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZvKSAmJgotICAgICAgICAgICAg KGluZm8tPnNoYWRvd09mZnNldC5jeCB8fCBpbmZvLT5zaGFkb3dPZmZzZXQuY3kgfHwgaW5mby0+ c2hhZG93Qmx1ciB8fCBpbmZvLT5zaGFkb3dDb2xvcikpCi0gICAgICAgICAgICBjb250ZXh0LnNl dFNoYWRvdyhGbG9hdFNpemUoaW5mby0+c2hhZG93T2Zmc2V0LmN4LCBpbmZvLT5zaGFkb3dPZmZz ZXQuY3kpLCBpbmZvLT5zaGFkb3dCbHVyLCBpbmZvLT5zaGFkb3dDb2xvciwgQ29sb3JTcGFjZURl dmljZVJHQik7Ci0KLSAgICAgICAgV2ViQ29yZURyYXdUZXh0QXRQb2ludChjb250ZXh0LCBkcmF3 U3RyaW5nLCBpbmZvLT5wdCwgbWFrZUZvbnQoKihpbmZvLT5kZXNjcmlwdGlvbikpLCBpbmZvLT5j b2xvciwgaW5mby0+dW5kZXJsaW5lZEluZGV4KTsKLSAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7 Ci0gICAgfQotCi0gICAgaWYgKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwgPj0gMCkKLSAg ICAgICAgd2tTZXRGb250U21vb3RoaW5nTGV2ZWwob2xkRm9udFNtb290aGluZ0xldmVsKTsKLX0K LQogZmxvYXQgVGV4dEZsb2F0V2lkdGgoTFBDVFNUUiB0ZXh0LCBpbnQgbGVuZ3RoLCBjb25zdCBX ZWJGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKQogewogICAgIHJldHVybiBXZWJDb3JlVGV4 dEZsb2F0V2lkdGgoU3RyaW5nKHRleHQsIGxlbmd0aCksIG1ha2VGb250KGRlc2NyaXB0aW9uKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oIGIvU291cmNl L1dlYktpdC93aW4vV2ViS2l0R3JhcGhpY3MuaAppbmRleCA1OWM4NzRiNTRjMTg3NGIyMjM1MzUw NzI4NzBiYWFhMDE1MWNiOWVhLi5jMDkwNDVmNTk3NzVmN2MyMGM1MjhiNTkwNDE4YjJjMzU0NjFh ZTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oCisrKyBi L1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmgKQEAgLTYzLDcgKzYzLDYgQEAgc3Ry dWN0IFdlYlRleHRSZW5kZXJJbmZvCiAgICAgQ0dDb2xvclJlZiBzaGFkb3dDb2xvcjsKIH07CiAK LXZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsKIGZsb2F0IFRleHRGbG9hdFdp ZHRoKExQQ1RTVFIgdGV4dCwgaW50IGxlbmd0aCwgY29uc3QgV2ViRm9udERlc2NyaXB0aW9uJik7 CiB2b2lkIEZvbnRNZXRyaWNzKGNvbnN0IFdlYkZvbnREZXNjcmlwdGlvbiYsIGludCogYXNjZW50 LCBpbnQqIGRlc2NlbnQsIGludCogbGluZVNwYWNpbmcpOwogCg== 215546 2013-10-30 12:06:19 -0700 2013-10-30 12:07:48 -0700 Patch bug-123485-20131030120618.patch text/plain 7042 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uMzAxNmE5YWRiZWU4NGE0MDVlMWRlYjA3MjQ1MjU4 YTIxYTUzZTBlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dp bi9XZWJLaXRHcmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsg aXMgbmV2ZXIgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZWJEcmF3VGV4dCBpcyB0aGUgb25seSBjYWxsZXIgb2YgV2ViQ29yZURyYXdUZXh0 QXRQb2ludCwgc28gd2UgY2FuCisgICAgICAgIGRlbGV0ZSB0aGF0IGFzIHdlbGwuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2ViQ29y ZVRleHRSZW5kZXJlci5jcHA6CisgICAgICAgICogcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVu ZGVyZXIuaDoKKwogMjAxMy0xMC0zMCAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBGYXZpY29ucyBhcmUgZmxpcHBlZCBpbiB2ZXJ0aWNhbCBkaXJlY3Rp b24gaW4gV2luQ2Fpcm8gYnVpbGRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYTExODJiZWI4NjdmNDUyNGNhNDM3 Y2ZiNGIyMTA5MjUxY2ZlYTJjLi41ODRmYWM5ZDcyYzZkODY1MGQ4MDM0MjIzZDM5MzhhZTdhMTJk YmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEzLTEwLTMwICBNeWxlcyBDLiBNYXhm aWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dpbi9XZWJLaXRH cmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsgaXMgbmV2ZXIg Y2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE ZWxldGluZyB0aGUgZnVuY3Rpb24KKworICAgICAgICAqIFdlYktpdC52Y3hwcm9qL1dlYktpdEV4 cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbjoKKwogMjAxMy0xMC0zMCAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5kb3dz XSBVbnJldmlld2VkIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBlYzk2NmI2OWQxNzBm NmI0ZjI0Y2Q1NzA2YTEyNTc5N2M5ZTIwODg2Li5iZDkyODU3MjZhNDkyMTkwMzY0OWY0ZTEyODI4 MjgwYWJlZjRhYTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTAt MzAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmg6dm9pZCBXZWJEcmF3VGV4dChXZWJUZXh0UmVuZGVy SW5mbyopOyBpcyBuZXZlciBjYWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyMzQ4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERlbGV0aW5nIHRoZSBzeW1ib2wgaW4gdGhlIGV4cG9ydCBsaXN0CisK KyAgICAgICAgKiBXZWJLaXRHcmFwaGljcy5jcHA6CisgICAgICAgICogV2ViS2l0R3JhcGhpY3Mu aDoKKwogMjAxMy0xMC0zMCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4K IAogICAgICAgICBbV0lOXSBBZGQgbWlzc2luZyBVU0UoQ0ZORVRXT1JLKSB0byBXZWJFcnJvci5o CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5k ZXJlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJl ci5jcHAKaW5kZXggM2QwMDdjZmY5YzY5MzkyYThkNzZiODlkYjhlYjljZWUzYTM0MmY4NS4uYTEx NTM1MGZiMzRhYzZhZGZhNWY0ZThhZWQ4MWE5OTIxZDMxMzU2NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmNwcApAQCAtODEsMTUg KzgxLDYgQEAgc3RhdGljIHZvaWQgZG9EcmF3VGV4dEF0UG9pbnQoR3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbnMKICAgICB9CiB9CiAKLXZvaWQgV2ViQ29y ZURyYXdUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0cmluZyYg dGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBjb25zdCBDb2xv ciYgY29sb3IsIGludCB1bmRlcmxpbmVkSW5kZXgpCi17Ci0gICAgY29udGV4dC5zYXZlKCk7Ci0K LSAgICBkb0RyYXdUZXh0QXRQb2ludChjb250ZXh0LCB0ZXh0LCBwb2ludCwgZm9udCwgY29sb3Is IHVuZGVybGluZWRJbmRleCk7Ci0KLSAgICBjb250ZXh0LnJlc3RvcmUoKTsKLX0KLQogdm9pZCBX ZWJDb3JlRHJhd0RvdWJsZWRUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNv bnN0IFN0cmluZyYgdGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250 LCBjb25zdCBDb2xvciYgdG9wQ29sb3IsIGNvbnN0IENvbG9yJiBib3R0b21Db2xvciwgaW50IHVu ZGVybGluZWRJbmRleCkKIHsKICAgICBjb250ZXh0LnNhdmUoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oCmluZGV4IDZkZWVmNGEzNzg1 NzVhMTk5MzI3ZDQyZGZhNTNiYTAwMmJlZTkzZmMuLmFkYzZjZGZhMmFhNTFlNzNkYjc1YjIxZDli NmQ2OWVlYTQzZGU2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9X ZWJDb3JlVGV4dFJlbmRlcmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dl YkNvcmVUZXh0UmVuZGVyZXIuaApAQCAtMzUsNyArMzUsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogICAgIGNsYXNzIEludFBvaW50OwogCi0gICAg dm9pZCBXZWJDb3JlRHJhd1RleHRBdFBvaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFN0cmlu ZyYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgRm9udCYsIGNvbnN0IENvbG9yJiwgaW50IHVuZGVy bGluZWRJbmRleCA9IC0xKTsKICAgICB2b2lkIFdlYkNvcmVEcmF3RG91YmxlZFRleHRBdFBvaW50 KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IEludFBvaW50JiwgY29uc3Qg Rm9udCYsIGNvbnN0IENvbG9yJiB0b3BDb2xvciwgY29uc3QgQ29sb3ImIGJvdHRvbUNvbG9yLCBp bnQgdW5kZXJsaW5lZEluZGV4ID0gLTEpOwogICAgIGZsb2F0IFdlYkNvcmVUZXh0RmxvYXRXaWR0 aChjb25zdCBTdHJpbmcmLCBjb25zdCBGb250Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVm LmluIGIvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3Iv V2ViS2l0RXhwb3J0cy5kZWYuaW4KaW5kZXggYjg4Yzg0OGYzYmYwMWU1MjJiZWY3ZDRkZTMzYTY2 ZjZlY2Y1MTA3MC4uODIzNTEzNmVlM2E0MjAzZTE4N2FjYjhjOWM4YjRmMGUxZTAxZmQ5ZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0 b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJv ai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4KQEAgLTExLDcgKzEx LDYgQEAgRVhQT1JUUwogICAgICAgICBXZWJMb2NhbGl6ZWRTdHJpbmdVVEY4CiAgICAgICAgIFdl YkxvY2FsaXplZExQQ1RTVFJVVEY4CiAjaWYgVVNFKENHKQotICAgICAgICBXZWJEcmF3VGV4dAog ICAgICAgICBGb250TWV0cmljcwogICAgICAgICBUZXh0RmxvYXRXaWR0aAogICAgICAgICBDZW50 ZXJUcnVuY2F0ZVN0cmluZ1RvV2lkdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dl YktpdEdyYXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmNwcApp bmRleCAyYTczNjYyOWIzNjdiMzY4ZmQwYTlkNGZmZjkwMjE2M2Y4NGM5ZmJjLi40YzJmYjYzMjYz ODkwMTlkMTBmNTk1MTVmNTU1ZWFhMWM1ZDk2NzUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3dpbi9XZWJLaXRHcmFwaGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViS2l0R3Jh cGhpY3MuY3BwCkBAIC04NywzOCArODcsNiBAQCBzdHJ1Y3QgV2ViVGV4dFJlbmRlckluZm9XaXRo b3V0U2hhZG93CiAgICAgaW50IG92ZXJyaWRlU21vb3RoaW5nTGV2ZWw7IC8vIHBhc3MgaW4gLTEg aWYgY2FsbGVyIGRvZXMgbm90IHdhbnQgdG8gb3ZlcnJpZGUgc21vb3RoaW5nIGxldmVsCiB9Owog Ci12b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJbmZvKiBpbmZvKQotewotICAgIGlmICgh aW5mbyB8fCBpbmZvLT5zdHJ1Y3RTaXplIDwgc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZvV2l0aG91 dFNoYWRvdykgfHwgIWluZm8tPmNnQ29udGV4dCB8fCAhaW5mby0+ZGVzY3JpcHRpb24pCi0gICAg ICAgIHJldHVybjsKLQotICAgIGludCBvbGRGb250U21vb3RoaW5nTGV2ZWwgPSAtMTsKLSAgICBp ZiAoaW5mby0+b3ZlcnJpZGVTbW9vdGhpbmdMZXZlbCA+PSAwKSB7Ci0gICAgICAgIG9sZEZvbnRT bW9vdGhpbmdMZXZlbCA9IHdrR2V0Rm9udFNtb290aGluZ0xldmVsKCk7Ci0gICAgICAgIHdrU2V0 Rm9udFNtb290aGluZ0xldmVsKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwpOwotICAgIH0K LQotICAgIHsKLSAgICAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQoaW5mby0+Y2dDb250ZXh0 KTsKLSAgICAgICAgU3RyaW5nIGRyYXdTdHJpbmcoaW5mby0+dGV4dCwgaW5mby0+bGVuZ3RoKTsK LSAgICAgICAgaWYgKGluZm8tPmRyYXdBc1Bhc3N3b3JkKQotICAgICAgICAgICAgZHJhd1N0cmlu Zy5maWxsKFdURjo6VW5pY29kZTo6YnVsbGV0KTsKLQotICAgICAgICBjb250ZXh0LnNhdmUoKTsK LQotICAgICAgICAvLyBTZXQgc2hhZG93IHNldHRpbmcKLSAgICAgICAgaWYgKGluZm8tPnN0cnVj dFNpemUgPT0gc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZvKSAmJgotICAgICAgICAgICAgKGluZm8t PnNoYWRvd09mZnNldC5jeCB8fCBpbmZvLT5zaGFkb3dPZmZzZXQuY3kgfHwgaW5mby0+c2hhZG93 Qmx1ciB8fCBpbmZvLT5zaGFkb3dDb2xvcikpCi0gICAgICAgICAgICBjb250ZXh0LnNldFNoYWRv dyhGbG9hdFNpemUoaW5mby0+c2hhZG93T2Zmc2V0LmN4LCBpbmZvLT5zaGFkb3dPZmZzZXQuY3kp LCBpbmZvLT5zaGFkb3dCbHVyLCBpbmZvLT5zaGFkb3dDb2xvciwgQ29sb3JTcGFjZURldmljZVJH Qik7Ci0KLSAgICAgICAgV2ViQ29yZURyYXdUZXh0QXRQb2ludChjb250ZXh0LCBkcmF3U3RyaW5n LCBpbmZvLT5wdCwgbWFrZUZvbnQoKihpbmZvLT5kZXNjcmlwdGlvbikpLCBpbmZvLT5jb2xvciwg aW5mby0+dW5kZXJsaW5lZEluZGV4KTsKLSAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7Ci0gICAg fQotCi0gICAgaWYgKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwgPj0gMCkKLSAgICAgICAg d2tTZXRGb250U21vb3RoaW5nTGV2ZWwob2xkRm9udFNtb290aGluZ0xldmVsKTsKLX0KLQogZmxv YXQgVGV4dEZsb2F0V2lkdGgoTFBDVFNUUiB0ZXh0LCBpbnQgbGVuZ3RoLCBjb25zdCBXZWJGb250 RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKQogewogICAgIHJldHVybiBXZWJDb3JlVGV4dEZsb2F0 V2lkdGgoU3RyaW5nKHRleHQsIGxlbmd0aCksIG1ha2VGb250KGRlc2NyaXB0aW9uKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oIGIvU291cmNlL1dlYktp dC93aW4vV2ViS2l0R3JhcGhpY3MuaAppbmRleCA1OWM4NzRiNTRjMTg3NGIyMjM1MzUwNzI4NzBi YWFhMDE1MWNiOWVhLi5jMDkwNDVmNTk3NzVmN2MyMGM1MjhiNTkwNDE4YjJjMzU0NjFhZTBlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmgKQEAgLTYzLDcgKzYzLDYgQEAgc3RydWN0IFdl YlRleHRSZW5kZXJJbmZvCiAgICAgQ0dDb2xvclJlZiBzaGFkb3dDb2xvcjsKIH07CiAKLXZvaWQg V2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsKIGZsb2F0IFRleHRGbG9hdFdpZHRoKExQ Q1RTVFIgdGV4dCwgaW50IGxlbmd0aCwgY29uc3QgV2ViRm9udERlc2NyaXB0aW9uJik7CiB2b2lk IEZvbnRNZXRyaWNzKGNvbnN0IFdlYkZvbnREZXNjcmlwdGlvbiYsIGludCogYXNjZW50LCBpbnQq IGRlc2NlbnQsIGludCogbGluZVNwYWNpbmcpOwogCg== 215547 2013-10-30 12:07:50 -0700 2013-10-30 12:37:07 -0700 Patch bug-123485-20131030120749.patch text/plain 7046 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uMzAxNmE5YWRiZWU4NGE0MDVlMWRlYjA3MjQ1MjU4 YTIxYTUzZTBlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dp bi9XZWJLaXRHcmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsg aXMgbmV2ZXIgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZWJEcmF3VGV4dCBpcyB0aGUgb25seSBjYWxsZXIgb2YgV2ViQ29yZURyYXdUZXh0 QXRQb2ludCwgc28gd2UgY2FuCisgICAgICAgIGRlbGV0ZSB0aGF0IGFzIHdlbGwuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2ViQ29y ZVRleHRSZW5kZXJlci5jcHA6CisgICAgICAgICogcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVu ZGVyZXIuaDoKKwogMjAxMy0xMC0zMCAgcGVhdm9Ab3V0bG9vay5jb20gIDxwZWF2b0BvdXRsb29r LmNvbT4KIAogICAgICAgICBGYXZpY29ucyBhcmUgZmxpcHBlZCBpbiB2ZXJ0aWNhbCBkaXJlY3Rp b24gaW4gV2luQ2Fpcm8gYnVpbGRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBjYTExODJiZWI4NjdmNDUyNGNhNDM3 Y2ZiNGIyMTA5MjUxY2ZlYTJjLi41ODRmYWM5ZDcyYzZkODY1MGQ4MDM0MjIzZDM5MzhhZTdhMTJk YmEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEzLTEwLTMwICBNeWxlcyBDLiBNYXhm aWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dpbi9XZWJLaXRH cmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsgaXMgbmV2ZXIg Y2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE ZWxldGluZyB0aGUgZnVuY3Rpb24KKworICAgICAgICAqIFdlYktpdC52Y3hwcm9qL1dlYktpdEV4 cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbjoKKwogMjAxMy0xMC0zMCAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXaW5kb3dz XSBVbnJldmlld2VkIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBlYzk2NmI2OWQxNzBm NmI0ZjI0Y2Q1NzA2YTEyNTc5N2M5ZTIwODg2Li5kZjA5ZDZhNDRkNmI1ODcwNzE5YjBlODYwNGM4 MTE0NTViZDJmZmQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTAt MzAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBX ZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmg6dm9pZCBXZWJEcmF3VGV4dChXZWJUZXh0UmVuZGVy SW5mbyopOyBpcyBuZXZlciBjYWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyMzQ4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFJlbW92ZWQgdW51c2VkIFdlYkRyYXdUZXh0IGltcGxlbWVudGF0aW9u LgorCisgICAgICAgICogV2ViS2l0R3JhcGhpY3MuY3BwOgorICAgICAgICAqIFdlYktpdEdyYXBo aWNzLmg6CisKIDIwMTMtMTAtMzAgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5v cmc+CiAKICAgICAgICAgW1dJTl0gQWRkIG1pc3NpbmcgVVNFKENGTkVUV09SSykgdG8gV2ViRXJy b3IuaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0 UmVuZGVyZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVu ZGVyZXIuY3BwCmluZGV4IDNkMDA3Y2ZmOWM2OTM5MmE4ZDc2Yjg5ZGI4ZWI5Y2VlM2EzNDJmODUu LmExMTUzNTBmYjM0YWM2YWRmYTVmNGU4YWVkODFhOTkyMWQzMTM1NjUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5jcHAKQEAgLTgx LDE1ICs4MSw2IEBAIHN0YXRpYyB2b2lkIGRvRHJhd1RleHRBdFBvaW50KEdyYXBoaWNzQ29udGV4 dCYgY29udGV4dCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBjb25zCiAgICAgfQogfQogCi12b2lkIFdl YkNvcmVEcmF3VGV4dEF0UG9pbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBTdHJp bmcmIHRleHQsIGNvbnN0IEludFBvaW50JiBwb2ludCwgY29uc3QgRm9udCYgZm9udCwgY29uc3Qg Q29sb3ImIGNvbG9yLCBpbnQgdW5kZXJsaW5lZEluZGV4KQotewotICAgIGNvbnRleHQuc2F2ZSgp OwotCi0gICAgZG9EcmF3VGV4dEF0UG9pbnQoY29udGV4dCwgdGV4dCwgcG9pbnQsIGZvbnQsIGNv bG9yLCB1bmRlcmxpbmVkSW5kZXgpOwotCi0gICAgY29udGV4dC5yZXN0b3JlKCk7Ci19Ci0KIHZv aWQgV2ViQ29yZURyYXdEb3VibGVkVGV4dEF0UG9pbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbnN0IEludFBvaW50JiBwb2ludCwgY29uc3QgRm9udCYg Zm9udCwgY29uc3QgQ29sb3ImIHRvcENvbG9yLCBjb25zdCBDb2xvciYgYm90dG9tQ29sb3IsIGlu dCB1bmRlcmxpbmVkSW5kZXgpCiB7CiAgICAgY29udGV4dC5zYXZlKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuaAppbmRleCA2ZGVlZjRh Mzc4NTc1YTE5OTMyN2Q0MmRmYTUzYmEwMDJiZWU5M2ZjLi5hZGM2Y2RmYTJhYTUxZTczZGI3NWIy MWQ5YjZkNjllZWE0M2RlNjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dp bi9XZWJDb3JlVGV4dFJlbmRlcmVyLmgKQEAgLTM1LDcgKzM1LDYgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIGNsYXNzIEdyYXBoaWNzQ29udGV4dDsKICAgICBjbGFzcyBJbnRQb2ludDsKIAot ICAgIHZvaWQgV2ViQ29yZURyYXdUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmLCBjb25zdCBT dHJpbmcmLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEZvbnQmLCBjb25zdCBDb2xvciYsIGludCB1 bmRlcmxpbmVkSW5kZXggPSAtMSk7CiAgICAgdm9pZCBXZWJDb3JlRHJhd0RvdWJsZWRUZXh0QXRQ b2ludChHcmFwaGljc0NvbnRleHQmLCBjb25zdCBTdHJpbmcmLCBjb25zdCBJbnRQb2ludCYsIGNv bnN0IEZvbnQmLCBjb25zdCBDb2xvciYgdG9wQ29sb3IsIGNvbnN0IENvbG9yJiBib3R0b21Db2xv ciwgaW50IHVuZGVybGluZWRJbmRleCA9IC0xKTsKICAgICBmbG9hdCBXZWJDb3JlVGV4dEZsb2F0 V2lkdGgoY29uc3QgU3RyaW5nJiwgY29uc3QgRm9udCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRz LmRlZi5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJh dG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCmluZGV4IGI4OGM4NDhmM2JmMDFlNTIyYmVmN2Q0ZGUz M2E2NmY2ZWNmNTEwNzAuLjgyMzUxMzZlZTNhNDIwM2UxODdhY2I4YzljOGI0ZjBlMWUwMWZkOWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2Vu ZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZj eHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCkBAIC0xMSw3 ICsxMSw2IEBAIEVYUE9SVFMKICAgICAgICAgV2ViTG9jYWxpemVkU3RyaW5nVVRGOAogICAgICAg ICBXZWJMb2NhbGl6ZWRMUENUU1RSVVRGOAogI2lmIFVTRShDRykKLSAgICAgICAgV2ViRHJhd1Rl eHQKICAgICAgICAgRm9udE1ldHJpY3MKICAgICAgICAgVGV4dEZsb2F0V2lkdGgKICAgICAgICAg Q2VudGVyVHJ1bmNhdGVTdHJpbmdUb1dpZHRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJLaXRHcmFwaGljcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5j cHAKaW5kZXggMmE3MzY2MjliMzY3YjM2OGZkMGE5ZDRmZmY5MDIxNjNmODRjOWZiYy4uNGMyZmI2 MzI2Mzg5MDE5ZDEwZjU5NTE1ZjU1NWVhYTFjNWQ5Njc1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC93aW4vV2ViS2l0R3JhcGhpY3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYktp dEdyYXBoaWNzLmNwcApAQCAtODcsMzggKzg3LDYgQEAgc3RydWN0IFdlYlRleHRSZW5kZXJJbmZv V2l0aG91dFNoYWRvdwogICAgIGludCBvdmVycmlkZVNtb290aGluZ0xldmVsOyAvLyBwYXNzIGlu IC0xIGlmIGNhbGxlciBkb2VzIG5vdCB3YW50IHRvIG92ZXJyaWRlIHNtb290aGluZyBsZXZlbAog fTsKIAotdm9pZCBXZWJEcmF3VGV4dChXZWJUZXh0UmVuZGVySW5mbyogaW5mbykKLXsKLSAgICBp ZiAoIWluZm8gfHwgaW5mby0+c3RydWN0U2l6ZSA8IHNpemVvZihXZWJUZXh0UmVuZGVySW5mb1dp dGhvdXRTaGFkb3cpIHx8ICFpbmZvLT5jZ0NvbnRleHQgfHwgIWluZm8tPmRlc2NyaXB0aW9uKQot ICAgICAgICByZXR1cm47Ci0KLSAgICBpbnQgb2xkRm9udFNtb290aGluZ0xldmVsID0gLTE7Ci0g ICAgaWYgKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwgPj0gMCkgewotICAgICAgICBvbGRG b250U21vb3RoaW5nTGV2ZWwgPSB3a0dldEZvbnRTbW9vdGhpbmdMZXZlbCgpOwotICAgICAgICB3 a1NldEZvbnRTbW9vdGhpbmdMZXZlbChpbmZvLT5vdmVycmlkZVNtb290aGluZ0xldmVsKTsKLSAg ICB9Ci0KLSAgICB7Ci0gICAgICAgIEdyYXBoaWNzQ29udGV4dCBjb250ZXh0KGluZm8tPmNnQ29u dGV4dCk7Ci0gICAgICAgIFN0cmluZyBkcmF3U3RyaW5nKGluZm8tPnRleHQsIGluZm8tPmxlbmd0 aCk7Ci0gICAgICAgIGlmIChpbmZvLT5kcmF3QXNQYXNzd29yZCkKLSAgICAgICAgICAgIGRyYXdT dHJpbmcuZmlsbChXVEY6OlVuaWNvZGU6OmJ1bGxldCk7Ci0KLSAgICAgICAgY29udGV4dC5zYXZl KCk7Ci0KLSAgICAgICAgLy8gU2V0IHNoYWRvdyBzZXR0aW5nCi0gICAgICAgIGlmIChpbmZvLT5z dHJ1Y3RTaXplID09IHNpemVvZihXZWJUZXh0UmVuZGVySW5mbykgJiYKLSAgICAgICAgICAgIChp bmZvLT5zaGFkb3dPZmZzZXQuY3ggfHwgaW5mby0+c2hhZG93T2Zmc2V0LmN5IHx8IGluZm8tPnNo YWRvd0JsdXIgfHwgaW5mby0+c2hhZG93Q29sb3IpKQotICAgICAgICAgICAgY29udGV4dC5zZXRT aGFkb3coRmxvYXRTaXplKGluZm8tPnNoYWRvd09mZnNldC5jeCwgaW5mby0+c2hhZG93T2Zmc2V0 LmN5KSwgaW5mby0+c2hhZG93Qmx1ciwgaW5mby0+c2hhZG93Q29sb3IsIENvbG9yU3BhY2VEZXZp Y2VSR0IpOwotCi0gICAgICAgIFdlYkNvcmVEcmF3VGV4dEF0UG9pbnQoY29udGV4dCwgZHJhd1N0 cmluZywgaW5mby0+cHQsIG1ha2VGb250KCooaW5mby0+ZGVzY3JpcHRpb24pKSwgaW5mby0+Y29s b3IsIGluZm8tPnVuZGVybGluZWRJbmRleCk7Ci0gICAgICAgIGNvbnRleHQucmVzdG9yZSgpOwot ICAgIH0KLQotICAgIGlmIChpbmZvLT5vdmVycmlkZVNtb290aGluZ0xldmVsID49IDApCi0gICAg ICAgIHdrU2V0Rm9udFNtb290aGluZ0xldmVsKG9sZEZvbnRTbW9vdGhpbmdMZXZlbCk7Ci19Ci0K IGZsb2F0IFRleHRGbG9hdFdpZHRoKExQQ1RTVFIgdGV4dCwgaW50IGxlbmd0aCwgY29uc3QgV2Vi Rm9udERlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbikKIHsKICAgICByZXR1cm4gV2ViQ29yZVRleHRG bG9hdFdpZHRoKFN0cmluZyh0ZXh0LCBsZW5ndGgpLCBtYWtlRm9udChkZXNjcmlwdGlvbikpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViS2l0R3JhcGhpY3MuaCBiL1NvdXJjZS9X ZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmgKaW5kZXggNTljODc0YjU0YzE4NzRiMjIzNTM1MDcy ODcwYmFhYTAxNTFjYjllYS4uYzA5MDQ1ZjU5Nzc1ZjdjMjBjNTI4YjU5MDQxOGIyYzM1NDYxYWUw ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViS2l0R3JhcGhpY3MuaAorKysgYi9T b3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oCkBAIC02Myw3ICs2Myw2IEBAIHN0cnVj dCBXZWJUZXh0UmVuZGVySW5mbwogICAgIENHQ29sb3JSZWYgc2hhZG93Q29sb3I7CiB9OwogCi12 b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJbmZvKik7CiBmbG9hdCBUZXh0RmxvYXRXaWR0 aChMUENUU1RSIHRleHQsIGludCBsZW5ndGgsIGNvbnN0IFdlYkZvbnREZXNjcmlwdGlvbiYpOwog dm9pZCBGb250TWV0cmljcyhjb25zdCBXZWJGb250RGVzY3JpcHRpb24mLCBpbnQqIGFzY2VudCwg aW50KiBkZXNjZW50LCBpbnQqIGxpbmVTcGFjaW5nKTsKIAo= 215550 2013-10-30 12:37:09 -0700 2013-10-30 13:30:41 -0700 Patch bug-123485-20131030123709.patch text/plain 7093 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uYmI1YWQ5ZjBhMGVkYTQ5MjY2ZTEwYzJiM2JlYjk3 NzhiZmZmNWJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0L3dp bi9XZWJLaXRHcmFwaGljcy5oOnZvaWQgV2ViRHJhd1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsg aXMgbmV2ZXIgY2FsbGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjM0ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXZWJEcmF3VGV4dCBpcyB0aGUgb25seSBjYWxsZXIgb2YgV2ViQ29yZURyYXdUZXh0 QXRQb2ludCwgc28gd2UgY2FuCisgICAgICAgIGRlbGV0ZSB0aGF0IGFzIHdlbGwuCisKKyAgICAg ICAgQmVjYXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBkaWZmZXJlbmNlLCBubyBuZXcgdGVzdHMg YXJlIG5lY2Vzc2FyeS4KKworICAgICAgICAqIHBsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRl cmVyLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oOgor CiAyMDEzLTEwLTMwICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAg ICAgICAgIEZhdmljb25zIGFyZSBmbGlwcGVkIGluIHZlcnRpY2FsIGRpcmVjdGlvbiBpbiBXaW5D YWlybyBidWlsZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNhMTE4MmJlYjg2N2Y0NTI0Y2E0MzdjZmI0YjIxMDky NTFjZmVhMmMuLjU4NGZhYzlkNzJjNmQ4NjUwZDgwMzQyMjNkMzkzOGFlN2ExMmRiYTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMTAtMzAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1h eGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmg6 dm9pZCBXZWJEcmF3VGV4dChXZWJUZXh0UmVuZGVySW5mbyopOyBpcyBuZXZlciBjYWxsZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzQ4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlbGV0aW5nIHRo ZSBmdW5jdGlvbgorCisgICAgICAgICogV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJh dG9yL1dlYktpdEV4cG9ydHMuZGVmLmluOgorCiAyMDEzLTEwLTMwICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1dpbmRvd3NdIFVucmV2aWV3 ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IGVjOTY2YjY5ZDE3MGY2YjRmMjRjZDU3 MDZhMTI1Nzk3YzllMjA4ODYuLmRmMDlkNmE0NGQ2YjU4NzA3MTliMGU4NjA0YzgxMTQ1NWJkMmZm ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0xMC0zMCAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFdlYktpdC93aW4v V2ViS2l0R3JhcGhpY3MuaDp2b2lkIFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJbmZvKik7IGlz IG5ldmVyIGNhbGxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTIzNDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmVtb3ZlZCB1bnVzZWQgV2ViRHJhd1RleHQgaW1wbGVtZW50YXRpb24uCisKKyAgICAg ICAgKiBXZWJLaXRHcmFwaGljcy5jcHA6CisgICAgICAgICogV2ViS2l0R3JhcGhpY3MuaDoKKwog MjAxMy0xMC0zMCAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBbV0lOXSBBZGQgbWlzc2luZyBVU0UoQ0ZORVRXT1JLKSB0byBXZWJFcnJvci5oCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5jcHAK aW5kZXggM2QwMDdjZmY5YzY5MzkyYThkNzZiODlkYjhlYjljZWUzYTM0MmY4NS4uYTExNTM1MGZi MzRhYzZhZGZhNWY0ZThhZWQ4MWE5OTIxZDMxMzU2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmNwcApAQCAtODEsMTUgKzgxLDYg QEAgc3RhdGljIHZvaWQgZG9EcmF3VGV4dEF0UG9pbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0 LCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbnMKICAgICB9CiB9CiAKLXZvaWQgV2ViQ29yZURyYXdU ZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0cmluZyYgdGV4dCwg Y29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBjb25zdCBDb2xvciYgY29s b3IsIGludCB1bmRlcmxpbmVkSW5kZXgpCi17Ci0gICAgY29udGV4dC5zYXZlKCk7Ci0KLSAgICBk b0RyYXdUZXh0QXRQb2ludChjb250ZXh0LCB0ZXh0LCBwb2ludCwgZm9udCwgY29sb3IsIHVuZGVy bGluZWRJbmRleCk7Ci0KLSAgICBjb250ZXh0LnJlc3RvcmUoKTsKLX0KLQogdm9pZCBXZWJDb3Jl RHJhd0RvdWJsZWRUZXh0QXRQb2ludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFN0 cmluZyYgdGV4dCwgY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBjb25z dCBDb2xvciYgdG9wQ29sb3IsIGNvbnN0IENvbG9yJiBib3R0b21Db2xvciwgaW50IHVuZGVybGlu ZWRJbmRleCkKIHsKICAgICBjb250ZXh0LnNhdmUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3dpbi9XZWJDb3JlVGV4dFJlbmRlcmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5oCmluZGV4IDZkZWVmNGEzNzg1NzVhMTk5 MzI3ZDQyZGZhNTNiYTAwMmJlZTkzZmMuLmFkYzZjZGZhMmFhNTFlNzNkYjc1YjIxZDliNmQ2OWVl YTQzZGU2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3Jl VGV4dFJlbmRlcmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVU ZXh0UmVuZGVyZXIuaApAQCAtMzUsNyArMzUsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgR3JhcGhpY3NDb250ZXh0OwogICAgIGNsYXNzIEludFBvaW50OwogCi0gICAgdm9pZCBX ZWJDb3JlRHJhd1RleHRBdFBvaW50KEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFN0cmluZyYsIGNv bnN0IEludFBvaW50JiwgY29uc3QgRm9udCYsIGNvbnN0IENvbG9yJiwgaW50IHVuZGVybGluZWRJ bmRleCA9IC0xKTsKICAgICB2b2lkIFdlYkNvcmVEcmF3RG91YmxlZFRleHRBdFBvaW50KEdyYXBo aWNzQ29udGV4dCYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IEludFBvaW50JiwgY29uc3QgRm9udCYs IGNvbnN0IENvbG9yJiB0b3BDb2xvciwgY29uc3QgQ29sb3ImIGJvdHRvbUNvbG9yLCBpbnQgdW5k ZXJsaW5lZEluZGV4ID0gLTEpOwogICAgIGZsb2F0IFdlYkNvcmVUZXh0RmxvYXRXaWR0aChjb25z dCBTdHJpbmcmLCBjb25zdCBGb250Jik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi S2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluIGIv U291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0 RXhwb3J0cy5kZWYuaW4KaW5kZXggYjg4Yzg0OGYzYmYwMWU1MjJiZWY3ZDRkZTMzYTY2ZjZlY2Y1 MTA3MC4uODIzNTEzNmVlM2E0MjAzZTE4N2FjYjhjOWM4YjRmMGUxZTAxZmQ5ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJLaXRFeHBvcnRHZW5lcmF0b3IvV2Vi S2l0RXhwb3J0cy5kZWYuaW4KKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQudmN4cHJvai9XZWJL aXRFeHBvcnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW4KQEAgLTExLDcgKzExLDYgQEAg RVhQT1JUUwogICAgICAgICBXZWJMb2NhbGl6ZWRTdHJpbmdVVEY4CiAgICAgICAgIFdlYkxvY2Fs aXplZExQQ1RTVFJVVEY4CiAjaWYgVVNFKENHKQotICAgICAgICBXZWJEcmF3VGV4dAogICAgICAg ICBGb250TWV0cmljcwogICAgICAgICBUZXh0RmxvYXRXaWR0aAogICAgICAgICBDZW50ZXJUcnVu Y2F0ZVN0cmluZ1RvV2lkdGgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdy YXBoaWNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYktpdEdyYXBoaWNzLmNwcAppbmRleCAy YTczNjYyOWIzNjdiMzY4ZmQwYTlkNGZmZjkwMjE2M2Y4NGM5ZmJjLi40YzJmYjYzMjYzODkwMTlk MTBmNTk1MTVmNTU1ZWFhMWM1ZDk2NzUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJLaXRHcmFwaGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViS2l0R3JhcGhpY3Mu Y3BwCkBAIC04NywzOCArODcsNiBAQCBzdHJ1Y3QgV2ViVGV4dFJlbmRlckluZm9XaXRob3V0U2hh ZG93CiAgICAgaW50IG92ZXJyaWRlU21vb3RoaW5nTGV2ZWw7IC8vIHBhc3MgaW4gLTEgaWYgY2Fs bGVyIGRvZXMgbm90IHdhbnQgdG8gb3ZlcnJpZGUgc21vb3RoaW5nIGxldmVsCiB9OwogCi12b2lk IFdlYkRyYXdUZXh0KFdlYlRleHRSZW5kZXJJbmZvKiBpbmZvKQotewotICAgIGlmICghaW5mbyB8 fCBpbmZvLT5zdHJ1Y3RTaXplIDwgc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZvV2l0aG91dFNoYWRv dykgfHwgIWluZm8tPmNnQ29udGV4dCB8fCAhaW5mby0+ZGVzY3JpcHRpb24pCi0gICAgICAgIHJl dHVybjsKLQotICAgIGludCBvbGRGb250U21vb3RoaW5nTGV2ZWwgPSAtMTsKLSAgICBpZiAoaW5m by0+b3ZlcnJpZGVTbW9vdGhpbmdMZXZlbCA+PSAwKSB7Ci0gICAgICAgIG9sZEZvbnRTbW9vdGhp bmdMZXZlbCA9IHdrR2V0Rm9udFNtb290aGluZ0xldmVsKCk7Ci0gICAgICAgIHdrU2V0Rm9udFNt b290aGluZ0xldmVsKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwpOwotICAgIH0KLQotICAg IHsKLSAgICAgICAgR3JhcGhpY3NDb250ZXh0IGNvbnRleHQoaW5mby0+Y2dDb250ZXh0KTsKLSAg ICAgICAgU3RyaW5nIGRyYXdTdHJpbmcoaW5mby0+dGV4dCwgaW5mby0+bGVuZ3RoKTsKLSAgICAg ICAgaWYgKGluZm8tPmRyYXdBc1Bhc3N3b3JkKQotICAgICAgICAgICAgZHJhd1N0cmluZy5maWxs KFdURjo6VW5pY29kZTo6YnVsbGV0KTsKLQotICAgICAgICBjb250ZXh0LnNhdmUoKTsKLQotICAg ICAgICAvLyBTZXQgc2hhZG93IHNldHRpbmcKLSAgICAgICAgaWYgKGluZm8tPnN0cnVjdFNpemUg PT0gc2l6ZW9mKFdlYlRleHRSZW5kZXJJbmZvKSAmJgotICAgICAgICAgICAgKGluZm8tPnNoYWRv d09mZnNldC5jeCB8fCBpbmZvLT5zaGFkb3dPZmZzZXQuY3kgfHwgaW5mby0+c2hhZG93Qmx1ciB8 fCBpbmZvLT5zaGFkb3dDb2xvcikpCi0gICAgICAgICAgICBjb250ZXh0LnNldFNoYWRvdyhGbG9h dFNpemUoaW5mby0+c2hhZG93T2Zmc2V0LmN4LCBpbmZvLT5zaGFkb3dPZmZzZXQuY3kpLCBpbmZv LT5zaGFkb3dCbHVyLCBpbmZvLT5zaGFkb3dDb2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7Ci0K LSAgICAgICAgV2ViQ29yZURyYXdUZXh0QXRQb2ludChjb250ZXh0LCBkcmF3U3RyaW5nLCBpbmZv LT5wdCwgbWFrZUZvbnQoKihpbmZvLT5kZXNjcmlwdGlvbikpLCBpbmZvLT5jb2xvciwgaW5mby0+ dW5kZXJsaW5lZEluZGV4KTsKLSAgICAgICAgY29udGV4dC5yZXN0b3JlKCk7Ci0gICAgfQotCi0g ICAgaWYgKGluZm8tPm92ZXJyaWRlU21vb3RoaW5nTGV2ZWwgPj0gMCkKLSAgICAgICAgd2tTZXRG b250U21vb3RoaW5nTGV2ZWwob2xkRm9udFNtb290aGluZ0xldmVsKTsKLX0KLQogZmxvYXQgVGV4 dEZsb2F0V2lkdGgoTFBDVFNUUiB0ZXh0LCBpbnQgbGVuZ3RoLCBjb25zdCBXZWJGb250RGVzY3Jp cHRpb24mIGRlc2NyaXB0aW9uKQogewogICAgIHJldHVybiBXZWJDb3JlVGV4dEZsb2F0V2lkdGgo U3RyaW5nKHRleHQsIGxlbmd0aCksIG1ha2VGb250KGRlc2NyaXB0aW9uKSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oIGIvU291cmNlL1dlYktpdC93aW4v V2ViS2l0R3JhcGhpY3MuaAppbmRleCA1OWM4NzRiNTRjMTg3NGIyMjM1MzUwNzI4NzBiYWFhMDE1 MWNiOWVhLi5jMDkwNDVmNTk3NzVmN2MyMGM1MjhiNTkwNDE4YjJjMzU0NjFhZTBlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJLaXRHcmFwaGljcy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvd2luL1dlYktpdEdyYXBoaWNzLmgKQEAgLTYzLDcgKzYzLDYgQEAgc3RydWN0IFdlYlRleHRS ZW5kZXJJbmZvCiAgICAgQ0dDb2xvclJlZiBzaGFkb3dDb2xvcjsKIH07CiAKLXZvaWQgV2ViRHJh d1RleHQoV2ViVGV4dFJlbmRlckluZm8qKTsKIGZsb2F0IFRleHRGbG9hdFdpZHRoKExQQ1RTVFIg dGV4dCwgaW50IGxlbmd0aCwgY29uc3QgV2ViRm9udERlc2NyaXB0aW9uJik7CiB2b2lkIEZvbnRN ZXRyaWNzKGNvbnN0IFdlYkZvbnREZXNjcmlwdGlvbiYsIGludCogYXNjZW50LCBpbnQqIGRlc2Nl bnQsIGludCogbGluZVNwYWNpbmcpOwogCg==