122608 2013-10-10 11:06:35 -0700 Add SPI for telling WebKit to prefer pictograph glyphs over monochrome ones 2013-10-10 16:04:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aestes aestes buildbot commit-queue esprehn+autocc glenn gyuyoung.kim macpherson menard mitz rniwa oldest_to_newest 938425 0 aestes 2013-10-10 11:06:35 -0700 Add SPI for telling WebKit to prefer pictograph glyphs over monochrome ones 938442 1 213908 aestes 2013-10-10 11:36:51 -0700 Created attachment 213908 Patch 938457 2 213908 buildbot 2013-10-10 11:56:41 -0700 Comment on attachment 213908 Patch Attachment 213908 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/3866073 938461 3 213908 ap 2013-10-10 12:00:32 -0700 Comment on attachment 213908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213908&action=review > Source/WebCore/platform/graphics/FontSelector.h:44 > + virtual PassRefPtr<FontData> getFallbackFontData(const FontDescription&, size_t) = 0; A drive-by nitpick: "get" is wrong to use in this function's name: 1. We use "get" for functions with a return argument. 2. A "get" function shouldn't transfer ownership via PassRefPtr, it's more about "create" or "take". 938463 4 213908 mitz 2013-10-10 12:04:06 -0700 Comment on attachment 213908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213908&action=review > Source/WebKit/mac/WebView/WebView.mm:3161 > +- (void)_setFontFallbackPrefersPictographs:(BOOL)flag > +{ > + if (_private->page) > + _private->page->settings().setFontFallbackPrefersPictographs(flag); > +} It’s clearly wrong for a WebView instance method to update the shared Settings object. Looking at the history of this code, I see that originally I had used WebPreferences for this, but then for some reason external to WebKit I had to change this into an instance method. It‘s OK to keep the code as-is for now, but please add a FIXME here about how this is wrong, and a comment next to the method declaration about how it affects all WebViews sharing the same WebPreferences instance. 938466 5 213908 aestes 2013-10-10 12:05:46 -0700 Comment on attachment 213908 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213908&action=review > Source/WebCore/css/CSSFontSelector.cpp:648 > + ASSERT_ARG(index, !index); I'm changing this to ASSERT_UNUSED(...) to fix the release build. 938469 6 mitz 2013-10-10 12:06:59 -0700 (In reply to comment #3) > (From update of attachment 213908 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=213908&action=review > > > Source/WebCore/platform/graphics/FontSelector.h:44 > > + virtual PassRefPtr<FontData> getFallbackFontData(const FontDescription&, size_t) = 0; > > A drive-by nitpick: "get" is wrong to use in this function's name: > 1. We use "get" for functions with a return argument. > 2. A "get" function shouldn't transfer ownership via PassRefPtr, it's more about "create" or "take". I agree with Alexey that the name is wrong, but I think it’s more important to keep the interface consistent with the getFontData member function for now, and then fix both at the same time. 938471 7 213908 buildbot 2013-10-10 12:07:53 -0700 Comment on attachment 213908 Patch Attachment 213908 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/3875074 938492 8 aestes 2013-10-10 12:44:14 -0700 (In reply to comment #6) > (In reply to comment #3) > > (From update of attachment 213908 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=213908&action=review > > > > > Source/WebCore/platform/graphics/FontSelector.h:44 > > > + virtual PassRefPtr<FontData> getFallbackFontData(const FontDescription&, size_t) = 0; > > > > A drive-by nitpick: "get" is wrong to use in this function's name: > > 1. We use "get" for functions with a return argument. > > 2. A "get" function shouldn't transfer ownership via PassRefPtr, it's more about "create" or "take". > > I agree with Alexey that the name is wrong, but I think it’s more important to keep the interface consistent with the getFontData member function for now, and then fix both at the same time. I'll add a FIXME for now. I'm also going to write a test, so I'll post a new patch incorporating all feedback. 938587 9 213940 aestes 2013-10-10 15:53:27 -0700 Created attachment 213940 Patch 938592 10 aestes 2013-10-10 16:04:27 -0700 Committed r157265: <http://trac.webkit.org/changeset/157265> 213908 2013-10-10 11:36:51 -0700 2013-10-10 15:53:25 -0700 Patch bug-122608-20131010113650.patch text/plain 12704 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZlY2QyMWJmYjUxNGZj NTZmMGE4NGYzNjA3MzY0YzYzMzY1MDc1Ny4uNDk3NTAyNzI4ZjJjZDdlNmU4ZGIxMTM5MDE0MTcw ZjY5OTZhNWU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEzLTEwLTEwICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgU1BJIGZvciB0ZWxsaW5n IFdlYktpdCB0byBwcmVmZXIgcGljdG9ncmFwaCBnbHlwaHMgb3ZlciBtb25vY2hyb21lIG9uZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjYwOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg QmFzZWQgb24gcGF0Y2hlcyBieSBEYW4gQmVybnN0ZWluLgorCisgICAgICAgIENyZWF0ZWQgYSBt ZWNoYW5pc20gdG8gYXBwZW5kIGEgZm9udCB0byB0aGUgZW5kIG9mIGEgZm9udCdzIGZhbGxiYWNr CisgICAgICAgIGxpc3QsIGJlZm9yZSB0aGUgc3lzdGVtIGZhbGxiYWNrIGxpc3QuIFRoaXMgbWVj aGFuaXNtIGlzIHVzZWQgd2hlbgorICAgICAgICBTZXR0aW5nczo6Zm9udEZhbGxiYWNrUHJlZmVy c1BpY3RvZ3JhcGhzKCkgaXMgdHJ1ZSB0byBpbnNlcnQgYQorICAgICAgICBwaWN0b2dyYXBoIGZv bnQgYWhlYWQgb2YgYSBtb25vY2hyb21lIG9uZSBmcm9tIHRoZSBzeXN0ZW0gZmFsbGJhY2sgbGlz dC4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBNb3ZlZAorICAgICAgICBfX1pON1dlYkNv cmU4U2V0dGluZ3MzM3NldEZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBoc0ViIG91dHNpZGUg b2YKKyAgICAgICAgYW4gaU9TIHBsYXRmb3JtIGd1YXJkLgorICAgICAgICAqIGNzcy9DU1NGb250 U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpmYWxsYmFj a0ZvbnREYXRhQ291bnQpOiBSZXR1bmVkIDEgaWYKKyAgICAgICAgcGljdG9ncmFwaCBmb250cyBh cmUgcHJlZmVycmVkLgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpnZXRGYWxs YmFja0ZvbnREYXRhKTogUmV0dXJuZWQgdGhlCisgICAgICAgIHBpY3RvZ3JhcGggZm9udCdzIEZv bnREYXRhIGlmIGl0IGlzIHByZWZlcnJlZC4KKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9y Lmg6CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0 aW5nczo6U2V0dGluZ3MpOiBJbml0aWFsaXplZAorICAgICAgICBtX2ZvbnRGYWxsYmFja1ByZWZl cnNQaWN0b2dyYXBocyB0byBmYWxzZS4KKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRG b250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMpOiBTZXQKKyAgICAgICAgbV9mb250RmFsbGJh Y2tQcmVmZXJzUGljdG9ncmFwaHMgYW5kIGNhbGxlZAorICAgICAgICBQYWdlOjpzZXROZWVkc1Jl Y2FsY1N0eWxlSW5BbGxGcmFtZXMoKS4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAg ICAgIChXZWJDb3JlOjpTZXR0aW5nczo6Zm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250R2x5cGhzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRHbHlwaHM6OnJlYWxpemVGb250RGF0YUF0KTogUmVhbGl6ZWQgdGhlIHNlbGVj dG9yJ3MKKyAgICAgICAgZmFsbGJhY2sgZm9udCBpZiBuZWNlc3NhcnkuCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvRm9udFNlbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNv bHZlVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6cmVzb2x2ZVRyZWUpOiBSZW1v dmVkIGlPUyBwbGF0Zm9ybSBndWFyZHMuCisKIDIwMTMtMTAtMDkgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBH T2JqZWN0IERPTSBzeW1ib2xzIGZpbGUgYWZ0ZXIgcjE1NzE2My4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRl eCAyNzk5YzNmYThlMDBjNTlkNzNhZjliMjc0Nzg4ZjlmNzI1YjcxMDdkLi41NWY1OTJhYmE4ZDEx ZTNlYmYyYWI2OTNmYTc2MjRmMDQ0Y2ExNTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTcgQEAKKzIwMTMtMTAtMTAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAg ICAgIEFkZCBTUEkgZm9yIHRlbGxpbmcgV2ViS2l0IHRvIHByZWZlciBwaWN0b2dyYXBoIGdseXBo cyBvdmVyIG1vbm9jaHJvbWUgb25lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIyNjA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQmFzZWQgb24gcGF0Y2hlcyBieSBEYW4gQmVybnN0ZWluLgorCisgICAg ICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9zZXRGb250RmFs bGJhY2tQcmVmZXJzUGljdG9ncmFwaHM6XSk6IENhbGxlZAorICAgICAgICBXZWJDb3JlOjpTZXR0 aW5nczo6c2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKCkuCisgICAgICAgICogV2Vi Vmlldy9XZWJWaWV3UHJpdmF0ZS5oOgorCiAyMDEzLTEwLTA4ICBEYXJpbiBBZGxlciAgPGRhcmlu QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJOZXRzY2FwZVBsdWdpblZpZXcgc2hvdWxkIG5vIGxv bmdlciB1c2UgZGVsZXRlQWxsVmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IDQ3ODNiZWUz NzMzNzBkY2NiMjIxZGRmOWM0MzQ0YjIwZjNiMWEyOTQuLmUxNmZjNWNhNWU1NTc3ZWVjNTA0Y2Ni M2ZiNTljOTczYjNjNzkxMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhw LmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0xMTE4LDYgKzExMTgs NyBAQCBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFi bGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMyc2V0TmVlZHNBZG9iZUZyYW1lUmVsb2FkaW5n UXVpcmtFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzJzZXRTY3JlZW5Gb250U3Vic3RpdHV0aW9u RW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzM3NldEFnZ3Jlc3NpdmVUaWxlUmV0ZW50 aW9uRW5hYmxlZEViCitfX1pON1dlYkNvcmU4U2V0dGluZ3MzM3NldEZvbnRGYWxsYmFja1ByZWZl cnNQaWN0b2dyYXBoc0ViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzN3NldFNjcm9sbGluZ1BlcmZv cm1hbmNlTG9nZ2luZ0VuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzhzZXRMb3dQb3dl clZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3M0MXNl dEFjY2VsZXJhdGVkQ29tcG9zaXRlZEFuaW1hdGlvbnNFbmFibGVkRWIKQEAgLTIyNDMsNyArMjI0 NCw2IEBAIF9fWk43V2ViQ29yZThJbnRQb2ludEMxRVJLN0NHUG9pbnQKIF9fWk43V2ViQ29yZThQ b3NpdGlvbkMxRU4zV1RGMTBQYXNzUmVmUHRySU5TXzROb2RlRUVFTlMwXzE5TGVnYWN5RWRpdGlu Z09mZnNldEUKIF9fWk43V2ViQ29yZThTVkdOYW1lczRpbml0RXYKIF9fWk43V2ViQ29yZThTZXR0 aW5nczEzc2V0U3RhbmRhbG9uZUViCi1fX1pON1dlYkNvcmU4U2V0dGluZ3MzM3NldEZvbnRGYWxs YmFja1ByZWZlcnNQaWN0b2dyYXBoc0ViCiBfX1pON1dlYkNvcmU5Rm9udENhY2hlMTdnZXRDYWNo ZWRGb250RGF0YUVSS05TXzE1Rm9udERlc2NyaXB0aW9uRVJLTjNXVEYxMkF0b21pY1N0cmluZ0Vi TlMwXzEyU2hvdWxkUmV0YWluRQogX19aTjdXZWJDb3JlOUZvbnRDYWNoZTI1Z2V0TGFzdFJlc29y dEZhbGxiYWNrRm9udEVSS05TXzE1Rm9udERlc2NyaXB0aW9uRU5TMF8xMlNob3VsZFJldGFpbkUK IF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyMHNldFdhc1Njcm9sbGVkQnlVc2VyRWIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggOWEwNWQ1NTg4NzNkNDBkMWY2NDg2NzJl NGU0Y2ZjNjM3MzQwZjdhNC4uYWQzMTNhNWFlZjNjYjZmZDRiMThjOTJkYmQ5YjA5YmEzMjJiNWYx ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKQEAgLTYzMiw0ICs2MzIs MjkgQEAgYm9vbCBDU1NGb250U2VsZWN0b3I6OnJlc29sdmVzRmFtaWx5Rm9yKGNvbnN0IEZvbnRE ZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24pIGNvbnMKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK3Np emVfdCBDU1NGb250U2VsZWN0b3I6OmZhbGxiYWNrRm9udERhdGFDb3VudCgpCit7CisgICAgaWYg KCFtX2RvY3VtZW50KQorICAgICAgICByZXR1cm4gMDsKKworICAgIGlmIChTZXR0aW5ncyogc2V0 dGluZ3MgPSBtX2RvY3VtZW50LT5zZXR0aW5ncygpKQorICAgICAgICByZXR1cm4gc2V0dGluZ3Mt PmZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpID8gMSA6IDA7CisKKyAgICByZXR1cm4g MDsKK30KKworUGFzc1JlZlB0cjxGb250RGF0YT4gQ1NTRm9udFNlbGVjdG9yOjpnZXRGYWxsYmFj a0ZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBzaXplX3Qg aW5kZXgpCit7CisgICAgQVNTRVJUX0FSRyhpbmRleCwgIWluZGV4KTsKKworICAgIGlmICghbV9k b2N1bWVudCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBt X2RvY3VtZW50LT5zZXR0aW5ncygpOworICAgIGlmICghc2V0dGluZ3MgfHwgIXNldHRpbmdzLT5m b250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAg ICByZXR1cm4gZm9udENhY2hlKCktPmdldENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwg c2V0dGluZ3MtPnBpY3RvZ3JhcGhGb250RmFtaWx5KCkpOworfQorCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTRm9udFNlbGVjdG9yLmgKaW5kZXggNjEyM2I1OTQ5ZTJkMDU1NTlmYmVmNGM4Zjg0ZjNiZDFj NjRkMmJhNS4uNDgyNjFlYTVkZmM1MThkOWU0NmZlYzNmM2NlNzI3OGUxZjQ2OWE1ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuaApAQCAtNTcsNiArNTcsOCBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCB1bnNpZ25lZCB1bmlxdWVJZCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1f dW5pcXVlSWQ7IH0KIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxGb250RGF0YT4gZ2V0Rm9udERh dGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgY29uc3QgQXRvbWljU3RyaW5nJikgT1ZFUlJJREU7 CisgICAgdmlydHVhbCBzaXplX3QgZmFsbGJhY2tGb250RGF0YUNvdW50KCkgT1ZFUlJJREU7Cisg ICAgdmlydHVhbCBQYXNzUmVmUHRyPEZvbnREYXRhPiBnZXRGYWxsYmFja0ZvbnREYXRhKGNvbnN0 IEZvbnREZXNjcmlwdGlvbiYsIHNpemVfdCkgT1ZFUlJJREU7CiAgICAgQ1NTU2VnbWVudGVkRm9u dEZhY2UqIGdldEZvbnRGYWNlKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0 cmluZyYgZmFtaWx5KTsKIAogICAgIHZpcnR1YWwgYm9vbCByZXNvbHZlc0ZhbWlseUZvcihjb25z dCBGb250RGVzY3JpcHRpb24mKSBjb25zdCBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5j cHAKaW5kZXggMWQwMmM5NThkMjYzYTMxNGE3MjY1MzUyZjAzOWM2YjZiOTg2NzRiOC4uMWUwMzRj MjkyZWUzNTk5MWY1Yjk0MDZmNGU3YjZlYWU3ZGVkNmExMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAKQEAgLTE4Miw2ICsxODIsNyBAQCBTZXR0aW5nczo6U2V0dGluZ3MoUGFnZSogcGFnZSkK ICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICAsIG1faGlkZGVuUGFnZUNTU0Fu aW1hdGlvblN1c3BlbnNpb25FbmFibGVkKGZhbHNlKQogI2VuZGlmCisgICAgLCBtX2ZvbnRGYWxs YmFja1ByZWZlcnNQaWN0b2dyYXBocyhmYWxzZSkKIHsKICAgICAvLyBBIEZyYW1lIG1heSBub3Qg aGF2ZSBiZWVuIGNyZWF0ZWQgeWV0LCBzbyB3ZSBpbml0aWFsaXplIHRoZSBBdG9taWNTdHJpbmcK ICAgICAvLyBoYXNoIGJlZm9yZSB0cnlpbmcgdG8gdXNlIGl0LgpAQCAtNjQxLDYgKzY0MiwxNSBA QCB2b2lkIFNldHRpbmdzOjpzZXRIaWRkZW5QYWdlQ1NTQW5pbWF0aW9uU3VzcGVuc2lvbkVuYWJs ZWQoYm9vbCBmbGFnKQogfQogI2VuZGlmCiAKK3ZvaWQgU2V0dGluZ3M6OnNldEZvbnRGYWxsYmFj a1ByZWZlcnNQaWN0b2dyYXBocyhib29sIHByZWZlclBpY3RvZ3JhcGhzKQoreworICAgIGlmICht X2ZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocyA9PSBwcmVmZXJQaWN0b2dyYXBocykKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMgPSBw cmVmZXJQaWN0b2dyYXBoczsKKyAgICBtX3BhZ2UtPnNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZy YW1lcygpOworfQorCiB2b2lkIFNldHRpbmdzOjpzZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJT aXplRW5hYmxlZChib29sIGZsYWcpCiB7CiAgICAgZ0xvd1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNp emVFbmFibGVkID0gZmxhZzsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGlu Z3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRleCA2NDk3NjNmNjNkN2I0 ZDIxYzc1MjMyOWU5YTZlMmFkNTc0ZThjMThlLi5hYzJhNzg2ZDBlM2MzMWIzMjBiYTZjMzVjZTNl ZmU1MjE5Nzc4MzM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCkBAIC0yNjEsNiArMjYxLDkgQEAg cHVibGljOgogICAgIHZvaWQgc2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNpb25FbmFi bGVkKGJvb2wpOwogI2VuZGlmCiAKKyAgICB2b2lkIHNldEZvbnRGYWxsYmFja1ByZWZlcnNQaWN0 b2dyYXBocyhib29sKTsKKyAgICBib29sIGZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygp IGNvbnN0IHsgcmV0dXJuIG1fZm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzOyB9CisKICAg ICBzdGF0aWMgYm9vbCBsb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZCgpIHsgcmV0 dXJuIGdMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZDsgfQogICAgIHN0YXRpYyB2 b2lkIHNldExvd1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkKGJvb2wpOwogCkBAIC0z MjMsNiArMzI2LDggQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkK ICAgICBib29sIG1faGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNpb25FbmFibGVkIDogMTsK ICNlbmRpZgorICAgIGJvb2wgbV9mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMgOiAxOwor CiAgICAgc3RhdGljIGRvdWJsZSBnRGVmYXVsdE1pbkRPTVRpbWVySW50ZXJ2YWw7CiAgICAgc3Rh dGljIGRvdWJsZSBnRGVmYXVsdERPTVRpbWVyQWxpZ25tZW50SW50ZXJ2YWw7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRHbHlwaHMuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udEdseXBocy5jcHAKaW5kZXggM2MyMTE5 NDkyZjVlMGIwNmM0MjA5YzRiODJmOWMzYWZkNmVlNWIxZS4uODYxMmRhMTk3NjU3M2VkMzYyMGI2 YTAzZDRmZDgyY2M0MDkyOWMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udEdseXBocy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udEdseXBocy5jcHAKQEAgLTk5LDggKzk5LDIwIEBAIGNvbnN0IEZvbnREYXRhKiBG b250R2x5cGhzOjpyZWFsaXplRm9udERhdGFBdChjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2Ny aXB0aW9uCiAgICAgLy8gTWFrZSBzdXJlIHdlJ3JlIG5vdCBwYXNzaW5nIGluIHNvbWUgY3Jhenkg dmFsdWUgaGVyZS4KICAgICBBU1NFUlQocmVhbGl6ZWRGb250SW5kZXggPT0gbV9yZWFsaXplZEZv bnREYXRhLnNpemUoKSk7CiAKLSAgICBpZiAobV9mYW1pbHlJbmRleCA9PSBjQWxsRmFtaWxpZXNT Y2FubmVkKQotICAgICAgICByZXR1cm4gMDsKKyAgICBpZiAobV9mYW1pbHlJbmRleCA8PSBjQWxs RmFtaWxpZXNTY2FubmVkKSB7CisgICAgICAgIGlmICghbV9mb250U2VsZWN0b3IpCisgICAgICAg ICAgICByZXR1cm4gMDsKKworICAgICAgICBzaXplX3QgaW5kZXggPSBjQWxsRmFtaWxpZXNTY2Fu bmVkIC0gbV9mYW1pbHlJbmRleDsKKyAgICAgICAgaWYgKGluZGV4ID09IG1fZm9udFNlbGVjdG9y LT5mYWxsYmFja0ZvbnREYXRhQ291bnQoKSkKKyAgICAgICAgICAgIHJldHVybiAwOworCisgICAg ICAgIG1fZmFtaWx5SW5kZXgtLTsKKyAgICAgICAgUmVmUHRyPEZvbnREYXRhPiBmYWxsYmFjayA9 IG1fZm9udFNlbGVjdG9yLT5nZXRGYWxsYmFja0ZvbnREYXRhKGRlc2NyaXB0aW9uLCBpbmRleCk7 CisgICAgICAgIGlmIChmYWxsYmFjaykKKyAgICAgICAgICAgIG1fcmVhbGl6ZWRGb250RGF0YS5h cHBlbmQoZmFsbGJhY2spOworICAgICAgICByZXR1cm4gZmFsbGJhY2suZ2V0KCk7CisgICAgfQog CiAgICAgLy8gQXNrIHRoZSBmb250IGNhY2hlIGZvciB0aGUgZm9udCBkYXRhLgogICAgIC8vIFdl IGFyZSBvYnRhaW5pbmcgdGhpcyBmb250IGZvciB0aGUgZmlyc3QgdGltZS4gV2Uga2VlcCB0cmFj ayBvZiB0aGUgZmFtaWxpZXMgd2UndmUgbG9va2VkIGF0IGJlZm9yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFNlbGVjdG9yLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250U2VsZWN0b3IuaAppbmRleCA2NTcxMDc3ZjY0OTU4 MDU3NjA2MzU0MjIxODE2ZTE2MjhiMWM2YThmLi5kYjU1ZjdlZmY0Y2Q4MjVlODY5N2U5ZmQ1OGEx M2Y0MjgyNGQwY2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9Gb250U2VsZWN0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250U2VsZWN0b3IuaApAQCAtNDAsNiArNDAsOCBAQCBjbGFzcyBGb250U2VsZWN0b3IgOiBwdWJs aWMgUmVmQ291bnRlZDxGb250U2VsZWN0b3I+IHsKIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5Gb250 U2VsZWN0b3IoKSB7IH0KICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8Rm9udERhdGE+IGdldEZvbnRE YXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFt ZSkgPSAwOworICAgIHZpcnR1YWwgc2l6ZV90IGZhbGxiYWNrRm9udERhdGFDb3VudCgpID0gMDsK KyAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8Rm9udERhdGE+IGdldEZhbGxiYWNrRm9udERhdGEoY29u c3QgRm9udERlc2NyaXB0aW9uJiwgc2l6ZV90KSA9IDA7CiAgICAgdmlydHVhbCBib29sIHJlc29s dmVzRmFtaWx5Rm9yKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYpIGNvbnN0ID0gMDsKIAogICAgIHZp cnR1YWwgdm9pZCBmb250Q2FjaGVJbnZhbGlkYXRlZCgpIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHls ZS9TdHlsZVJlc29sdmVUcmVlLmNwcAppbmRleCBiYmI4OGMyY2IxMmQyMjU2MjA5YTZiMzRkMDM1 Zjg4OTY5Y2I2N2UxLi42NzRkYzg5MWYxY2UwYjNmNjc5NDEzZWJlZWQ3NThhYjhlODNkYjI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcApAQCAtMjcsNiArMjcs NyBAQAogI2luY2x1ZGUgIlN0eWxlUmVzb2x2ZVRyZWUuaCIKIAogI2luY2x1ZGUgIkFYT2JqZWN0 Q2FjaGUuaCIKKyNpbmNsdWRlICJDU1NGb250U2VsZWN0b3IuaCIKICNpbmNsdWRlICJFbGVtZW50 LmgiCiAjaW5jbHVkZSAiRWxlbWVudEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiRWxlbWVudFJhcmVE YXRhLmgiCkBAIC03OTEsNyArNzkyLDYgQEAgdm9pZCByZXNvbHZlVHJlZShEb2N1bWVudCYgZG9j dW1lbnQsIENoYW5nZSBjaGFuZ2UpCiAgICAgaWYgKHJlc29sdmVSb290U3R5bGUpIHsKICAgICAg ICAgUmVmUHRyPFJlbmRlclN0eWxlPiBkb2N1bWVudFN0eWxlID0gcmVzb2x2ZUZvckRvY3VtZW50 KGRvY3VtZW50KTsKIAotI2lmIFBMQVRGT1JNKElPUykKICAgICAgICAgLy8gSW5zZXJ0aW5nIHRo ZSBwaWN0b2dyYXBoIGZvbnQgYXQgdGhlIGVuZCBvZiB0aGUgZm9udCBmYWxsYmFjayBsaXN0IGlz IGRvbmUgYnkgdGhlCiAgICAgICAgIC8vIGZvbnQgc2VsZWN0b3IsIHNvIHNldCBhIGZvbnQgc2Vs ZWN0b3IgaWYgbmVlZGVkLgogICAgICAgICBpZiAoU2V0dGluZ3MqIHNldHRpbmdzID0gZG9jdW1l bnQuc2V0dGluZ3MoKSkgewpAQCAtNzk5LDcgKzc5OSw2IEBAIHZvaWQgcmVzb2x2ZVRyZWUoRG9j dW1lbnQmIGRvY3VtZW50LCBDaGFuZ2UgY2hhbmdlKQogICAgICAgICAgICAgaWYgKHNldHRpbmdz LT5mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoKSAmJiBzdHlsZVJlc29sdmVyKQogICAg ICAgICAgICAgICAgIGRvY3VtZW50U3R5bGUtPmZvbnQoKS51cGRhdGUoc3R5bGVSZXNvbHZlci0+ Zm9udFNlbGVjdG9yKCkpOwogICAgICAgICB9Ci0jZW5kaWYKIAogICAgICAgICBTdHlsZTo6Q2hh bmdlIGRvY3VtZW50Q2hhbmdlID0gZGV0ZXJtaW5lQ2hhbmdlKGRvY3VtZW50U3R5bGUuZ2V0KCks IGRvY3VtZW50LnJlbmRlclZpZXcoKS0+c3R5bGUoKSwgZG9jdW1lbnQuc2V0dGluZ3MoKSk7CiAg ICAgICAgIGlmIChkb2N1bWVudENoYW5nZSAhPSBOb0NoYW5nZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQppbmRleCAzYmIxZGUxZmZiOTRkMThhNjAzYTE4MjFmYzNmNWM1ZjJhNDgz OGFiLi4zYjgwMDYyOGEwNDk5MDczYTQzMDBiZjFhM2EwNmQ0OWUwYjIyMTIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0zMTU0LDYgKzMxNTQsMTIgQEAgLSAoTlNEYXRh ICopX3NvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhCiAgICAgcmV0dXJuIF9wcml2YXRlLT5zb3Vy Y2VBcHBsaWNhdGlvbkF1ZGl0RGF0YS5nZXQoKTsKIH0KIAorLSAodm9pZClfc2V0Rm9udEZhbGxi YWNrUHJlZmVyc1BpY3RvZ3JhcGhzOihCT09MKWZsYWcKK3sKKyAgICBpZiAoX3ByaXZhdGUtPnBh Z2UpCisgICAgICAgIF9wcml2YXRlLT5wYWdlLT5zZXR0aW5ncygpLnNldEZvbnRGYWxsYmFja1By ZWZlcnNQaWN0b2dyYXBocyhmbGFnKTsKK30KKwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gX1dl YlNhZmVGb3J3YXJkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUu aAppbmRleCA2MmRjNjY3MTkxZWY3OThlNjMxYTk0MjE3M2YzZjc2OGE2NWI5MDViLi4yOGE0MDE3 ZDY3YTYwMWE5MzJmZmRhYzcxZjgwNjBiNjVmMzRjY2RkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oCkBAIC02NDksNiArNjQ5LDggQEAgQ291bGQgYmUgd29y dGggYWRkaW5nIHRvIHRoZSBBUEkuCiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5LCBnZXR0 ZXI9X3NvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhLCBzZXR0ZXI9X3NldFNvdXJjZUFwcGxpY2F0 aW9uQXVkaXREYXRhOikgTlNEYXRhICpzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YTsKIAorLSAo dm9pZClfc2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzOihCT09MKWZsYWc7CisKIEBl bmQKIAogQGludGVyZmFjZSBXZWJWaWV3IChXZWJWaWV3UHJpbnRpbmdQcml2YXRlKQo= 213940 2013-10-10 15:53:27 -0700 2013-10-10 15:56:21 -0700 Patch bug-122608-20131010155326.patch text/plain 16948 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmZlY2QyMWJmYjUxNGZj NTZmMGE4NGYzNjA3MzY0YzYzMzY1MDc1Ny4uODQzODMyODE2NzIwZDAzYzU0NjA1ZjVkMjJkYmNh MmM0MGRjYTM2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEzLTEwLTEwICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgU1BJIGZvciB0ZWxsaW5n IFdlYktpdCB0byBwcmVmZXIgcGljdG9ncmFwaCBnbHlwaHMgb3ZlciBtb25vY2hyb21lIG9uZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjYwOAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJhc2VkIG9u IHBhdGNoZXMgYnkgRGFuIEJlcm5zdGVpbi4KKworICAgICAgICBUZXN0OiBmb250cy9mb250LWZh bGxiYWNrLXByZWZlcnMtcGljdG9ncmFwaHMuaHRtbAorCisgICAgICAgIENyZWF0ZWQgYSBtZWNo YW5pc20gdG8gYXBwZW5kIGEgZm9udCB0byB0aGUgZW5kIG9mIGEgZm9udCdzIGZhbGxiYWNrCisg ICAgICAgIGxpc3QsIGJlZm9yZSB0aGUgc3lzdGVtIGZhbGxiYWNrIGxpc3QuIFRoaXMgbWVjaGFu aXNtIGlzIHVzZWQgd2hlbgorICAgICAgICBTZXR0aW5nczo6Zm9udEZhbGxiYWNrUHJlZmVyc1Bp Y3RvZ3JhcGhzKCkgaXMgdHJ1ZSB0byBpbnNlcnQgYQorICAgICAgICBwaWN0b2dyYXBoIGZvbnQg YWhlYWQgb2YgYSBtb25vY2hyb21lIG9uZSBmcm9tIHRoZSBzeXN0ZW0gZmFsbGJhY2sgbGlzdC4K KworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBNb3ZlZAorICAgICAgICBfX1pON1dlYkNvcmU4 U2V0dGluZ3MzM3NldEZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBoc0ViIG91dHNpZGUgb2YK KyAgICAgICAgYW4gaU9TIHBsYXRmb3JtIGd1YXJkLgorICAgICAgICAqIGNzcy9DU1NGb250U2Vs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpmYWxsYmFja0Zv bnREYXRhQ291bnQpOiBSZXR1bmVkIDEgaWYKKyAgICAgICAgcGljdG9ncmFwaCBmb250cyBhcmUg cHJlZmVycmVkLgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpnZXRGYWxsYmFj a0ZvbnREYXRhKTogUmV0dXJuZWQgdGhlCisgICAgICAgIHBpY3RvZ3JhcGggZm9udCdzIEZvbnRE YXRhIGlmIGl0IGlzIHByZWZlcnJlZC4KKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9yLmg6 CisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5n czo6U2V0dGluZ3MpOiBJbml0aWFsaXplZAorICAgICAgICBtX2ZvbnRGYWxsYmFja1ByZWZlcnNQ aWN0b2dyYXBocyB0byBmYWxzZS4KKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRGb250 RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMpOiBTZXQKKyAgICAgICAgbV9mb250RmFsbGJhY2tQ cmVmZXJzUGljdG9ncmFwaHMgYW5kIGNhbGxlZAorICAgICAgICBQYWdlOjpzZXROZWVkc1JlY2Fs Y1N0eWxlSW5BbGxGcmFtZXMoKS4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAg IChXZWJDb3JlOjpTZXR0aW5nczo6Zm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250R2x5cGhzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZvbnRHbHlwaHM6OnJlYWxpemVGb250RGF0YUF0KTogUmVhbGl6ZWQgdGhlIHNlbGVjdG9y J3MKKyAgICAgICAgZmFsbGJhY2sgZm9udCBpZiBuZWNlc3NhcnkuCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvRm9udFNlbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZl VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6cmVzb2x2ZVRyZWUpOiBSZW1vdmVk IGlPUyBwbGF0Zm9ybSBndWFyZHMuCisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNldHRpbmdz LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OnNldEZvbnRGYWxsYmFj a1ByZWZlcnNQaWN0b2dyYXBocyk6IFNldCB0aGUKKyAgICAgICAgY29ycmVzcG9uZGluZyBXZWJD b3JlOjpTZXR0aW5nLgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5oOiBEZWZp bmVkIGFuIGludGVybmFsIHNldHRpbmcgZm9yIHRoZSB0ZXN0LgorICAgICAgICAqIHRlc3Rpbmcv SW50ZXJuYWxTZXR0aW5ncy5pZGw6IERpdHRvLgorCiAyMDEzLTEwLTA5ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRh dGUgR09iamVjdCBET00gc3ltYm9scyBmaWxlIGFmdGVyIHIxNTcxNjMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggMjc5OWMzZmE4ZTAwYzU5ZDczYWY5YjI3NDc4OGY5ZjcyNWI3MTA3ZC4uNTVmNTkyYWJh OGQxMWUzZWJmMmFiNjkzZmE3NjI0ZjA0NGNhMTU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTEwLTEwICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKwor ICAgICAgICBBZGQgU1BJIGZvciB0ZWxsaW5nIFdlYktpdCB0byBwcmVmZXIgcGljdG9ncmFwaCBn bHlwaHMgb3ZlciBtb25vY2hyb21lIG9uZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMjYwOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEJhc2VkIG9uIHBhdGNoZXMgYnkgRGFuIEJlcm5zdGVpbi4KKwor ICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfc2V0Rm9u dEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzOl0pOiBDYWxsZWQKKyAgICAgICAgV2ViQ29yZTo6 U2V0dGluZ3M6OnNldEZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpLgorICAgICAgICAq IFdlYlZpZXcvV2ViVmlld1ByaXZhdGUuaDoKKwogMjAxMy0xMC0wOCAgRGFyaW4gQWRsZXIgIDxk YXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViTmV0c2NhcGVQbHVnaW5WaWV3IHNob3VsZCBu byBsb25nZXIgdXNlIGRlbGV0ZUFsbFZhbHVlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA0Nzgz YmVlMzczMzcwZGNjYjIyMWRkZjljNDM0NGIyMGYzYjFhMjk0Li5lMTZmYzVjYTVlNTU3N2VlYzUw NGNjYjNmYjU5Yzk3M2IzYzc5MTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMTExOCw2ICsx MTE4LDcgQEAgX19aTjdXZWJDb3JlOFNldHRpbmdzMzJzZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5n RW5hYmxlZEViCiBfX1pON1dlYkNvcmU4U2V0dGluZ3MzMnNldE5lZWRzQWRvYmVGcmFtZVJlbG9h ZGluZ1F1aXJrRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczMyc2V0U2NyZWVuRm9udFN1YnN0aXR1 dGlvbkVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzNzZXRBZ2dyZXNzaXZlVGlsZVJl dGVudGlvbkVuYWJsZWRFYgorX19aTjdXZWJDb3JlOFNldHRpbmdzMzNzZXRGb250RmFsbGJhY2tQ cmVmZXJzUGljdG9ncmFwaHNFYgogX19aTjdXZWJDb3JlOFNldHRpbmdzMzdzZXRTY3JvbGxpbmdQ ZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZThTZXR0aW5nczM4c2V0TG93 UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWRFYgogX19aTjdXZWJDb3JlOFNldHRpbmdz NDFzZXRBY2NlbGVyYXRlZENvbXBvc2l0ZWRBbmltYXRpb25zRW5hYmxlZEViCkBAIC0yMjQzLDcg KzIyNDQsNiBAQCBfX1pON1dlYkNvcmU4SW50UG9pbnRDMUVSSzdDR1BvaW50CiBfX1pON1dlYkNv cmU4UG9zaXRpb25DMUVOM1dURjEwUGFzc1JlZlB0cklOU180Tm9kZUVFRU5TMF8xOUxlZ2FjeUVk aXRpbmdPZmZzZXRFCiBfX1pON1dlYkNvcmU4U1ZHTmFtZXM0aW5pdEV2CiBfX1pON1dlYkNvcmU4 U2V0dGluZ3MxM3NldFN0YW5kYWxvbmVFYgotX19aTjdXZWJDb3JlOFNldHRpbmdzMzNzZXRGb250 RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHNFYgogX19aTjdXZWJDb3JlOUZvbnRDYWNoZTE3Z2V0 Q2FjaGVkRm9udERhdGFFUktOU18xNUZvbnREZXNjcmlwdGlvbkVSS04zV1RGMTJBdG9taWNTdHJp bmdFYk5TMF8xMlNob3VsZFJldGFpbkUKIF9fWk43V2ViQ29yZTlGb250Q2FjaGUyNWdldExhc3RS ZXNvcnRGYWxsYmFja0ZvbnRFUktOU18xNUZvbnREZXNjcmlwdGlvbkVOUzBfMTJTaG91bGRSZXRh aW5FCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjBzZXRXYXNTY3JvbGxlZEJ5VXNlckViCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCmluZGV4IDlhMDVkNTU4ODczZDQwZDFmNjQ4 NjcyZTRlNGNmYzYzNzM0MGY3YTQuLmNiMzZiOTVjZTk4Mzc1NGQ1MjFhMWU4Zjc4OTVlMmQwNGY5 NGY2NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCkBAIC02MzIsNCAr NjMyLDI5IEBAIGJvb2wgQ1NTRm9udFNlbGVjdG9yOjpyZXNvbHZlc0ZhbWlseUZvcihjb25zdCBG b250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uKSBjb25zCiAgICAgcmV0dXJuIGZhbHNlOwogfQog CitzaXplX3QgQ1NTRm9udFNlbGVjdG9yOjpmYWxsYmFja0ZvbnREYXRhQ291bnQoKQoreworICAg IGlmICghbV9kb2N1bWVudCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoU2V0dGluZ3Mq IHNldHRpbmdzID0gbV9kb2N1bWVudC0+c2V0dGluZ3MoKSkKKyAgICAgICAgcmV0dXJuIHNldHRp bmdzLT5mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoKSA/IDEgOiAwOworCisgICAgcmV0 dXJuIDA7Cit9CisKK1Bhc3NSZWZQdHI8Rm9udERhdGE+IENTU0ZvbnRTZWxlY3Rvcjo6Z2V0RmFs bGJhY2tGb250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgc2l6 ZV90IGluZGV4KQoreworICAgIEFTU0VSVF9VTlVTRUQoaW5kZXgsICFpbmRleCk7CisKKyAgICBp ZiAoIW1fZG9jdW1lbnQpCisgICAgICAgIHJldHVybiAwOworCisgICAgU2V0dGluZ3MqIHNldHRp bmdzID0gbV9kb2N1bWVudC0+c2V0dGluZ3MoKTsKKyAgICBpZiAoIXNldHRpbmdzIHx8ICFzZXR0 aW5ncy0+Zm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKCkpCisgICAgICAgIHJldHVybiAw OworCisgICAgcmV0dXJuIGZvbnRDYWNoZSgpLT5nZXRDYWNoZWRGb250RGF0YShmb250RGVzY3Jp cHRpb24sIHNldHRpbmdzLT5waWN0b2dyYXBoRm9udEZhbWlseSgpKTsKK30KKwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCmluZGV4IDYxMjNiNTk0OWUyZDA1NTU5ZmJlZjRjOGY4 NGYzYmQxYzY0ZDJiYTUuLjQ4MjYxZWE1ZGZjNTE4ZDllNDZmZWMzZjNjZTcyNzhlMWY0NjlhNWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmgKQEAgLTU3LDYgKzU3LDggQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdW5zaWduZWQgdW5pcXVlSWQoKSBjb25zdCBPVkVSUklERSB7IHJl dHVybiBtX3VuaXF1ZUlkOyB9CiAKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8Rm9udERhdGE+IGdl dEZvbnREYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYpIE9W RVJSSURFOworICAgIHZpcnR1YWwgc2l6ZV90IGZhbGxiYWNrRm9udERhdGFDb3VudCgpIE9WRVJS SURFOworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxGb250RGF0YT4gZ2V0RmFsbGJhY2tGb250RGF0 YShjb25zdCBGb250RGVzY3JpcHRpb24mLCBzaXplX3QpIE9WRVJSSURFOwogICAgIENTU1NlZ21l bnRlZEZvbnRGYWNlKiBnZXRGb250RmFjZShjb25zdCBGb250RGVzY3JpcHRpb24mLCBjb25zdCBB dG9taWNTdHJpbmcmIGZhbWlseSk7CiAKICAgICB2aXJ0dWFsIGJvb2wgcmVzb2x2ZXNGYW1pbHlG b3IoY29uc3QgRm9udERlc2NyaXB0aW9uJikgY29uc3QgT1ZFUlJJREU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0 dGluZ3MuY3BwCmluZGV4IDFkMDJjOTU4ZDI2M2EzMTRhNzI2NTM1MmYwMzljNmI2Yjk4Njc0Yjgu LjFlMDM0YzI5MmVlMzU5OTFmNWI5NDA2ZjRlN2I2ZWFlN2RlZDZhMTAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuY3BwCkBAIC0xODIsNiArMTgyLDcgQEAgU2V0dGluZ3M6OlNldHRpbmdzKFBhZ2Uq IHBhZ2UpCiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElUWV9BUEkpCiAgICAgLCBtX2hpZGRlblBh Z2VDU1NBbmltYXRpb25TdXNwZW5zaW9uRW5hYmxlZChmYWxzZSkKICNlbmRpZgorICAgICwgbV9m b250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoZmFsc2UpCiB7CiAgICAgLy8gQSBGcmFtZSBt YXkgbm90IGhhdmUgYmVlbiBjcmVhdGVkIHlldCwgc28gd2UgaW5pdGlhbGl6ZSB0aGUgQXRvbWlj U3RyaW5nCiAgICAgLy8gaGFzaCBiZWZvcmUgdHJ5aW5nIHRvIHVzZSBpdC4KQEAgLTY0MSw2ICs2 NDIsMTUgQEAgdm9pZCBTZXR0aW5nczo6c2V0SGlkZGVuUGFnZUNTU0FuaW1hdGlvblN1c3BlbnNp b25FbmFibGVkKGJvb2wgZmxhZykKIH0KICNlbmRpZgogCit2b2lkIFNldHRpbmdzOjpzZXRGb250 RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoYm9vbCBwcmVmZXJQaWN0b2dyYXBocykKK3sKKyAg ICBpZiAobV9mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMgPT0gcHJlZmVyUGljdG9ncmFw aHMpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3Jh cGhzID0gcHJlZmVyUGljdG9ncmFwaHM7CisgICAgbV9wYWdlLT5zZXROZWVkc1JlY2FsY1N0eWxl SW5BbGxGcmFtZXMoKTsKK30KKwogdm9pZCBTZXR0aW5nczo6c2V0TG93UG93ZXJWaWRlb0F1ZGlv QnVmZmVyU2l6ZUVuYWJsZWQoYm9vbCBmbGFnKQogewogICAgIGdMb3dQb3dlclZpZGVvQXVkaW9C dWZmZXJTaXplRW5hYmxlZCA9IGZsYWc7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgKaW5kZXggNjQ5NzYz ZjYzZDdiNGQyMWM3NTIzMjllOWE2ZTJhZDU3NGU4YzE4ZS4uYWMyYTc4NmQwZTNjMzFiMzIwYmE2 YzM1Y2UzZWZlNTIxOTc3ODMzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0 aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtMjYxLDYgKzI2 MSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEhpZGRlblBhZ2VDU1NBbmltYXRpb25TdXNwZW5z aW9uRW5hYmxlZChib29sKTsKICNlbmRpZgogCisgICAgdm9pZCBzZXRGb250RmFsbGJhY2tQcmVm ZXJzUGljdG9ncmFwaHMoYm9vbCk7CisgICAgYm9vbCBmb250RmFsbGJhY2tQcmVmZXJzUGljdG9n cmFwaHMoKSBjb25zdCB7IHJldHVybiBtX2ZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBoczsg fQorCiAgICAgc3RhdGljIGJvb2wgbG93UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWQo KSB7IHJldHVybiBnTG93UG93ZXJWaWRlb0F1ZGlvQnVmZmVyU2l6ZUVuYWJsZWQ7IH0KICAgICBz dGF0aWMgdm9pZCBzZXRMb3dQb3dlclZpZGVvQXVkaW9CdWZmZXJTaXplRW5hYmxlZChib29sKTsK IApAQCAtMzIzLDYgKzMyNiw4IEBAIHByaXZhdGU6CiAjaWYgRU5BQkxFKFBBR0VfVklTSUJJTElU WV9BUEkpCiAgICAgYm9vbCBtX2hpZGRlblBhZ2VDU1NBbmltYXRpb25TdXNwZW5zaW9uRW5hYmxl ZCA6IDE7CiAjZW5kaWYKKyAgICBib29sIG1fZm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhz IDogMTsKKwogICAgIHN0YXRpYyBkb3VibGUgZ0RlZmF1bHRNaW5ET01UaW1lckludGVydmFsOwog ICAgIHN0YXRpYyBkb3VibGUgZ0RlZmF1bHRET01UaW1lckFsaWdubWVudEludGVydmFsOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250R2x5cGhzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRHbHlwaHMuY3BwCmluZGV4 IDNjMjExOTQ5MmY1ZTBiMDZjNDIwOWM0YjgyZjljM2FmZDZlZTViMWUuLjg2MTJkYTE5NzY1NzNl ZDM2MjBiNmEwM2Q0ZmQ4MmNjNDA5MjljMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRHbHlwaHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRHbHlwaHMuY3BwCkBAIC05OSw4ICs5OSwyMCBAQCBjb25zdCBGb250 RGF0YSogRm9udEdseXBoczo6cmVhbGl6ZUZvbnREYXRhQXQoY29uc3QgRm9udERlc2NyaXB0aW9u JiBkZXNjcmlwdGlvbgogICAgIC8vIE1ha2Ugc3VyZSB3ZSdyZSBub3QgcGFzc2luZyBpbiBzb21l IGNyYXp5IHZhbHVlIGhlcmUuCiAgICAgQVNTRVJUKHJlYWxpemVkRm9udEluZGV4ID09IG1fcmVh bGl6ZWRGb250RGF0YS5zaXplKCkpOwogCi0gICAgaWYgKG1fZmFtaWx5SW5kZXggPT0gY0FsbEZh bWlsaWVzU2Nhbm5lZCkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKG1fZmFtaWx5SW5kZXgg PD0gY0FsbEZhbWlsaWVzU2Nhbm5lZCkgeworICAgICAgICBpZiAoIW1fZm9udFNlbGVjdG9yKQor ICAgICAgICAgICAgcmV0dXJuIDA7CisKKyAgICAgICAgc2l6ZV90IGluZGV4ID0gY0FsbEZhbWls aWVzU2Nhbm5lZCAtIG1fZmFtaWx5SW5kZXg7CisgICAgICAgIGlmIChpbmRleCA9PSBtX2ZvbnRT ZWxlY3Rvci0+ZmFsbGJhY2tGb250RGF0YUNvdW50KCkpCisgICAgICAgICAgICByZXR1cm4gMDsK KworICAgICAgICBtX2ZhbWlseUluZGV4LS07CisgICAgICAgIFJlZlB0cjxGb250RGF0YT4gZmFs bGJhY2sgPSBtX2ZvbnRTZWxlY3Rvci0+Z2V0RmFsbGJhY2tGb250RGF0YShkZXNjcmlwdGlvbiwg aW5kZXgpOworICAgICAgICBpZiAoZmFsbGJhY2spCisgICAgICAgICAgICBtX3JlYWxpemVkRm9u dERhdGEuYXBwZW5kKGZhbGxiYWNrKTsKKyAgICAgICAgcmV0dXJuIGZhbGxiYWNrLmdldCgpOwor ICAgIH0KIAogICAgIC8vIEFzayB0aGUgZm9udCBjYWNoZSBmb3IgdGhlIGZvbnQgZGF0YS4KICAg ICAvLyBXZSBhcmUgb2J0YWluaW5nIHRoaXMgZm9udCBmb3IgdGhlIGZpcnN0IHRpbWUuIFdlIGtl ZXAgdHJhY2sgb2YgdGhlIGZhbWlsaWVzIHdlJ3ZlIGxvb2tlZCBhdCBiZWZvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRTZWxlY3Rvci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFNlbGVjdG9yLmgKaW5kZXggNjU3MTA3 N2Y2NDk1ODA1NzYwNjM1NDIyMTgxNmUxNjI4YjFjNmE4Zi4uNjhhMjJkZTFhMTM2NTM2MzY5NjRk YmUxNzM1M2IyOWVhZTdhZWRlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRm9udFNlbGVjdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udFNlbGVjdG9yLmgKQEAgLTM5LDcgKzM5LDEyIEBAIGNsYXNzIEZvbnRTZWxlY3Rv ckNsaWVudDsKIGNsYXNzIEZvbnRTZWxlY3RvciA6IHB1YmxpYyBSZWZDb3VudGVkPEZvbnRTZWxl Y3Rvcj4gewogcHVibGljOgogICAgIHZpcnR1YWwgfkZvbnRTZWxlY3RvcigpIHsgfQorCisgICAg Ly8gRklYTUU6IFJlbW92ZSB0aGUgImdldCIgcHJlZml4IGZyb20gdGhlc2UgdHdvIG1lbWJlciBm dW5jdGlvbnMKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8Rm9udERhdGE+IGdldEZvbnREYXRhKGNv bnN0IEZvbnREZXNjcmlwdGlvbiYsIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5TmFtZSkgPSAw OworICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxGb250RGF0YT4gZ2V0RmFsbGJhY2tGb250RGF0YShj b25zdCBGb250RGVzY3JpcHRpb24mLCBzaXplX3QpID0gMDsKKworICAgIHZpcnR1YWwgc2l6ZV90 IGZhbGxiYWNrRm9udERhdGFDb3VudCgpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgcmVzb2x2ZXNG YW1pbHlGb3IoY29uc3QgRm9udERlc2NyaXB0aW9uJikgY29uc3QgPSAwOwogCiAgICAgdmlydHVh bCB2b2lkIGZvbnRDYWNoZUludmFsaWRhdGVkKCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9zdHlsZS9TdHlsZVJlc29sdmVUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlUmVzb2x2ZVRyZWUuY3BwCmluZGV4IGJiYjg4YzJjYjEyZDIyNTYyMDlhNmIzNGQwMzVmODg5 NjljYjY3ZTEuLjY3NGRjODkxZjFjZTBiM2Y2Nzk0MTNlYmVlZDc1OGFiOGU4M2RiMjcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCkBAIC0yNyw2ICsyNyw3IEBA CiAjaW5jbHVkZSAiU3R5bGVSZXNvbHZlVHJlZS5oIgogCiAjaW5jbHVkZSAiQVhPYmplY3RDYWNo ZS5oIgorI2luY2x1ZGUgIkNTU0ZvbnRTZWxlY3Rvci5oIgogI2luY2x1ZGUgIkVsZW1lbnQuaCIK ICNpbmNsdWRlICJFbGVtZW50SXRlcmF0b3IuaCIKICNpbmNsdWRlICJFbGVtZW50UmFyZURhdGEu aCIKQEAgLTc5MSw3ICs3OTIsNiBAQCB2b2lkIHJlc29sdmVUcmVlKERvY3VtZW50JiBkb2N1bWVu dCwgQ2hhbmdlIGNoYW5nZSkKICAgICBpZiAocmVzb2x2ZVJvb3RTdHlsZSkgewogICAgICAgICBS ZWZQdHI8UmVuZGVyU3R5bGU+IGRvY3VtZW50U3R5bGUgPSByZXNvbHZlRm9yRG9jdW1lbnQoZG9j dW1lbnQpOwogCi0jaWYgUExBVEZPUk0oSU9TKQogICAgICAgICAvLyBJbnNlcnRpbmcgdGhlIHBp Y3RvZ3JhcGggZm9udCBhdCB0aGUgZW5kIG9mIHRoZSBmb250IGZhbGxiYWNrIGxpc3QgaXMgZG9u ZSBieSB0aGUKICAgICAgICAgLy8gZm9udCBzZWxlY3Rvciwgc28gc2V0IGEgZm9udCBzZWxlY3Rv ciBpZiBuZWVkZWQuCiAgICAgICAgIGlmIChTZXR0aW5ncyogc2V0dGluZ3MgPSBkb2N1bWVudC5z ZXR0aW5ncygpKSB7CkBAIC03OTksNyArNzk5LDYgQEAgdm9pZCByZXNvbHZlVHJlZShEb2N1bWVu dCYgZG9jdW1lbnQsIENoYW5nZSBjaGFuZ2UpCiAgICAgICAgICAgICBpZiAoc2V0dGluZ3MtPmZv bnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpICYmIHN0eWxlUmVzb2x2ZXIpCiAgICAgICAg ICAgICAgICAgZG9jdW1lbnRTdHlsZS0+Zm9udCgpLnVwZGF0ZShzdHlsZVJlc29sdmVyLT5mb250 U2VsZWN0b3IoKSk7CiAgICAgICAgIH0KLSNlbmRpZgogCiAgICAgICAgIFN0eWxlOjpDaGFuZ2Ug ZG9jdW1lbnRDaGFuZ2UgPSBkZXRlcm1pbmVDaGFuZ2UoZG9jdW1lbnRTdHlsZS5nZXQoKSwgZG9j dW1lbnQucmVuZGVyVmlldygpLT5zdHlsZSgpLCBkb2N1bWVudC5zZXR0aW5ncygpKTsKICAgICAg ICAgaWYgKGRvY3VtZW50Q2hhbmdlICE9IE5vQ2hhbmdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAKaW5kZXggNTFlOTkyOTZjNTE3Mjc5YzRkMDEzZTQ2NmFl ZjQyZjYwMTkzMTc5MC4uNmMzMmRmZjgxOTBlZTU5OTcwMTRmMDRjM2ZhNGVkMmJiNDBlMDg0MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuY3BwCkBAIC01MjIs NCArNTIyLDEwIEBAIHZvaWQgSW50ZXJuYWxTZXR0aW5nczo6c2V0QXV0b3Njcm9sbEZvckRyYWdB bmREcm9wRW5hYmxlZChib29sIGVuYWJsZWQsIEV4Y2VwdGlvCiAgICAgc2V0dGluZ3MoKS0+c2V0 QXV0b3Njcm9sbEZvckRyYWdBbmREcm9wRW5hYmxlZChlbmFibGVkKTsKIH0KIAordm9pZCBJbnRl cm5hbFNldHRpbmdzOjpzZXRGb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoYm9vbCBwcmVm ZXJQaWN0b2dyYXBocywgRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgSW50ZXJuYWxTZXR0aW5n c0d1YXJkRm9yU2V0dGluZ3MoKTsKKyAgICBzZXR0aW5ncygpLT5zZXRGb250RmFsbGJhY2tQcmVm ZXJzUGljdG9ncmFwaHMocHJlZmVyUGljdG9ncmFwaHMpOworfQorCiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuaCBiL1NvdXJjZS9XZWJDb3Jl L3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5oCmluZGV4IGE5YjM5ZWEzMWFiNmQ4YjAxNGY3Y2Fh N2JjNzg3M2ViYjZiMzU3NWIuLjBmYTg0NWVkYTc5Y2RjMjhkNGI4YWQ0MTRkNTU3N2M4ZDQ3MmI0 ZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5oCkBAIC0xMzUs NiArMTM1LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGltZVdpdGhvdXRNb3VzZU1vdmVtZW50 QmVmb3JlSGlkaW5nQ29udHJvbHMoZG91YmxlIHRpbWUsIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2 b2lkIHNldFVzZUxlZ2FjeUJhY2tncm91bmRTaXplU2hvcnRoYW5kQmVoYXZpb3IoYm9vbCBlbmFi bGVkLCBFeGNlcHRpb25Db2RlJik7CiAgICAgdm9pZCBzZXRBdXRvc2Nyb2xsRm9yRHJhZ0FuZERy b3BFbmFibGVkKGJvb2wgZW5hYmxlZCwgRXhjZXB0aW9uQ29kZSYpOworICAgIHZvaWQgc2V0Rm9u dEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzKGJvb2wgcHJlZmVyUGljdG9ncmFwaHMsIEV4Y2Vw dGlvbkNvZGUmKTsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBJbnRlcm5hbFNldHRpbmdzKFBh Z2UqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5n cy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3MuaWRsCmluZGV4 IDRkZDFkNTFkYjMxNTQ0MjFkMTRmNjc0YzdiZmM0NTNjMmYxYjk5YzMuLjcwOWMxMWVhZDIzNzA4 NWIxNWY2ZTNiNDYzMGNiYmFhZDM5ZDg5MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9J bnRlcm5hbFNldHRpbmdzLmlkbApAQCAtNTksNCArNTksNSBAQAogICAgIFtSYWlzZXNFeGNlcHRp b25dIHZvaWQgc2V0VGltZVdpdGhvdXRNb3VzZU1vdmVtZW50QmVmb3JlSGlkaW5nQ29udHJvbHMo ZG91YmxlIHRpbWUpOwogICAgIFtSYWlzZXNFeGNlcHRpb25dIHZvaWQgc2V0VXNlTGVnYWN5QmFj a2dyb3VuZFNpemVTaG9ydGhhbmRCZWhhdmlvcihib29sZWFuIGVuYWJsZWQpOwogICAgIFtSYWlz ZXNFeGNlcHRpb25dIHZvaWQgc2V0QXV0b3Njcm9sbEZvckRyYWdBbmREcm9wRW5hYmxlZChib29s ZWFuIGVuYWJsZWQpOworICAgIFtSYWlzZXNFeGNlcHRpb25dIHZvaWQgc2V0Rm9udEZhbGxiYWNr UHJlZmVyc1BpY3RvZ3JhcGhzKGJvb2xlYW4gcHJlZmVyUGljdG9ncmFwaHMpOwogfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCAzYmIxZGUxZmZiOTRkMThhNjAzYTE4MjFm YzNmNWM1ZjJhNDgzOGFiLi4zYjgwMDYyOGEwNDk5MDczYTQzMDBiZjFhM2EwNmQ0OWUwYjIyMTIy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0zMTU0LDYgKzMxNTQsMTIg QEAgLSAoTlNEYXRhICopX3NvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhCiAgICAgcmV0dXJuIF9w cml2YXRlLT5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YS5nZXQoKTsKIH0KIAorLSAodm9pZClf c2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzOihCT09MKWZsYWcKK3sKKyAgICBpZiAo X3ByaXZhdGUtPnBhZ2UpCisgICAgICAgIF9wcml2YXRlLT5wYWdlLT5zZXR0aW5ncygpLnNldEZv bnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocyhmbGFnKTsKK30KKwogQGVuZAogCiBAaW1wbGVt ZW50YXRpb24gX1dlYlNhZmVGb3J3YXJkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlld1ByaXZhdGUuaAppbmRleCA2MmRjNjY3MTkxZWY3OThlNjMxYTk0MjE3M2YzZjc2OGE2NWI5 MDViLi4yOGE0MDE3ZDY3YTYwMWE5MzJmZmRhYzcxZjgwNjBiNjVmMzRjY2RkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oCkBAIC02NDksNiArNjQ5LDggQEAg Q291bGQgYmUgd29ydGggYWRkaW5nIHRvIHRoZSBBUEkuCiAKIEBwcm9wZXJ0eSAobm9uYXRvbWlj LCBjb3B5LCBnZXR0ZXI9X3NvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhLCBzZXR0ZXI9X3NldFNv dXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhOikgTlNEYXRhICpzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0 RGF0YTsKIAorLSAodm9pZClfc2V0Rm9udEZhbGxiYWNrUHJlZmVyc1BpY3RvZ3JhcGhzOihCT09M KWZsYWc7CisKIEBlbmQKIAogQGludGVyZmFjZSBXZWJWaWV3IChXZWJWaWV3UHJpbnRpbmdQcml2 YXRlKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDY3Yzg0Y2M2ZDllYTM4MGI1NzA5NWU4NjBmMDFjZmRlZGRhZjQxYjQuLjY3 ZmE5NTRkMDllNjUzMjAwZWMwYmYzZDg1YWNiMmVkZjM4MTM2MmMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxMy0xMC0xMCAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CisKKyAgICAg ICAgQWRkIFNQSSBmb3IgdGVsbGluZyBXZWJLaXQgdG8gcHJlZmVyIHBpY3RvZ3JhcGggZ2x5cGhz IG92ZXIgbW9ub2Nocm9tZSBvbmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjI2MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBCYXNlZCBvbiBwYXRjaGVzIGJ5IERhbiBCZXJuc3RlaW4uCisKKyAgICAg ICAgKiBmb250cy9mb250LWZhbGxiYWNrLXByZWZlcnMtcGljdG9ncmFwaHMtZXhwZWN0ZWQuaHRt bDogQWRkZWQuCisgICAgICAgICogZm9udHMvZm9udC1mYWxsYmFjay1wcmVmZXJzLXBpY3RvZ3Jh cGhzLmh0bWw6IEFkZGVkLgorCiAyMDEzLTEwLTA5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxn bnNAZ25vbWUub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLiBBZGQgdGltZW91 dCBhcyBleHBlY3RlZCByZXN1bHQgZm9yIGZhc3QvaGlzdG9yeS9nby1iYWNrLXRvLWlmcmFtZS13 aXRoLXBsdWdpbi5odG1sLApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZm9udHMvZm9udC1mYWxs YmFjay1wcmVmZXJzLXBpY3RvZ3JhcGhzLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mb250 cy9mb250LWZhbGxiYWNrLXByZWZlcnMtcGljdG9ncmFwaHMtZXhwZWN0ZWQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi45MmVhNDI5MjZkZDYzZGQwMzcyM2MzYzQzODdhNDc5ZmRjMTAzOGRkCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZm9udHMvZm9udC1mYWxsYmFjay1wcmVmZXJzLXBpY3RvZ3Jh cGhzLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxzcGFu IHN0eWxlPSJmb250LWZhbWlseTogLXdlYmtpdC1waWN0b2dyYXBoIj4mI3gyNjY1Ozwvc3Bhbj4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ZvbnRzL2ZvbnQtZmFsbGJhY2stcHJlZmVycy1waWN0 b2dyYXBocy5odG1sIGIvTGF5b3V0VGVzdHMvZm9udHMvZm9udC1mYWxsYmFjay1wcmVmZXJzLXBp Y3RvZ3JhcGhzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODEyZjc4NjZlNzNjYWIyNzMzMDBjZTJhMmNlNGEz NTZkNmEzMGQ1ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ZvbnRzL2ZvbnQtZmFs bGJhY2stcHJlZmVycy1waWN0b2dyYXBocy5odG1sCkBAIC0wLDAgKzEsNiBAQAorPCFET0NUWVBF IGh0bWw+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgd2luZG93LmludGVy bmFscy5zZXR0aW5ncy5zZXRGb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHModHJ1ZSk7Cis8 L3NjcmlwdD4KKyYjeDI2NjU7Cg==