137550 2014-10-08 23:48:46 -0700 Remove second-to-last client of WebFontCache 2014-10-09 14:35:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield cdumez commit-queue dino jonlee simon.fraser thorton oldest_to_newest 1040495 0 mmaxfield 2014-10-08 23:48:46 -0700 Remove second-to-last client of WebFontCache 1040499 1 239520 mmaxfield 2014-10-08 23:55:21 -0700 Created attachment 239520 Patch 1040501 2 commit-queue 2014-10-08 23:57:07 -0700 Attachment 239520 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1040502 3 239521 mmaxfield 2014-10-08 23:59:25 -0700 Created attachment 239521 Patch 1040570 4 239521 darin 2014-10-09 09:32:40 -0700 Comment on attachment 239521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239521&action=review > Source/WebKit/mac/WebView/WebHTMLView.mm:4897 > // Find the font the same way the rendering code would later if it encountered this CSS. This whole “find font” sequence, in the end, is just used to get a font name. I think we should just refactor into a helper that returns an NSString rather than having this tricky dance here in the middle of a function that’s already doing so many other things. > Source/WebKit/mac/WebView/WebHTMLView.mm:4902 > + FontCachePurgePreventer purgePreventer; Why is this needed? This seems like a really tricky class to use right if this is really needed for a simple case like this. Can purging really happen in the tiny window before we call platformData().font() and then fontName? 1040621 5 239521 mmaxfield 2014-10-09 11:39:08 -0700 Comment on attachment 239521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239521&action=review >> Source/WebKit/mac/WebView/WebHTMLView.mm:4897 >> // Find the font the same way the rendering code would later if it encountered this CSS. > > This whole “find font” sequence, in the end, is just used to get a font name. I think we should just refactor into a helper that returns an NSString rather than having this tricky dance here in the middle of a function that’s already doing so many other things. I agree with you, however, I think that doing this kind of refactor would cut through many levels of function calls, including splitting WebFontCache which is going away soon. I think that such a refactoring would ultimately introduce more complexity than this patch adds. >> Source/WebKit/mac/WebView/WebHTMLView.mm:4902 >> + FontCachePurgePreventer purgePreventer; > > Why is this needed? This seems like a really tricky class to use right if this is really needed for a simple case like this. Can purging really happen in the tiny window before we call platformData().font() and then fontName? There is an assert in getCachedFontData(). 1040630 6 239521 commit-queue 2014-10-09 12:16:08 -0700 Comment on attachment 239521 Patch Clearing flags on attachment: 239521 Committed r174517: <http://trac.webkit.org/changeset/174517> 1040631 7 commit-queue 2014-10-09 12:16:14 -0700 All reviewed patches have been landed. Closing bug. 1040691 8 239521 darin 2014-10-09 14:35:03 -0700 Comment on attachment 239521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239521&action=review >>> Source/WebKit/mac/WebView/WebHTMLView.mm:4897 >>> // Find the font the same way the rendering code would later if it encountered this CSS. >> >> This whole “find font” sequence, in the end, is just used to get a font name. I think we should just refactor into a helper that returns an NSString rather than having this tricky dance here in the middle of a function that’s already doing so many other things. > > I agree with you, however, I think that doing this kind of refactor would cut through many levels of function calls, including splitting WebFontCache which is going away soon. I think that such a refactoring would ultimately introduce more complexity than this patch adds. I think you misunderstood. I just meant a helper function right here in this source file. 239520 2014-10-08 23:55:21 -0700 2014-10-08 23:59:20 -0700 Patch bug-137550-20141008235523.patch text/plain 5592 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTQ4YjlkOGM2YThjY2Q1 OTUyYmI3YTlmMmQzMjYwYjlhZTZlMzQzNC4uMmJiYmM3NDlhY2Q5OTEwMTEzYzJmMTUwMzg1ZjRj ZmEyMzgyMjQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEwLTA4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPGxpdGhlcnVtQGdtYWlsLmNvbT4KKworICAgICAgICBSZW1vdmUgc2Vj b25kLXRvLWxhc3QgY2xpZW50IG9mIFdlYkZvbnRDYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2Fj aGUuaDogQWxsb3cgbWlncmF0aW9uIG9mIGNsaWVudCB0byBnZXRDYWNoZWRGb250RGF0YSgpCisK IDIwMTQtMTAtMDggIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMTc0NDgwLiBCcm9rZSBpT1MgYnVp bGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMThiMjJlMTQwZTU2MGI0YjA3NTBmOWJjZTFhZTAzYmI3 MTdjZDE5Yi4uY2ZhOTI5MjcxMTk4NDlkN2RlNWVhYTczZGQ5ZjkyYTYzMWFkNzA5MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEwLTA4ICBNeWxlcyBDLiBNYXhmaWVs ZCAgPGxpdGhlcnVtQGdtYWlsLmNvbT4KKworICAgICAgICBSZW1vdmUgc2Vjb25kLXRvLWxhc3Qg Y2xpZW50IG9mIFdlYkZvbnRDYWNoZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM3NTUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIEZvbnRDYWNoZTo6Z2V0Q2FjaGVkRm9udERhdGEoKSBpbnN0ZWFk IG9mIFdlYkZvbnRDYWNoZS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06Cisg ICAgICAgICgtW1dlYkhUTUxWaWV3IF9hZGRUb1N0eWxlOmZvbnRBOmZvbnRCOl0pOgorCiAyMDE0 LTEwLTA3ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBV c2UgaXM8PigpIC8gZG93bmNhc3Q8PigpIGZvciBSZW5kZXJUZXh0IC8gUmVuZGVyVGV4dEZyYWdt ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGE1YWFlNGRlZGEzZTNiYzQ5ZGVhMmY4MjM3ODMz NjVhZjhjYjhlYmUuLmJjZDEyNzZkZWE1YzAwZmZkY2Y2OTQ0Y2QzZWUwYzZhMjc2YzRlNzQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCkBAIC0xNDA0LDYgKzE0MDQsNyBAQCBfX1pON1dlYkNvcmU5Rmxv YXRTaXplQzFFUks2Q0dTaXplCiBfX1pON1dlYkNvcmU5RmxvYXRTaXplQzFFUktOU183SW50U2l6 ZUUKIF9fWk43V2ViQ29yZTlGb250Q2FjaGUxMGludmFsaWRhdGVFdgogX19aTjdXZWJDb3JlOUZv bnRDYWNoZTEzZm9udERhdGFDb3VudEV2CitfX1pON1dlYkNvcmU5Rm9udENhY2hlMTdnZXRDYWNo ZWRGb250RGF0YUVSS05TXzE1Rm9udERlc2NyaXB0aW9uRVJLTjNXVEYxMkF0b21pY1N0cmluZ0Vi TlMwXzEyU2hvdWxkUmV0YWluRQogX19aTjdXZWJDb3JlOUZvbnRDYWNoZTIxaW5hY3RpdmVGb250 RGF0YUNvdW50RXYKIF9fWk43V2ViQ29yZTlGb250Q2FjaGUyMXB1cmdlSW5hY3RpdmVGb250RGF0 YUVpCiBfX1pON1dlYkNvcmU5Rm9udENhY2hlMjlwdXJnZUluYWN0aXZlRm9udERhdGFJZk5lZWRl ZEV2CkBAIC0yNzQ0LDcgKzI3NDUsNiBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MyM3NldE5ldHdv cmtJbnRlcmZhY2VOYW1lRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlOFNldHRpbmdzMzFz ZXRBdWRpb1Nlc3Npb25DYXRlZ29yeU92ZXJyaWRlRWoKIF9fWk43V2ViQ29yZThTZXR0aW5nczM0 c2V0TmV0d29ya0RhdGFVc2FnZVRyYWNraW5nRW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGlu Z3MzOGdTaG91bGRPcHRPdXRPZk5ldHdvcmtTdGF0ZU9ic2VydmF0aW9uRQotX19aTjdXZWJDb3Jl OUZvbnRDYWNoZTE3Z2V0Q2FjaGVkRm9udERhdGFFUktOU18xNUZvbnREZXNjcmlwdGlvbkVSS04z V1RGMTJBdG9taWNTdHJpbmdFYk5TMF8xMlNob3VsZFJldGFpbkUKIF9fWk43V2ViQ29yZTlGb250 Q2FjaGUyNWdldExhc3RSZXNvcnRGYWxsYmFja0ZvbnRFUktOU18xNUZvbnREZXNjcmlwdGlvbkVO UzBfMTJTaG91bGRSZXRhaW5FCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MTdzZXRTY3JvbGxWZWxv Y2l0eUVkZGRkCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjBzZXRXYXNTY3JvbGxlZEJ5VXNlckVi CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDBi MjczZTRiYjkxNDY4M2QwNTIyNzM0ODRlMzMxNDk0YzU1MzY5MDcuLjRiYzlkZmExMDM0ZDVlOWQw NDZlM2MzNWRlOGU4ZGRhYzViYmVlZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0ZvbnRDYWNoZS5oCkBAIC0xMzMsNyArMTMzLDcgQEAgcHVibGljOgogCiAgICAgdm9p ZCBnZXRUcmFpdHNJbkZhbWlseShjb25zdCBBdG9taWNTdHJpbmcmLCBWZWN0b3I8dW5zaWduZWQ+ Jik7CiAKLSAgICBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBnZXRDYWNoZWRGb250RGF0YShj b25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBBdG9taWNTdHJpbmcmLCBib29sIGNoZWNraW5n QWx0ZXJuYXRlTmFtZSA9IGZhbHNlLCBTaG91bGRSZXRhaW4gPSBSZXRhaW4pOworICAgIFdFQkNP UkVfRVhQT1JUIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IGdldENhY2hlZEZvbnREYXRhKGNv bnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYsIGJvb2wgY2hlY2tpbmdB bHRlcm5hdGVOYW1lID0gZmFsc2UsIFNob3VsZFJldGFpbiA9IFJldGFpbik7CiAgICAgV0VCQ09S RV9FWFBPUlQgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gZ2V0TGFzdFJlc29ydEZhbGxiYWNr Rm9udChjb25zdCBGb250RGVzY3JpcHRpb24mLCBTaG91bGRSZXRhaW4gPSBSZXRhaW4pOwogICAg IFNpbXBsZUZvbnREYXRhKiBnZXROb25SZXRhaW5lZExhc3RSZXNvcnRGYWxsYmFja0ZvbnQoY29u c3QgRm9udERlc2NyaXB0aW9uJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViSFRNTFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxW aWV3Lm1tCmluZGV4IDUzMmRjY2M3MDNmMTU2YmIwNjVkZmZlZGY5ZGVjNTk1ZDgzNjJlYzguLjkz ZDM4ZjBlOGNhNTRiNWY4NWY2MTg3NjYyNTA5NzI1MTIyZTljYzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQpAQCAtOTAsNiArOTAsNyBAQAogI2ltcG9ydCA8V2Vi Q29yZS9FeGNlcHRpb25IYW5kbGVycy5oPgogI2ltcG9ydCA8V2ViQ29yZS9GbG9hdFJlY3QuaD4K ICNpbXBvcnQgPFdlYkNvcmUvRm9jdXNDb250cm9sbGVyLmg+CisjaW1wb3J0IDxXZWJDb3JlL0Zv bnRDYWNoZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9G cmFtZUxvYWRlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9GcmFtZVNlbGVjdGlvbi5oPgpAQCAtNDg5 NCwxMyArNDg5NSwxNiBAQCAtICh2b2lkKV9hZGRUb1N0eWxlOihET01DU1NTdHlsZURlY2xhcmF0 aW9uICopc3R5bGUgZm9udEE6KE5TRm9udCAqKWEgZm9udEI6KE5TRgogICAgICAgICAvLyB0aGUg UG9zdHNjcmlwdCBuYW1lLgogICAgICAgICAKICAgICAgICAgLy8gRmluZCB0aGUgZm9udCB0aGUg c2FtZSB3YXkgdGhlIHJlbmRlcmluZyBjb2RlIHdvdWxkIGxhdGVyIGlmIGl0IGVuY291bnRlcmVk IHRoaXMgQ1NTLgotICAgICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gYUlzSXRhbGljID8g TlNGb250SXRhbGljVHJhaXQgOiAwOwotICAgICAgICBpbnQgd2VpZ2h0ID0gYUlzQm9sZCA/IFNU QU5EQVJEX0JPTERfV0VJR0hUIDogU1RBTkRBUkRfV0VJR0hUOwotICAgICAgICBOU0ZvbnQgKmZv dW5kRm9udCA9IFtXZWJGb250Q2FjaGUgZm9udFdpdGhGYW1pbHk6YUZhbWlseU5hbWUgdHJhaXRz OnRyYWl0cyB3ZWlnaHQ6d2VpZ2h0IHNpemU6YVBvaW50U2l6ZV07CisgICAgICAgIEZvbnREZXNj cmlwdGlvbiBmb250RGVzY3JpcHRpb247CisgICAgICAgIGZvbnREZXNjcmlwdGlvbi5zZXRJdGFs aWMoYUlzSXRhbGljKTsKKyAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFdlaWdodChhSXNCb2xk ID8gRm9udFdlaWdodDkwMCA6IEZvbnRXZWlnaHQ1MDApOworICAgICAgICBmb250RGVzY3JpcHRp b24uc2V0U3BlY2lmaWVkU2l6ZShhUG9pbnRTaXplKTsKKyAgICAgICAgRm9udENhY2hlUHVyZ2VQ cmV2ZW50ZXIgcHVyZ2VQcmV2ZW50ZXI7CisgICAgICAgIFJlZlB0cjxTaW1wbGVGb250RGF0YT4g c2ltcGxlRm9udERhdGEgPSBmb250Q2FjaGUoKS5nZXRDYWNoZWRGb250RGF0YShmb250RGVzY3Jp cHRpb24sIGFGYW1pbHlOYW1lLCBmYWxzZSwgV2ViQ29yZTo6Rm9udENhY2hlOjpEb05vdFJldGFp bik7CiAKICAgICAgICAgLy8gSWYgd2UgZG9uJ3QgZmluZCBhIGZvbnQgd2l0aCB0aGUgc2FtZSBQ b3N0c2NyaXB0IG5hbWUsIHRoZW4gd2UnbGwgaGF2ZSB0byB1c2UgdGhlCiAgICAgICAgIC8vIFBv c3RzY3JpcHQgbmFtZSB0byBtYWtlIHRoZSBDU1Mgc3BlY2lmaWMgZW5vdWdoLgotICAgICAgICBp ZiAoIVtbZm91bmRGb250IGZvbnROYW1lXSBpc0VxdWFsVG9TdHJpbmc6W2EgZm9udE5hbWVdXSkK KyAgICAgICAgaWYgKCFbW3NpbXBsZUZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5mb250KCkgZm9u dE5hbWVdIGlzRXF1YWxUb1N0cmluZzpbYSBmb250TmFtZV1dKQogICAgICAgICAgICAgZmFtaWx5 TmFtZUZvckNTUyA9IFthIGZvbnROYW1lXTsKIAogICAgICAgICAvLyBGSVhNRTogTmVlZCBtb3Jl IHNvcGhpc3RpY2F0ZWQgZXNjYXBpbmcgY29kZSBpZiB3ZSB3YW50IHRvIGhhbmRsZSBmYW1pbHkg bmFtZXMK 239521 2014-10-08 23:59:25 -0700 2014-10-09 14:35:03 -0700 Patch bug-137550-20141008235928.patch text/plain 5654 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTQ4YjlkOGM2YThjY2Q1 OTUyYmI3YTlmMmQzMjYwYjlhZTZlMzQzNC4uYTM1ZTE2MjJmNzY5NWE4NGM3YWQ4MGQ4ZGI5ZWJm OTBmMWNhZjI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE0LTEwLTA4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHNl Y29uZC10by1sYXN0IGNsaWVudCBvZiBXZWJGb250Q2FjaGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzU1MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIG5vIGJlaGF2 aW9yIGNoYW5nZS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOiBBbGxvdyBtaWdyYXRpb24gb2YgY2xpZW50IHRvIGdl dENhY2hlZEZvbnREYXRhKCkKKworMjAxNC0xMC0wOCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgorCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIx NzQ0ODAuIEJyb2tlIGlPUyBidWlsZC4KIAogICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDE4YjIyZTE0MGU1NjBiNGIwNzUwZjliY2UxYWUw M2JiNzE3Y2QxOWIuLmI4NzA0MDQ0MjI1MjI1OTRmYzk1OTUzOTcyZjFiM2Q5ZjhjMjNkYzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0xMC0wOCAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzZWNvbmQtdG8t bGFzdCBjbGllbnQgb2YgV2ViRm9udENhY2hlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc1NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgRm9udENhY2hlOjpnZXRDYWNoZWRGb250RGF0YSgpIGlu c3RlYWQgb2YgV2ViRm9udENhY2hlLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5t bToKKyAgICAgICAgKC1bV2ViSFRNTFZpZXcgX2FkZFRvU3R5bGU6Zm9udEE6Zm9udEI6XSk6CisK IDIwMTQtMTAtMDcgIENocmlzdG9waGUgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIFVzZSBpczw+KCkgLyBkb3duY2FzdDw+KCkgZm9yIFJlbmRlclRleHQgLyBSZW5kZXJUZXh0 RnJhZ21lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggYTVhYWU0ZGVkYTNlM2JjNDlkZWEyZjgy Mzc4MzM2NWFmOGNiOGViZS4uYmNkMTI3NmRlYTVjMDBmZmRjZjY5NDRjZDNlZTBjNmEyNzZjNGU3 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTE0MDQsNiArMTQwNCw3IEBAIF9fWk43V2ViQ29y ZTlGbG9hdFNpemVDMUVSSzZDR1NpemUKIF9fWk43V2ViQ29yZTlGbG9hdFNpemVDMUVSS05TXzdJ bnRTaXplRQogX19aTjdXZWJDb3JlOUZvbnRDYWNoZTEwaW52YWxpZGF0ZUV2CiBfX1pON1dlYkNv cmU5Rm9udENhY2hlMTNmb250RGF0YUNvdW50RXYKK19fWk43V2ViQ29yZTlGb250Q2FjaGUxN2dl dENhY2hlZEZvbnREYXRhRVJLTlNfMTVGb250RGVzY3JpcHRpb25FUktOM1dURjEyQXRvbWljU3Ry aW5nRWJOUzBfMTJTaG91bGRSZXRhaW5FCiBfX1pON1dlYkNvcmU5Rm9udENhY2hlMjFpbmFjdGl2 ZUZvbnREYXRhQ291bnRFdgogX19aTjdXZWJDb3JlOUZvbnRDYWNoZTIxcHVyZ2VJbmFjdGl2ZUZv bnREYXRhRWkKIF9fWk43V2ViQ29yZTlGb250Q2FjaGUyOXB1cmdlSW5hY3RpdmVGb250RGF0YUlm TmVlZGVkRXYKQEAgLTI3NDQsNyArMjc0NSw2IEBAIF9fWk43V2ViQ29yZThTZXR0aW5nczIzc2V0 TmV0d29ya0ludGVyZmFjZU5hbWVFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmU4U2V0dGlu Z3MzMXNldEF1ZGlvU2Vzc2lvbkNhdGVnb3J5T3ZlcnJpZGVFagogX19aTjdXZWJDb3JlOFNldHRp bmdzMzRzZXROZXR3b3JrRGF0YVVzYWdlVHJhY2tpbmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZThT ZXR0aW5nczM4Z1Nob3VsZE9wdE91dE9mTmV0d29ya1N0YXRlT2JzZXJ2YXRpb25FCi1fX1pON1dl YkNvcmU5Rm9udENhY2hlMTdnZXRDYWNoZWRGb250RGF0YUVSS05TXzE1Rm9udERlc2NyaXB0aW9u RVJLTjNXVEYxMkF0b21pY1N0cmluZ0ViTlMwXzEyU2hvdWxkUmV0YWluRQogX19aTjdXZWJDb3Jl OUZvbnRDYWNoZTI1Z2V0TGFzdFJlc29ydEZhbGxiYWNrRm9udEVSS05TXzE1Rm9udERlc2NyaXB0 aW9uRU5TMF8xMlNob3VsZFJldGFpbkUKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcxN3NldFNjcm9s bFZlbG9jaXR5RWRkZGQKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyMHNldFdhc1Njcm9sbGVkQnlV c2VyRWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRD YWNoZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKaW5k ZXggMGIyNzNlNGJiOTE0NjgzZDA1MjI3MzQ4NGUzMzE0OTRjNTUzNjkwNy4uNGJjOWRmYTEwMzRk NWU5ZDA0NmUzYzM1ZGU4ZThkZGFjNWJiZWVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKQEAgLTEzMyw3ICsxMzMsNyBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIGdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3Rvcjx1bnNp Z25lZD4mKTsKIAotICAgIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IGdldENhY2hlZEZvbnRE YXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYsIGJvb2wgY2hl Y2tpbmdBbHRlcm5hdGVOYW1lID0gZmFsc2UsIFNob3VsZFJldGFpbiA9IFJldGFpbik7CisgICAg V0VCQ09SRV9FWFBPUlQgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gZ2V0Q2FjaGVkRm9udERh dGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgY29uc3QgQXRvbWljU3RyaW5nJiwgYm9vbCBjaGVj a2luZ0FsdGVybmF0ZU5hbWUgPSBmYWxzZSwgU2hvdWxkUmV0YWluID0gUmV0YWluKTsKICAgICBX RUJDT1JFX0VYUE9SVCBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBnZXRMYXN0UmVzb3J0RmFs bGJhY2tGb250KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIFNob3VsZFJldGFpbiA9IFJldGFpbik7 CiAgICAgU2ltcGxlRm9udERhdGEqIGdldE5vblJldGFpbmVkTGFzdFJlc29ydEZhbGxiYWNrRm9u dChjb25zdCBGb250RGVzY3JpcHRpb24mKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi SFRNTFZpZXcubW0KaW5kZXggNTMyZGNjYzcwM2YxNTZiYjA2NWRmZmVkZjlkZWM1OTVkODM2MmVj OC4uOTNkMzhmMGU4Y2E1NGI1Zjg1ZjYxODc2NjI1MDk3MjUxMjJlOWNjOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC05MCw2ICs5MCw3IEBACiAjaW1wb3J0 IDxXZWJDb3JlL0V4Y2VwdGlvbkhhbmRsZXJzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0Zsb2F0UmVj dC5oPgogI2ltcG9ydCA8V2ViQ29yZS9Gb2N1c0NvbnRyb2xsZXIuaD4KKyNpbXBvcnQgPFdlYkNv cmUvRm9udENhY2hlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+CiAjaW1wb3J0IDxXZWJD b3JlL0ZyYW1lTG9hZGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lU2VsZWN0aW9uLmg+CkBA IC00ODk0LDEzICs0ODk1LDE2IEBAIC0gKHZvaWQpX2FkZFRvU3R5bGU6KERPTUNTU1N0eWxlRGVj bGFyYXRpb24gKilzdHlsZSBmb250QTooTlNGb250ICopYSBmb250QjooTlNGCiAgICAgICAgIC8v IHRoZSBQb3N0c2NyaXB0IG5hbWUuCiAgICAgICAgIAogICAgICAgICAvLyBGaW5kIHRoZSBmb250 IHRoZSBzYW1lIHdheSB0aGUgcmVuZGVyaW5nIGNvZGUgd291bGQgbGF0ZXIgaWYgaXQgZW5jb3Vu dGVyZWQgdGhpcyBDU1MuCi0gICAgICAgIE5TRm9udFRyYWl0TWFzayB0cmFpdHMgPSBhSXNJdGFs aWMgPyBOU0ZvbnRJdGFsaWNUcmFpdCA6IDA7Ci0gICAgICAgIGludCB3ZWlnaHQgPSBhSXNCb2xk ID8gU1RBTkRBUkRfQk9MRF9XRUlHSFQgOiBTVEFOREFSRF9XRUlHSFQ7Ci0gICAgICAgIE5TRm9u dCAqZm91bmRGb250ID0gW1dlYkZvbnRDYWNoZSBmb250V2l0aEZhbWlseTphRmFtaWx5TmFtZSB0 cmFpdHM6dHJhaXRzIHdlaWdodDp3ZWlnaHQgc2l6ZTphUG9pbnRTaXplXTsKKyAgICAgICAgRm9u dERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbjsKKyAgICAgICAgZm9udERlc2NyaXB0aW9uLnNl dEl0YWxpYyhhSXNJdGFsaWMpOworICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0V2VpZ2h0KGFJ c0JvbGQgPyBGb250V2VpZ2h0OTAwIDogRm9udFdlaWdodDUwMCk7CisgICAgICAgIGZvbnREZXNj cmlwdGlvbi5zZXRTcGVjaWZpZWRTaXplKGFQb2ludFNpemUpOworICAgICAgICBGb250Q2FjaGVQ dXJnZVByZXZlbnRlciBwdXJnZVByZXZlbnRlcjsKKyAgICAgICAgUmVmUHRyPFNpbXBsZUZvbnRE YXRhPiBzaW1wbGVGb250RGF0YSA9IGZvbnRDYWNoZSgpLmdldENhY2hlZEZvbnREYXRhKGZvbnRE ZXNjcmlwdGlvbiwgYUZhbWlseU5hbWUsIGZhbHNlLCBXZWJDb3JlOjpGb250Q2FjaGU6OkRvTm90 UmV0YWluKTsKIAogICAgICAgICAvLyBJZiB3ZSBkb24ndCBmaW5kIGEgZm9udCB3aXRoIHRoZSBz YW1lIFBvc3RzY3JpcHQgbmFtZSwgdGhlbiB3ZSdsbCBoYXZlIHRvIHVzZSB0aGUKICAgICAgICAg Ly8gUG9zdHNjcmlwdCBuYW1lIHRvIG1ha2UgdGhlIENTUyBzcGVjaWZpYyBlbm91Z2guCi0gICAg ICAgIGlmICghW1tmb3VuZEZvbnQgZm9udE5hbWVdIGlzRXF1YWxUb1N0cmluZzpbYSBmb250TmFt ZV1dKQorICAgICAgICBpZiAoIVtbc2ltcGxlRm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLmZvbnQo KSBmb250TmFtZV0gaXNFcXVhbFRvU3RyaW5nOlthIGZvbnROYW1lXV0pCiAgICAgICAgICAgICBm YW1pbHlOYW1lRm9yQ1NTID0gW2EgZm9udE5hbWVdOwogCiAgICAgICAgIC8vIEZJWE1FOiBOZWVk IG1vcmUgc29waGlzdGljYXRlZCBlc2NhcGluZyBjb2RlIGlmIHdlIHdhbnQgdG8gaGFuZGxlIGZh bWlseSBuYW1lcwo=