139765 2014-12-17 22:18:00 -0800 Move 'font-weight' CSS property to the new StyleBuilder 2014-12-18 10:36:31 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez benjamin commit-queue kling koivisto sam oldest_to_newest 1056720 0 cdumez 2014-12-17 22:18:00 -0800 Move 'font-weight' CSS property to the new StyleBuilder. 1056721 1 243483 cdumez 2014-12-17 22:45:09 -0800 Created attachment 243483 Patch 1056723 2 243484 cdumez 2014-12-17 22:55:31 -0800 Created attachment 243484 Patch 1056784 3 243484 commit-queue 2014-12-18 08:47:48 -0800 Comment on attachment 243484 Patch Rejecting attachment 243484 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 243484, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: uzz 3. patching file Source/WebCore/css/CSSPropertyNames.in patching file Source/WebCore/css/DeprecatedStyleBuilder.cpp Hunk #1 succeeded at 503 (offset -11 lines). Hunk #2 FAILED at 690. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/css/DeprecatedStyleBuilder.cpp.rej patching file Source/WebCore/css/StyleBuilderCustom.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Antti Koivisto']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/6495677223796736 1056802 4 243497 cdumez 2014-12-18 10:01:56 -0800 Created attachment 243497 Patch 1056808 5 243497 commit-queue 2014-12-18 10:36:27 -0800 Comment on attachment 243497 Patch Clearing flags on attachment: 243497 Committed r177503: <http://trac.webkit.org/changeset/177503> 1056809 6 commit-queue 2014-12-18 10:36:31 -0800 All reviewed patches have been landed. Closing bug. 243483 2014-12-17 22:45:09 -0800 2014-12-17 22:55:27 -0800 Patch bug-139765-20141217224509.patch text/plain 7549 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTUyZTg3NDYzMTkzNWRi ZDM2OGU2ZWFiMDc1OGY3MDk5MWE2MzlhMy4uMDk1MTNkNmQ3MDY1ZGMyOWFiZTIzMjljNDBhMTNh Mjg0YzU3ZGFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnZm9udC13ZWlnaHQn IENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NzY1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSAnZm9udC13ZWlnaHQnIENTUyBwcm9w ZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlciBieSB1c2luZworICAgICAgICBjdXN0b20gY29k ZS4gQWxzbyBjbGVhbiB1cCB0aGUgY29kZSBieSBkcm9wcGluZyB1bm5lY2Vzc2FyeQorICAgICAg ICBpczxDU1NQcmltaXRpdmVWYWx1ZT4oKSBjaGVjayBhcyB3ZWxsIGFzIGR1cGxpY2F0ZSBzZXRX ZWlnaHQoKQorICAgICAgICBjYWxscy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2 aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAg ICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRl cHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAo V2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQ6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQ6OmNyZWF0ZUhhbmRsZXIp OiBEZWxldGVkLgorICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsRm9udFdlaWdodCk6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEZvbnRXZWln aHQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlRm9u dFdlaWdodCk6CisKIDIwMTQtMTItMTcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29t PgogCiAgICAgICAgIFJlZi1pZnkgUmFuZ2U6OmNyZWF0ZSgpLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UHJvcGVydHlOYW1lcy5pbgppbmRleCAwMDBlZGRiZTdhY2M1YmM1MzBkYjY3OGQwODQ5MWFmYWE1 ZTYzNzk2Li44MDU4MTRlYzNkNjQwNmFiZDkxYzc5YjhhODc1OGFmNWExNDg4MmJmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtNjgsNyArNjgsNyBAQCBmb250LWZh bWlseSBbSW5oZXJpdGVkLCBDdXN0b209QWxsXQogZm9udC1zaXplIFtJbmhlcml0ZWQsIExlZ2Fj eVN0eWxlQnVpbGRlcl0KIGZvbnQtc3R5bGUgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVy XQogZm9udC12YXJpYW50IFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KLWZvbnQtd2Vp Z2h0IFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KK2ZvbnQtd2VpZ2h0IFtJbmhlcml0 ZWQsIEN1c3RvbT1BbGxdCiB0ZXh0LXJlbmRlcmluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1 aWxkZXJdCiAtd2Via2l0LWZvbnQtZmVhdHVyZS1zZXR0aW5ncyBbSW5oZXJpdGVkLCBMZWdhY3lT dHlsZUJ1aWxkZXJdCiAtd2Via2l0LWZvbnQta2VybmluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHls ZUJ1aWxkZXJdCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxl QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5j cHAKaW5kZXggNzA4NWU0NWQ1NzVhY2Y0ZTRmZGViYTEwOWE4MmYyOGY0N2NlZDZlYS4uMDk1ODc2 MzY1ZDA0ZjcwOTMxZWVkODAwZTljNzBiZTRmZjAxYWE3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcApAQCAtNTE0LDM4ICs1MTQsNiBAQCBwdWJs aWM6CiAgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4g UHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAm YXBwbHlWYWx1ZSk7IH0KIH07CiAKLWNsYXNzIEFwcGx5UHJvcGVydHlGb250V2VpZ2h0IHsKLXB1 YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVz b2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlm ICghaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1By aW1pdGl2ZVZhbHVlPigqdmFsdWUpOwotICAgICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2Ny aXB0aW9uID0gc3R5bGVSZXNvbHZlci0+Zm9udERlc2NyaXB0aW9uKCk7Ci0gICAgICAgIHN3aXRj aCAocHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpKSB7Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVJ bnZhbGlkOgotICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICBi cmVhazsKLSAgICAgICAgY2FzZSBDU1NWYWx1ZUJvbGRlcjoKLSAgICAgICAgICAgIGZvbnREZXNj cmlwdGlvbi5zZXRXZWlnaHQoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+Zm9udERlc2Ny aXB0aW9uKCkud2VpZ2h0KCkpOwotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdo dChmb250RGVzY3JpcHRpb24uYm9sZGVyV2VpZ2h0KCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGNhc2UgQ1NTVmFsdWVMaWdodGVyOgotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9u LnNldFdlaWdodChzdHlsZVJlc29sdmVyLT5wYXJlbnRTdHlsZSgpLT5mb250RGVzY3JpcHRpb24o KS53ZWlnaHQoKSk7Ci0gICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KGZvbnRE ZXNjcmlwdGlvbi5saWdodGVyV2VpZ2h0KCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGRlZmF1bHQ6Ci0gICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KHByaW1pdGl2 ZVZhbHVlKTsKLSAgICAgICAgfQotICAgICAgICBzdHlsZVJlc29sdmVyLT5zZXRGb250RGVzY3Jp cHRpb24oZm9udERlc2NyaXB0aW9uKTsKLSAgICB9Ci0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxl ciBjcmVhdGVIYW5kbGVyKCkKLSAgICB7Ci0gICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVy ID0gQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udFdlaWdodCwgJkZvbnREZXNjcmlwdGlvbjo6d2VpZ2h0 LCAmRm9udERlc2NyaXB0aW9uOjpzZXRXZWlnaHQsIEZvbnRXZWlnaHROb3JtYWw+OjpjcmVhdGVI YW5kbGVyKCk7Ci0gICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoaGFuZGxlci5pbmhlcml0 RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rpb24oKSwgJmFwcGx5VmFsdWUpOwotICAg IH0KLX07Ci0KIGNsYXNzIEFwcGx5UHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcyB7CiBwdWJs aWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5 bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKQEAgLTczMyw3ICs3MDEsNiBAQCBEZXByZWNhdGVk U3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlGb250U2l6ZSwgQXBwbHlQcm9wZXJ0eUZvbnRTaXplOjpjcmVhdGVI YW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRTdHlsZSwg QXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udEl0YWxpYywgJkZvbnREZXNjcmlwdGlvbjo6aXRhbGljLCAm Rm9udERlc2NyaXB0aW9uOjpzZXRJdGFsaWMsIEZvbnRJdGFsaWNPZmY+OjpjcmVhdGVIYW5kbGVy KCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBBcHBs eVByb3BlcnR5Rm9udDxGb250U21hbGxDYXBzLCAmRm9udERlc2NyaXB0aW9uOjpzbWFsbENhcHMs ICZGb250RGVzY3JpcHRpb246OnNldFNtYWxsQ2FwcywgRm9udFNtYWxsQ2Fwc09mZj46OmNyZWF0 ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFdlaWdo dCwgQXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQ6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJv cGVydHlIYW5kbGVyKENTU1Byb3BlcnR5TGlzdFN0eWxlSW1hZ2UsIEFwcGx5UHJvcGVydHlTdHls ZUltYWdlPCZSZW5kZXJTdHlsZTo6bGlzdFN0eWxlSW1hZ2UsICZSZW5kZXJTdHlsZTo6c2V0TGlz dFN0eWxlSW1hZ2UsICZSZW5kZXJTdHlsZTo6aW5pdGlhbExpc3RTdHlsZUltYWdlLCBDU1NQcm9w ZXJ0eUxpc3RTdHlsZUltYWdlPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlPcnBoYW5zLCBBcHBseVByb3BlcnR5QXV0bzxzaG9ydCwgJlJlbmRl clN0eWxlOjpvcnBoYW5zLCAmUmVuZGVyU3R5bGU6OnNldE9ycGhhbnMsICZSZW5kZXJTdHlsZTo6 aGFzQXV0b09ycGhhbnMsICZSZW5kZXJTdHlsZTo6c2V0SGFzQXV0b09ycGhhbnM+OjpjcmVhdGVI YW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU91dGxpbmVDb2xv ciwgQXBwbHlQcm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJTdHlsZTo6 b3V0bGluZUNvbG9yLCAmUmVuZGVyU3R5bGU6OnNldE91dGxpbmVDb2xvciwgJlJlbmRlclN0eWxl OjpzZXRWaXNpdGVkTGlua091dGxpbmVDb2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0 ZUhhbmRsZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVy Q3VzdG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXgg NDgxYTMzN2M2YjAzNTRhZTY2NzY2NTU2MjhlNGUzYzg4YzJlYmM5NS4uYmQ3ZGUxNzQ2NmU3NTdl ODI1ZjkyOTM5MTdjMWJkNzExNTc0OGVhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlQnVpbGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxk ZXJDdXN0b20uaApAQCAtMTM5LDYgKzEzOSwxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQg YXBwbHlJbmhlcml0Q3Vyc29yKFN0eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgdm9pZCBhcHBs eVZhbHVlQ3Vyc29yKFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogCisgICAgc3RhdGljIHZv aWQgYXBwbHlJbml0aWFsRm9udFdlaWdodChTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIHZv aWQgYXBwbHlJbmhlcml0Rm9udFdlaWdodChTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIHZv aWQgYXBwbHlWYWx1ZUZvbnRXZWlnaHQoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CisKIHBy aXZhdGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3RpdmVab29tKFN0eWxlUmVzb2x2ZXIm KTsKICAgICBzdGF0aWMgQ1NTVG9MZW5ndGhDb252ZXJzaW9uRGF0YSBjc3N0b0xlbmd0aENvbnZl cnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKFN0eWxlUmVzb2x2ZXImKTsKQEAgLTExODEsNiAr MTE4NSw0MCBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDdXJz b3IoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQwogICAgIH0KIH0KIAoraW5saW5lIHZv aWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxGb250V2VpZ2h0KFN0eWxlUmVzb2x2 ZXImIHN0eWxlUmVzb2x2ZXIpCit7CisgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlv biA9IHN0eWxlUmVzb2x2ZXIuZm9udERlc2NyaXB0aW9uKCk7CisgICAgZm9udERlc2NyaXB0aW9u LnNldFdlaWdodChGb250V2VpZ2h0Tm9ybWFsKTsKKyAgICBzdHlsZVJlc29sdmVyLnNldEZvbnRE ZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOworfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxk ZXJDdXN0b206OmFwcGx5SW5oZXJpdEZvbnRXZWlnaHQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNv bHZlcikKK3sKKyAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNv bHZlci5mb250RGVzY3JpcHRpb24oKTsKKyAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KHN0 eWxlUmVzb2x2ZXIucGFyZW50Rm9udERlc2NyaXB0aW9uKCkud2VpZ2h0KCkpOworICAgIHN0eWxl UmVzb2x2ZXIuc2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Cit9CisKK2lubGlu ZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUZvbnRXZWlnaHQoU3R5bGVSZXNv bHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQoreworICAgIGF1dG8mIHByaW1p dGl2ZVZhbHVlID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKTsKKyAgICBGb250 RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci5mb250RGVzY3JpcHRp b24oKTsKKyAgICBzd2l0Y2ggKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSkgeworICAgIGNh c2UgQ1NTVmFsdWVJbnZhbGlkOgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBDU1NWYWx1ZUJvbGRlcjoKKyAgICAgICAgZm9udERlc2NyaXB0 aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24uYm9sZGVyV2VpZ2h0KCkpOworICAgICAgICBi cmVhazsKKyAgICBjYXNlIENTU1ZhbHVlTGlnaHRlcjoKKyAgICAgICAgZm9udERlc2NyaXB0aW9u LnNldFdlaWdodChmb250RGVzY3JpcHRpb24ubGlnaHRlcldlaWdodCgpKTsKKyAgICAgICAgYnJl YWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChwcmlt aXRpdmVWYWx1ZSk7CisgICAgfQorICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2NyaXB0aW9u KGZvbnREZXNjcmlwdGlvbik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlm IC8vIFN0eWxlQnVpbGRlckN1c3RvbV9oCg== 243484 2014-12-17 22:55:31 -0800 2014-12-18 10:01:52 -0800 Patch bug-139765-20141217225531.patch text/plain 7600 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTUyZTg3NDYzMTkzNWRi ZDM2OGU2ZWFiMDc1OGY3MDk5MWE2MzlhMy4uOGUxYmVjZmU0MTQ3Y2RhMTI1OTMxYTVlZjBlZDAw ZDIwMzJhNTY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnZm9udC13ZWlnaHQn IENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NzY1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSAnZm9udC13ZWlnaHQnIENTUyBwcm9w ZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlciBieSB1c2luZworICAgICAgICBjdXN0b20gY29k ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAg ICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5 bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6 OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0 eUZvbnRXZWlnaHQ6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBw bHlQcm9wZXJ0eUZvbnRXZWlnaHQ6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAgICAgICAq IGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRl ckN1c3RvbTo6YXBwbHlJbml0aWFsRm9udFdlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEZvbnRXZWlnaHQpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlRm9udFdlaWdodCk6CisKIDIwMTQtMTIt MTcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZi1pZnkg UmFuZ2U6OmNyZWF0ZSgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3Bl cnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRl eCAwMDBlZGRiZTdhY2M1YmM1MzBkYjY3OGQwODQ5MWFmYWE1ZTYzNzk2Li44MDU4MTRlYzNkNjQw NmFiZDkxYzc5YjhhODc1OGFmNWExNDg4MmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUHJvcGVydHlOYW1lcy5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVy dHlOYW1lcy5pbgpAQCAtNjgsNyArNjgsNyBAQCBmb250LWZhbWlseSBbSW5oZXJpdGVkLCBDdXN0 b209QWxsXQogZm9udC1zaXplIFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KIGZvbnQt c3R5bGUgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQogZm9udC12YXJpYW50IFtJbmhl cml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KLWZvbnQtd2VpZ2h0IFtJbmhlcml0ZWQsIExlZ2Fj eVN0eWxlQnVpbGRlcl0KK2ZvbnQtd2VpZ2h0IFtJbmhlcml0ZWQsIEN1c3RvbT1BbGxdCiB0ZXh0 LXJlbmRlcmluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCiAtd2Via2l0LWZvbnQt ZmVhdHVyZS1zZXR0aW5ncyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCiAtd2Via2l0 LWZvbnQta2VybmluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKaW5kZXggNzA4NWU0NWQ1NzVh Y2Y0ZTRmZGViYTEwOWE4MmYyOGY0N2NlZDZlYS4uMDk1ODc2MzY1ZDA0ZjcwOTMxZWVkODAwZTlj NzBiZTRmZjAxYWE3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRT dHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVC dWlsZGVyLmNwcApAQCAtNTE0LDM4ICs1MTQsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFByb3Bl cnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBs eUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KIH07CiAK LWNsYXNzIEFwcGx5UHJvcGVydHlGb250V2VpZ2h0IHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9p ZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIs IENTU1ZhbHVlKiB2YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFs dWU+KCp2YWx1ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIENTU1ByaW1pdGl2ZVZh bHVlJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUp OwotICAgICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZl ci0+Zm9udERlc2NyaXB0aW9uKCk7Ci0gICAgICAgIHN3aXRjaCAocHJpbWl0aXZlVmFsdWUuZ2V0 VmFsdWVJRCgpKSB7Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVJbnZhbGlkOgotICAgICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBD U1NWYWx1ZUJvbGRlcjoKLSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoc3R5 bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKS0+Zm9udERlc2NyaXB0aW9uKCkud2VpZ2h0KCkpOwot ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24uYm9s ZGVyV2VpZ2h0KCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVM aWdodGVyOgotICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChzdHlsZVJlc29s dmVyLT5wYXJlbnRTdHlsZSgpLT5mb250RGVzY3JpcHRpb24oKS53ZWlnaHQoKSk7Ci0gICAgICAg ICAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KGZvbnREZXNjcmlwdGlvbi5saWdodGVyV2Vp Z2h0KCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAg ICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KHByaW1pdGl2ZVZhbHVlKTsKLSAgICAgICAgfQot ICAgICAgICBzdHlsZVJlc29sdmVyLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9u KTsKLSAgICB9Ci0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkKLSAg ICB7Ci0gICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0gQXBwbHlQcm9wZXJ0eUZvbnQ8 Rm9udFdlaWdodCwgJkZvbnREZXNjcmlwdGlvbjo6d2VpZ2h0LCAmRm9udERlc2NyaXB0aW9uOjpz ZXRXZWlnaHQsIEZvbnRXZWlnaHROb3JtYWw+OjpjcmVhdGVIYW5kbGVyKCk7Ci0gICAgICAgIHJl dHVybiBQcm9wZXJ0eUhhbmRsZXIoaGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5p bml0aWFsRnVuY3Rpb24oKSwgJmFwcGx5VmFsdWUpOwotICAgIH0KLX07Ci0KIGNsYXNzIEFwcGx5 UHJvcGVydHlGb250VmFyaWFudExpZ2F0dXJlcyB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQg YXBwbHlJbmhlcml0VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNv bHZlcikKQEAgLTczMyw3ICs3MDEsNiBAQCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNh dGVkU3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlGb250 U2l6ZSwgQXBwbHlQcm9wZXJ0eUZvbnRTaXplOjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRTdHlsZSwgQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9u dEl0YWxpYywgJkZvbnREZXNjcmlwdGlvbjo6aXRhbGljLCAmRm9udERlc2NyaXB0aW9uOjpzZXRJ dGFsaWMsIEZvbnRJdGFsaWNPZmY+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBBcHBseVByb3BlcnR5Rm9udDxGb250U21h bGxDYXBzLCAmRm9udERlc2NyaXB0aW9uOjpzbWFsbENhcHMsICZGb250RGVzY3JpcHRpb246OnNl dFNtYWxsQ2FwcywgRm9udFNtYWxsQ2Fwc09mZj46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFdlaWdodCwgQXBwbHlQcm9wZXJ0eUZvbnRX ZWlnaHQ6OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5TGlzdFN0eWxlSW1hZ2UsIEFwcGx5UHJvcGVydHlTdHlsZUltYWdlPCZSZW5kZXJTdHlsZTo6 bGlzdFN0eWxlSW1hZ2UsICZSZW5kZXJTdHlsZTo6c2V0TGlzdFN0eWxlSW1hZ2UsICZSZW5kZXJT dHlsZTo6aW5pdGlhbExpc3RTdHlsZUltYWdlLCBDU1NQcm9wZXJ0eUxpc3RTdHlsZUltYWdlPjo6 Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlPcnBo YW5zLCBBcHBseVByb3BlcnR5QXV0bzxzaG9ydCwgJlJlbmRlclN0eWxlOjpvcnBoYW5zLCAmUmVu ZGVyU3R5bGU6OnNldE9ycGhhbnMsICZSZW5kZXJTdHlsZTo6aGFzQXV0b09ycGhhbnMsICZSZW5k ZXJTdHlsZTo6c2V0SGFzQXV0b09ycGhhbnM+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eU91dGxpbmVDb2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9y PE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJTdHlsZTo6b3V0bGluZUNvbG9yLCAmUmVuZGVy U3R5bGU6OnNldE91dGxpbmVDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRWaXNpdGVkTGlua091dGxp bmVDb2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmggYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXggNDgxYTMzN2M2YjAzNTRhZTY2NzY2 NTU2MjhlNGUzYzg4YzJlYmM5NS4uMjkyMTc1Y2U1MDljNTA2OThiN2RiYzk4MDVjZTQ1OTk3ZTY5 NDdkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaApAQCAtMTM5LDYg KzEzOSwxMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Q3Vyc29yKFN0 eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlQ3Vyc29yKFN0eWxlUmVz b2x2ZXImLCBDU1NWYWx1ZSYpOwogCisgICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsRm9udFdl aWdodChTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Rm9udFdl aWdodChTdHlsZVJlc29sdmVyJik7CisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUZvbnRXZWln aHQoU3R5bGVSZXNvbHZlciYsIENTU1ZhbHVlJik7CisKIHByaXZhdGU6CiAgICAgc3RhdGljIHZv aWQgcmVzZXRFZmZlY3RpdmVab29tKFN0eWxlUmVzb2x2ZXImKTsKICAgICBzdGF0aWMgQ1NTVG9M ZW5ndGhDb252ZXJzaW9uRGF0YSBjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29t RmFjdG9yKFN0eWxlUmVzb2x2ZXImKTsKQEAgLTExODEsNiArMTE4NSw0MiBAQCBpbmxpbmUgdm9p ZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVDdXJzb3IoU3R5bGVSZXNvbHZlciYgc3R5 bGVSZXNvbHZlciwgQwogICAgIH0KIH0KIAoraW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9t OjphcHBseUluaXRpYWxGb250V2VpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpCit7 CisgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIuZm9u dERlc2NyaXB0aW9uKCk7CisgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChGb250V2VpZ2h0 Tm9ybWFsKTsKKyAgICBzdHlsZVJlc29sdmVyLnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3Jp cHRpb24pOworfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJp dEZvbnRXZWlnaHQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKK3sKKyAgICBGb250RGVz Y3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci5mb250RGVzY3JpcHRpb24o KTsKKyAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KHN0eWxlUmVzb2x2ZXIucGFyZW50Rm9u dERlc2NyaXB0aW9uKCkud2VpZ2h0KCkpOworICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2Ny aXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Cit9CisKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1 c3RvbTo6YXBwbHlWYWx1ZUZvbnRXZWlnaHQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwg Q1NTVmFsdWUmIHZhbHVlKQoreworICAgIGF1dG8mIHByaW1pdGl2ZVZhbHVlID0gZG93bmNhc3Q8 Q1NTUHJpbWl0aXZlVmFsdWU+KHZhbHVlKTsKKyAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2Ny aXB0aW9uID0gc3R5bGVSZXNvbHZlci5mb250RGVzY3JpcHRpb24oKTsKKyAgICBzd2l0Y2ggKHBy aW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSkgeworICAgIGNhc2UgQ1NTVmFsdWVJbnZhbGlkOgor ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBD U1NWYWx1ZUJvbGRlcjoKKyAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChzdHlsZVJl c29sdmVyLnBhcmVudFN0eWxlKCktPmZvbnREZXNjcmlwdGlvbigpLndlaWdodCgpKTsKKyAgICAg ICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24uYm9sZGVyV2VpZ2h0 KCkpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIENTU1ZhbHVlTGlnaHRlcjoKKyAgICAgICAg Zm9udERlc2NyaXB0aW9uLnNldFdlaWdodChzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPmZv bnREZXNjcmlwdGlvbigpLndlaWdodCgpKTsKKyAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdl aWdodChmb250RGVzY3JpcHRpb24ubGlnaHRlcldlaWdodCgpKTsKKyAgICAgICAgYnJlYWs7Cisg ICAgZGVmYXVsdDoKKyAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChwcmltaXRpdmVW YWx1ZSk7CisgICAgfQorICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERlc2NyaXB0aW9uKGZvbnRE ZXNjcmlwdGlvbik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFN0 eWxlQnVpbGRlckN1c3RvbV9oCg== 243497 2014-12-18 10:01:56 -0800 2014-12-18 10:36:27 -0800 Patch bug-139765-20141218100200.patch text/plain 7691 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI2MTAxODQ0OGUxYmRj ZTAyNTI3MDQ0ZTQ0ZjcyMzgyMDNmYjY3MC4uN2MzZDljMmExNTNlMWE5ZDA1ODU1OGNmMzY2YjE1 YTM3Y2Q2MzNkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTEyLTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnZm9udC13ZWlnaHQn IENTUyBwcm9wZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NzY1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgTW92ZSAnZm9udC13ZWlnaHQnIENTUyBwcm9w ZXJ0eSB0byB0aGUgbmV3IFN0eWxlQnVpbGRlciBieSB1c2luZworICAgICAgICBjdXN0b20gY29k ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAg ICAqIGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5 bGVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6 OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0 eUZvbnRXZWlnaHQ6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBw bHlQcm9wZXJ0eUZvbnRXZWlnaHQ6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAgICAgICAq IGNzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRl ckN1c3RvbTo6YXBwbHlJbml0aWFsRm9udFdlaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpTdHls ZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdEZvbnRXZWlnaHQpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlRm9udFdlaWdodCk6CisKIDIwMTQtMTIt MTggIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CiAKICAg ICAgICAgSW50ZXJuYWxzIG1ldGhvZHMgcmV0dXJuIDAgaW5zdGVhZCBvZiBmYWxzZSB3aGVuIHRo ZXkgZmFpbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMu aW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCA3OTAyMTll YjgwNDFhYTFhMTg2ODhiMTQ5Mjg1N2YzNWQyNDUwOTE5Li41ZmIxYThiYjJkOWJhYjRjOTQ4OTc4 MjliMzIzMmVjN2FmMGE2MDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJv cGVydHlOYW1lcy5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5p bgpAQCAtNjgsNyArNjgsNyBAQCBmb250LWZhbWlseSBbSW5oZXJpdGVkLCBDdXN0b209QWxsXQog Zm9udC1zaXplIFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRlcl0KIGZvbnQtc3R5bGUgW0lu aGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVyXQogZm9udC12YXJpYW50IFtJbmhlcml0ZWQsIExl Z2FjeVN0eWxlQnVpbGRlcl0KLWZvbnQtd2VpZ2h0IFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVp bGRlcl0KK2ZvbnQtd2VpZ2h0IFtJbmhlcml0ZWQsIEN1c3RvbT1BbGxdCiB0ZXh0LXJlbmRlcmlu ZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCiAtd2Via2l0LWZvbnQtZmVhdHVyZS1z ZXR0aW5ncyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCiAtd2Via2l0LWZvbnQta2Vy bmluZyBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKaW5kZXggNjZjZmVhOTUyZjhjNWFkNmUzYjNj ZjZmZGJiY2MyMzY0ZmE5NDU5Mi4uYTc3ZTM1YWVjYzk1MWFjN2YzZWFhOTFkNTkzNzY1ZTM0Yjdh OThhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNw cApAQCAtNTAzLDM4ICs1MDMsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFByb3BlcnR5SGFuZGxl ciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRW YWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KIH07CiAKLWNsYXNzIEFw cGx5UHJvcGVydHlGb250V2VpZ2h0IHsKLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBhcHBseVZh bHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVl KiB2YWx1ZSkKLSAgICB7Ci0gICAgICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1 ZSkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlJiBwcmlt aXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqdmFsdWUpOwotICAgICAg ICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uID0gc3R5bGVSZXNvbHZlci0+Zm9udERl c2NyaXB0aW9uKCk7Ci0gICAgICAgIHN3aXRjaCAocHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgp KSB7Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVJbnZhbGlkOgotICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBDU1NWYWx1ZUJv bGRlcjoKLSAgICAgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoc3R5bGVSZXNvbHZl ci0+cGFyZW50U3R5bGUoKS0+Zm9udERlc2NyaXB0aW9uKCkud2VpZ2h0KCkpOwotICAgICAgICAg ICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChmb250RGVzY3JpcHRpb24uYm9sZGVyV2VpZ2h0 KCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVMaWdodGVyOgot ICAgICAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChzdHlsZVJlc29sdmVyLT5wYXJl bnRTdHlsZSgpLT5mb250RGVzY3JpcHRpb24oKS53ZWlnaHQoKSk7Ci0gICAgICAgICAgICBmb250 RGVzY3JpcHRpb24uc2V0V2VpZ2h0KGZvbnREZXNjcmlwdGlvbi5saWdodGVyV2VpZ2h0KCkpOwot ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBmb250RGVz Y3JpcHRpb24uc2V0V2VpZ2h0KHByaW1pdGl2ZVZhbHVlKTsKLSAgICAgICAgfQotICAgICAgICBz dHlsZVJlc29sdmVyLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKLSAgICB9 Ci0gICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkKLSAgICB7Ci0gICAg ICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0gQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udFdlaWdo dCwgJkZvbnREZXNjcmlwdGlvbjo6d2VpZ2h0LCAmRm9udERlc2NyaXB0aW9uOjpzZXRXZWlnaHQs IEZvbnRXZWlnaHROb3JtYWw+OjpjcmVhdGVIYW5kbGVyKCk7Ci0gICAgICAgIHJldHVybiBQcm9w ZXJ0eUhhbmRsZXIoaGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVu Y3Rpb24oKSwgJmFwcGx5VmFsdWUpOwotICAgIH0KLX07Ci0KIGNsYXNzIEFwcGx5UHJvcGVydHlG b250VmFyaWFudExpZ2F0dXJlcyB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhl cml0VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKQEAg LTcyMiw3ICs2OTAsNiBAQCBEZXByZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVC dWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlGb250U2l6ZSwgQXBw bHlQcm9wZXJ0eUZvbnRTaXplOjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFu ZGxlcihDU1NQcm9wZXJ0eUZvbnRTdHlsZSwgQXBwbHlQcm9wZXJ0eUZvbnQ8Rm9udEl0YWxpYywg JkZvbnREZXNjcmlwdGlvbjo6aXRhbGljLCAmRm9udERlc2NyaXB0aW9uOjpzZXRJdGFsaWMsIEZv bnRJdGFsaWNPZmY+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihD U1NQcm9wZXJ0eUZvbnRWYXJpYW50LCBBcHBseVByb3BlcnR5Rm9udDxGb250U21hbGxDYXBzLCAm Rm9udERlc2NyaXB0aW9uOjpzbWFsbENhcHMsICZGb250RGVzY3JpcHRpb246OnNldFNtYWxsQ2Fw cywgRm9udFNtYWxsQ2Fwc09mZj46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5Rm9udFdlaWdodCwgQXBwbHlQcm9wZXJ0eUZvbnRXZWlnaHQ6OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5T3JwaGFu cywgQXBwbHlQcm9wZXJ0eUF1dG88c2hvcnQsICZSZW5kZXJTdHlsZTo6b3JwaGFucywgJlJlbmRl clN0eWxlOjpzZXRPcnBoYW5zLCAmUmVuZGVyU3R5bGU6Omhhc0F1dG9PcnBoYW5zLCAmUmVuZGVy U3R5bGU6OnNldEhhc0F1dG9PcnBoYW5zPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlPdXRsaW5lQ29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxO b0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6Om91dGxpbmVDb2xvciwgJlJlbmRlclN0 eWxlOjpzZXRPdXRsaW5lQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtPdXRsaW5l Q29sb3IsICZSZW5kZXJTdHlsZTo6Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uQ29sb3IsIEFwcGx5 UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6OnRleHREZWNv cmF0aW9uQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VGV4dERlY29yYXRpb25Db2xvciwgJlJlbmRl clN0eWxlOjpzZXRWaXNpdGVkTGlua1RleHREZWNvcmF0aW9uQ29sb3IsICZSZW5kZXJTdHlsZTo6 Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlQnVpbGRlckN1c3RvbS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1 c3RvbS5oCmluZGV4IDQ4MWEzMzdjNmIwMzU0YWU2Njc2NjU1NjI4ZTRlM2M4OGMyZWJjOTUuLjI5 MjE3NWNlNTA5YzUwNjk4YjdkYmM5ODA1Y2U0NTk5N2U2OTQ3ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKQEAgLTEzOSw2ICsxMzksMTAgQEAgcHVibGljOgogICAg IHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdEN1cnNvcihTdHlsZVJlc29sdmVyJik7CiAgICAgc3Rh dGljIHZvaWQgYXBwbHlWYWx1ZUN1cnNvcihTdHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKIAor ICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbEZvbnRXZWlnaHQoU3R5bGVSZXNvbHZlciYpOwor ICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdEZvbnRXZWlnaHQoU3R5bGVSZXNvbHZlciYpOwor ICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWVGb250V2VpZ2h0KFN0eWxlUmVzb2x2ZXImLCBDU1NW YWx1ZSYpOworCiBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIHJlc2V0RWZmZWN0aXZlWm9vbShT dHlsZVJlc29sdmVyJik7CiAgICAgc3RhdGljIENTU1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEgY3Nz dG9MZW5ndGhDb252ZXJzaW9uRGF0YVdpdGhUZXh0Wm9vbUZhY3RvcihTdHlsZVJlc29sdmVyJik7 CkBAIC0xMTgxLDYgKzExODUsNDIgQEAgaW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjph cHBseVZhbHVlQ3Vyc29yKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIEMKICAgICB9CiB9 CiAKK2lubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbml0aWFsRm9udFdlaWdo dChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQoreworICAgIEZvbnREZXNjcmlwdGlvbiBm b250RGVzY3JpcHRpb24gPSBzdHlsZVJlc29sdmVyLmZvbnREZXNjcmlwdGlvbigpOworICAgIGZv bnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoRm9udFdlaWdodE5vcm1hbCk7CisgICAgc3R5bGVSZXNv bHZlci5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKK30KKworaW5saW5lIHZv aWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseUluaGVyaXRGb250V2VpZ2h0KFN0eWxlUmVzb2x2 ZXImIHN0eWxlUmVzb2x2ZXIpCit7CisgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlv biA9IHN0eWxlUmVzb2x2ZXIuZm9udERlc2NyaXB0aW9uKCk7CisgICAgZm9udERlc2NyaXB0aW9u LnNldFdlaWdodChzdHlsZVJlc29sdmVyLnBhcmVudEZvbnREZXNjcmlwdGlvbigpLndlaWdodCgp KTsKKyAgICBzdHlsZVJlc29sdmVyLnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24p OworfQorCitpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVGb250V2Vp Z2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkKK3sKKyAg ICBhdXRvJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1 ZSk7CisgICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IHN0eWxlUmVzb2x2ZXIu Zm9udERlc2NyaXB0aW9uKCk7CisgICAgc3dpdGNoIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlE KCkpIHsKKyAgICBjYXNlIENTU1ZhbHVlSW52YWxpZDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTVmFsdWVCb2xkZXI6CisgICAgICAg IGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoc3R5bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpLT5m b250RGVzY3JpcHRpb24oKS53ZWlnaHQoKSk7CisgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRX ZWlnaHQoZm9udERlc2NyaXB0aW9uLmJvbGRlcldlaWdodCgpKTsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBDU1NWYWx1ZUxpZ2h0ZXI6CisgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWln aHQoc3R5bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpLT5mb250RGVzY3JpcHRpb24oKS53ZWlnaHQo KSk7CisgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRXZWlnaHQoZm9udERlc2NyaXB0aW9uLmxp Z2h0ZXJXZWlnaHQoKSk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGZv bnREZXNjcmlwdGlvbi5zZXRXZWlnaHQocHJpbWl0aXZlVmFsdWUpOworICAgIH0KKyAgICBzdHls ZVJlc29sdmVyLnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOworfQorCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBTdHlsZUJ1aWxkZXJDdXN0b21faAo=