121575 2013-09-18 14:49:41 -0700 Move logicalHeightForLine out from LineWidth.h 2013-09-20 13:52:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 930752 0 zoltan 2013-09-18 14:49:41 -0700 In bug #121107 I moved logicalHeightForLine into LineWidth.h as part of LineWidth refactoring. Now it's time to move logicalHeightForLine to a member function of RenderBlock. 930755 1 212022 zoltan 2013-09-18 14:52:33 -0700 Created attachment 212022 proposed patch 930791 2 212029 zoltan 2013-09-18 16:58:56 -0700 Created attachment 212029 proposed patch 930973 3 212075 zoltan 2013-09-19 09:33:34 -0700 Created attachment 212075 proposed patch - updated changelog 931496 4 212075 hyatt 2013-09-20 11:48:20 -0700 Comment on attachment 212075 proposed patch - updated changelog r=me 931497 5 212075 commit-queue 2013-09-20 11:51:48 -0700 Comment on attachment 212075 proposed patch - updated changelog Rejecting attachment 212075 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 212075, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: FAILED -- saving rejects to file Source/WebCore/rendering/LineWidth.cpp.rej patching file Source/WebCore/rendering/LineWidth.h patching file Source/WebCore/rendering/RenderBlock.cpp Hunk #1 succeeded at 5642 (offset -2 lines). patching file Source/WebCore/rendering/RenderBlock.h patching file Source/WebCore/rendering/RenderBlockLineLayout.cpp Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'David Hyatt']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/1873322 931548 6 212212 zoltan 2013-09-20 13:18:12 -0700 Created attachment 212212 updated to tot 931568 7 212212 commit-queue 2013-09-20 13:52:38 -0700 Comment on attachment 212212 updated to tot Clearing flags on attachment: 212212 Committed r156197: <http://trac.webkit.org/changeset/156197> 931570 8 commit-queue 2013-09-20 13:52:41 -0700 All reviewed patches have been landed. Closing bug. 212022 2013-09-18 14:52:33 -0700 2013-09-18 16:58:56 -0700 proposed patch lineheight.patch text/plain 8472 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMjM4OGM3Li45M2YwMzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTMtMDktMTggIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgTW92ZSBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBvdXQgZnJvbSBMaW5lV2lkdGguaAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNTc1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gYnVnICMxMjEx MDcgKHIxNTU1NjUpLCBJIG1vdmVkIGxvZ2ljYWxIZWlnaHRGb3JMaW5lIGludG8gTGluZVdpZHRo LmggYXMgcGFydCBvZiBMaW5lV2lkdGgKKyAgICAgICAgcmVmYWN0b3JpbmcuIE5vdyBpdCdzIHRp bWUgdG8gbW92ZSBsb2dpY2FsSGVpZ2h0Rm9yTGluZSB0byBhIG1lbWJlciBmdW5jdGlvbiBvZiBS ZW5kZXJCbG9jay4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4K KworICAgICAgICAqIHJlbmRlcmluZy9MaW5lV2lkdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGluZVdpZHRoOjp1cGRhdGVBdmFpbGFibGVXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpMaW5l V2lkdGg6OnNocmlua0F2YWlsYWJsZVdpZHRoRm9yTmV3RmxvYXRJZk5lZWRlZCk6CisgICAgICAg ICogcmVuZGVyaW5nL0xpbmVXaWR0aC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHA6IE1vdmUgdGhlIGRlZmluaXRpb24gaGVyZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJsb2NrOjpsb2dpY2FsSGVpZ2h0Rm9yTGluZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmg6IE1vdmUgdGhlIGZ1bmN0aW9uIGhlcmUuCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 bGF5b3V0U2hhcGVJbnNpZGVJbmZvKToKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZUxvZ2ljYWxJ bmxpbmVQb3NpdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6dXBkYXRlU2VnbWVudHNGb3JTaGFw ZXMpOgorCiAyMDEzLTA5LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVmUHRySGFzaE1hcCBzaG91bGQgd29yayB3aXRoIG1vdmUgb25seSB0eXBl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0aC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmNwcAppbmRleCBjODBhZmM5Li5mODQ5 YjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmNwcApAQCAtNzIsNyArNzIs NyBAQCBib29sIExpbmVXaWR0aDo6Zml0c09uTGluZUV4Y2x1ZGluZ1RyYWlsaW5nV2hpdGVzcGFj ZShmbG9hdCBleHRyYSkgY29uc3QKIHZvaWQgTGluZVdpZHRoOjp1cGRhdGVBdmFpbGFibGVXaWR0 aChMYXlvdXRVbml0IHJlcGxhY2VkSGVpZ2h0KQogewogICAgIExheW91dFVuaXQgaGVpZ2h0ID0g bV9ibG9jay5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0g bG9naWNhbEhlaWdodEZvckxpbmUoJm1fYmxvY2ssIG1faXNGaXJzdExpbmUsIHJlcGxhY2VkSGVp Z2h0KTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBtX2Jsb2NrLmxvZ2ljYWxIZWln aHRGb3JMaW5lKG1faXNGaXJzdExpbmUsIHJlcGxhY2VkSGVpZ2h0KTsKICAgICBtX2xlZnQgPSBt X2Jsb2NrLmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShoZWlnaHQsIHNob3VsZEluZGVudFRleHQo KSwgbG9naWNhbEhlaWdodCk7CiAgICAgbV9yaWdodCA9IG1fYmxvY2subG9naWNhbFJpZ2h0T2Zm c2V0Rm9yTGluZShoZWlnaHQsIHNob3VsZEluZGVudFRleHQoKSwgbG9naWNhbEhlaWdodCk7CiAK QEAgLTEwNywxNCArMTA3LDE0IEBAIHZvaWQgTGluZVdpZHRoOjpzaHJpbmtBdmFpbGFibGVXaWR0 aEZvck5ld0Zsb2F0SWZOZWVkZWQoRmxvYXRpbmdPYmplY3QqIG5ld0Zsb2F0CiAgICAgICAgIGlm IChwcmV2aW91c0Zsb2F0ICE9IG5ld0Zsb2F0ICYmIHByZXZpb3VzRmxvYXQtPnR5cGUoKSA9PSBu ZXdGbG9hdC0+dHlwZSgpKSB7CiAgICAgICAgICAgICBwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8g PSBwcmV2aW91c0Zsb2F0LT5yZW5kZXJlcigpLT5zaGFwZU91dHNpZGVJbmZvKCk7CiAgICAgICAg ICAgICBpZiAocHJldmlvdXNTaGFwZU91dHNpZGVJbmZvKQotICAgICAgICAgICAgICAgIHByZXZp b3VzU2hhcGVPdXRzaWRlSW5mby0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGlu ZShtX2Jsb2NrLmxvZ2ljYWxIZWlnaHQoKSwgcHJldmlvdXNGbG9hdC0+bG9naWNhbFRvcChtX2Js b2NrLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpLCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSgmbV9i bG9jaywgbV9pc0ZpcnN0TGluZSkpOworICAgICAgICAgICAgICAgIHByZXZpb3VzU2hhcGVPdXRz aWRlSW5mby0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShtX2Jsb2NrLmxv Z2ljYWxIZWlnaHQoKSwgcHJldmlvdXNGbG9hdC0+bG9naWNhbFRvcChtX2Jsb2NrLmlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkpLCBtX2Jsb2NrLmxvZ2ljYWxIZWlnaHRGb3JMaW5lKG1faXNGaXJz dExpbmUpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgfQogCiAgICAgU2hh cGVPdXRzaWRlSW5mbyogc2hhcGVPdXRzaWRlSW5mbyA9IG5ld0Zsb2F0LT5yZW5kZXJlcigpLT5z aGFwZU91dHNpZGVJbmZvKCk7CiAgICAgaWYgKHNoYXBlT3V0c2lkZUluZm8pCi0gICAgICAgIHNo YXBlT3V0c2lkZUluZm8tPmNvbXB1dGVTZWdtZW50c0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUobV9i bG9jay5sb2dpY2FsSGVpZ2h0KCksIG5ld0Zsb2F0LT5sb2dpY2FsVG9wKG1fYmxvY2suaXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKSksIGxvZ2ljYWxIZWlnaHRGb3JMaW5lKCZtX2Jsb2NrLCBtX2lz Rmlyc3RMaW5lKSk7CisgICAgICAgIHNoYXBlT3V0c2lkZUluZm8tPmNvbXB1dGVTZWdtZW50c0Zv ckNvbnRhaW5pbmdCbG9ja0xpbmUobV9ibG9jay5sb2dpY2FsSGVpZ2h0KCksIG5ld0Zsb2F0LT5s b2dpY2FsVG9wKG1fYmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSksIG1fYmxvY2subG9n aWNhbEhlaWdodEZvckxpbmUobV9pc0ZpcnN0TGluZSkpOwogI2VuZGlmCiAKICAgICBpZiAobmV3 RmxvYXQtPnR5cGUoKSA9PSBGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0KSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTGluZVdpZHRoLmgKaW5kZXggOGUxZDBmZS4uMmUzMjMyZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9MaW5lV2lkdGguaApAQCAtMzcsMTcgKzM3LDYgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiBlbnVtIEluZGVudFRleHRPck5vdCB7IERvTm90SW5kZW50VGV4dCwgSW5kZW50VGV4 dCB9OwogCi1pbmxpbmUgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0Rm9yTGluZShjb25zdCBSZW5k ZXJCbG9jayogYmxvY2ssIGJvb2wgaXNGaXJzdExpbmUsIExheW91dFVuaXQgcmVwbGFjZWRIZWln aHQgPSAwKQotewotICAgIGlmICghYmxvY2stPmRvY3VtZW50KCkuaW5Ob1F1aXJrc01vZGUoKSAm JiByZXBsYWNlZEhlaWdodCkKLSAgICAgICAgcmV0dXJuIHJlcGxhY2VkSGVpZ2h0OwotCi0gICAg aWYgKCEoYmxvY2stPnN0eWxlKGlzRmlyc3RMaW5lKS0+bGluZUJveENvbnRhaW4oKSAmIExpbmVC b3hDb250YWluQmxvY2spKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIHJldHVybiBzdGQ6Om1h eDxMYXlvdXRVbml0PihyZXBsYWNlZEhlaWdodCwgYmxvY2stPmxpbmVIZWlnaHQoaXNGaXJzdExp bmUsIGJsb2NrLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBW ZXJ0aWNhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcykpOwotfQotCiBjbGFzcyBM aW5lV2lkdGggewogcHVibGljOgogICAgIExpbmVXaWR0aChSZW5kZXJCbG9jayYsIGJvb2wgaXNG aXJzdExpbmUsIEluZGVudFRleHRPck5vdCBzaG91bGRJbmRlbnRUZXh0KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IDRiNDFhMWUuLmNmMzg2YjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcApAQCAtNTY0NCw2ICs1NjQ0LDE3 IEBAIGludCBSZW5kZXJCbG9jazo6YmFzZWxpbmVQb3NpdGlvbihGb250QmFzZWxpbmUgYmFzZWxp bmVUeXBlLCBib29sIGZpcnN0TGluZSwgTGluCiAgICAgcmV0dXJuIGZvbnRNZXRyaWNzLmFzY2Vu dChiYXNlbGluZVR5cGUpICsgKGxpbmVIZWlnaHQoZmlyc3RMaW5lLCBkaXJlY3Rpb24sIGxpbmVQ b3NpdGlvbk1vZGUpIC0gZm9udE1ldHJpY3MuaGVpZ2h0KCkpIC8gMjsKIH0KIAorTGF5b3V0VW5p dCBSZW5kZXJCbG9jazo6bG9naWNhbEhlaWdodEZvckxpbmUoYm9vbCBpc0ZpcnN0TGluZSwgTGF5 b3V0VW5pdCByZXBsYWNlZEhlaWdodCkgY29uc3QKK3sKKyAgICBpZiAoIWRvY3VtZW50KCkuaW5O b1F1aXJrc01vZGUoKSAmJiByZXBsYWNlZEhlaWdodCkKKyAgICAgICAgcmV0dXJuIHJlcGxhY2Vk SGVpZ2h0OworCisgICAgaWYgKCEoc3R5bGUoaXNGaXJzdExpbmUpLT5saW5lQm94Q29udGFpbigp ICYgTGluZUJveENvbnRhaW5CbG9jaykpCisgICAgICAgIHJldHVybiAwOworCisgICAgcmV0dXJu IHN0ZDo6bWF4PExheW91dFVuaXQ+KHJlcGxhY2VkSGVpZ2h0LCBsaW5lSGVpZ2h0KGlzRmlyc3RM aW5lLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0aWNh bExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcykpOworfQorCiBpbnQgUmVuZGVyQmxv Y2s6OmZpcnN0TGluZUJveEJhc2VsaW5lKCkgY29uc3QKIHsKICAgICBpZiAoaXNXcml0aW5nTW9k ZVJvb3QoKSAmJiAhaXNSdWJ5UnVuKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5oCmluZGV4IDM0NTBkOTQuLjFhYzdiYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5oCkBAIC0xMTUsNiArMTE1LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgTGF5b3V0 VW5pdCBsaW5lSGVpZ2h0KGJvb2wgZmlyc3RMaW5lLCBMaW5lRGlyZWN0aW9uTW9kZSwgTGluZVBv c2l0aW9uTW9kZSA9IFBvc2l0aW9uT25Db250YWluaW5nTGluZSkgY29uc3QgT1ZFUlJJREUgRklO QUw7CiAgICAgdmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlvbihGb250QmFzZWxpbmUsIGJvb2wg Zmlyc3RMaW5lLCBMaW5lRGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0aW9uTW9kZSA9IFBvc2l0aW9u T25Db250YWluaW5nTGluZSkgY29uc3QgT1ZFUlJJREU7CiAKKyAgICBMYXlvdXRVbml0IGxvZ2lj YWxIZWlnaHRGb3JMaW5lKGJvb2wgaXNGaXJzdExpbmUsIExheW91dFVuaXQgcmVwbGFjZWRIZWln aHQgPSAwKSBjb25zdDsKKwogICAgIFJlbmRlckxpbmVCb3hMaXN0JiBsaW5lQm94ZXMoKSB7IHJl dHVybiBtX2xpbmVCb3hlczsgfQogICAgIGNvbnN0IFJlbmRlckxpbmVCb3hMaXN0JiBsaW5lQm94 ZXMoKSBjb25zdCB7IHJldHVybiBtX2xpbmVCb3hlczsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IDg1ZDkxZmYuLjAy MzExOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCkBAIC03Niw3ICs3Niw3IEBAIFNoYXBlSW5zaWRlSW5mbyogUmVuZGVyQmxv Y2s6OmxheW91dFNoYXBlSW5zaWRlSW5mbygpIGNvbnN0CiAKICAgICBpZiAoIXNoYXBlSW5zaWRl SW5mbyAmJiBmbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkgJiYgYWxsb3dzU2hhcGVJbnNpZGVJ bmZvU2hhcmluZygpKSB7CiAgICAgICAgIC8vIHJlZ2lvbkF0QmxvY2tPZmZzZXQgcmV0dXJucyBy ZWdpb25zIGxpa2UgYW4gYXJyYXkgZmlyc3Q9ezAsTi0xfSwgc2Vjb25kPXtOLE0tMX0sIC4uLgot ICAgICAgICBMYXlvdXRVbml0IG9mZnNldCA9IGxvZ2ljYWxIZWlnaHQoKSArIGxvZ2ljYWxIZWln aHRGb3JMaW5lKHRoaXMsIGZhbHNlKSAtIExheW91dFVuaXQoMSk7CisgICAgICAgIExheW91dFVu aXQgb2Zmc2V0ID0gbG9naWNhbEhlaWdodCgpICsgbG9naWNhbEhlaWdodEZvckxpbmUoZmFsc2Up IC0gTGF5b3V0VW5pdCgxKTsKICAgICAgICAgUmVuZGVyUmVnaW9uKiByZWdpb24gPSByZWdpb25B dEJsb2NrT2Zmc2V0KG9mZnNldCk7CiAgICAgICAgIGlmIChyZWdpb24pCiAgICAgICAgICAgICBz aGFwZUluc2lkZUluZm8gPSByZWdpb24tPnNoYXBlSW5zaWRlSW5mbygpOwpAQCAtNzY4LDcgKzc2 OCw3IEBAIHN0YXRpYyBJbmRlbnRUZXh0T3JOb3QgcmVxdWlyZXNJbmRlbnQoYm9vbCBpc0ZpcnN0 TGluZSwgYm9vbCBpc0FmdGVySGFyZExpbmVCcmVhCiAKIHN0YXRpYyB2b2lkIHVwZGF0ZUxvZ2lj YWxJbmxpbmVQb3NpdGlvbnMoUmVuZGVyQmxvY2sqIGJsb2NrLCBmbG9hdCYgbGluZUxvZ2ljYWxM ZWZ0LCBmbG9hdCYgbGluZUxvZ2ljYWxSaWdodCwgZmxvYXQmIGF2YWlsYWJsZUxvZ2ljYWxXaWR0 aCwgYm9vbCBmaXJzdExpbmUsIEluZGVudFRleHRPck5vdCBzaG91bGRJbmRlbnRUZXh0LCBMYXlv dXRVbml0IGJveExvZ2ljYWxIZWlnaHQpCiB7Ci0gICAgTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhl aWdodCA9IGxvZ2ljYWxIZWlnaHRGb3JMaW5lKGJsb2NrLCBmaXJzdExpbmUsIGJveExvZ2ljYWxI ZWlnaHQpOworICAgIExheW91dFVuaXQgbGluZUxvZ2ljYWxIZWlnaHQgPSBibG9jay0+bG9naWNh bEhlaWdodEZvckxpbmUoZmlyc3RMaW5lLCBib3hMb2dpY2FsSGVpZ2h0KTsKICAgICBsaW5lTG9n aWNhbExlZnQgPSBibG9jay0+cGl4ZWxTbmFwcGVkTG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGJs b2NrLT5sb2dpY2FsSGVpZ2h0KCksIHNob3VsZEluZGVudFRleHQgPT0gSW5kZW50VGV4dCwgbGlu ZUxvZ2ljYWxIZWlnaHQpOwogICAgIGxpbmVMb2dpY2FsUmlnaHQgPSBibG9jay0+cGl4ZWxTbmFw cGVkTG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShibG9jay0+bG9naWNhbEhlaWdodCgpLCBzaG91 bGRJbmRlbnRUZXh0ID09IEluZGVudFRleHQsIGxpbmVMb2dpY2FsSGVpZ2h0KTsKICAgICBhdmFp bGFibGVMb2dpY2FsV2lkdGggPSBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0OwpA QCAtMjU5Myw3ICsyNTkzLDcgQEAgc3RhdGljIHZvaWQgdXBkYXRlU2VnbWVudHNGb3JTaGFwZXMo UmVuZGVyQmxvY2sqIGJsb2NrLCBjb25zdCBGbG9hdGluZ09iamVjdCogbGEKICAgICBBU1NFUlQo bGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSk7CiAKICAgICBTaGFwZUluc2lkZUluZm8qIHNoYXBl SW5zaWRlSW5mbyA9IGJsb2NrLT5sYXlvdXRTaGFwZUluc2lkZUluZm8oKTsKLSAgICBMYXlvdXRV bml0IGxpbmVMb2dpY2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdodEZvckxpbmUoYmxvY2ssIGlzRmly c3RMaW5lKTsKKyAgICBMYXlvdXRVbml0IGxpbmVMb2dpY2FsSGVpZ2h0ID0gYmxvY2stPmxvZ2lj YWxIZWlnaHRGb3JMaW5lKGlzRmlyc3RMaW5lKTsKICAgICBMYXlvdXRVbml0IGxpbmVMb2dpY2Fs Qm90dG9tID0gYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSArIGxpbmVMb2dpY2FsSGVpZ2h0OwogICAg IGJvb2wgbGluZU92ZXJsYXBzV2l0aEZsb2F0ID0gKGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUt PnkoKSA8IGxpbmVMb2dpY2FsQm90dG9tKSAmJiAoYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSA8IGxh c3RGbG9hdEZyb21QcmV2aW91c0xpbmUtPm1heFkoKSk7CiAK 212029 2013-09-18 16:58:56 -0700 2013-09-19 09:33:34 -0700 proposed patch lineheight2.patch text/plain 9451 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMjM4OGM3Li4yNGRlZTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTMtMDktMTggIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgTW92ZSBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBvdXQgb2YgTGluZVdpZHRoLmgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTU3NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGJ1ZyAjMTIxMTA3 IChyMTU1NTY1KSwgSSBtb3ZlZCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBpbnRvIExpbmVXaWR0aC5o IGFzIHBhcnQgb2YgTGluZVdpZHRoCisgICAgICAgIHJlZmFjdG9yaW5nLiBMb2dpY2FsSGVpZ2h0 Rm9yTGluZSB3aXRob3V0IHBhc3NpbmcgdGhlIHNlY29uZCBwYXJhbWV0ZXIgdXNlcyBSZW5kZXJC bG9jazo6bGluZUhlaWdodAorICAgICAgICBhbnl3YXksIHNvIEkgbW9kaWZpZWQgdGhlIGFmZmVj dGVkIGZ1bmN0aW9ucyB0byBjYWxsIGxpbmVIZWlnaHQgZGlyZWN0bHkuIEkgcmVuYW1lZCBsb2dp Y2FsSGVpZ2h0Rm9yTGluZQorICAgICAgICB0byBtaW5MaW5lSGVpZ2h0Rm9yUmVwbGFjZWRSZW5k ZXJlciwgYW5kIG1hZGUgdGhlIHNlY29uZCBwYXJhbWV0ZXIgYSBtYW5kYXRvcnkgZm9yIHRoYXQg ZnVuY3Rpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisK KyAgICAgICAgKiByZW5kZXJpbmcvTGluZVdpZHRoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxp bmVXaWR0aDo6dXBkYXRlQXZhaWxhYmxlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGluZVdp ZHRoOjpzaHJpbmtBdmFpbGFibGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQpOgorICAgICAgICAq IHJlbmRlcmluZy9MaW5lV2lkdGguaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwOiBNb3ZlIHRoZSBkZWZpbml0aW9uIGhlcmUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9jazo6bWluTGluZUhlaWdodEZvclJlcGxhY2VkUmVuZGVyZXIpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9jay5oOiBNb3ZlIHRoZSBmdW5jdGlvbiBoZXJlIGFuZCByZW5hbWUgaXQu CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0U2hhcGVJbnNpZGVJbmZvKToKKyAgICAgICAg KFdlYkNvcmU6OnVwZGF0ZUxvZ2ljYWxJbmxpbmVQb3NpdGlvbnMpOgorICAgICAgICAoV2ViQ29y ZTo6dXBkYXRlU2VnbWVudHNGb3JTaGFwZXMpOgorCiAyMDEzLTA5LTE4ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmUHRySGFzaE1hcCBzaG91bGQg d29yayB3aXRoIG1vdmUgb25seSB0eXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0xpbmVXaWR0aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRo LmNwcAppbmRleCBjODBhZmM5Li44ZmY3Mzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTGluZVdpZHRoLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGlu ZVdpZHRoLmNwcApAQCAtNzIsNyArNzIsNyBAQCBib29sIExpbmVXaWR0aDo6Zml0c09uTGluZUV4 Y2x1ZGluZ1RyYWlsaW5nV2hpdGVzcGFjZShmbG9hdCBleHRyYSkgY29uc3QKIHZvaWQgTGluZVdp ZHRoOjp1cGRhdGVBdmFpbGFibGVXaWR0aChMYXlvdXRVbml0IHJlcGxhY2VkSGVpZ2h0KQogewog ICAgIExheW91dFVuaXQgaGVpZ2h0ID0gbV9ibG9jay5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgTGF5 b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdodEZvckxpbmUoJm1fYmxvY2ssIG1f aXNGaXJzdExpbmUsIHJlcGxhY2VkSGVpZ2h0KTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHQgPSBtX2Jsb2NrLm1pbkxpbmVIZWlnaHRGb3JSZXBsYWNlZFJlbmRlcmVyKG1faXNGaXJzdExp bmUsIHJlcGxhY2VkSGVpZ2h0KTsKICAgICBtX2xlZnQgPSBtX2Jsb2NrLmxvZ2ljYWxMZWZ0T2Zm c2V0Rm9yTGluZShoZWlnaHQsIHNob3VsZEluZGVudFRleHQoKSwgbG9naWNhbEhlaWdodCk7CiAg ICAgbV9yaWdodCA9IG1fYmxvY2subG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShoZWlnaHQsIHNo b3VsZEluZGVudFRleHQoKSwgbG9naWNhbEhlaWdodCk7CiAKQEAgLTEwMiwxOSArMTAyLDIwIEBA IHZvaWQgTGluZVdpZHRoOjpzaHJpbmtBdmFpbGFibGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQo RmxvYXRpbmdPYmplY3QqIG5ld0Zsb2F0CiAgICAgY29uc3QgRmxvYXRpbmdPYmplY3RTZXQmIGZs b2F0aW5nT2JqZWN0U2V0ID0gbV9ibG9jay5tX2Zsb2F0aW5nT2JqZWN0cy0+c2V0KCk7CiAgICAg RmxvYXRpbmdPYmplY3RTZXRJdGVyYXRvciBpdCA9IGZsb2F0aW5nT2JqZWN0U2V0LmVuZCgpOwog ICAgIEZsb2F0aW5nT2JqZWN0U2V0SXRlcmF0b3IgYmVnaW4gPSBmbG9hdGluZ09iamVjdFNldC5i ZWdpbigpOworICAgIExheW91dFVuaXQgbGluZUhlaWdodCA9IG1fYmxvY2subGluZUhlaWdodCht X2lzRmlyc3RMaW5lLCBtX2Jsb2NrLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9u dGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVzKTsKICAg ICBmb3IgKC0taXQ7IGl0ICE9IGJlZ2luOyAtLWl0KSB7CiAgICAgICAgIEZsb2F0aW5nT2JqZWN0 KiBwcmV2aW91c0Zsb2F0ID0gKml0OwogICAgICAgICBpZiAocHJldmlvdXNGbG9hdCAhPSBuZXdG bG9hdCAmJiBwcmV2aW91c0Zsb2F0LT50eXBlKCkgPT0gbmV3RmxvYXQtPnR5cGUoKSkgewogICAg ICAgICAgICAgcHJldmlvdXNTaGFwZU91dHNpZGVJbmZvID0gcHJldmlvdXNGbG9hdC0+cmVuZGVy ZXIoKS0+c2hhcGVPdXRzaWRlSW5mbygpOwogICAgICAgICAgICAgaWYgKHByZXZpb3VzU2hhcGVP dXRzaWRlSW5mbykKLSAgICAgICAgICAgICAgICBwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8tPmNv bXB1dGVTZWdtZW50c0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUobV9ibG9jay5sb2dpY2FsSGVpZ2h0 KCksIHByZXZpb3VzRmxvYXQtPmxvZ2ljYWxUb3AobV9ibG9jay5pc0hvcml6b250YWxXcml0aW5n TW9kZSgpKSwgbG9naWNhbEhlaWdodEZvckxpbmUoJm1fYmxvY2ssIG1faXNGaXJzdExpbmUpKTsK KyAgICAgICAgICAgICAgICBwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8tPmNvbXB1dGVTZWdtZW50 c0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUobV9ibG9jay5sb2dpY2FsSGVpZ2h0KCksIHByZXZpb3Vz RmxvYXQtPmxvZ2ljYWxUb3AobV9ibG9jay5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSwgbGlu ZUhlaWdodCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgIH0KIAogICAgIFNo YXBlT3V0c2lkZUluZm8qIHNoYXBlT3V0c2lkZUluZm8gPSBuZXdGbG9hdC0+cmVuZGVyZXIoKS0+ c2hhcGVPdXRzaWRlSW5mbygpOwogICAgIGlmIChzaGFwZU91dHNpZGVJbmZvKQotICAgICAgICBz aGFwZU91dHNpZGVJbmZvLT5jb21wdXRlU2VnbWVudHNGb3JDb250YWluaW5nQmxvY2tMaW5lKG1f YmxvY2subG9naWNhbEhlaWdodCgpLCBuZXdGbG9hdC0+bG9naWNhbFRvcChtX2Jsb2NrLmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkpLCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSgmbV9ibG9jaywgbV9p c0ZpcnN0TGluZSkpOworICAgICAgICBzaGFwZU91dHNpZGVJbmZvLT5jb21wdXRlU2VnbWVudHNG b3JDb250YWluaW5nQmxvY2tMaW5lKG1fYmxvY2subG9naWNhbEhlaWdodCgpLCBuZXdGbG9hdC0+ bG9naWNhbFRvcChtX2Jsb2NrLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpLCBsaW5lSGVpZ2h0 KTsKICNlbmRpZgogCiAgICAgaWYgKG5ld0Zsb2F0LT50eXBlKCkgPT0gRmxvYXRpbmdPYmplY3Q6 OkZsb2F0TGVmdCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVX aWR0aC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0aC5oCmluZGV4IDhlMWQw ZmUuLjJlMzIzMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MaW5lV2lk dGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmgKQEAgLTM3LDE3 ICszNyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogZW51bSBJbmRlbnRUZXh0T3JOb3QgeyBE b05vdEluZGVudFRleHQsIEluZGVudFRleHQgfTsKIAotaW5saW5lIExheW91dFVuaXQgbG9naWNh bEhlaWdodEZvckxpbmUoY29uc3QgUmVuZGVyQmxvY2sqIGJsb2NrLCBib29sIGlzRmlyc3RMaW5l LCBMYXlvdXRVbml0IHJlcGxhY2VkSGVpZ2h0ID0gMCkKLXsKLSAgICBpZiAoIWJsb2NrLT5kb2N1 bWVudCgpLmluTm9RdWlya3NNb2RlKCkgJiYgcmVwbGFjZWRIZWlnaHQpCi0gICAgICAgIHJldHVy biByZXBsYWNlZEhlaWdodDsKLQotICAgIGlmICghKGJsb2NrLT5zdHlsZShpc0ZpcnN0TGluZSkt PmxpbmVCb3hDb250YWluKCkgJiBMaW5lQm94Q29udGFpbkJsb2NrKSkKLSAgICAgICAgcmV0dXJu IDA7Ci0KLSAgICByZXR1cm4gc3RkOjptYXg8TGF5b3V0VW5pdD4ocmVwbGFjZWRIZWlnaHQsIGJs b2NrLT5saW5lSGVpZ2h0KGlzRmlyc3RMaW5lLCBibG9jay0+aXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxMaW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JM aW5lQm94ZXMpKTsKLX0KLQogY2xhc3MgTGluZVdpZHRoIHsKIHB1YmxpYzoKICAgICBMaW5lV2lk dGgoUmVuZGVyQmxvY2smLCBib29sIGlzRmlyc3RMaW5lLCBJbmRlbnRUZXh0T3JOb3Qgc2hvdWxk SW5kZW50VGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRl eCA0YjQxYTFlLi41YTBjMTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAKQEAgLTU2NDQsNiArNTY0NCwxNyBAQCBpbnQgUmVuZGVyQmxvY2s6OmJhc2VsaW5lUG9z aXRpb24oRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSwgYm9vbCBmaXJzdExpbmUsIExpbgogICAg IHJldHVybiBmb250TWV0cmljcy5hc2NlbnQoYmFzZWxpbmVUeXBlKSArIChsaW5lSGVpZ2h0KGZp cnN0TGluZSwgZGlyZWN0aW9uLCBsaW5lUG9zaXRpb25Nb2RlKSAtIGZvbnRNZXRyaWNzLmhlaWdo dCgpKSAvIDI7CiB9CiAKK0xheW91dFVuaXQgUmVuZGVyQmxvY2s6Om1pbkxpbmVIZWlnaHRGb3JS ZXBsYWNlZFJlbmRlcmVyKGJvb2wgaXNGaXJzdExpbmUsIExheW91dFVuaXQgcmVwbGFjZWRIZWln aHQpIGNvbnN0Cit7CisgICAgaWYgKCFkb2N1bWVudCgpLmluTm9RdWlya3NNb2RlKCkgJiYgcmVw bGFjZWRIZWlnaHQpCisgICAgICAgIHJldHVybiByZXBsYWNlZEhlaWdodDsKKworICAgIGlmICgh KHN0eWxlKGlzRmlyc3RMaW5lKS0+bGluZUJveENvbnRhaW4oKSAmIExpbmVCb3hDb250YWluQmxv Y2spKQorICAgICAgICByZXR1cm4gMDsKKworICAgIHJldHVybiBzdGQ6Om1heDxMYXlvdXRVbml0 PihyZXBsYWNlZEhlaWdodCwgbGluZUhlaWdodChpc0ZpcnN0TGluZSwgaXNIb3Jpem9udGFsV3Jp dGluZ01vZGUoKSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxMaW5lLCBQb3NpdGlvbk9mSW50 ZXJpb3JMaW5lQm94ZXMpKTsKK30KKwogaW50IFJlbmRlckJsb2NrOjpmaXJzdExpbmVCb3hCYXNl bGluZSgpIGNvbnN0CiB7CiAgICAgaWYgKGlzV3JpdGluZ01vZGVSb290KCkgJiYgIWlzUnVieVJ1 bigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAppbmRleCAzNDUwZDk0Li40 M2YyZjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaApAQCAtMTE1LDYg KzExNSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbGluZUhlaWdodChib29s IGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUsIExpbmVQb3NpdGlvbk1vZGUgPSBQb3NpdGlv bk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0IE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgaW50 IGJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVj dGlvbk1vZGUsIExpbmVQb3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNv bnN0IE9WRVJSSURFOwogCisgICAgTGF5b3V0VW5pdCBtaW5MaW5lSGVpZ2h0Rm9yUmVwbGFjZWRS ZW5kZXJlcihib29sIGlzRmlyc3RMaW5lLCBMYXlvdXRVbml0IHJlcGxhY2VkSGVpZ2h0KSBjb25z dDsKKwogICAgIFJlbmRlckxpbmVCb3hMaXN0JiBsaW5lQm94ZXMoKSB7IHJldHVybiBtX2xpbmVC b3hlczsgfQogICAgIGNvbnN0IFJlbmRlckxpbmVCb3hMaXN0JiBsaW5lQm94ZXMoKSBjb25zdCB7 IHJldHVybiBtX2xpbmVCb3hlczsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCmluZGV4IDg1ZDkxZmYuLjQ5NjY2ZDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3Bw CkBAIC03NSw4ICs3NSw5IEBAIFNoYXBlSW5zaWRlSW5mbyogUmVuZGVyQmxvY2s6OmxheW91dFNo YXBlSW5zaWRlSW5mbygpIGNvbnN0CiAgICAgU2hhcGVJbnNpZGVJbmZvKiBzaGFwZUluc2lkZUlu Zm8gPSB2aWV3KCkubGF5b3V0U3RhdGUoKS0+c2hhcGVJbnNpZGVJbmZvKCk7CiAKICAgICBpZiAo IXNoYXBlSW5zaWRlSW5mbyAmJiBmbG93VGhyZWFkQ29udGFpbmluZ0Jsb2NrKCkgJiYgYWxsb3dz U2hhcGVJbnNpZGVJbmZvU2hhcmluZygpKSB7CisgICAgICAgIExheW91dFVuaXQgbGluZUhlaWdo dCA9IHRoaXMtPmxpbmVIZWlnaHQoZmFsc2UsIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBI b3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVz KTsKICAgICAgICAgLy8gcmVnaW9uQXRCbG9ja09mZnNldCByZXR1cm5zIHJlZ2lvbnMgbGlrZSBh biBhcnJheSBmaXJzdD17MCxOLTF9LCBzZWNvbmQ9e04sTS0xfSwgLi4uCi0gICAgICAgIExheW91 dFVuaXQgb2Zmc2V0ID0gbG9naWNhbEhlaWdodCgpICsgbG9naWNhbEhlaWdodEZvckxpbmUodGhp cywgZmFsc2UpIC0gTGF5b3V0VW5pdCgxKTsKKyAgICAgICAgTGF5b3V0VW5pdCBvZmZzZXQgPSBs b2dpY2FsSGVpZ2h0KCkgKyBsaW5lSGVpZ2h0IC0gTGF5b3V0VW5pdCgxKTsKICAgICAgICAgUmVu ZGVyUmVnaW9uKiByZWdpb24gPSByZWdpb25BdEJsb2NrT2Zmc2V0KG9mZnNldCk7CiAgICAgICAg IGlmIChyZWdpb24pCiAgICAgICAgICAgICBzaGFwZUluc2lkZUluZm8gPSByZWdpb24tPnNoYXBl SW5zaWRlSW5mbygpOwpAQCAtNzY4LDcgKzc2OSw3IEBAIHN0YXRpYyBJbmRlbnRUZXh0T3JOb3Qg cmVxdWlyZXNJbmRlbnQoYm9vbCBpc0ZpcnN0TGluZSwgYm9vbCBpc0FmdGVySGFyZExpbmVCcmVh CiAKIHN0YXRpYyB2b2lkIHVwZGF0ZUxvZ2ljYWxJbmxpbmVQb3NpdGlvbnMoUmVuZGVyQmxvY2sq IGJsb2NrLCBmbG9hdCYgbGluZUxvZ2ljYWxMZWZ0LCBmbG9hdCYgbGluZUxvZ2ljYWxSaWdodCwg ZmxvYXQmIGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgYm9vbCBmaXJzdExpbmUsIEluZGVudFRleHRP ck5vdCBzaG91bGRJbmRlbnRUZXh0LCBMYXlvdXRVbml0IGJveExvZ2ljYWxIZWlnaHQpCiB7Ci0g ICAgTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCA9IGxvZ2ljYWxIZWlnaHRGb3JMaW5lKGJs b2NrLCBmaXJzdExpbmUsIGJveExvZ2ljYWxIZWlnaHQpOworICAgIExheW91dFVuaXQgbGluZUxv Z2ljYWxIZWlnaHQgPSBibG9jay0+bWluTGluZUhlaWdodEZvclJlcGxhY2VkUmVuZGVyZXIoZmly c3RMaW5lLCBib3hMb2dpY2FsSGVpZ2h0KTsKICAgICBsaW5lTG9naWNhbExlZnQgPSBibG9jay0+ cGl4ZWxTbmFwcGVkTG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGJsb2NrLT5sb2dpY2FsSGVpZ2h0 KCksIHNob3VsZEluZGVudFRleHQgPT0gSW5kZW50VGV4dCwgbGluZUxvZ2ljYWxIZWlnaHQpOwog ICAgIGxpbmVMb2dpY2FsUmlnaHQgPSBibG9jay0+cGl4ZWxTbmFwcGVkTG9naWNhbFJpZ2h0T2Zm c2V0Rm9yTGluZShibG9jay0+bG9naWNhbEhlaWdodCgpLCBzaG91bGRJbmRlbnRUZXh0ID09IElu ZGVudFRleHQsIGxpbmVMb2dpY2FsSGVpZ2h0KTsKICAgICBhdmFpbGFibGVMb2dpY2FsV2lkdGgg PSBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0OwpAQCAtMjU5Myw3ICsyNTk0LDcg QEAgc3RhdGljIHZvaWQgdXBkYXRlU2VnbWVudHNGb3JTaGFwZXMoUmVuZGVyQmxvY2sqIGJsb2Nr LCBjb25zdCBGbG9hdGluZ09iamVjdCogbGEKICAgICBBU1NFUlQobGFzdEZsb2F0RnJvbVByZXZp b3VzTGluZSk7CiAKICAgICBTaGFwZUluc2lkZUluZm8qIHNoYXBlSW5zaWRlSW5mbyA9IGJsb2Nr LT5sYXlvdXRTaGFwZUluc2lkZUluZm8oKTsKLSAgICBMYXlvdXRVbml0IGxpbmVMb2dpY2FsSGVp Z2h0ID0gbG9naWNhbEhlaWdodEZvckxpbmUoYmxvY2ssIGlzRmlyc3RMaW5lKTsKKyAgICBMYXlv dXRVbml0IGxpbmVMb2dpY2FsSGVpZ2h0ID0gYmxvY2stPmxpbmVIZWlnaHQoaXNGaXJzdExpbmUs IGJsb2NrLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0 aWNhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyk7CiAgICAgTGF5b3V0VW5pdCBs aW5lTG9naWNhbEJvdHRvbSA9IGJsb2NrLT5sb2dpY2FsSGVpZ2h0KCkgKyBsaW5lTG9naWNhbEhl aWdodDsKICAgICBib29sIGxpbmVPdmVybGFwc1dpdGhGbG9hdCA9IChsYXN0RmxvYXRGcm9tUHJl dmlvdXNMaW5lLT55KCkgPCBsaW5lTG9naWNhbEJvdHRvbSkgJiYgKGJsb2NrLT5sb2dpY2FsSGVp Z2h0KCkgPCBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLT5tYXhZKCkpOwogCg== 212075 2013-09-19 09:33:34 -0700 2013-09-20 13:18:12 -0700 proposed patch - updated changelog lineheight4.patch text/plain 9674 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNjkyYmEyLi4yNzNlODI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTMtMDktMTkgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgTW92ZSBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBvdXQgb2YgTGluZVdpZHRoLmgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTU3NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIGJ1ZyAjMTIxMTA3 IChyMTU1NTY1KSwgSSBtb3ZlZCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBpbnRvIExpbmVXaWR0aC5o IGFzIHBhcnQgb2YgTGluZVdpZHRoCisgICAgICAgIHJlZmFjdG9yaW5nLiBMb2dpY2FsSGVpZ2h0 Rm9yTGluZSB3aXRob3V0IHBhc3NpbmcgdGhlIHNlY29uZCBwYXJhbWV0ZXIgdXNlcyBSZW5kZXJC bG9jazo6bGluZUhlaWdodAorICAgICAgICBhbnl3YXksIGV4Y2VwdCBpdCBkb2Vzbid0IHRha2Ug LWxpbmUtYm94LWNvbnRhaW4gQ1NTIHByb3BlcnR5IGludG8gYWNjb3VudC4gRm9yIFNoYXBlcyB3 ZSBkb24ndAorICAgICAgICBoYXZlIGltcGxlbWVudGF0aW9uIGZvciB2YXJpYWJsZS1oZWlnaHQg bGluZXMgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTM2MSkgeWV0 LCBzbworICAgICAgICBzbyBJIG1vZGlmaWVkIHRoZSBhZmZlY3RlZCBmdW5jdGlvbnMgdG8gY2Fs bCBsaW5lSGVpZ2h0IGRpcmVjdGx5LiBJIHJlbmFtZWQgbG9naWNhbEhlaWdodEZvckxpbmUKKyAg ICAgICAgdG8gbWluTGluZUhlaWdodEZvclJlcGxhY2VkUmVuZGVyZXIsIGFuZCBJIG1hZGUgdGhl IHNlY29uZCBwYXJhbWV0ZXIgYSBtYW5kYXRvcnkgZm9yIHRoYXQgZnVuY3Rpb24uCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvTGluZVdpZHRoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVXaWR0aDo6dXBkYXRlQXZh aWxhYmxlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGluZVdpZHRoOjpzaHJpbmtBdmFpbGFi bGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9MaW5lV2lk dGguaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOiBNb3ZlIHRoZSBkZWZp bml0aW9uIGhlcmUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bWluTGluZUhlaWdo dEZvclJlcGxhY2VkUmVuZGVyZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5o OiBNb3ZlIHRoZSBmdW5jdGlvbiBoZXJlIGFuZCByZW5hbWUgaXQuCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJC bG9jazo6bGF5b3V0U2hhcGVJbnNpZGVJbmZvKToKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZUxv Z2ljYWxJbmxpbmVQb3NpdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6dXBkYXRlU2VnbWVudHNG b3JTaGFwZXMpOgorCiAyMDEzLTA5LTE5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUu Y29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNDk5MjgpOiBDYW52YXNTdHlsZTo6b3BlcmF0 b3I9IGxlYWtzIGV2ZXJ5dGhpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9MaW5lV2lkdGguY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0aC5jcHAK aW5kZXggYzgwYWZjOS4uOGZmNzM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0xpbmVXaWR0aC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0 aC5jcHAKQEAgLTcyLDcgKzcyLDcgQEAgYm9vbCBMaW5lV2lkdGg6OmZpdHNPbkxpbmVFeGNsdWRp bmdUcmFpbGluZ1doaXRlc3BhY2UoZmxvYXQgZXh0cmEpIGNvbnN0CiB2b2lkIExpbmVXaWR0aDo6 dXBkYXRlQXZhaWxhYmxlV2lkdGgoTGF5b3V0VW5pdCByZXBsYWNlZEhlaWdodCkKIHsKICAgICBM YXlvdXRVbml0IGhlaWdodCA9IG1fYmxvY2subG9naWNhbEhlaWdodCgpOwotICAgIExheW91dFVu aXQgbG9naWNhbEhlaWdodCA9IGxvZ2ljYWxIZWlnaHRGb3JMaW5lKCZtX2Jsb2NrLCBtX2lzRmly c3RMaW5lLCByZXBsYWNlZEhlaWdodCk7CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0ID0g bV9ibG9jay5taW5MaW5lSGVpZ2h0Rm9yUmVwbGFjZWRSZW5kZXJlcihtX2lzRmlyc3RMaW5lLCBy ZXBsYWNlZEhlaWdodCk7CiAgICAgbV9sZWZ0ID0gbV9ibG9jay5sb2dpY2FsTGVmdE9mZnNldEZv ckxpbmUoaGVpZ2h0LCBzaG91bGRJbmRlbnRUZXh0KCksIGxvZ2ljYWxIZWlnaHQpOwogICAgIG1f cmlnaHQgPSBtX2Jsb2NrLmxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoaGVpZ2h0LCBzaG91bGRJ bmRlbnRUZXh0KCksIGxvZ2ljYWxIZWlnaHQpOwogCkBAIC0xMDIsMTkgKzEwMiwyMCBAQCB2b2lk IExpbmVXaWR0aDo6c2hyaW5rQXZhaWxhYmxlV2lkdGhGb3JOZXdGbG9hdElmTmVlZGVkKEZsb2F0 aW5nT2JqZWN0KiBuZXdGbG9hdAogICAgIGNvbnN0IEZsb2F0aW5nT2JqZWN0U2V0JiBmbG9hdGlu Z09iamVjdFNldCA9IG1fYmxvY2subV9mbG9hdGluZ09iamVjdHMtPnNldCgpOwogICAgIEZsb2F0 aW5nT2JqZWN0U2V0SXRlcmF0b3IgaXQgPSBmbG9hdGluZ09iamVjdFNldC5lbmQoKTsKICAgICBG bG9hdGluZ09iamVjdFNldEl0ZXJhdG9yIGJlZ2luID0gZmxvYXRpbmdPYmplY3RTZXQuYmVnaW4o KTsKKyAgICBMYXlvdXRVbml0IGxpbmVIZWlnaHQgPSBtX2Jsb2NrLmxpbmVIZWlnaHQobV9pc0Zp cnN0TGluZSwgbV9ibG9jay5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExp bmUgOiBWZXJ0aWNhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyk7CiAgICAgZm9y ICgtLWl0OyBpdCAhPSBiZWdpbjsgLS1pdCkgewogICAgICAgICBGbG9hdGluZ09iamVjdCogcHJl dmlvdXNGbG9hdCA9ICppdDsKICAgICAgICAgaWYgKHByZXZpb3VzRmxvYXQgIT0gbmV3RmxvYXQg JiYgcHJldmlvdXNGbG9hdC0+dHlwZSgpID09IG5ld0Zsb2F0LT50eXBlKCkpIHsKICAgICAgICAg ICAgIHByZXZpb3VzU2hhcGVPdXRzaWRlSW5mbyA9IHByZXZpb3VzRmxvYXQtPnJlbmRlcmVyKCkt PnNoYXBlT3V0c2lkZUluZm8oKTsKICAgICAgICAgICAgIGlmIChwcmV2aW91c1NoYXBlT3V0c2lk ZUluZm8pCi0gICAgICAgICAgICAgICAgcHJldmlvdXNTaGFwZU91dHNpZGVJbmZvLT5jb21wdXRl U2VnbWVudHNGb3JDb250YWluaW5nQmxvY2tMaW5lKG1fYmxvY2subG9naWNhbEhlaWdodCgpLCBw cmV2aW91c0Zsb2F0LT5sb2dpY2FsVG9wKG1fYmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSksIGxvZ2ljYWxIZWlnaHRGb3JMaW5lKCZtX2Jsb2NrLCBtX2lzRmlyc3RMaW5lKSk7CisgICAg ICAgICAgICAgICAgcHJldmlvdXNTaGFwZU91dHNpZGVJbmZvLT5jb21wdXRlU2VnbWVudHNGb3JD b250YWluaW5nQmxvY2tMaW5lKG1fYmxvY2subG9naWNhbEhlaWdodCgpLCBwcmV2aW91c0Zsb2F0 LT5sb2dpY2FsVG9wKG1fYmxvY2suaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSksIGxpbmVIZWln aHQpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBTaGFwZU91 dHNpZGVJbmZvKiBzaGFwZU91dHNpZGVJbmZvID0gbmV3RmxvYXQtPnJlbmRlcmVyKCktPnNoYXBl T3V0c2lkZUluZm8oKTsKICAgICBpZiAoc2hhcGVPdXRzaWRlSW5mbykKLSAgICAgICAgc2hhcGVP dXRzaWRlSW5mby0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29udGFpbmluZ0Jsb2NrTGluZShtX2Jsb2Nr LmxvZ2ljYWxIZWlnaHQoKSwgbmV3RmxvYXQtPmxvZ2ljYWxUb3AobV9ibG9jay5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpKSwgbG9naWNhbEhlaWdodEZvckxpbmUoJm1fYmxvY2ssIG1faXNGaXJz dExpbmUpKTsKKyAgICAgICAgc2hhcGVPdXRzaWRlSW5mby0+Y29tcHV0ZVNlZ21lbnRzRm9yQ29u dGFpbmluZ0Jsb2NrTGluZShtX2Jsb2NrLmxvZ2ljYWxIZWlnaHQoKSwgbmV3RmxvYXQtPmxvZ2lj YWxUb3AobV9ibG9jay5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSwgbGluZUhlaWdodCk7CiAj ZW5kaWYKIAogICAgIGlmIChuZXdGbG9hdC0+dHlwZSgpID09IEZsb2F0aW5nT2JqZWN0OjpGbG9h dExlZnQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MaW5lV2lkdGgu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MaW5lV2lkdGguaAppbmRleCA4ZTFkMGZlLi4y ZTMyMzJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xpbmVXaWR0aC5oCkBAIC0zNywxNyArMzcs NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGVudW0gSW5kZW50VGV4dE9yTm90IHsgRG9Ob3RJ bmRlbnRUZXh0LCBJbmRlbnRUZXh0IH07CiAKLWlubGluZSBMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHRGb3JMaW5lKGNvbnN0IFJlbmRlckJsb2NrKiBibG9jaywgYm9vbCBpc0ZpcnN0TGluZSwgTGF5 b3V0VW5pdCByZXBsYWNlZEhlaWdodCA9IDApCi17Ci0gICAgaWYgKCFibG9jay0+ZG9jdW1lbnQo KS5pbk5vUXVpcmtzTW9kZSgpICYmIHJlcGxhY2VkSGVpZ2h0KQotICAgICAgICByZXR1cm4gcmVw bGFjZWRIZWlnaHQ7Ci0KLSAgICBpZiAoIShibG9jay0+c3R5bGUoaXNGaXJzdExpbmUpLT5saW5l Qm94Q29udGFpbigpICYgTGluZUJveENvbnRhaW5CbG9jaykpCi0gICAgICAgIHJldHVybiAwOwot Ci0gICAgcmV0dXJuIHN0ZDo6bWF4PExheW91dFVuaXQ+KHJlcGxhY2VkSGVpZ2h0LCBibG9jay0+ bGluZUhlaWdodChpc0ZpcnN0TGluZSwgYmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkg PyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJv eGVzKSk7Ci19Ci0KIGNsYXNzIExpbmVXaWR0aCB7CiBwdWJsaWM6CiAgICAgTGluZVdpZHRoKFJl bmRlckJsb2NrJiwgYm9vbCBpc0ZpcnN0TGluZSwgSW5kZW50VGV4dE9yTm90IHNob3VsZEluZGVu dFRleHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMDhh OTRjZi4uZGI3NjFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CkBAIC01NjQ0LDYgKzU2NDQsMTcgQEAgaW50IFJlbmRlckJsb2NrOjpiYXNlbGluZVBvc2l0aW9u KEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGJvb2wgZmlyc3RMaW5lLCBMaW4KICAgICByZXR1 cm4gZm9udE1ldHJpY3MuYXNjZW50KGJhc2VsaW5lVHlwZSkgKyAobGluZUhlaWdodChmaXJzdExp bmUsIGRpcmVjdGlvbiwgbGluZVBvc2l0aW9uTW9kZSkgLSBmb250TWV0cmljcy5oZWlnaHQoKSkg LyAyOwogfQogCitMYXlvdXRVbml0IFJlbmRlckJsb2NrOjptaW5MaW5lSGVpZ2h0Rm9yUmVwbGFj ZWRSZW5kZXJlcihib29sIGlzRmlyc3RMaW5lLCBMYXlvdXRVbml0IHJlcGxhY2VkSGVpZ2h0KSBj b25zdAoreworICAgIGlmICghZG9jdW1lbnQoKS5pbk5vUXVpcmtzTW9kZSgpICYmIHJlcGxhY2Vk SGVpZ2h0KQorICAgICAgICByZXR1cm4gcmVwbGFjZWRIZWlnaHQ7CisKKyAgICBpZiAoIShzdHls ZShpc0ZpcnN0TGluZSktPmxpbmVCb3hDb250YWluKCkgJiBMaW5lQm94Q29udGFpbkJsb2NrKSkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gc3RkOjptYXg8TGF5b3V0VW5pdD4ocmVw bGFjZWRIZWlnaHQsIGxpbmVIZWlnaHQoaXNGaXJzdExpbmUsIGlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkgPyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9y TGluZUJveGVzKSk7Cit9CisKIGludCBSZW5kZXJCbG9jazo6Zmlyc3RMaW5lQm94QmFzZWxpbmUo KSBjb25zdAogewogICAgIGlmIChpc1dyaXRpbmdNb2RlUm9vdCgpICYmICFpc1J1YnlSdW4oKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggNWM2OGQ1YS4uNDViMGY0 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTExNSw2ICsxMTUs OCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IGxpbmVIZWlnaHQoYm9vbCBmaXJz dExpbmUsIExpbmVEaXJlY3Rpb25Nb2RlLCBMaW5lUG9zaXRpb25Nb2RlID0gUG9zaXRpb25PbkNv bnRhaW5pbmdMaW5lKSBjb25zdCBPVkVSUklERSBGSU5BTDsKICAgICB2aXJ0dWFsIGludCBiYXNl bGluZVBvc2l0aW9uKEZvbnRCYXNlbGluZSwgYm9vbCBmaXJzdExpbmUsIExpbmVEaXJlY3Rpb25N b2RlLCBMaW5lUG9zaXRpb25Nb2RlID0gUG9zaXRpb25PbkNvbnRhaW5pbmdMaW5lKSBjb25zdCBP VkVSUklERTsKIAorICAgIExheW91dFVuaXQgbWluTGluZUhlaWdodEZvclJlcGxhY2VkUmVuZGVy ZXIoYm9vbCBpc0ZpcnN0TGluZSwgTGF5b3V0VW5pdCByZXBsYWNlZEhlaWdodCkgY29uc3Q7CisK ICAgICBSZW5kZXJMaW5lQm94TGlzdCYgbGluZUJveGVzKCkgeyByZXR1cm4gbV9saW5lQm94ZXM7 IH0KICAgICBjb25zdCBSZW5kZXJMaW5lQm94TGlzdCYgbGluZUJveGVzKCkgY29uc3QgeyByZXR1 cm4gbV9saW5lQm94ZXM7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAppbmRleCA4NWQ5MWZmLi40OTY2NmQ4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAt NzUsOCArNzUsOSBAQCBTaGFwZUluc2lkZUluZm8qIFJlbmRlckJsb2NrOjpsYXlvdXRTaGFwZUlu c2lkZUluZm8oKSBjb25zdAogICAgIFNoYXBlSW5zaWRlSW5mbyogc2hhcGVJbnNpZGVJbmZvID0g dmlldygpLmxheW91dFN0YXRlKCktPnNoYXBlSW5zaWRlSW5mbygpOwogCiAgICAgaWYgKCFzaGFw ZUluc2lkZUluZm8gJiYgZmxvd1RocmVhZENvbnRhaW5pbmdCbG9jaygpICYmIGFsbG93c1NoYXBl SW5zaWRlSW5mb1NoYXJpbmcoKSkgeworICAgICAgICBMYXlvdXRVbml0IGxpbmVIZWlnaHQgPSB0 aGlzLT5saW5lSGVpZ2h0KGZhbHNlLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpv bnRhbExpbmUgOiBWZXJ0aWNhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyk7CiAg ICAgICAgIC8vIHJlZ2lvbkF0QmxvY2tPZmZzZXQgcmV0dXJucyByZWdpb25zIGxpa2UgYW4gYXJy YXkgZmlyc3Q9ezAsTi0xfSwgc2Vjb25kPXtOLE0tMX0sIC4uLgotICAgICAgICBMYXlvdXRVbml0 IG9mZnNldCA9IGxvZ2ljYWxIZWlnaHQoKSArIGxvZ2ljYWxIZWlnaHRGb3JMaW5lKHRoaXMsIGZh bHNlKSAtIExheW91dFVuaXQoMSk7CisgICAgICAgIExheW91dFVuaXQgb2Zmc2V0ID0gbG9naWNh bEhlaWdodCgpICsgbGluZUhlaWdodCAtIExheW91dFVuaXQoMSk7CiAgICAgICAgIFJlbmRlclJl Z2lvbiogcmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNldChvZmZzZXQpOwogICAgICAgICBpZiAo cmVnaW9uKQogICAgICAgICAgICAgc2hhcGVJbnNpZGVJbmZvID0gcmVnaW9uLT5zaGFwZUluc2lk ZUluZm8oKTsKQEAgLTc2OCw3ICs3NjksNyBAQCBzdGF0aWMgSW5kZW50VGV4dE9yTm90IHJlcXVp cmVzSW5kZW50KGJvb2wgaXNGaXJzdExpbmUsIGJvb2wgaXNBZnRlckhhcmRMaW5lQnJlYQogCiBz dGF0aWMgdm9pZCB1cGRhdGVMb2dpY2FsSW5saW5lUG9zaXRpb25zKFJlbmRlckJsb2NrKiBibG9j aywgZmxvYXQmIGxpbmVMb2dpY2FsTGVmdCwgZmxvYXQmIGxpbmVMb2dpY2FsUmlnaHQsIGZsb2F0 JiBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIGJvb2wgZmlyc3RMaW5lLCBJbmRlbnRUZXh0T3JOb3Qg c2hvdWxkSW5kZW50VGV4dCwgTGF5b3V0VW5pdCBib3hMb2dpY2FsSGVpZ2h0KQogewotICAgIExh eW91dFVuaXQgbGluZUxvZ2ljYWxIZWlnaHQgPSBsb2dpY2FsSGVpZ2h0Rm9yTGluZShibG9jaywg Zmlyc3RMaW5lLCBib3hMb2dpY2FsSGVpZ2h0KTsKKyAgICBMYXlvdXRVbml0IGxpbmVMb2dpY2Fs SGVpZ2h0ID0gYmxvY2stPm1pbkxpbmVIZWlnaHRGb3JSZXBsYWNlZFJlbmRlcmVyKGZpcnN0TGlu ZSwgYm94TG9naWNhbEhlaWdodCk7CiAgICAgbGluZUxvZ2ljYWxMZWZ0ID0gYmxvY2stPnBpeGVs U25hcHBlZExvZ2ljYWxMZWZ0T2Zmc2V0Rm9yTGluZShibG9jay0+bG9naWNhbEhlaWdodCgpLCBz aG91bGRJbmRlbnRUZXh0ID09IEluZGVudFRleHQsIGxpbmVMb2dpY2FsSGVpZ2h0KTsKICAgICBs aW5lTG9naWNhbFJpZ2h0ID0gYmxvY2stPnBpeGVsU25hcHBlZExvZ2ljYWxSaWdodE9mZnNldEZv ckxpbmUoYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSwgc2hvdWxkSW5kZW50VGV4dCA9PSBJbmRlbnRU ZXh0LCBsaW5lTG9naWNhbEhlaWdodCk7CiAgICAgYXZhaWxhYmxlTG9naWNhbFdpZHRoID0gbGlu ZUxvZ2ljYWxSaWdodCAtIGxpbmVMb2dpY2FsTGVmdDsKQEAgLTI1OTMsNyArMjU5NCw3IEBAIHN0 YXRpYyB2b2lkIHVwZGF0ZVNlZ21lbnRzRm9yU2hhcGVzKFJlbmRlckJsb2NrKiBibG9jaywgY29u c3QgRmxvYXRpbmdPYmplY3QqIGxhCiAgICAgQVNTRVJUKGxhc3RGbG9hdEZyb21QcmV2aW91c0xp bmUpOwogCiAgICAgU2hhcGVJbnNpZGVJbmZvKiBzaGFwZUluc2lkZUluZm8gPSBibG9jay0+bGF5 b3V0U2hhcGVJbnNpZGVJbmZvKCk7Ci0gICAgTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCA9 IGxvZ2ljYWxIZWlnaHRGb3JMaW5lKGJsb2NrLCBpc0ZpcnN0TGluZSk7CisgICAgTGF5b3V0VW5p dCBsaW5lTG9naWNhbEhlaWdodCA9IGJsb2NrLT5saW5lSGVpZ2h0KGlzRmlyc3RMaW5lLCBibG9j ay0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxM aW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94ZXMpOwogICAgIExheW91dFVuaXQgbGluZUxv Z2ljYWxCb3R0b20gPSBibG9jay0+bG9naWNhbEhlaWdodCgpICsgbGluZUxvZ2ljYWxIZWlnaHQ7 CiAgICAgYm9vbCBsaW5lT3ZlcmxhcHNXaXRoRmxvYXQgPSAobGFzdEZsb2F0RnJvbVByZXZpb3Vz TGluZS0+eSgpIDwgbGluZUxvZ2ljYWxCb3R0b20pICYmIChibG9jay0+bG9naWNhbEhlaWdodCgp IDwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZS0+bWF4WSgpKTsKIAo= 212212 2013-09-20 13:18:12 -0700 2013-09-20 13:52:38 -0700 updated to tot lineheight_5.patch text/plain 9513 zoltan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NmIyYTY0Li41ZTc5YzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTMtMDktMjAgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgTW92ZSBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBvdXQgb2YgTGluZVdpZHRoLmgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTU3NQorCisgICAg ICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0LgorCisgICAgICAgIEluIGJ1ZyAjMTIxMTA3IChy MTU1NTY1KSwgSSBtb3ZlZCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSBpbnRvIExpbmVXaWR0aC5oIGFz IHBhcnQgb2YgTGluZVdpZHRoCisgICAgICAgIHJlZmFjdG9yaW5nLiBMb2dpY2FsSGVpZ2h0Rm9y TGluZSB3aXRob3V0IHBhc3NpbmcgdGhlIHNlY29uZCBwYXJhbWV0ZXIgdXNlcyBSZW5kZXJCbG9j azo6bGluZUhlaWdodAorICAgICAgICBhbnl3YXksIGV4Y2VwdCBpdCBkb2Vzbid0IHRha2UgLWxp bmUtYm94LWNvbnRhaW4gQ1NTIHByb3BlcnR5IGludG8gYWNjb3VudC4gRm9yIFNoYXBlcyB3ZSBk b24ndAorICAgICAgICBoYXZlIGltcGxlbWVudGF0aW9uIGZvciB2YXJpYWJsZS1oZWlnaHQgbGlu ZXMgKGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTM2MSkgeWV0LCBz bworICAgICAgICBzbyBJIG1vZGlmaWVkIHRoZSBhZmZlY3RlZCBmdW5jdGlvbnMgdG8gY2FsbCBs aW5lSGVpZ2h0IGRpcmVjdGx5LiBJIHJlbmFtZWQgbG9naWNhbEhlaWdodEZvckxpbmUKKyAgICAg ICAgdG8gbWluTGluZUhlaWdodEZvclJlcGxhY2VkUmVuZGVyZXIsIGFuZCBJIG1hZGUgdGhlIHNl Y29uZCBwYXJhbWV0ZXIgYSBtYW5kYXRvcnkgZm9yIHRoYXQgZnVuY3Rpb24uCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcv TGluZVdpZHRoLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVXaWR0aDo6dXBkYXRlQXZhaWxh YmxlV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6TGluZVdpZHRoOjpzaHJpbmtBdmFpbGFibGVX aWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9MaW5lV2lkdGgu aDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOiBNb3ZlIHRoZSBkZWZpbml0 aW9uIGhlcmUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bWluTGluZUhlaWdodEZv clJlcGxhY2VkUmVuZGVyZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOiBN b3ZlIHRoZSBmdW5jdGlvbiBoZXJlIGFuZCByZW5hbWUgaXQuCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bGF5b3V0U2hhcGVJbnNpZGVJbmZvKToKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZUxvZ2lj YWxJbmxpbmVQb3NpdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6dXBkYXRlU2VnbWVudHNGb3JT aGFwZXMpOgorCiAyMDEzLTA5LTIwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBNb3ZlIGxheWVyIGhpZXJhcmNoeSBmdW5jdGlvbnMgZnJvbSBSZW5kZXJPYmpl Y3QgdG8gUmVuZGVyRWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0xpbmVXaWR0aC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmNwcApp bmRleCBiMzk2ZTA0Li4yZjdkNmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvTGluZVdpZHRoLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRo LmNwcApAQCAtNzIsNyArNzIsNyBAQCBib29sIExpbmVXaWR0aDo6Zml0c09uTGluZUV4Y2x1ZGlu Z1RyYWlsaW5nV2hpdGVzcGFjZShmbG9hdCBleHRyYSkgY29uc3QKIHZvaWQgTGluZVdpZHRoOjp1 cGRhdGVBdmFpbGFibGVXaWR0aChMYXlvdXRVbml0IHJlcGxhY2VkSGVpZ2h0KQogewogICAgIExh eW91dFVuaXQgaGVpZ2h0ID0gbV9ibG9jay5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgTGF5b3V0VW5p dCBsb2dpY2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdodEZvckxpbmUoJm1fYmxvY2ssIG1faXNGaXJz dExpbmUsIHJlcGxhY2VkSGVpZ2h0KTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQgPSBt X2Jsb2NrLm1pbkxpbmVIZWlnaHRGb3JSZXBsYWNlZFJlbmRlcmVyKG1faXNGaXJzdExpbmUsIHJl cGxhY2VkSGVpZ2h0KTsKICAgICBtX2xlZnQgPSBtX2Jsb2NrLmxvZ2ljYWxMZWZ0T2Zmc2V0Rm9y TGluZShoZWlnaHQsIHNob3VsZEluZGVudFRleHQoKSwgbG9naWNhbEhlaWdodCk7CiAgICAgbV9y aWdodCA9IG1fYmxvY2subG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShoZWlnaHQsIHNob3VsZElu ZGVudFRleHQoKSwgbG9naWNhbEhlaWdodCk7CiAKQEAgLTEwMiwxOSArMTAyLDIwIEBAIHZvaWQg TGluZVdpZHRoOjpzaHJpbmtBdmFpbGFibGVXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQoRmxvYXRp bmdPYmplY3QqIG5ld0Zsb2F0CiAgICAgY29uc3QgRmxvYXRpbmdPYmplY3RTZXQmIGZsb2F0aW5n T2JqZWN0U2V0ID0gbV9ibG9jay5tX2Zsb2F0aW5nT2JqZWN0cy0+c2V0KCk7CiAgICAgRmxvYXRp bmdPYmplY3RTZXRJdGVyYXRvciBpdCA9IGZsb2F0aW5nT2JqZWN0U2V0LmVuZCgpOwogICAgIEZs b2F0aW5nT2JqZWN0U2V0SXRlcmF0b3IgYmVnaW4gPSBmbG9hdGluZ09iamVjdFNldC5iZWdpbigp OworICAgIExheW91dFVuaXQgbGluZUhlaWdodCA9IG1fYmxvY2subGluZUhlaWdodChtX2lzRmly c3RMaW5lLCBtX2Jsb2NrLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsTGlu ZSA6IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVzKTsKICAgICBmb3Ig KC0taXQ7IGl0ICE9IGJlZ2luOyAtLWl0KSB7CiAgICAgICAgIEZsb2F0aW5nT2JqZWN0KiBwcmV2 aW91c0Zsb2F0ID0gKml0OwogICAgICAgICBpZiAocHJldmlvdXNGbG9hdCAhPSBuZXdGbG9hdCAm JiBwcmV2aW91c0Zsb2F0LT50eXBlKCkgPT0gbmV3RmxvYXQtPnR5cGUoKSkgewogICAgICAgICAg ICAgcHJldmlvdXNTaGFwZU91dHNpZGVJbmZvID0gcHJldmlvdXNGbG9hdC0+cmVuZGVyZXIoKS0+ c2hhcGVPdXRzaWRlSW5mbygpOwogICAgICAgICAgICAgaWYgKHByZXZpb3VzU2hhcGVPdXRzaWRl SW5mbykKLSAgICAgICAgICAgICAgICBwcmV2aW91c1NoYXBlT3V0c2lkZUluZm8tPnVwZGF0ZURl bHRhc0ZvckNvbnRhaW5pbmdCbG9ja0xpbmUoJm1fYmxvY2ssIHByZXZpb3VzRmxvYXQsIG1fYmxv Y2subG9naWNhbEhlaWdodCgpLCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSgmbV9ibG9jaywgbV9pc0Zp cnN0TGluZSkpOworICAgICAgICAgICAgICAgIHByZXZpb3VzU2hhcGVPdXRzaWRlSW5mby0+dXBk YXRlRGVsdGFzRm9yQ29udGFpbmluZ0Jsb2NrTGluZSgmbV9ibG9jaywgcHJldmlvdXNGbG9hdCwg bV9ibG9jay5sb2dpY2FsSGVpZ2h0KCksIGxpbmVIZWlnaHQpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICB9CiAKICAgICBTaGFwZU91dHNpZGVJbmZvKiBzaGFwZU91dHNpZGVJ bmZvID0gbmV3RmxvYXQtPnJlbmRlcmVyKCktPnNoYXBlT3V0c2lkZUluZm8oKTsKICAgICBpZiAo c2hhcGVPdXRzaWRlSW5mbykKLSAgICAgICAgc2hhcGVPdXRzaWRlSW5mby0+dXBkYXRlRGVsdGFz Rm9yQ29udGFpbmluZ0Jsb2NrTGluZSgmbV9ibG9jaywgbmV3RmxvYXQsIG1fYmxvY2subG9naWNh bEhlaWdodCgpLCBsb2dpY2FsSGVpZ2h0Rm9yTGluZSgmbV9ibG9jaywgbV9pc0ZpcnN0TGluZSkp OworICAgICAgICBzaGFwZU91dHNpZGVJbmZvLT51cGRhdGVEZWx0YXNGb3JDb250YWluaW5nQmxv Y2tMaW5lKCZtX2Jsb2NrLCBuZXdGbG9hdCwgbV9ibG9jay5sb2dpY2FsSGVpZ2h0KCksIGxpbmVI ZWlnaHQpOwogI2VuZGlmCiAKICAgICBpZiAobmV3RmxvYXQtPnR5cGUoKSA9PSBGbG9hdGluZ09i amVjdDo6RmxvYXRMZWZ0KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv TGluZVdpZHRoLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGluZVdpZHRoLmgKaW5kZXgg OGUxZDBmZS4uMmUzMjMyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xp bmVXaWR0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MaW5lV2lkdGguaApAQCAt MzcsMTcgKzM3LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBlbnVtIEluZGVudFRleHRPck5v dCB7IERvTm90SW5kZW50VGV4dCwgSW5kZW50VGV4dCB9OwogCi1pbmxpbmUgTGF5b3V0VW5pdCBs b2dpY2FsSGVpZ2h0Rm9yTGluZShjb25zdCBSZW5kZXJCbG9jayogYmxvY2ssIGJvb2wgaXNGaXJz dExpbmUsIExheW91dFVuaXQgcmVwbGFjZWRIZWlnaHQgPSAwKQotewotICAgIGlmICghYmxvY2st PmRvY3VtZW50KCkuaW5Ob1F1aXJrc01vZGUoKSAmJiByZXBsYWNlZEhlaWdodCkKLSAgICAgICAg cmV0dXJuIHJlcGxhY2VkSGVpZ2h0OwotCi0gICAgaWYgKCEoYmxvY2stPnN0eWxlKGlzRmlyc3RM aW5lKS0+bGluZUJveENvbnRhaW4oKSAmIExpbmVCb3hDb250YWluQmxvY2spKQotICAgICAgICBy ZXR1cm4gMDsKLQotICAgIHJldHVybiBzdGQ6Om1heDxMYXlvdXRVbml0PihyZXBsYWNlZEhlaWdo dCwgYmxvY2stPmxpbmVIZWlnaHQoaXNGaXJzdExpbmUsIGJsb2NrLT5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0aWNhbExpbmUsIFBvc2l0aW9uT2ZJbnRl cmlvckxpbmVCb3hlcykpOwotfQotCiBjbGFzcyBMaW5lV2lkdGggewogcHVibGljOgogICAgIExp bmVXaWR0aChSZW5kZXJCbG9jayYsIGJvb2wgaXNGaXJzdExpbmUsIEluZGVudFRleHRPck5vdCBz aG91bGRJbmRlbnRUZXh0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CmluZGV4IGUxZTZlN2MuLjViZGYxMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcApAQCAtNTY0Miw2ICs1NjQyLDE3IEBAIGludCBSZW5kZXJCbG9jazo6YmFzZWxp bmVQb3NpdGlvbihGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBib29sIGZpcnN0TGluZSwgTGlu CiAgICAgcmV0dXJuIGZvbnRNZXRyaWNzLmFzY2VudChiYXNlbGluZVR5cGUpICsgKGxpbmVIZWln aHQoZmlyc3RMaW5lLCBkaXJlY3Rpb24sIGxpbmVQb3NpdGlvbk1vZGUpIC0gZm9udE1ldHJpY3Mu aGVpZ2h0KCkpIC8gMjsKIH0KIAorTGF5b3V0VW5pdCBSZW5kZXJCbG9jazo6bWluTGluZUhlaWdo dEZvclJlcGxhY2VkUmVuZGVyZXIoYm9vbCBpc0ZpcnN0TGluZSwgTGF5b3V0VW5pdCByZXBsYWNl ZEhlaWdodCkgY29uc3QKK3sKKyAgICBpZiAoIWRvY3VtZW50KCkuaW5Ob1F1aXJrc01vZGUoKSAm JiByZXBsYWNlZEhlaWdodCkKKyAgICAgICAgcmV0dXJuIHJlcGxhY2VkSGVpZ2h0OworCisgICAg aWYgKCEoc3R5bGUoaXNGaXJzdExpbmUpLT5saW5lQm94Q29udGFpbigpICYgTGluZUJveENvbnRh aW5CbG9jaykpCisgICAgICAgIHJldHVybiAwOworCisgICAgcmV0dXJuIHN0ZDo6bWF4PExheW91 dFVuaXQ+KHJlcGxhY2VkSGVpZ2h0LCBsaW5lSGVpZ2h0KGlzRmlyc3RMaW5lLCBpc0hvcml6b250 YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0aWNhbExpbmUsIFBvc2l0aW9u T2ZJbnRlcmlvckxpbmVCb3hlcykpOworfQorCiBpbnQgUmVuZGVyQmxvY2s6OmZpcnN0TGluZUJv eEJhc2VsaW5lKCkgY29uc3QKIHsKICAgICBpZiAoaXNXcml0aW5nTW9kZVJvb3QoKSAmJiAhaXNS dWJ5UnVuKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCmluZGV4IDVjNjhk NWEuLjQ1YjBmNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCkBAIC0x MTUsNiArMTE1LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBsaW5lSGVpZ2h0 KGJvb2wgZmlyc3RMaW5lLCBMaW5lRGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0aW9uTW9kZSA9IFBv c2l0aW9uT25Db250YWluaW5nTGluZSkgY29uc3QgT1ZFUlJJREUgRklOQUw7CiAgICAgdmlydHVh bCBpbnQgYmFzZWxpbmVQb3NpdGlvbihGb250QmFzZWxpbmUsIGJvb2wgZmlyc3RMaW5lLCBMaW5l RGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0aW9uTW9kZSA9IFBvc2l0aW9uT25Db250YWluaW5nTGlu ZSkgY29uc3QgT1ZFUlJJREU7CiAKKyAgICBMYXlvdXRVbml0IG1pbkxpbmVIZWlnaHRGb3JSZXBs YWNlZFJlbmRlcmVyKGJvb2wgaXNGaXJzdExpbmUsIExheW91dFVuaXQgcmVwbGFjZWRIZWlnaHQp IGNvbnN0OworCiAgICAgUmVuZGVyTGluZUJveExpc3QmIGxpbmVCb3hlcygpIHsgcmV0dXJuIG1f bGluZUJveGVzOyB9CiAgICAgY29uc3QgUmVuZGVyTGluZUJveExpc3QmIGxpbmVCb3hlcygpIGNv bnN0IHsgcmV0dXJuIG1fbGluZUJveGVzOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKaW5kZXggODVkOTFmZi4uNDk2NjZkOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91 dC5jcHAKQEAgLTc1LDggKzc1LDkgQEAgU2hhcGVJbnNpZGVJbmZvKiBSZW5kZXJCbG9jazo6bGF5 b3V0U2hhcGVJbnNpZGVJbmZvKCkgY29uc3QKICAgICBTaGFwZUluc2lkZUluZm8qIHNoYXBlSW5z aWRlSW5mbyA9IHZpZXcoKS5sYXlvdXRTdGF0ZSgpLT5zaGFwZUluc2lkZUluZm8oKTsKIAogICAg IGlmICghc2hhcGVJbnNpZGVJbmZvICYmIGZsb3dUaHJlYWRDb250YWluaW5nQmxvY2soKSAmJiBh bGxvd3NTaGFwZUluc2lkZUluZm9TaGFyaW5nKCkpIHsKKyAgICAgICAgTGF5b3V0VW5pdCBsaW5l SGVpZ2h0ID0gdGhpcy0+bGluZUhlaWdodChmYWxzZSwgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxMaW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5l Qm94ZXMpOwogICAgICAgICAvLyByZWdpb25BdEJsb2NrT2Zmc2V0IHJldHVybnMgcmVnaW9ucyBs aWtlIGFuIGFycmF5IGZpcnN0PXswLE4tMX0sIHNlY29uZD17TixNLTF9LCAuLi4KLSAgICAgICAg TGF5b3V0VW5pdCBvZmZzZXQgPSBsb2dpY2FsSGVpZ2h0KCkgKyBsb2dpY2FsSGVpZ2h0Rm9yTGlu ZSh0aGlzLCBmYWxzZSkgLSBMYXlvdXRVbml0KDEpOworICAgICAgICBMYXlvdXRVbml0IG9mZnNl dCA9IGxvZ2ljYWxIZWlnaHQoKSArIGxpbmVIZWlnaHQgLSBMYXlvdXRVbml0KDEpOwogICAgICAg ICBSZW5kZXJSZWdpb24qIHJlZ2lvbiA9IHJlZ2lvbkF0QmxvY2tPZmZzZXQob2Zmc2V0KTsKICAg ICAgICAgaWYgKHJlZ2lvbikKICAgICAgICAgICAgIHNoYXBlSW5zaWRlSW5mbyA9IHJlZ2lvbi0+ c2hhcGVJbnNpZGVJbmZvKCk7CkBAIC03NjgsNyArNzY5LDcgQEAgc3RhdGljIEluZGVudFRleHRP ck5vdCByZXF1aXJlc0luZGVudChib29sIGlzRmlyc3RMaW5lLCBib29sIGlzQWZ0ZXJIYXJkTGlu ZUJyZWEKIAogc3RhdGljIHZvaWQgdXBkYXRlTG9naWNhbElubGluZVBvc2l0aW9ucyhSZW5kZXJC bG9jayogYmxvY2ssIGZsb2F0JiBsaW5lTG9naWNhbExlZnQsIGZsb2F0JiBsaW5lTG9naWNhbFJp Z2h0LCBmbG9hdCYgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBib29sIGZpcnN0TGluZSwgSW5kZW50 VGV4dE9yTm90IHNob3VsZEluZGVudFRleHQsIExheW91dFVuaXQgYm94TG9naWNhbEhlaWdodCkK IHsKLSAgICBMYXlvdXRVbml0IGxpbmVMb2dpY2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdodEZvckxp bmUoYmxvY2ssIGZpcnN0TGluZSwgYm94TG9naWNhbEhlaWdodCk7CisgICAgTGF5b3V0VW5pdCBs aW5lTG9naWNhbEhlaWdodCA9IGJsb2NrLT5taW5MaW5lSGVpZ2h0Rm9yUmVwbGFjZWRSZW5kZXJl cihmaXJzdExpbmUsIGJveExvZ2ljYWxIZWlnaHQpOwogICAgIGxpbmVMb2dpY2FsTGVmdCA9IGJs b2NrLT5waXhlbFNuYXBwZWRMb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoYmxvY2stPmxvZ2ljYWxI ZWlnaHQoKSwgc2hvdWxkSW5kZW50VGV4dCA9PSBJbmRlbnRUZXh0LCBsaW5lTG9naWNhbEhlaWdo dCk7CiAgICAgbGluZUxvZ2ljYWxSaWdodCA9IGJsb2NrLT5waXhlbFNuYXBwZWRMb2dpY2FsUmln aHRPZmZzZXRGb3JMaW5lKGJsb2NrLT5sb2dpY2FsSGVpZ2h0KCksIHNob3VsZEluZGVudFRleHQg PT0gSW5kZW50VGV4dCwgbGluZUxvZ2ljYWxIZWlnaHQpOwogICAgIGF2YWlsYWJsZUxvZ2ljYWxX aWR0aCA9IGxpbmVMb2dpY2FsUmlnaHQgLSBsaW5lTG9naWNhbExlZnQ7CkBAIC0yNTkzLDcgKzI1 OTQsNyBAQCBzdGF0aWMgdm9pZCB1cGRhdGVTZWdtZW50c0ZvclNoYXBlcyhSZW5kZXJCbG9jayog YmxvY2ssIGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBsYQogICAgIEFTU0VSVChsYXN0RmxvYXRGcm9t UHJldmlvdXNMaW5lKTsKIAogICAgIFNoYXBlSW5zaWRlSW5mbyogc2hhcGVJbnNpZGVJbmZvID0g YmxvY2stPmxheW91dFNoYXBlSW5zaWRlSW5mbygpOwotICAgIExheW91dFVuaXQgbGluZUxvZ2lj YWxIZWlnaHQgPSBsb2dpY2FsSGVpZ2h0Rm9yTGluZShibG9jaywgaXNGaXJzdExpbmUpOworICAg IExheW91dFVuaXQgbGluZUxvZ2ljYWxIZWlnaHQgPSBibG9jay0+bGluZUhlaWdodChpc0ZpcnN0 TGluZSwgYmxvY2stPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsTGluZSA6 IFZlcnRpY2FsTGluZSwgUG9zaXRpb25PZkludGVyaW9yTGluZUJveGVzKTsKICAgICBMYXlvdXRV bml0IGxpbmVMb2dpY2FsQm90dG9tID0gYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSArIGxpbmVMb2dp Y2FsSGVpZ2h0OwogICAgIGJvb2wgbGluZU92ZXJsYXBzV2l0aEZsb2F0ID0gKGxhc3RGbG9hdEZy b21QcmV2aW91c0xpbmUtPnkoKSA8IGxpbmVMb2dpY2FsQm90dG9tKSAmJiAoYmxvY2stPmxvZ2lj YWxIZWlnaHQoKSA8IGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUtPm1heFkoKSk7CiAK