97360 2012-09-21 13:53:57 -0700 [Chromium][Mac] Remove loadFont from PlatformSupport 2012-09-24 16:57:11 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 82948 1 pilgrim pilgrim abarth cc-bugs eric fishd haraken jamesr webkit.review.bot oldest_to_newest 725782 0 pilgrim 2012-09-21 13:53:57 -0700 [Chromium][Mac] Remove loadFont from PlatformSupport 725786 1 165184 pilgrim 2012-09-21 13:56:19 -0700 Created attachment 165184 Patch 725796 2 webkit.review.bot 2012-09-21 13:59:00 -0700 Attachment 165184 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebKit/chromium/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] Source/WebCore/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 725801 3 pilgrim 2012-09-21 14:03:43 -0700 I have many words for you, WebKit Style Guidelines. None are appropriate in mixed company. 725804 4 eric 2012-09-21 14:06:20 -0700 Are you using webkit-patch upload? It would warn you about these before uploading the patch? Or you can run check-webkit-style manually 725968 5 abarth 2012-09-21 16:46:14 -0700 Maybe it checks style before you author the change log? 725972 6 165184 abarth 2012-09-21 16:48:19 -0700 Comment on attachment 165184 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165184&action=review > Source/WebCore/platform/chromium/PlatformSupport.h:94 > #if OS(DARWIN) > - static bool loadFont(NSFont* srcFont, CGFontRef*, uint32_t* fontID); > #elif OS(UNIX) Should we clean up this ifdef? > Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:126 > + WebKit::WebSandboxSupport* ss = WebKit::Platform::current()->sandboxSupport(); ss -> sandboxSupport (please use complete words in variable names) > Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:128 > + if (!ss) > + return 0; Should we add an ASSERT_NOT_REACHED here like the old code had? 726002 7 165233 pilgrim 2012-09-21 17:34:59 -0700 Created attachment 165233 Patch 726003 8 165233 pilgrim 2012-09-21 17:35:37 -0700 Comment on attachment 165233 Patch Style nits addressed. abarth's suggestions implemented. 726020 9 165233 webkit.review.bot 2012-09-21 18:27:14 -0700 Comment on attachment 165233 Patch Rejecting attachment 165233 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: rejects to file Source/WebCore/platform/chromium/PlatformSupport.h.rej patching file Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm patching file Source/WebKit/chromium/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/chromium/src/PlatformSupport.cpp Hunk #1 succeeded at 218 with fuzz 2. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Adam Barth']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/13950846 726037 10 165242 pilgrim 2012-09-21 20:24:41 -0700 Created attachment 165242 Patch 726038 11 165242 pilgrim 2012-09-21 20:25:00 -0700 Comment on attachment 165242 Patch Repatched to ToT. 726824 12 165242 abarth 2012-09-24 10:44:46 -0700 Comment on attachment 165242 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165242&action=review > Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm:130 > + // This function should only be called in response to an error loading a > + // font due to being blocked by the sandbox. > + // This by definition shouldn't happen if there is no sandbox support. Looks like these should be indented one more space, right? 726827 13 165242 abarth 2012-09-24 10:45:15 -0700 Comment on attachment 165242 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165242&action=review > Source/WebKit/chromium/src/PlatformSupport.cpp:220 > #if OS(DARWIN) This ifdef doesn't seem to be needed anymore since none of the cases do anything. ;) 727062 14 165461 pilgrim 2012-09-24 16:13:07 -0700 Created attachment 165461 Patch 727063 15 165461 pilgrim 2012-09-24 16:13:26 -0700 Comment on attachment 165461 Patch Nits addressed. 727087 16 165461 webkit.review.bot 2012-09-24 16:57:07 -0700 Comment on attachment 165461 Patch Clearing flags on attachment: 165461 Committed r129429: <http://trac.webkit.org/changeset/129429> 727088 17 webkit.review.bot 2012-09-24 16:57:11 -0700 All reviewed patches have been landed. Closing bug. 165184 2012-09-21 13:56:19 -0700 2012-09-21 17:34:55 -0700 Patch bug-97360-20120921165542.patch text/plain 4664 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTIxICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dW01hY10g UmVtb3ZlIGxvYWRGb250IGZyb20gUGxhdGZvcm1TdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzM2MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisJUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmllcy4gU2VlIHRy YWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3Jt U3VwcG9ydC5oOgorICAgICAgICAoUGxhdGZvcm1TdXBwb3J0KToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKwogMjAxMi0w OS0yMSAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBkaWdpYS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyOTI0OC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCShyZXZpc2lvbiAx MjkyNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBv cnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDksMTUgKzQ5LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgTlBP YmplY3QgTlBPYmplY3Q7CiB0eXBlZGVmIHN0cnVjdCBfTlBQIE5QUF90OwogdHlwZWRlZiBOUFBf dCogTlBQOwogCi0jaWYgT1MoREFSV0lOKQotdHlwZWRlZiBzdHJ1Y3QgQ0dGb250KiBDR0ZvbnRS ZWY7Ci0jaWZkZWYgX19PQkpDX18KLUBjbGFzcyBOU0ZvbnQ7Ci0jZWxzZQotY2xhc3MgTlNGb250 OwotI2VuZGlmCi0jZW5kaWYgLy8gT1MoREFSV0lOKQotCiAjaWYgT1MoV0lORE9XUykKIHR5cGVk ZWYgc3RydWN0IEhGT05UX18qIEhGT05UOwogI2VuZGlmCkBAIC0xMDAsNyArOTEsNiBAQCBwdWJs aWM6CiAgICAgc3RhdGljIGJvb2wgZW5zdXJlRm9udExvYWRlZChIRk9OVCk7CiAjZW5kaWYKICNp ZiBPUyhEQVJXSU4pCi0gICAgc3RhdGljIGJvb2wgbG9hZEZvbnQoTlNGb250KiBzcmNGb250LCBD R0ZvbnRSZWYqLCB1aW50MzJfdCogZm9udElEKTsKICNlbGlmIE9TKFVOSVgpCiAgICAgc3RydWN0 IEZvbnRGYW1pbHkgewogICAgICAgICBTdHJpbmcgbmFtZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Ny b3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1tCShyZXZpc2lvbiAxMjkyNDQpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5t bQkod29ya2luZyBjb3B5KQpAQCAtMzAsOCArMzAsMTAgQEAKICNpbXBvcnQgIkNyb3NzUHJvY2Vz c0ZvbnRMb2FkaW5nLmgiCiAKICNpbXBvcnQgIi4uL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEu aCIKLSNpbXBvcnQgIlBsYXRmb3JtU3VwcG9ydC5oIgorI2luY2x1ZGUgIkxpbmtIYXNoLmgiCiAj aW1wb3J0IDxBcHBLaXQvTlNGb250Lmg+CisjaW1wb3J0IDxwdWJsaWMvUGxhdGZvcm0uaD4KKyNp bXBvcnQgPHB1YmxpYy9tYWMvV2ViU2FuZGJveFN1cHBvcnQuaD4KICNpbXBvcnQgPHd0Zi9IYXNo TWFwLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEyMSw3ICsxMjMsMTAgQEAgUGFzc1Jl ZlB0cjxNZW1vcnlBY3RpdmF0ZWRGb250PiBsb2FkRm9udAogICAgIENHRm9udFJlZiB0bXBDR0Zv bnQ7CiAgICAgdWludDMyX3QgZm9udElEOwogICAgIC8vIFNlbmQgY3Jvc3MtcHJvY2VzcyByZXF1 ZXN0IHRvIGxvYWQgZm9udC4KLSAgICBpZiAoIVBsYXRmb3JtU3VwcG9ydDo6bG9hZEZvbnQobnNG b250LCAmdG1wQ0dGb250LCAmZm9udElEKSkKKyAgICBXZWJLaXQ6OldlYlNhbmRib3hTdXBwb3J0 KiBzcyA9IFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+c2FuZGJveFN1cHBvcnQoKTsKKyAg ICBpZiAoIXNzKQorICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAoIXNzLT5sb2FkRm9udChuc0Zv bnQsICZ0bXBDR0ZvbnQsICZmb250SUQpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIFJldGFp blB0cjxDR0ZvbnRSZWY+IGNnRm9udCh0bXBDR0ZvbnQpOwpAQCAtMTI5LDcgKzEzNCw3IEBAIFBh c3NSZWZQdHI8TWVtb3J5QWN0aXZhdGVkRm9udD4gbG9hZEZvbnQKICAgICAvLyB0aGUgSUQgY2Fj aGUuCiAgICAgZm9udCA9IGZvbnRDYWNoZUJ5Rm9udElEKCkuZ2V0KGZvbnRJRCk7CiAgICAgaWYg KGZvbnQpCi0gICAgICAgIC8vIEZJWE1FOiBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRGb250KCkgc2hv dWxkIGNvbnN1bHQgdGhlIGlkIGNhY2hlCisgICAgICAgIC8vIEZJWE1FOiBXZWJTYW5kYm94U3Vw cG9ydDo6bG9hZEZvbnQoKSBzaG91bGQgY29uc3VsdCB0aGUgaWQgY2FjaGUKICAgICAgICAgLy8g YmVmb3JlIGFjdGl2YXRpbmcgdGhlIGZvbnQuCiAgICAgICAgIHJldHVybiBmb250OwogCkluZGV4 OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTI5MjUwKQorKysgU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAor MjAxMi0wOS0yMSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgW0Nocm9taXVtXVtNYWNdIFJlbW92ZSBsb2FkRm9udCBmcm9tIFBsYXRmb3JtU3VwcG9ydAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTczNjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCVBhcnQgb2YgYSByZWZhY3Rv cmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAgKiBzcmMvUGxh dGZvcm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA5LTIxICBEYW5h IEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQWRk IHNldHRlcnMgdG8gV2ViRmlsdGVyT3BlcmF0aW9uIGZvciBJUEMgcGlja2xpbmcKSW5kZXg6IFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkocmV2aXNp b24gMTI5MjQ0KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE4LDIwICsyMTgsNiBAQCBib29sIFBsYXRmb3JtU3Vw cG9ydDo6ZW5zdXJlRm9udExvYWRlZChICiAjZW5kaWYKIAogI2lmIE9TKERBUldJTikKLWJvb2wg UGxhdGZvcm1TdXBwb3J0Ojpsb2FkRm9udChOU0ZvbnQqIHNyY0ZvbnQsIENHRm9udFJlZiogb3V0 LCB1aW50MzJfdCogZm9udElEKQotewotICAgIFdlYlNhbmRib3hTdXBwb3J0KiBzcyA9IFdlYktp dDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+c2FuZGJveFN1cHBvcnQoKTsKLSAgICBpZiAoc3MpCi0g ICAgICAgIHJldHVybiBzcy0+bG9hZEZvbnQoc3JjRm9udCwgb3V0LCBmb250SUQpOwotCi0gICAg Ly8gVGhpcyBmdW5jdGlvbiBzaG91bGQgb25seSBiZSBjYWxsZWQgaW4gcmVzcG9uc2UgdG8gYW4g ZXJyb3IgbG9hZGluZyBhCi0gICAgLy8gZm9udCBkdWUgdG8gYmVpbmcgYmxvY2tlZCBieSB0aGUg c2FuZGJveC4KLSAgICAvLyBUaGlzIGJ5IGRlZmluaXRpb24gc2hvdWxkbid0IGhhcHBlbiBpZiB0 aGVyZSBpcyBubyBzYW5kYm94IHN1cHBvcnQuCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0g ICAgKm91dCA9IDA7Ci0gICAgKmZvbnRJRCA9IDA7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQogI2Vs aWYgT1MoVU5JWCkKIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFj dGVycyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0 IGNoYXIqIHByZWZlcnJlZExvY2FsZSwgRm9udEZhbWlseSogZmFtaWx5KQogewo= 165233 2012-09-21 17:34:59 -0700 2012-09-21 20:24:38 -0700 Patch bug-97360-20120921203422.patch text/plain 5060 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTIxICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dW01hY10g UmVtb3ZlIGxvYWRGb250IGZyb20gUGxhdGZvcm1TdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzM2MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgYSByZWZhY3RvcmluZyBzZXJpZXMu IFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9Q bGF0Zm9ybVN1cHBvcnQuaDoKKyAgICAgICAgKFBsYXRmb3JtU3VwcG9ydCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ3Jvc3NQcm9jZXNzRm9udExvYWRpbmcubW06CisK IDIwMTItMDktMjEgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5AZGlnaWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjkyNDguCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9QbGF0Zm9ybVN1cHBvcnQuaAkocmV2 aXNpb24gMTI5MjQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZv cm1TdXBwb3J0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDE1ICs0OSw2IEBAIHR5cGVkZWYgc3Ry dWN0IE5QT2JqZWN0IE5QT2JqZWN0OwogdHlwZWRlZiBzdHJ1Y3QgX05QUCBOUFBfdDsKIHR5cGVk ZWYgTlBQX3QqIE5QUDsKIAotI2lmIE9TKERBUldJTikKLXR5cGVkZWYgc3RydWN0IENHRm9udCog Q0dGb250UmVmOwotI2lmZGVmIF9fT0JKQ19fCi1AY2xhc3MgTlNGb250OwotI2Vsc2UKLWNsYXNz IE5TRm9udDsKLSNlbmRpZgotI2VuZGlmIC8vIE9TKERBUldJTikKLQogI2lmIE9TKFdJTkRPV1Mp CiB0eXBlZGVmIHN0cnVjdCBIRk9OVF9fKiBIRk9OVDsKICNlbmRpZgpAQCAtOTgsOSArODksNiBA QCBwdWJsaWM6CiAgICAgLy8gRm9udCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICNpZiBPUyhXSU5ET1dTKQogICAgIHN0YXRp YyBib29sIGVuc3VyZUZvbnRMb2FkZWQoSEZPTlQpOwotI2VuZGlmCi0jaWYgT1MoREFSV0lOKQot ICAgIHN0YXRpYyBib29sIGxvYWRGb250KE5TRm9udCogc3JjRm9udCwgQ0dGb250UmVmKiwgdWlu dDMyX3QqIGZvbnRJRCk7CiAjZWxpZiBPUyhVTklYKQogICAgIHN0cnVjdCBGb250RmFtaWx5IHsK ICAgICAgICAgU3RyaW5nIG5hbWU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250 TG9hZGluZy5tbQkocmV2aXNpb24gMTI5MjQ0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ3Jvc3NQcm9jZXNzRm9udExvYWRpbmcubW0JKHdvcmtpbmcgY29w eSkKQEAgLTMwLDggKzMwLDEwIEBACiAjaW1wb3J0ICJDcm9zc1Byb2Nlc3NGb250TG9hZGluZy5o IgogCiAjaW1wb3J0ICIuLi9ncmFwaGljcy9Gb250UGxhdGZvcm1EYXRhLmgiCi0jaW1wb3J0ICJQ bGF0Zm9ybVN1cHBvcnQuaCIKKyNpbmNsdWRlICJMaW5rSGFzaC5oIgogI2ltcG9ydCA8QXBwS2l0 L05TRm9udC5oPgorI2ltcG9ydCA8cHVibGljL1BsYXRmb3JtLmg+CisjaW1wb3J0IDxwdWJsaWMv bWFjL1dlYlNhbmRib3hTdXBwb3J0Lmg+CiAjaW1wb3J0IDx3dGYvSGFzaE1hcC5oPgogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CkBAIC0xMjEsNyArMTIzLDE1IEBAIFBhc3NSZWZQdHI8TWVtb3J5QWN0 aXZhdGVkRm9udD4gbG9hZEZvbnQKICAgICBDR0ZvbnRSZWYgdG1wQ0dGb250OwogICAgIHVpbnQz Ml90IGZvbnRJRDsKICAgICAvLyBTZW5kIGNyb3NzLXByb2Nlc3MgcmVxdWVzdCB0byBsb2FkIGZv bnQuCi0gICAgaWYgKCFQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRGb250KG5zRm9udCwgJnRtcENHRm9u dCwgJmZvbnRJRCkpCisgICAgV2ViS2l0OjpXZWJTYW5kYm94U3VwcG9ydCogc2FuZGJveFN1cHBv cnQgPSBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPnNhbmRib3hTdXBwb3J0KCk7CisgICAg aWYgKCFzYW5kYm94U3VwcG9ydCkgeworICAgICAgIC8vIFRoaXMgZnVuY3Rpb24gc2hvdWxkIG9u bHkgYmUgY2FsbGVkIGluIHJlc3BvbnNlIHRvIGFuIGVycm9yIGxvYWRpbmcgYQorICAgICAgIC8v IGZvbnQgZHVlIHRvIGJlaW5nIGJsb2NrZWQgYnkgdGhlIHNhbmRib3guCisgICAgICAgLy8gVGhp cyBieSBkZWZpbml0aW9uIHNob3VsZG4ndCBoYXBwZW4gaWYgdGhlcmUgaXMgbm8gc2FuZGJveCBz dXBwb3J0LgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIDA7 CisgICAgfQorICAgIGlmICghc2FuZGJveFN1cHBvcnQtPmxvYWRGb250KG5zRm9udCwgJnRtcENH Rm9udCwgJmZvbnRJRCkpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgUmV0YWluUHRyPENHRm9u dFJlZj4gY2dGb250KHRtcENHRm9udCk7CkBAIC0xMjksNyArMTM5LDcgQEAgUGFzc1JlZlB0cjxN ZW1vcnlBY3RpdmF0ZWRGb250PiBsb2FkRm9udAogICAgIC8vIHRoZSBJRCBjYWNoZS4KICAgICBm b250ID0gZm9udENhY2hlQnlGb250SUQoKS5nZXQoZm9udElEKTsKICAgICBpZiAoZm9udCkKLSAg ICAgICAgLy8gRklYTUU6IFBsYXRmb3JtU3VwcG9ydDo6bG9hZEZvbnQoKSBzaG91bGQgY29uc3Vs dCB0aGUgaWQgY2FjaGUKKyAgICAgICAgLy8gRklYTUU6IFdlYlNhbmRib3hTdXBwb3J0Ojpsb2Fk Rm9udCgpIHNob3VsZCBjb25zdWx0IHRoZSBpZCBjYWNoZQogICAgICAgICAvLyBiZWZvcmUgYWN0 aXZhdGluZyB0aGUgZm9udC4KICAgICAgICAgcmV0dXJuIGZvbnQ7CiAKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjkyNTApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA5LTIx ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21p dW1dW01hY10gUmVtb3ZlIGxvYWRGb250IGZyb20gUGxhdGZvcm1TdXBwb3J0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzM2MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgYSByZWZhY3Rvcmlu ZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAgKiBzcmMvUGxhdGZv cm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA5LTIxICBEYW5hIEph bnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gQWRkIHNl dHRlcnMgdG8gV2ViRmlsdGVyT3BlcmF0aW9uIGZvciBJUEMgcGlja2xpbmcKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkocmV2aXNpb24g MTI5MjQ0KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjE4LDIwICsyMTgsNiBAQCBib29sIFBsYXRmb3JtU3VwcG9y dDo6ZW5zdXJlRm9udExvYWRlZChICiAjZW5kaWYKIAogI2lmIE9TKERBUldJTikKLWJvb2wgUGxh dGZvcm1TdXBwb3J0Ojpsb2FkRm9udChOU0ZvbnQqIHNyY0ZvbnQsIENHRm9udFJlZiogb3V0LCB1 aW50MzJfdCogZm9udElEKQotewotICAgIFdlYlNhbmRib3hTdXBwb3J0KiBzcyA9IFdlYktpdDo6 UGxhdGZvcm06OmN1cnJlbnQoKS0+c2FuZGJveFN1cHBvcnQoKTsKLSAgICBpZiAoc3MpCi0gICAg ICAgIHJldHVybiBzcy0+bG9hZEZvbnQoc3JjRm9udCwgb3V0LCBmb250SUQpOwotCi0gICAgLy8g VGhpcyBmdW5jdGlvbiBzaG91bGQgb25seSBiZSBjYWxsZWQgaW4gcmVzcG9uc2UgdG8gYW4gZXJy b3IgbG9hZGluZyBhCi0gICAgLy8gZm9udCBkdWUgdG8gYmVpbmcgYmxvY2tlZCBieSB0aGUgc2Fu ZGJveC4KLSAgICAvLyBUaGlzIGJ5IGRlZmluaXRpb24gc2hvdWxkbid0IGhhcHBlbiBpZiB0aGVy ZSBpcyBubyBzYW5kYm94IHN1cHBvcnQuCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg Km91dCA9IDA7Ci0gICAgKmZvbnRJRCA9IDA7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQogI2VsaWYg T1MoVU5JWCkKIHZvaWQgUGxhdGZvcm1TdXBwb3J0OjpnZXRGb250RmFtaWx5Rm9yQ2hhcmFjdGVy cyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IG51bUNoYXJhY3RlcnMsIGNvbnN0IGNo YXIqIHByZWZlcnJlZExvY2FsZSwgRm9udEZhbWlseSogZmFtaWx5KQogewo= 165242 2012-09-21 20:24:41 -0700 2012-09-24 16:13:03 -0700 Patch bug-97360-20120921232405.patch text/plain 4921 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTI5MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTIxICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dW01hY10g UmVtb3ZlIGxvYWRGb250IGZyb20gUGxhdGZvcm1TdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzM2MAorCisgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmllcy4gU2Vl IHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRm b3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxhdGZvcm1TdXBwb3J0KToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKwogMjAx Mi0wOS0yMSAgQWRhbSBLbGVpbiAgPGFkYW1rQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1v dmUgYm9ndXMgYXNzZXJ0aW9ucyBmcm9tIENoaWxkTGlzdE11dGF0aW9uU2NvcGUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5o CShyZXZpc2lvbiAxMjkyOTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Q bGF0Zm9ybVN1cHBvcnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDksMTUgKzQ5LDYgQEAgdHlwZWRl ZiBzdHJ1Y3QgTlBPYmplY3QgTlBPYmplY3Q7CiB0eXBlZGVmIHN0cnVjdCBfTlBQIE5QUF90Owog dHlwZWRlZiBOUFBfdCogTlBQOwogCi0jaWYgT1MoREFSV0lOKQotdHlwZWRlZiBzdHJ1Y3QgQ0dG b250KiBDR0ZvbnRSZWY7Ci0jaWZkZWYgX19PQkpDX18KLUBjbGFzcyBOU0ZvbnQ7Ci0jZWxzZQot Y2xhc3MgTlNGb250OwotI2VuZGlmCi0jZW5kaWYgLy8gT1MoREFSV0lOKQotCiAjaWYgT1MoV0lO RE9XUykKIHR5cGVkZWYgc3RydWN0IEhGT05UX18qIEhGT05UOwogI2VuZGlmCkBAIC05OSw5ICs5 MCw2IEBAIHB1YmxpYzoKICNpZiBPUyhXSU5ET1dTKQogICAgIHN0YXRpYyBib29sIGVuc3VyZUZv bnRMb2FkZWQoSEZPTlQpOwogI2VuZGlmCi0jaWYgT1MoREFSV0lOKQotICAgIHN0YXRpYyBib29s IGxvYWRGb250KE5TRm9udCogc3JjRm9udCwgQ0dGb250UmVmKiwgdWludDMyX3QqIGZvbnRJRCk7 Ci0jZW5kaWYKIAogICAgIC8vIEluZGV4ZWREQiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SURC RmFjdG9yeUJhY2tlbmRJbnRlcmZhY2U+IGlkYkZhY3RvcnkoKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1tCShyZXZpc2lvbiAxMjkyOTMpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGlu Zy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAsOCArMzAsMTAgQEAKICNpbXBvcnQgIkNyb3NzUHJv Y2Vzc0ZvbnRMb2FkaW5nLmgiCiAKICNpbXBvcnQgIi4uL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURh dGEuaCIKLSNpbXBvcnQgIlBsYXRmb3JtU3VwcG9ydC5oIgorI2luY2x1ZGUgIkxpbmtIYXNoLmgi CiAjaW1wb3J0IDxBcHBLaXQvTlNGb250Lmg+CisjaW1wb3J0IDxwdWJsaWMvUGxhdGZvcm0uaD4K KyNpbXBvcnQgPHB1YmxpYy9tYWMvV2ViU2FuZGJveFN1cHBvcnQuaD4KICNpbXBvcnQgPHd0Zi9I YXNoTWFwLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEyMSw3ICsxMjMsMTUgQEAgUGFz c1JlZlB0cjxNZW1vcnlBY3RpdmF0ZWRGb250PiBsb2FkRm9udAogICAgIENHRm9udFJlZiB0bXBD R0ZvbnQ7CiAgICAgdWludDMyX3QgZm9udElEOwogICAgIC8vIFNlbmQgY3Jvc3MtcHJvY2VzcyBy ZXF1ZXN0IHRvIGxvYWQgZm9udC4KLSAgICBpZiAoIVBsYXRmb3JtU3VwcG9ydDo6bG9hZEZvbnQo bnNGb250LCAmdG1wQ0dGb250LCAmZm9udElEKSkKKyAgICBXZWJLaXQ6OldlYlNhbmRib3hTdXBw b3J0KiBzYW5kYm94U3VwcG9ydCA9IFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+c2FuZGJv eFN1cHBvcnQoKTsKKyAgICBpZiAoIXNhbmRib3hTdXBwb3J0KSB7CisgICAgICAgLy8gVGhpcyBm dW5jdGlvbiBzaG91bGQgb25seSBiZSBjYWxsZWQgaW4gcmVzcG9uc2UgdG8gYW4gZXJyb3IgbG9h ZGluZyBhCisgICAgICAgLy8gZm9udCBkdWUgdG8gYmVpbmcgYmxvY2tlZCBieSB0aGUgc2FuZGJv eC4KKyAgICAgICAvLyBUaGlzIGJ5IGRlZmluaXRpb24gc2hvdWxkbid0IGhhcHBlbiBpZiB0aGVy ZSBpcyBubyBzYW5kYm94IHN1cHBvcnQuCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICByZXR1cm4gMDsKKyAgICB9CisgICAgaWYgKCFzYW5kYm94U3VwcG9ydC0+bG9hZEZv bnQobnNGb250LCAmdG1wQ0dGb250LCAmZm9udElEKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAg ICBSZXRhaW5QdHI8Q0dGb250UmVmPiBjZ0ZvbnQodG1wQ0dGb250KTsKQEAgLTEyOSw3ICsxMzks NyBAQCBQYXNzUmVmUHRyPE1lbW9yeUFjdGl2YXRlZEZvbnQ+IGxvYWRGb250CiAgICAgLy8gdGhl IElEIGNhY2hlLgogICAgIGZvbnQgPSBmb250Q2FjaGVCeUZvbnRJRCgpLmdldChmb250SUQpOwog ICAgIGlmIChmb250KQotICAgICAgICAvLyBGSVhNRTogUGxhdGZvcm1TdXBwb3J0Ojpsb2FkRm9u dCgpIHNob3VsZCBjb25zdWx0IHRoZSBpZCBjYWNoZQorICAgICAgICAvLyBGSVhNRTogV2ViU2Fu ZGJveFN1cHBvcnQ6OmxvYWRGb250KCkgc2hvdWxkIGNvbnN1bHQgdGhlIGlkIGNhY2hlCiAgICAg ICAgIC8vIGJlZm9yZSBhY3RpdmF0aW5nIHRoZSBmb250LgogICAgICAgICByZXR1cm4gZm9udDsK IApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTI5MykKKysrIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTItMDktMjEgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFtDaHJvbWl1bV1bTWFjXSBSZW1vdmUgbG9hZEZvbnQgZnJvbSBQbGF0Zm9ybVN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3 MzYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBQYXJ0IG9m IGEgcmVmYWN0b3Jpbmcgc2VyaWVzLiBTZWUgdHJhY2tpbmcgYnVnIDgyOTQ4LgorCisgICAgICAg ICogc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0w OS0yMSAgS2VuaWNoaSBJc2hpYmFzaGkgIDxiYXNoaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg W0Nocm9taXVtXSBVc2UgT3BlblR5cGVWZXJ0aWNhbERhdGEgb24gTGludXgKSW5kZXg6IFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAkocmV2aXNpb24g MTI5MjkzKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjE4LDIwICsyMTgsNiBAQCBib29sIFBsYXRmb3JtU3VwcG9y dDo6ZW5zdXJlRm9udExvYWRlZChICiAjZW5kaWYKIAogI2lmIE9TKERBUldJTikKLWJvb2wgUGxh dGZvcm1TdXBwb3J0Ojpsb2FkRm9udChOU0ZvbnQqIHNyY0ZvbnQsIENHRm9udFJlZiogb3V0LCB1 aW50MzJfdCogZm9udElEKQotewotICAgIFdlYlNhbmRib3hTdXBwb3J0KiBzcyA9IFdlYktpdDo6 UGxhdGZvcm06OmN1cnJlbnQoKS0+c2FuZGJveFN1cHBvcnQoKTsKLSAgICBpZiAoc3MpCi0gICAg ICAgIHJldHVybiBzcy0+bG9hZEZvbnQoc3JjRm9udCwgb3V0LCBmb250SUQpOwotCi0gICAgLy8g VGhpcyBmdW5jdGlvbiBzaG91bGQgb25seSBiZSBjYWxsZWQgaW4gcmVzcG9uc2UgdG8gYW4gZXJy b3IgbG9hZGluZyBhCi0gICAgLy8gZm9udCBkdWUgdG8gYmVpbmcgYmxvY2tlZCBieSB0aGUgc2Fu ZGJveC4KLSAgICAvLyBUaGlzIGJ5IGRlZmluaXRpb24gc2hvdWxkbid0IGhhcHBlbiBpZiB0aGVy ZSBpcyBubyBzYW5kYm94IHN1cHBvcnQuCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg Km91dCA9IDA7Ci0gICAgKmZvbnRJRCA9IDA7Ci0gICAgcmV0dXJuIGZhbHNlOwotfQogI2VsaWYg T1MoVU5JWCkKICNlbmRpZgogCg== 165461 2012-09-24 16:13:07 -0700 2012-09-24 16:57:07 -0700 Patch bug-97360-20120924191228.patch text/plain 5103 pilgrim SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTQyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA5LTIxICBNYXJrIFBp bGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dW01hY10g UmVtb3ZlIGxvYWRGb250IGZyb20gUGxhdGZvcm1TdXBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NzM2MAorCisgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCisKKyAgICAgICAgUGFydCBvZiBhIHJlZmFjdG9yaW5nIHNlcmllcy4gU2Vl IHRyYWNraW5nIGJ1ZyA4Mjk0OC4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRm b3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxhdGZvcm1TdXBwb3J0KToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Dcm9zc1Byb2Nlc3NGb250TG9hZGluZy5tbToKKwogMjAx Mi0wOS0yMSAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgW1Y4 XSBBcnJheUJ1ZmZlciBjb2RlIHNob3VsZCBub3QgcGFzcyBhIG5lZ2F0aXZlIGxlbmd0aCB0byBT ZXRJbmRleGVkUHJvcGVydGllc1RvRXh0ZXJuYWxBcnJheURhdGEoKQpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgJKHJldmlz aW9uIDEyOTQyNSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3Jt U3VwcG9ydC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSwxNSArNDksNiBAQCB0eXBlZGVmIHN0cnVj dCBOUE9iamVjdCBOUE9iamVjdDsKIHR5cGVkZWYgc3RydWN0IF9OUFAgTlBQX3Q7CiB0eXBlZGVm IE5QUF90KiBOUFA7CiAKLSNpZiBPUyhEQVJXSU4pCi10eXBlZGVmIHN0cnVjdCBDR0ZvbnQqIENH Rm9udFJlZjsKLSNpZmRlZiBfX09CSkNfXwotQGNsYXNzIE5TRm9udDsKLSNlbHNlCi1jbGFzcyBO U0ZvbnQ7Ci0jZW5kaWYKLSNlbmRpZiAvLyBPUyhEQVJXSU4pCi0KICNpZiBPUyhXSU5ET1dTKQog dHlwZWRlZiBzdHJ1Y3QgSEZPTlRfXyogSEZPTlQ7CiAjZW5kaWYKQEAgLTk5LDkgKzkwLDYgQEAg cHVibGljOgogI2lmIE9TKFdJTkRPV1MpCiAgICAgc3RhdGljIGJvb2wgZW5zdXJlRm9udExvYWRl ZChIRk9OVCk7CiAjZW5kaWYKLSNpZiBPUyhEQVJXSU4pCi0gICAgc3RhdGljIGJvb2wgbG9hZEZv bnQoTlNGb250KiBzcmNGb250LCBDR0ZvbnRSZWYqLCB1aW50MzJfdCogZm9udElEKTsKLSNlbmRp ZgogCiAgICAgLy8gSW5kZXhlZERCIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJREJGYWN0b3J5 QmFja2VuZEludGVyZmFjZT4gaWRiRmFjdG9yeSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ3Jvc3NQcm9jZXNzRm9udExvYWRpbmcubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ3Jvc3NQ cm9jZXNzRm9udExvYWRpbmcubW0JKHJldmlzaW9uIDEyOTQyNSkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Nyb3NzUHJvY2Vzc0ZvbnRMb2FkaW5nLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0zMCw4ICszMCwxMCBAQAogI2ltcG9ydCAiQ3Jvc3NQcm9jZXNzRm9u dExvYWRpbmcuaCIKIAogI2ltcG9ydCAiLi4vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oIgot I2ltcG9ydCAiUGxhdGZvcm1TdXBwb3J0LmgiCisjaW5jbHVkZSAiTGlua0hhc2guaCIKICNpbXBv cnQgPEFwcEtpdC9OU0ZvbnQuaD4KKyNpbXBvcnQgPHB1YmxpYy9QbGF0Zm9ybS5oPgorI2ltcG9y dCA8cHVibGljL21hYy9XZWJTYW5kYm94U3VwcG9ydC5oPgogI2ltcG9ydCA8d3RmL0hhc2hNYXAu aD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMTIxLDcgKzEyMywxNSBAQCBQYXNzUmVmUHRy PE1lbW9yeUFjdGl2YXRlZEZvbnQ+IGxvYWRGb250CiAgICAgQ0dGb250UmVmIHRtcENHRm9udDsK ICAgICB1aW50MzJfdCBmb250SUQ7CiAgICAgLy8gU2VuZCBjcm9zcy1wcm9jZXNzIHJlcXVlc3Qg dG8gbG9hZCBmb250LgotICAgIGlmICghUGxhdGZvcm1TdXBwb3J0Ojpsb2FkRm9udChuc0ZvbnQs ICZ0bXBDR0ZvbnQsICZmb250SUQpKQorICAgIFdlYktpdDo6V2ViU2FuZGJveFN1cHBvcnQqIHNh bmRib3hTdXBwb3J0ID0gV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5zYW5kYm94U3VwcG9y dCgpOworICAgIGlmICghc2FuZGJveFN1cHBvcnQpIHsKKyAgICAgICAgLy8gVGhpcyBmdW5jdGlv biBzaG91bGQgb25seSBiZSBjYWxsZWQgaW4gcmVzcG9uc2UgdG8gYW4gZXJyb3IgbG9hZGluZyBh CisgICAgICAgIC8vIGZvbnQgZHVlIHRvIGJlaW5nIGJsb2NrZWQgYnkgdGhlIHNhbmRib3guCisg ICAgICAgIC8vIFRoaXMgYnkgZGVmaW5pdGlvbiBzaG91bGRuJ3QgaGFwcGVuIGlmIHRoZXJlIGlz IG5vIHNhbmRib3ggc3VwcG9ydC4KKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgIHJldHVybiAwOworICAgIH0KKyAgICBpZiAoIXNhbmRib3hTdXBwb3J0LT5sb2FkRm9udChu c0ZvbnQsICZ0bXBDR0ZvbnQsICZmb250SUQpKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIFJl dGFpblB0cjxDR0ZvbnRSZWY+IGNnRm9udCh0bXBDR0ZvbnQpOwpAQCAtMTI5LDcgKzEzOSw3IEBA IFBhc3NSZWZQdHI8TWVtb3J5QWN0aXZhdGVkRm9udD4gbG9hZEZvbnQKICAgICAvLyB0aGUgSUQg Y2FjaGUuCiAgICAgZm9udCA9IGZvbnRDYWNoZUJ5Rm9udElEKCkuZ2V0KGZvbnRJRCk7CiAgICAg aWYgKGZvbnQpCi0gICAgICAgIC8vIEZJWE1FOiBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRGb250KCkg c2hvdWxkIGNvbnN1bHQgdGhlIGlkIGNhY2hlCisgICAgICAgIC8vIEZJWE1FOiBXZWJTYW5kYm94 U3VwcG9ydDo6bG9hZEZvbnQoKSBzaG91bGQgY29uc3VsdCB0aGUgaWQgY2FjaGUKICAgICAgICAg Ly8gYmVmb3JlIGFjdGl2YXRpbmcgdGhlIGZvbnQuCiAgICAgICAgIHJldHVybiBmb250OwogCklu ZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gMTI5NDI1KQorKysgU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBA QAorMjAxMi0wOS0yMSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgW0Nocm9taXVtXVtNYWNdIFJlbW92ZSBsb2FkRm9udCBmcm9tIFBsYXRmb3JtU3VwcG9y dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTczNjAK KworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgIFBhcnQgb2YgYSBy ZWZhY3RvcmluZyBzZXJpZXMuIFNlZSB0cmFja2luZyBidWcgODI5NDguCisKKyAgICAgICAgKiBz cmMvUGxhdGZvcm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA5LTI0 ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4g IFJvbGxlZCBERVBTLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1T dXBwb3J0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0 Zm9ybVN1cHBvcnQuY3BwCShyZXZpc2lvbiAxMjk0MjUpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTcsMjQgKzIx Nyw2IEBAIGJvb2wgUGxhdGZvcm1TdXBwb3J0OjplbnN1cmVGb250TG9hZGVkKEgKIH0KICNlbmRp ZgogCi0jaWYgT1MoREFSV0lOKQotYm9vbCBQbGF0Zm9ybVN1cHBvcnQ6OmxvYWRGb250KE5TRm9u dCogc3JjRm9udCwgQ0dGb250UmVmKiBvdXQsIHVpbnQzMl90KiBmb250SUQpCi17Ci0gICAgV2Vi U2FuZGJveFN1cHBvcnQqIHNzID0gV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5zYW5kYm94 U3VwcG9ydCgpOwotICAgIGlmIChzcykKLSAgICAgICAgcmV0dXJuIHNzLT5sb2FkRm9udChzcmNG b250LCBvdXQsIGZvbnRJRCk7Ci0KLSAgICAvLyBUaGlzIGZ1bmN0aW9uIHNob3VsZCBvbmx5IGJl IGNhbGxlZCBpbiByZXNwb25zZSB0byBhbiBlcnJvciBsb2FkaW5nIGEKLSAgICAvLyBmb250IGR1 ZSB0byBiZWluZyBibG9ja2VkIGJ5IHRoZSBzYW5kYm94LgotICAgIC8vIFRoaXMgYnkgZGVmaW5p dGlvbiBzaG91bGRuJ3QgaGFwcGVuIGlmIHRoZXJlIGlzIG5vIHNhbmRib3ggc3VwcG9ydC4KLSAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAqb3V0ID0gMDsKLSAgICAqZm9udElEID0gMDsK LSAgICByZXR1cm4gZmFsc2U7Ci19Ci0jZWxpZiBPUyhVTklYKQotI2VuZGlmCi0KIC8vIEluZGV4 ZWQgRGF0YWJhc2UgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAogUGFzc1JlZlB0cjxJREJGYWN0b3J5QmFja2VuZEludGVyZmFjZT4g UGxhdGZvcm1TdXBwb3J0OjppZGJGYWN0b3J5KCkK