133186 2014-05-22 11:09:32 -0700 -apple-system- styled element doesn't respond to system font size changes 2014-05-22 14:53:01 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhock mhock commit-queue enrica esprehn+autocc glenn kondapallykalyan oldest_to_newest 1011021 0 mhock 2014-05-22 11:09:32 -0700 -apple-system- styled element doens't respond to system font size changes. <rdar://problem/16583782> 1011022 1 231899 mhock 2014-05-22 11:13:45 -0700 Created attachment 231899 patch 1011034 2 231899 enrica 2014-05-22 12:15:48 -0700 Comment on attachment 231899 patch View in context: https://bugs.webkit.org/attachment.cgi?id=231899&action=review Looks good to me, provided you address the comments. > Source/WebCore/ChangeLog:3 > + -apple-system- styled element doens't respond to system font size changes. typo: doesn't. We normally use the same title for all ChangeLogs in the same patch. > Source/WebCore/WebCore.xcodeproj/project.pbxproj:2272 > + 759CB837192DA9190012BC64 /* ControlStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 311C08BC18E35D6800B65615 /* ControlStates.h */; settings = {ATTRIBUTES = (Private, ); }; }; What is this? > Source/WebCore/WebCore.xcodeproj/project.pbxproj:25764 > + 759CB837192DA9190012BC64 /* ControlStates.h in Headers */, What is this change? > Source/WebCore/rendering/RenderThemeIOS.mm:315 > CFStringRef RenderThemeIOS::contentSizeCategory() No need to use CFStringRef here. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:165 > + CFStringRef _userTextSize; We normally use NSString. > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1043 > +- (CFStringRef)_contentSizeCategory Ditto. This way you don't need the cast on the return. 1011035 3 mhock 2014-05-22 12:23:36 -0700 (In reply to comment #2) > (From update of attachment 231899 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231899&action=review > > Looks good to me, provided you address the comments. > > > Source/WebCore/ChangeLog:3 > > + -apple-system- styled element doens't respond to system font size changes. > > typo: doesn't. We normally use the same title for all ChangeLogs in the same patch. Oops, put a bad title in that one, thanks! > > Source/WebCore/WebCore.xcodeproj/project.pbxproj:2272 > > + 759CB837192DA9190012BC64 /* ControlStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 311C08BC18E35D6800B65615 /* ControlStates.h */; settings = {ATTRIBUTES = (Private, ); }; }; > > What is this? > > > Source/WebCore/WebCore.xcodeproj/project.pbxproj:25764 > > + 759CB837192DA9190012BC64 /* ControlStates.h in Headers */, > > What is this change? This is needed in order to #import <WebCore/RenderThemeIOS.h> in WebPageIOS.mm. It's because RenderThemeIOS needs RenderTheme which in turn needs ControlStates. > > Source/WebCore/rendering/RenderThemeIOS.mm:315 > > CFStringRef RenderThemeIOS::contentSizeCategory() > > No need to use CFStringRef here. > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:165 > > + CFStringRef _userTextSize; > > We normally use NSString. > > > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1043 > > +- (CFStringRef)_contentSizeCategory > > Ditto. This way you don't need the cast on the return. OK, I'll try getting rid of the CFStringRefs. 1011056 4 231913 mhock 2014-05-22 14:04:58 -0700 Created attachment 231913 address comments 1011063 5 231914 mhock 2014-05-22 14:40:40 -0700 Created attachment 231914 remove unneeded change to FontCacheIOS.mm 1011068 6 mhock 2014-05-22 14:53:01 -0700 Committed r169223: <http://trac.webkit.org/changeset/169223> 231899 2014-05-22 11:13:45 -0700 2014-05-22 14:04:58 -0700 patch applesystemfont.01.diff text/plain 14728 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlNDIyNjU0Li5kMTgzY2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDUtMjIgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IC1hcHBsZS1zeXN0ZW0tIHN0eWxlZCBlbGVtZW50IGRvZW5zJ3QgcmVzcG9uZCB0byBzeXN0ZW0g Zm9udCBzaXplIGNoYW5nZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzMxODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTgzNzgyPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5l eHAuaW46CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUaGVtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ol9jb250ZW50U2l6ZUNhdGVnb3J5 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpjb250ZW50U2l6ZUNhdGVnb3J5 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpzZXRDb250ZW50U2l6ZUNhdGVn b3J5KToKKwogMjAxNC0wNS0yMSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNv bT4KIAogICAgICAgICBbaU9TXSB0d28gbWVkaWEgY29udHJvbCBidXR0b24gc3RyaW5ncyBhcmUg bm90IGxvY2FsaXplZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4g Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCA5OWJlYjRhLi44MzFmOTA3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMjUxNCw2ICsyNTE0LDcgQEAgX19aTjdXZWJDb3JlMTRG cmFtZVNlbGVjdGlvbjUyZXhwYW5kU2VsZWN0aW9uVG9TdGFydE9mV29yZENvbnRhaW5pbmdDYXJl dFNlbGVjdGkKIF9fWk43V2ViQ29yZTE0RnJhbWVTZWxlY3Rpb242bW92ZVRvRVJLTlNfMTVWaXNp YmxlUG9zaXRpb25FTlNfMTRFVXNlclRyaWdnZXJlZEVOUzBfMTlDdXJzb3JBbGlnbk9uU2Nyb2xs RQogX19aTjdXZWJDb3JlMTRGcmFtZVNlbGVjdGlvbjZtb3ZlVG9FUktOU18xNVZpc2libGVQb3Np dGlvbkVTM19OU18xNEVVc2VyVHJpZ2dlcmVkRQogX19aTjdXZWJDb3JlMTRJY29uQ29udHJvbGxl cjN1cmxFdgorX19aTjdXZWJDb3JlMTRSZW5kZXJUaGVtZUlPUzIyc2V0Q29udGVudFNpemVDYXRl Z29yeUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5kbGU2Y2FuY2Vs RXYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5kbGU5c2V0Q2xpZW50RVBOU18yMFJlc291cmNl SGFuZGxlQ2xpZW50RQogX19aTjdXZWJDb3JlMTRSZXNvdXJjZUhhbmRsZUQxRXYKQEAgLTI2MjYs NiArMjYyNyw3IEBAIF9fWk43V2ViQ29yZTRGb250QzFFUktOU18xNkZvbnRQbGF0Zm9ybURhdGFF TjNXVEYxMFBhc3NSZWZQdHJJTlNfMTJGb250U2VsZWN0b3JFCiBfX1pON1dlYkNvcmU0SWNvbjE4 Y3JlYXRlSWNvbkZvckltYWdlRVA3Q0dJbWFnZQogX19aTjdXZWJDb3JlNE5vZGUxN2lzQ29udGVu dEVkaXRhYmxlRU5TMF8yMlVzZXJTZWxlY3RBbGxUcmVhdG1lbnRFCiBfX1pON1dlYkNvcmU0Tm9k ZTIzY29tcGFyZURvY3VtZW50UG9zaXRpb25FUFMwXworX19aTjdXZWJDb3JlNFBhZ2U1MnVwZGF0 ZVN0eWxlRm9yQWxsUGFnZXNBZnRlckdsb2JhbENoYW5nZUluRW52aXJvbm1lbnRFdgogX19aTjdX ZWJDb3JlNUNvbG9yQzFFUDdDR0NvbG9yCiBfX1pON1dlYkNvcmU1RXZlbnRDMUVSS04zV1RGMTJB dG9taWNTdHJpbmdFYmIKIF9fWk43V2ViQ29yZTVGcmFtZTE1c2V0VGltZXJzUGF1c2VkRWIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv aiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRl eCBmMDhmMDQ0Li41MmIxZGY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yMjY5LDYgKzIyNjksNyBAQAogCQk3NTc5M0VEMzBE MENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2ZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NTc5M0VEMDBEMENFODVCMDA3RkMwQUMgLyogRE9N TWVzc2FnZUV2ZW50LmggKi87IH07CiAJCTc1NzkzRUQ0MEQwQ0U4NUIwMDdGQzBBQyAvKiBET01N ZXNzYWdlRXZlbnQubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA3NTc5M0VEMTBEMENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2ZW50Lm1tICovOyB9 OwogCQk3NTc5M0VENTBEMENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2ZW50SW50ZXJuYWwu aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDc1NzkzRUQy MEQwQ0U4NUIwMDdGQzBBQyAvKiBET01NZXNzYWdlRXZlbnRJbnRlcm5hbC5oICovOyB9OworCQk3 NTlDQjgzNzE5MkRBOTE5MDAxMkJDNjQgLyogQ29udHJvbFN0YXRlcy5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzExQzA4QkMxOEUzNUQ2ODAwQjY1NjE1 IC8qIENvbnRyb2xTdGF0ZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwogCQk3NURDQzdCODE4QjgxQzg4MDBBNTcxMjggLyogU2Vzc2lvbklESGFzaC5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNzVEQ0M3Qjcx OEI4MUM4ODAwQTU3MTI4IC8qIFNlc3Npb25JREhhc2guaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklC VVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3NjMzQTcyNjEzRDhCMzNBMDA4NTAxQjYgLyog TG9jYWxlVG9TY3JpcHRNYXBwaW5nLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA3NjMzQTcyNDEzRDhCMzNBMDA4NTAxQjYgLyogTG9jYWxlVG9TY3JpcHRN YXBwaW5nLmggKi87IH07CiAJCTc2MzNBNzI3MTNEOEIzM0EwMDg1MDFCNiAvKiBMb2NhbGVUb1Nj cmlwdE1hcHBpbmdEZWZhdWx0LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDc2MzNBNzI1MTNEOEIzM0EwMDg1MDFCNiAvKiBMb2NhbGVUb1NjcmlwdE1h cHBpbmdEZWZhdWx0LmNwcCAqLzsgfTsKQEAgLTUzOTAsNyArNTM5MSw3IEBACiAJCUJDRUE0ODg3 MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZU1hYy5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NDgwOTdEOTMwMjAwOTRDOUU0IC8qIFJl bmRlclRoZW1lTWFjLmggKi87IH07CiAJCUJDRUE0ODg4MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5k ZXJUaGVtZU1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEJDRUE0ODQ5MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZU1hYy5tbSAqLzsgfTsK IAkJQkNFQTQ4ODkwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRoZW1lLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDRUE0ODRBMDk3RDkzMDIwMDk0 QzlFNCAvKiBSZW5kZXJUaGVtZS5jcHAgKi87IH07Ci0JCUJDRUE0ODhBMDk3RDkzMDIwMDk0QzlF NCAvKiBSZW5kZXJUaGVtZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gQkNFQTQ4NEIwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRoZW1lLmggKi87IH07 CisJCUJDRUE0ODhBMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEIwOTdEOTMwMjAwOTRD OUU0IC8qIFJlbmRlclRoZW1lLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKIAkJQkNFQTQ4OEIwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEMw OTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQuY3BwICovOyB9OwogCQlCQ0VBNDg4QzA5N0Q5 MzAyMDA5NEM5RTQgLyogUmVuZGVyVGV4dC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEQwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQu aCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlCQ0VB NDg4RDA5N0Q5MzAyMDA5NEM5RTQgLyogUmVuZGVyVGV4dEZyYWdtZW50LmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDRUE0ODRFMDk3RDkzMDIwMDk0 QzlFNCAvKiBSZW5kZXJUZXh0RnJhZ21lbnQuY3BwICovOyB9OwpAQCAtNjYwMCw3ICs2NjAxLDcg QEAKIAkJRkVEMTNEM0EwQ0VBOTM0NjAwRDg5NDY2IC8qIEVkaXRvcklPUy5tbSBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRDEzRDM5MENFQTkzNDYwMEQ4 OTQ2NiAvKiBFZGl0b3JJT1MubW0gKi87IH07CiAJCUZFRDEzRDNEMENFQTkzNkEwMEQ4OTQ2NiAv KiBGcmFtZUlPUy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEZFRDEzRDNCMENFQTkzNkEwMEQ4OTQ2NiAvKiBGcmFtZUlPUy5tbSAqLzsgfTsKIAkJRkVE MTNENDAwQ0VBOTM5NDAwRDg5NDY2IC8qIEljb25JT1MubW0gaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0QzRjBDRUE5Mzk0MDBEODk0NjYgLyogSWNv bklPUy5tbSAqLzsgfTsKLQkJRkVEMTNENTIwQ0VBOTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRoZW1l SU9TLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQx M0Q1MDBDRUE5NDk3MDBEODk0NjYgLyogUmVuZGVyVGhlbWVJT1MuaCAqLzsgfTsKKwkJRkVEMTNE NTIwQ0VBOTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRoZW1lSU9TLmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0Q1MDBDRUE5NDk3MDBEODk0NjYgLyog UmVuZGVyVGhlbWVJT1MuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCAp OyB9OyB9OwogCQlGRUQ0ODM5MENFRDY2QzMyNTVGNzJDNTkgLyogTWF0aE1MU2VsZWN0RWxlbWVu dC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNzVB MDU5QUYxNzBEOEZBQTVCOENBQkUgLyogTWF0aE1MU2VsZWN0RWxlbWVudC5jcHAgKi87IH07CiAJ CUZFREVGODQxMTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFREVGODNGMTY3OTcxMDgw MDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmNwcCAqLzsgfTsKIAkJRkVERUY4NDIxNjc5NzEw ODAwMEU0NDRBIC8qIERhdGFiYXNlU3RyYXRlZ3kuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFREVGODQwMTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFz ZVN0cmF0ZWd5LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsg fTsKQEAgLTI1NzYwLDYgKzI1NzYxLDcgQEAKIAkJCQk5N0JDNkE0NTE1MDVGMDgxMDAxQjc0QUMg LyogU1FMUmVzdWx0U2V0Um93TGlzdC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJOTdCQzZBNDgxNTA1 RjA4MTAwMUI3NEFDIC8qIFNRTFN0YXRlbWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJRkU4QTY3 NDgxNkNERDE5RTAwOTMwQkY4IC8qIFNRTFN0YXRlbWVudEJhY2tlbmQuaCBpbiBIZWFkZXJzICov LAorCQkJCTc1OUNCODM3MTkyREE5MTkwMDEyQkM2NCAvKiBDb250cm9sU3RhdGVzLmggaW4gSGVh ZGVycyAqLywKIAkJCQk5N0JDNkE0OTE1MDVGMDgxMDAxQjc0QUMgLyogU1FMU3RhdGVtZW50Q2Fs bGJhY2suaCBpbiBIZWFkZXJzICovLAogCQkJCTk3QkM2QTRCMTUwNUYwODEwMDFCNzRBQyAvKiBT UUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmggaW4gSGVhZGVycyAqLywKIAkJCQk5N0JDNkE0RTE1 MDVGMDgxMDAxQjc0QUMgLyogU1FMU3RhdGVtZW50U3luYy5oIGluIEhlYWRlcnMgKi8sCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCmluZGV4IGM0MjMwMDguLjFiZTVl N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCkBAIC00Nyw2 ICs0Nyw4IEBAIHB1YmxpYzoKIAogICAgIHN0YXRpYyBDRlN0cmluZ1JlZiBjb250ZW50U2l6ZUNh dGVnb3J5KCk7CiAKKyAgICBzdGF0aWMgdm9pZCBzZXRDb250ZW50U2l6ZUNhdGVnb3J5KGNvbnN0 IFN0cmluZyYpOworCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlv bihjb25zdCBSZW5kZXJPYmplY3QmKSBjb25zdCBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCmluZGV4IDgyZTFkMGMuLjY0NGIxZjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KQEAgLTMwNiwxMSArMzA2 LDI0IEBAIFBhc3NSZWZQdHI8UmVuZGVyVGhlbWU+IFJlbmRlclRoZW1lSU9TOjpjcmVhdGUoKQog ICAgIHJldHVybiBhZG9wdFJlZihuZXcgUmVuZGVyVGhlbWVJT1MpOwogfQogCitzdGF0aWMgU3Ry aW5nJiBfY29udGVudFNpemVDYXRlZ29yeSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFN0cmluZz4gX2NvbnRlbnRTaXplQ2F0ZWdvcnk7CisgICAgcmV0dXJuIF9jb250ZW50U2l6ZUNh dGVnb3J5LmdldCgpOworfQorCiBDRlN0cmluZ1JlZiBSZW5kZXJUaGVtZUlPUzo6Y29udGVudFNp emVDYXRlZ29yeSgpCiB7CisgICAgaWYgKCFfY29udGVudFNpemVDYXRlZ29yeSgpLmlzTnVsbCgp KQorICAgICAgICByZXR1cm4gKF9fYnJpZGdlIENGU3RyaW5nUmVmKXN0YXRpY19jYXN0PE5TU3Ry aW5nKj4oX2NvbnRlbnRTaXplQ2F0ZWdvcnkoKSk7CiAgICAgcmV0dXJuIChDRlN0cmluZ1JlZilb W2dldFVJQXBwbGljYXRpb25DbGFzcygpIHNoYXJlZEFwcGxpY2F0aW9uXSBwcmVmZXJyZWRDb250 ZW50U2l6ZUNhdGVnb3J5XTsKIH0KIAordm9pZCBSZW5kZXJUaGVtZUlPUzo6c2V0Q29udGVudFNp emVDYXRlZ29yeShjb25zdCBTdHJpbmcmIGNvbnRlbnRTaXplQ2F0ZWdvcnkpCit7CisgICAgX2Nv bnRlbnRTaXplQ2F0ZWdvcnkoKSA9IGNvbnRlbnRTaXplQ2F0ZWdvcnk7Cit9CisKIGNvbnN0IENv bG9yJiBSZW5kZXJUaGVtZUlPUzo6c2hhZG93Q29sb3IoKSBjb25zdAogewogICAgIHN0YXRpYyBD b2xvciBjb2xvcigwLjBmLCAwLjBmLCAwLjBmLCAwLjdmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhMDdmYzU4 Li5hMjQyMTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTQtMDUtMjIgIE1hcnRp biBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEVuYWJsZSAtYXBwbGUt c3lzdGVtLSBzdHlsZWQgZWxlbWVudHMgdG8gcmVzcG9uZCB0byBzeXN0ZW0gZm9udCBzaXplIGNo YW5nZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzMxODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTgzNzgyPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBpbml0V2l0aEZyYW1lOmNvbmZpZ3Vy YXRpb246XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfY29udGVudFNpemVDYXRlZ29yeURpZENo YW5nZTpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb250ZW50U2l6ZUNhdGVnb3J5XSk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNv bnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb250ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdlKToK KwogMjAxNC0wNS0yMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAg IE9ubHkgZW5hYmxlIHNhbmRib3ggZXh0ZW5zaW9ucyBvbiBtYWMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGYwYzcwMTcuLjNjMzgw MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCkBAIC03OCw2ICs3OCw3IEBACiAjaW1wb3J0ICJXZWJQYWdlTWVzc2FnZXMuaCIKICNpbXBv cnQgPENvcmVHcmFwaGljcy9DR0Zsb2F0Lmg+CiAjaW1wb3J0IDxDb3JlR3JhcGhpY3MvQ0dQREZE b2N1bWVudFByaXZhdGUuaD4KKyNpbXBvcnQgPFVJS2l0L1VJQXBwbGljYXRpb24uaD4KICNpbXBv cnQgPFVJS2l0L1VJUGVyaXBoZXJhbEhvc3RfUHJpdmF0ZS5oPgogI2ltcG9ydCA8UXVhcnR6Q29y ZS9DQVJlbmRlclNlcnZlci5oPgogI2ltcG9ydCA8UXVhcnR6Q29yZS9RdWFydHpDb3JlUHJpdmF0 ZS5oPgpAQCAtMTYxLDYgKzE2Miw4IEBAIFdLV2ViVmlldyogZnJvbVdlYlBhZ2VQcm94eShXZWJL aXQ6OldlYlBhZ2VQcm94eSYgcGFnZSkKIAogICAgIEJPT0wgX3BhZ2VJc1ByaW50aW5nVG9QREY7 CiAgICAgUmV0YWluUHRyPENHUERGRG9jdW1lbnRSZWY+IF9wcmludGVkRG9jdW1lbnQ7CisgICAg Q0ZTdHJpbmdSZWYgX3VzZXJUZXh0U2l6ZTsKKwogI2VuZGlmCiAjaWYgUExBVEZPUk0oTUFDKQog ICAgIFJldGFpblB0cjxXS1ZpZXc+IF93a1ZpZXc7CkBAIC0yMzIsNiArMjM1LDggQEAgV0tXZWJW aWV3KiBmcm9tV2ViUGFnZVByb3h5KFdlYktpdDo6V2ViUGFnZVByb3h5JiBwYWdlKQogICAgIFtj ZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2tleWJvYXJkRGlkQ2hh bmdlRnJhbWU6KSBuYW1lOlVJS2V5Ym9hcmREaWRDaGFuZ2VGcmFtZU5vdGlmaWNhdGlvbiBvYmpl Y3Q6bmlsXTsKICAgICBbY2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9y KF9rZXlib2FyZFdpbGxTaG93OikgbmFtZTpVSUtleWJvYXJkV2lsbFNob3dOb3RpZmljYXRpb24g b2JqZWN0Om5pbF07CiAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxl Y3Rvcihfa2V5Ym9hcmRXaWxsSGlkZTopIG5hbWU6VUlLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0 aW9uIG9iamVjdDpuaWxdOworICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpA c2VsZWN0b3IoX2NvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2U6KSBuYW1lOlVJQ29udGVudFNp emVDYXRlZ29yeURpZENoYW5nZU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKKyAgICBfcGFnZS0+ Y29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZShbc2VsZiBfY29udGVudFNpemVDYXRlZ29yeV0p OwogCiAgICAgW1tfY29uZmlndXJhdGlvbiBfY29udGVudFByb3ZpZGVyUmVnaXN0cnldIGFkZFBh Z2U6Kl9wYWdlXTsKICNlbmRpZgpAQCAtMTAzMCw2ICsxMDM1LDE2IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25NaW5pbXVtTGF5b3V0U2l6ZShXZWJLaXQ6Oldl YlBhZ2VQcm94CiAgICAgW3NlbGYgX2tleWJvYXJkQ2hhbmdlZFdpdGhJbmZvOm5vdGlmaWNhdGlv bi51c2VySW5mbyBhZGp1c3RTY3JvbGxWaWV3OllFU107CiB9CiAKKy0gKHZvaWQpX2NvbnRlbnRT aXplQ2F0ZWdvcnlEaWRDaGFuZ2U6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCit7Cisg ICAgX3BhZ2UtPmNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoW3NlbGYgX2NvbnRlbnRTaXpl Q2F0ZWdvcnldKTsKK30KKworLSAoQ0ZTdHJpbmdSZWYpX2NvbnRlbnRTaXplQ2F0ZWdvcnkKK3sK KyAgICByZXR1cm4gKENGU3RyaW5nUmVmKVtbVUlBcHBsaWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlv bl0gcHJlZmVycmVkQ29udGVudFNpemVDYXRlZ29yeV07Cit9CisKIC0gKHZvaWQpc2V0QWxsb3dz QmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM6KEJPT0wpYWxsb3dzQmFja0ZvcndhcmROYXZp Z2F0aW9uR2VzdHVyZXMKIHsKICAgICBpZiAoX2FsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdl c3R1cmVzID09IGFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGZiMjQ4MDQuLjZkYThkMzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTYzNCw2ICs2MzQsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBkaWROb3RIYW5kbGVUYXBBc0NsaWNrKGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50Jik7CiAgICAgdm9pZCB2aWV3cG9ydE1ldGFUYWdXaWR0aERpZENoYW5nZShmbG9hdCB3 aWR0aCk7CiAgICAgdm9pZCBkaWRGaW5pc2hEcmF3aW5nUGFnZXNUb1BERihjb25zdCBJUEM6OkRh dGFSZWZlcmVuY2UmKTsKKyAgICB2b2lkIGNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoY29u c3QgU3RyaW5nJiBjb250ZW50U2l6ZUNhdGVnb3J5KTsKICNlbmRpZgogCiAgICAgY29uc3QgRWRp dG9yU3RhdGUmIGVkaXRvclN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9lZGl0b3JTdGF0ZTsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQppbmRl eCAzMDg4ZTI5Li4xNjk2Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dlYlBhZ2VQcm94eUlPUy5tbQpAQCAtNjU0LDYgKzY1NCwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkRmluaXNoRHJhd2luZ1BhZ2VzVG9QREYoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBw ZGZEYXRhKQogICAgIG1fcGFnZUNsaWVudC5kaWRGaW5pc2hEcmF3aW5nUGFnZXNUb1BERihwZGZE YXRhKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFu Z2UoY29uc3QgU3RyaW5nJiBjb250ZW50U2l6ZUNhdGVnb3J5KQoreworICAgIHByb2Nlc3MoKS5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDb250ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdlKGNvbnRl bnRTaXplQ2F0ZWdvcnkpLCBtX3BhZ2VJRCk7Cit9CisKICNpZiBVU0UoUVVJQ0tfTE9PSykKICAg ICAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydExvYWRGb3JRdWlja0xvb2tEb2N1bWVudElu TWFpbkZyYW1lKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IFN0cmluZyYgdXRpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMjlmNmFmZS4u YjIyM2NkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o CkBAIC00ODcsNiArNDg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgdXBkYXRlU2VsZWN0aW9uQXBw ZWFyYW5jZSgpOwogCiAgICAgdm9pZCBkaXNwYXRjaEFzeW5jaHJvbm91c1RvdWNoRXZlbnRzKGNv bnN0IFZlY3RvcjxXZWJUb3VjaEV2ZW50LCAxPiYgcXVldWUpOworICAgIHZvaWQgY29udGVudFNp emVDYXRlZ29yeURpZENoYW5nZShjb25zdCBTdHJpbmcmKTsKICNpZiBFTkFCTEUoSU5TUEVDVE9S KQogICAgIHZvaWQgc2hvd0luc3BlY3RvckluZGljYXRpb24oKTsKICAgICB2b2lkIGhpZGVJbnNw ZWN0b3JJbmRpY2F0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDFjMWNjYjAuLmFhY2IyZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz LmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluCkBAIC03OCw2ICs3OCw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2 ZXIgewogICAgIEFwcGxpY2F0aW9uV2lsbFJlc2lnbkFjdGl2ZSgpCiAgICAgQXBwbGljYXRpb25X aWxsRW50ZXJGb3JlZ3JvdW5kKCkKICAgICBBcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZSgpCisg ICAgQ29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZShTdHJpbmcgY29udGVudFNpemVDYXRlZ29y eSkKICNlbmRpZgogCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1IpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggNzgy YTEzOC4uODE1MGQ2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtNzYsNiArNzYsNyBAQAogI2ltcG9ydCA8V2ViQ29y ZS9QbGF0Zm9ybU1vdXNlRXZlbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyQmxvY2suaD4K ICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVySW1hZ2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUmVuZGVy VGhlbWVJT1MuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyVmlldy5oPgogI2ltcG9ydCA8V2Vi Q29yZS9SZXNvdXJjZUJ1ZmZlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4K QEAgLTIzMTcsNiArMjMxOCwxMiBAQCB2b2lkIFdlYlBhZ2U6OmNvbXB1dGVQYWdlc0ZvclByaW50 aW5nQW5kU3RhcnREcmF3aW5nVG9QREYodWludDY0X3QgZnJhbWVJRCwgY29ucwogICAgIHNlbmQo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmluaXNoRHJhd2luZ1BhZ2VzVG9QREYoSVBDOjpE YXRhUmVmZXJlbmNlKENGRGF0YUdldEJ5dGVQdHIocGRmUGFnZURhdGEuZ2V0KCkpLCBDRkRhdGFH ZXRMZW5ndGgocGRmUGFnZURhdGEuZ2V0KCkpKSkpOwogfQogCit2b2lkIFdlYlBhZ2U6OmNvbnRl bnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoY29uc3QgU3RyaW5nJiBjb250ZW50U2l6ZUNhdGVnb3J5 KQoreworICAgIFJlbmRlclRoZW1lSU9TOjpzZXRDb250ZW50U2l6ZUNhdGVnb3J5KGNvbnRlbnRT aXplQ2F0ZWdvcnkpOworICAgIFBhZ2U6OnVwZGF0ZVN0eWxlRm9yQWxsUGFnZXNBZnRlckdsb2Jh bENoYW5nZUluRW52aXJvbm1lbnQoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNl bmRpZiAvLyBQTEFURk9STShJT1MpCg== 231913 2014-05-22 14:04:58 -0700 2014-05-22 14:40:40 -0700 address comments applesystemfont.02.diff text/plain 15539 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNmM2ZmE5Li4zYzg2NWI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDUtMjIgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIEVuYWJsZSAtYXBwbGUtc3lzdGVtLSBzdHlsZWQgZWxlbWVudHMgdG8gcmVzcG9uZCB0 byBzeXN0ZW0gZm9udCBzaXplIGNoYW5nZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMxODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTgz NzgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVucmljYSBDYXN1Y2NpLgorCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ol9jb250ZW50U2l6 ZUNhdGVnb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpjb250ZW50U2l6 ZUNhdGVnb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpzZXRDb250ZW50 U2l6ZUNhdGVnb3J5KToKKwogMjAxNC0wNS0yMiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxl LmNvbT4KIAogICAgICAgICBbTVNFXSBTdG9yZWQgc2FtcGxlcyBhcmUgbm90IGZyZWVkIHdoZW4g U291cmNlQnVmZmVyIGlzIHJlbW92ZWQgZnJvbSBNZWRpYVNvdXJjZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgppbmRleCBlZTdiYjg1Li5jMDdkOTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMjUxNSw2 ICsyNTE1LDcgQEAgX19aTjdXZWJDb3JlMTRGcmFtZVNlbGVjdGlvbjUyZXhwYW5kU2VsZWN0aW9u VG9TdGFydE9mV29yZENvbnRhaW5pbmdDYXJldFNlbGVjdGkKIF9fWk43V2ViQ29yZTE0RnJhbWVT ZWxlY3Rpb242bW92ZVRvRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FTlNfMTRFVXNlclRyaWdnZXJl ZEVOUzBfMTlDdXJzb3JBbGlnbk9uU2Nyb2xsRQogX19aTjdXZWJDb3JlMTRGcmFtZVNlbGVjdGlv bjZtb3ZlVG9FUktOU18xNVZpc2libGVQb3NpdGlvbkVTM19OU18xNEVVc2VyVHJpZ2dlcmVkRQog X19aTjdXZWJDb3JlMTRJY29uQ29udHJvbGxlcjN1cmxFdgorX19aTjdXZWJDb3JlMTRSZW5kZXJU aGVtZUlPUzIyc2V0Q29udGVudFNpemVDYXRlZ29yeUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2Vi Q29yZTE0UmVzb3VyY2VIYW5kbGU2Y2FuY2VsRXYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5k bGU5c2V0Q2xpZW50RVBOU18yMFJlc291cmNlSGFuZGxlQ2xpZW50RQogX19aTjdXZWJDb3JlMTRS ZXNvdXJjZUhhbmRsZUQxRXYKQEAgLTI2MjcsNiArMjYyOCw3IEBAIF9fWk43V2ViQ29yZTRGb250 QzFFUktOU18xNkZvbnRQbGF0Zm9ybURhdGFFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTJGb250U2Vs ZWN0b3JFCiBfX1pON1dlYkNvcmU0SWNvbjE4Y3JlYXRlSWNvbkZvckltYWdlRVA3Q0dJbWFnZQog X19aTjdXZWJDb3JlNE5vZGUxN2lzQ29udGVudEVkaXRhYmxlRU5TMF8yMlVzZXJTZWxlY3RBbGxU cmVhdG1lbnRFCiBfX1pON1dlYkNvcmU0Tm9kZTIzY29tcGFyZURvY3VtZW50UG9zaXRpb25FUFMw XworX19aTjdXZWJDb3JlNFBhZ2U1MnVwZGF0ZVN0eWxlRm9yQWxsUGFnZXNBZnRlckdsb2JhbENo YW5nZUluRW52aXJvbm1lbnRFdgogX19aTjdXZWJDb3JlNUNvbG9yQzFFUDdDR0NvbG9yCiBfX1pO N1dlYkNvcmU1RXZlbnRDMUVSS04zV1RGMTJBdG9taWNTdHJpbmdFYmIKIF9fWk43V2ViQ29yZTVG cmFtZTE1c2V0VGltZXJzUGF1c2VkRWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBmMDhmMDQ0Li41MmIxZGY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yMjY5 LDYgKzIyNjksNyBAQAogCQk3NTc5M0VEMzBEMENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2 ZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NTc5 M0VEMDBEMENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2ZW50LmggKi87IH07CiAJCTc1Nzkz RUQ0MEQwQ0U4NUIwMDdGQzBBQyAvKiBET01NZXNzYWdlRXZlbnQubW0gaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NTc5M0VEMTBEMENFODVCMDA3RkMwQUMg LyogRE9NTWVzc2FnZUV2ZW50Lm1tICovOyB9OwogCQk3NTc5M0VENTBEMENFODVCMDA3RkMwQUMg LyogRE9NTWVzc2FnZUV2ZW50SW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDc1NzkzRUQyMEQwQ0U4NUIwMDdGQzBBQyAvKiBET01NZXNzYWdl RXZlbnRJbnRlcm5hbC5oICovOyB9OworCQk3NTlDQjgzNzE5MkRBOTE5MDAxMkJDNjQgLyogQ29u dHJvbFN0YXRlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMzExQzA4QkMxOEUzNUQ2ODAwQjY1NjE1IC8qIENvbnRyb2xTdGF0ZXMuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3NURDQzdCODE4QjgxQzg4 MDBBNTcxMjggLyogU2Vzc2lvbklESGFzaC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNzVEQ0M3QjcxOEI4MUM4ODAwQTU3MTI4IC8qIFNlc3Npb25JREhh c2guaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3 NjMzQTcyNjEzRDhCMzNBMDA4NTAxQjYgLyogTG9jYWxlVG9TY3JpcHRNYXBwaW5nLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NjMzQTcyNDEzRDhCMzNB MDA4NTAxQjYgLyogTG9jYWxlVG9TY3JpcHRNYXBwaW5nLmggKi87IH07CiAJCTc2MzNBNzI3MTNE OEIzM0EwMDg1MDFCNiAvKiBMb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZhdWx0LmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDc2MzNBNzI1MTNEOEIzM0Ew MDg1MDFCNiAvKiBMb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZhdWx0LmNwcCAqLzsgfTsKQEAgLTUz OTAsNyArNTM5MSw3IEBACiAJCUJDRUE0ODg3MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVt ZU1hYy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNF QTQ4NDgwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRoZW1lTWFjLmggKi87IH07CiAJCUJDRUE0 ODg4MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZU1hYy5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDRUE0ODQ5MDk3RDkzMDIwMDk0QzlFNCAv KiBSZW5kZXJUaGVtZU1hYy5tbSAqLzsgfTsKIAkJQkNFQTQ4ODkwOTdEOTMwMjAwOTRDOUU0IC8q IFJlbmRlclRoZW1lLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEJDRUE0ODRBMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZS5jcHAgKi87IH07 Ci0JCUJDRUE0ODhBMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEIwOTdEOTMwMjAwOTRD OUU0IC8qIFJlbmRlclRoZW1lLmggKi87IH07CisJCUJDRUE0ODhBMDk3RDkzMDIwMDk0QzlFNCAv KiBSZW5kZXJUaGVtZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gQkNFQTQ4NEIwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRoZW1lLmggKi87IHNldHRp bmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQkNFQTQ4OEIwOTdEOTMw MjAwOTRDOUU0IC8qIFJlbmRlclRleHQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEMwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQu Y3BwICovOyB9OwogCQlCQ0VBNDg4QzA5N0Q5MzAyMDA5NEM5RTQgLyogUmVuZGVyVGV4dC5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEQwOTdE OTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQlCQ0VBNDg4RDA5N0Q5MzAyMDA5NEM5RTQgLyogUmVuZGVy VGV4dEZyYWdtZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEJDRUE0ODRFMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUZXh0RnJhZ21lbnQuY3Bw ICovOyB9OwpAQCAtNjYwMCw3ICs2NjAxLDcgQEAKIAkJRkVEMTNEM0EwQ0VBOTM0NjAwRDg5NDY2 IC8qIEVkaXRvcklPUy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEZFRDEzRDM5MENFQTkzNDYwMEQ4OTQ2NiAvKiBFZGl0b3JJT1MubW0gKi87IH07CiAJ CUZFRDEzRDNEMENFQTkzNkEwMEQ4OTQ2NiAvKiBGcmFtZUlPUy5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRDEzRDNCMENFQTkzNkEwMEQ4OTQ2NiAv KiBGcmFtZUlPUy5tbSAqLzsgfTsKIAkJRkVEMTNENDAwQ0VBOTM5NDAwRDg5NDY2IC8qIEljb25J T1MubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQx M0QzRjBDRUE5Mzk0MDBEODk0NjYgLyogSWNvbklPUy5tbSAqLzsgfTsKLQkJRkVEMTNENTIwQ0VB OTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRoZW1lSU9TLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0Q1MDBDRUE5NDk3MDBEODk0NjYgLyogUmVuZGVy VGhlbWVJT1MuaCAqLzsgfTsKKwkJRkVEMTNENTIwQ0VBOTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRo ZW1lSU9TLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBG RUQxM0Q1MDBDRUE5NDk3MDBEODk0NjYgLyogUmVuZGVyVGhlbWVJT1MuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRUQ0ODM5MENFRDY2QzMyNTVG NzJDNTkgLyogTWF0aE1MU2VsZWN0RWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNzVBMDU5QUYxNzBEOEZBQTVCOENBQkUgLyogTWF0aE1M U2VsZWN0RWxlbWVudC5jcHAgKi87IH07CiAJCUZFREVGODQxMTY3OTcxMDgwMDBFNDQ0QSAvKiBE YXRhYmFzZVN0cmF0ZWd5LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEZFREVGODNGMTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmNw cCAqLzsgfTsKIAkJRkVERUY4NDIxNjc5NzEwODAwMEU0NDRBIC8qIERhdGFiYXNlU3RyYXRlZ3ku aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFREVGODQw MTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmggKi87IHNldHRpbmdzID0ge0FU VFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTI1NzYwLDYgKzI1NzYxLDcgQEAKIAkJ CQk5N0JDNkE0NTE1MDVGMDgxMDAxQjc0QUMgLyogU1FMUmVzdWx0U2V0Um93TGlzdC5oIGluIEhl YWRlcnMgKi8sCiAJCQkJOTdCQzZBNDgxNTA1RjA4MTAwMUI3NEFDIC8qIFNRTFN0YXRlbWVudC5o IGluIEhlYWRlcnMgKi8sCiAJCQkJRkU4QTY3NDgxNkNERDE5RTAwOTMwQkY4IC8qIFNRTFN0YXRl bWVudEJhY2tlbmQuaCBpbiBIZWFkZXJzICovLAorCQkJCTc1OUNCODM3MTkyREE5MTkwMDEyQkM2 NCAvKiBDb250cm9sU3RhdGVzLmggaW4gSGVhZGVycyAqLywKIAkJCQk5N0JDNkE0OTE1MDVGMDgx MDAxQjc0QUMgLyogU1FMU3RhdGVtZW50Q2FsbGJhY2suaCBpbiBIZWFkZXJzICovLAogCQkJCTk3 QkM2QTRCMTUwNUYwODEwMDFCNzRBQyAvKiBTUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmggaW4g SGVhZGVycyAqLywKIAkJCQk5N0JDNkE0RTE1MDVGMDgxMDAxQjc0QUMgLyogU1FMU3RhdGVtZW50 U3luYy5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaW9zL0ZvbnRDYWNoZUlPUy5tbQppbmRleCBlMDRjNzM0Li5mYzgwZDAyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udENhY2hlSU9T Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250Q2FjaGVJ T1MubW0KQEAgLTU1NSw3ICs1NTUsNyBAQCBzdGF0aWMgQ1RGb250UmVmIGNyZWF0ZUNURm9udFdp dGhUZXh0U3R5bGUoY29uc3QgU3RyaW5nJiBmYW1pbHlOYW1lLCBDVEZvbnRTeW1ibwogICAgIGlm ICh0cmFpdHMgJiBrQ1RGb250VHJhaXRJdGFsaWMpCiAgICAgICAgIHN5bWJvbGljVHJhaXRzIHw9 IGtDVEZvbnRUcmFpdEl0YWxpYzsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGZhbWlseU5h bWVTdHIgPSBmYW1pbHlOYW1lLmNyZWF0ZUNGU3RyaW5nKCk7Ci0gICAgUmV0YWluUHRyPENURm9u dERlc2NyaXB0b3JSZWY+IGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9y Q3JlYXRlV2l0aFRleHRTdHlsZShmYW1pbHlOYW1lU3RyLmdldCgpLCBSZW5kZXJUaGVtZUlPUzo6 Y29udGVudFNpemVDYXRlZ29yeSgpLCBudWxscHRyKSk7CisgICAgUmV0YWluUHRyPENURm9udERl c2NyaXB0b3JSZWY+IGZvbnREZXNjcmlwdG9yID0gYWRvcHRDRihDVEZvbnREZXNjcmlwdG9yQ3Jl YXRlV2l0aFRleHRTdHlsZShmYW1pbHlOYW1lU3RyLmdldCgpLCAoX19icmlkZ2UgQ0ZTdHJpbmdS ZWYpUmVuZGVyVGhlbWVJT1M6OmNvbnRlbnRTaXplQ2F0ZWdvcnkoKSwgbnVsbHB0cikpOwogICAg IGlmIChzeW1ib2xpY1RyYWl0cykKICAgICAgICAgZm9udERlc2NyaXB0b3IgPSBhZG9wdENGKENU Rm9udERlc2NyaXB0b3JDcmVhdGVDb3B5V2l0aFN5bWJvbGljVHJhaXRzKGZvbnREZXNjcmlwdG9y LmdldCgpLCBzeW1ib2xpY1RyYWl0cywgc3ltYm9saWNUcmFpdHMpKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaAppbmRleCBjNDIzMDA4Li4xYmU1ZTdkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MuaApAQCAtNDcsNiArNDcsOCBA QCBwdWJsaWM6CiAKICAgICBzdGF0aWMgQ0ZTdHJpbmdSZWYgY29udGVudFNpemVDYXRlZ29yeSgp OwogCisgICAgc3RhdGljIHZvaWQgc2V0Q29udGVudFNpemVDYXRlZ29yeShjb25zdCBTdHJpbmcm KTsKKwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9zaXRpb24oY29uc3Qg UmVuZGVyT2JqZWN0JikgY29uc3Qgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUlPUy5tbQppbmRleCA4MmUxZDBjLi42NDRiMWYyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCkBAIC0zMDYsMTEgKzMwNiwyNCBAQCBQ YXNzUmVmUHRyPFJlbmRlclRoZW1lPiBSZW5kZXJUaGVtZUlPUzo6Y3JlYXRlKCkKICAgICByZXR1 cm4gYWRvcHRSZWYobmV3IFJlbmRlclRoZW1lSU9TKTsKIH0KIAorc3RhdGljIFN0cmluZyYgX2Nv bnRlbnRTaXplQ2F0ZWdvcnkoKQoreworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxTdHJpbmc+ IF9jb250ZW50U2l6ZUNhdGVnb3J5OworICAgIHJldHVybiBfY29udGVudFNpemVDYXRlZ29yeS5n ZXQoKTsKK30KKwogQ0ZTdHJpbmdSZWYgUmVuZGVyVGhlbWVJT1M6OmNvbnRlbnRTaXplQ2F0ZWdv cnkoKQogeworICAgIGlmICghX2NvbnRlbnRTaXplQ2F0ZWdvcnkoKS5pc051bGwoKSkKKyAgICAg ICAgcmV0dXJuIChfX2JyaWRnZSBDRlN0cmluZ1JlZilzdGF0aWNfY2FzdDxOU1N0cmluZyo+KF9j b250ZW50U2l6ZUNhdGVnb3J5KCkpOwogICAgIHJldHVybiAoQ0ZTdHJpbmdSZWYpW1tnZXRVSUFw cGxpY2F0aW9uQ2xhc3MoKSBzaGFyZWRBcHBsaWNhdGlvbl0gcHJlZmVycmVkQ29udGVudFNpemVD YXRlZ29yeV07CiB9CiAKK3ZvaWQgUmVuZGVyVGhlbWVJT1M6OnNldENvbnRlbnRTaXplQ2F0ZWdv cnkoY29uc3QgU3RyaW5nJiBjb250ZW50U2l6ZUNhdGVnb3J5KQoreworICAgIF9jb250ZW50U2l6 ZUNhdGVnb3J5KCkgPSBjb250ZW50U2l6ZUNhdGVnb3J5OworfQorCiBjb25zdCBDb2xvciYgUmVu ZGVyVGhlbWVJT1M6OnNoYWRvd0NvbG9yKCkgY29uc3QKIHsKICAgICBzdGF0aWMgQ29sb3IgY29s b3IoMC4wZiwgMC4wZiwgMC4wZiwgMC43Zik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjQxNjdmZi4uOGU1ZjAy NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA1LTIyICBNYXJ0aW4gSG9jayAg PG1ob2NrQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBFbmFibGUgLWFwcGxlLXN5c3RlbS0g c3R5bGVkIGVsZW1lbnRzIHRvIHJlc3BvbmQgdG8gc3lzdGVtIGZvbnQgc2l6ZSBjaGFuZ2VzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMTg2Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjU4Mzc4Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBF bnJpY2EgQ2FzdWNjaS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgaW5pdFdpdGhGcmFtZTpjb25maWd1cmF0aW9uOl0p OgorICAgICAgICAoLVtXS1dlYlZpZXcgX2NvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2U6XSk6 CisgICAgICAgICgtW1dLV2ViVmlldyBfY29udGVudFNpemVDYXRlZ29yeV0pOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBh Z2VQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpjb250ZW50U2l6 ZUNhdGVnb3J5RGlkQ2hhbmdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZTo6Y29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZSk6CisKIDIwMTQt MDUtMjIgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lP U11bV0syXSBBcHBsaWNhdGlvbiBjYWNoZSBpcyBicm9rZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggZjBjNzAxNy4uYmFjODcwYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0K QEAgLTc4LDYgKzc4LDcgQEAKICNpbXBvcnQgIldlYlBhZ2VNZXNzYWdlcy5oIgogI2ltcG9ydCA8 Q29yZUdyYXBoaWNzL0NHRmxvYXQuaD4KICNpbXBvcnQgPENvcmVHcmFwaGljcy9DR1BERkRvY3Vt ZW50UHJpdmF0ZS5oPgorI2ltcG9ydCA8VUlLaXQvVUlBcHBsaWNhdGlvbi5oPgogI2ltcG9ydCA8 VUlLaXQvVUlQZXJpcGhlcmFsSG9zdF9Qcml2YXRlLmg+CiAjaW1wb3J0IDxRdWFydHpDb3JlL0NB UmVuZGVyU2VydmVyLmg+CiAjaW1wb3J0IDxRdWFydHpDb3JlL1F1YXJ0ekNvcmVQcml2YXRlLmg+ CkBAIC0yMzIsNiArMjMzLDggQEAgV0tXZWJWaWV3KiBmcm9tV2ViUGFnZVByb3h5KFdlYktpdDo6 V2ViUGFnZVByb3h5JiBwYWdlKQogICAgIFtjZW50ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3Rv cjpAc2VsZWN0b3IoX2tleWJvYXJkRGlkQ2hhbmdlRnJhbWU6KSBuYW1lOlVJS2V5Ym9hcmREaWRD aGFuZ2VGcmFtZU5vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICAgICBbY2VudGVyIGFkZE9ic2Vy dmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF9rZXlib2FyZFdpbGxTaG93OikgbmFtZTpVSUtl eWJvYXJkV2lsbFNob3dOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CiAgICAgW2NlbnRlciBhZGRP YnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfa2V5Ym9hcmRXaWxsSGlkZTopIG5hbWU6 VUlLZXlib2FyZFdpbGxIaWRlTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOworICAgIFtjZW50ZXIg YWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2NvbnRlbnRTaXplQ2F0ZWdvcnlE aWRDaGFuZ2U6KSBuYW1lOlVJQ29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZU5vdGlmaWNhdGlv biBvYmplY3Q6bmlsXTsKKyAgICBfcGFnZS0+Y29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZShb c2VsZiBfY29udGVudFNpemVDYXRlZ29yeV0pOwogCiAgICAgW1tfY29uZmlndXJhdGlvbiBfY29u dGVudFByb3ZpZGVyUmVnaXN0cnldIGFkZFBhZ2U6Kl9wYWdlXTsKICNlbmRpZgpAQCAtMTAzMCw2 ICsxMDMzLDE2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25N aW5pbXVtTGF5b3V0U2l6ZShXZWJLaXQ6OldlYlBhZ2VQcm94CiAgICAgW3NlbGYgX2tleWJvYXJk Q2hhbmdlZFdpdGhJbmZvOm5vdGlmaWNhdGlvbi51c2VySW5mbyBhZGp1c3RTY3JvbGxWaWV3OllF U107CiB9CiAKKy0gKHZvaWQpX2NvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2U6KE5TTm90aWZp Y2F0aW9uICopbm90aWZpY2F0aW9uCit7CisgICAgX3BhZ2UtPmNvbnRlbnRTaXplQ2F0ZWdvcnlE aWRDaGFuZ2UoW3NlbGYgX2NvbnRlbnRTaXplQ2F0ZWdvcnldKTsKK30KKworLSAoTlNTdHJpbmcg KilfY29udGVudFNpemVDYXRlZ29yeQoreworICAgIHJldHVybiBbW1VJQXBwbGljYXRpb24gc2hh cmVkQXBwbGljYXRpb25dIHByZWZlcnJlZENvbnRlbnRTaXplQ2F0ZWdvcnldOworfQorCiAtICh2 b2lkKXNldEFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzOihCT09MKWFsbG93c0Jh Y2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1cmVzCiB7CiAgICAgaWYgKF9hbGxvd3NCYWNrRm9yd2Fy ZE5hdmlnYXRpb25HZXN0dXJlcyA9PSBhbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJl cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBmYjI0ODA0Li42 ZGE4ZDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC02MzQs NiArNjM0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkTm90SGFuZGxlVGFwQXNDbGljayhjb25z dCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIHZvaWQgdmlld3BvcnRNZXRhVGFnV2lkdGhEaWRD aGFuZ2UoZmxvYXQgd2lkdGgpOwogICAgIHZvaWQgZGlkRmluaXNoRHJhd2luZ1BhZ2VzVG9QREYo Y29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJik7CisgICAgdm9pZCBjb250ZW50U2l6ZUNhdGVnb3J5 RGlkQ2hhbmdlKGNvbnN0IFN0cmluZyYgY29udGVudFNpemVDYXRlZ29yeSk7CiAjZW5kaWYKIAog ICAgIGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3JTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZWRp dG9yU3RhdGU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2Vi UGFnZVByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJv eHlJT1MubW0KaW5kZXggMzA4OGUyOS4uMTY5NmNjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KQEAgLTY1NCw2ICs2NTQsMTEgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaERyYXdpbmdQYWdlc1RvUERGKGNvbnN0IElQQzo6RGF0 YVJlZmVyZW5jZSYgcGRmRGF0YSkKICAgICBtX3BhZ2VDbGllbnQuZGlkRmluaXNoRHJhd2luZ1Bh Z2VzVG9QREYocGRmRGF0YSk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpjb250ZW50U2l6ZUNh dGVnb3J5RGlkQ2hhbmdlKGNvbnN0IFN0cmluZyYgY29udGVudFNpemVDYXRlZ29yeSkKK3sKKyAg ICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q29udGVudFNpemVDYXRlZ29yeURp ZENoYW5nZShjb250ZW50U2l6ZUNhdGVnb3J5KSwgbV9wYWdlSUQpOworfQorCiAjaWYgVVNFKFFV SUNLX0xPT0spCiAgICAgCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRMb2FkRm9yUXVpY2tM b29rRG9jdW1lbnRJbk1haW5GcmFtZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBTdHJp bmcmIHV0aSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu ZGV4IDI5ZjZhZmUuLmIyMjNjZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaApAQCAtNDg3LDYgKzQ4Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHVwZGF0 ZVNlbGVjdGlvbkFwcGVhcmFuY2UoKTsKIAogICAgIHZvaWQgZGlzcGF0Y2hBc3luY2hyb25vdXNU b3VjaEV2ZW50cyhjb25zdCBWZWN0b3I8V2ViVG91Y2hFdmVudCwgMT4mIHF1ZXVlKTsKKyAgICB2 b2lkIGNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoY29uc3QgU3RyaW5nJik7CiAjaWYgRU5B QkxFKElOU1BFQ1RPUikKICAgICB2b2lkIHNob3dJbnNwZWN0b3JJbmRpY2F0aW9uKCk7CiAgICAg dm9pZCBoaWRlSW5zcGVjdG9ySW5kaWNhdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCAxYzFjY2IwLi5h YWNiMmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtNzgsNiArNzgsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdl IExlZ2FjeVJlY2VpdmVyIHsKICAgICBBcHBsaWNhdGlvbldpbGxSZXNpZ25BY3RpdmUoKQogICAg IEFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCgpCiAgICAgQXBwbGljYXRpb25EaWRCZWNv bWVBY3RpdmUoKQorICAgIENvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoU3RyaW5nIGNvbnRl bnRTaXplQ2F0ZWdvcnkpCiAjZW5kaWYKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5TUEVDVE9SKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdl SU9TLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tCmluZGV4IGYyOWJmYmIuLjBiYTBiZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTc2LDYgKzc2LDcgQEAKICNp bXBvcnQgPFdlYkNvcmUvUGxhdGZvcm1Nb3VzZUV2ZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Jl bmRlckJsb2NrLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1JlbmRlckltYWdlLmg+CisjaW1wb3J0IDxX ZWJDb3JlL1JlbmRlclRoZW1lSU9TLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1JlbmRlclZpZXcuaD4K ICNpbXBvcnQgPFdlYkNvcmUvUmVzb3VyY2VCdWZmZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvU2hh cmVkQnVmZmVyLmg+CkBAIC0yMzI2LDYgKzIzMjcsMTIgQEAgdm9pZCBXZWJQYWdlOjpjb21wdXRl UGFnZXNGb3JQcmludGluZ0FuZFN0YXJ0RHJhd2luZ1RvUERGKHVpbnQ2NF90IGZyYW1lSUQsIGNv bnMKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZpbmlzaERyYXdpbmdQYWdl c1RvUERGKElQQzo6RGF0YVJlZmVyZW5jZShDRkRhdGFHZXRCeXRlUHRyKHBkZlBhZ2VEYXRhLmdl dCgpKSwgQ0ZEYXRhR2V0TGVuZ3RoKHBkZlBhZ2VEYXRhLmdldCgpKSkpKTsKIH0KIAordm9pZCBX ZWJQYWdlOjpjb250ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdlKGNvbnN0IFN0cmluZyYgY29udGVu dFNpemVDYXRlZ29yeSkKK3sKKyAgICBSZW5kZXJUaGVtZUlPUzo6c2V0Q29udGVudFNpemVDYXRl Z29yeShjb250ZW50U2l6ZUNhdGVnb3J5KTsKKyAgICBQYWdlOjp1cGRhdGVTdHlsZUZvckFsbFBh Z2VzQWZ0ZXJHbG9iYWxDaGFuZ2VJbkVudmlyb25tZW50KCk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYktpdAogCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKQo= 231914 2014-05-22 14:40:40 -0700 2014-05-22 14:40:40 -0700 remove unneeded change to FontCacheIOS.mm applesystemfont.03.diff text/plain 14515 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNmM2ZmE5Li4zYzg2NWI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTQtMDUtMjIgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdIEVuYWJsZSAtYXBwbGUtc3lzdGVtLSBzdHlsZWQgZWxlbWVudHMgdG8gcmVzcG9uZCB0 byBzeXN0ZW0gZm9udCBzaXplIGNoYW5nZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMxODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTgz NzgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVucmljYSBDYXN1Y2NpLgorCisgICAgICAgICog V2ViQ29yZS5leHAuaW46CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ol9jb250ZW50U2l6 ZUNhdGVnb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpjb250ZW50U2l6 ZUNhdGVnb3J5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjpzZXRDb250ZW50 U2l6ZUNhdGVnb3J5KToKKwogMjAxNC0wNS0yMiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxl LmNvbT4KIAogICAgICAgICBbTVNFXSBTdG9yZWQgc2FtcGxlcyBhcmUgbm90IGZyZWVkIHdoZW4g U291cmNlQnVmZmVyIGlzIHJlbW92ZWQgZnJvbSBNZWRpYVNvdXJjZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5p bgppbmRleCBlZTdiYjg1Li5jMDdkOTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMjUxNSw2 ICsyNTE1LDcgQEAgX19aTjdXZWJDb3JlMTRGcmFtZVNlbGVjdGlvbjUyZXhwYW5kU2VsZWN0aW9u VG9TdGFydE9mV29yZENvbnRhaW5pbmdDYXJldFNlbGVjdGkKIF9fWk43V2ViQ29yZTE0RnJhbWVT ZWxlY3Rpb242bW92ZVRvRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FTlNfMTRFVXNlclRyaWdnZXJl ZEVOUzBfMTlDdXJzb3JBbGlnbk9uU2Nyb2xsRQogX19aTjdXZWJDb3JlMTRGcmFtZVNlbGVjdGlv bjZtb3ZlVG9FUktOU18xNVZpc2libGVQb3NpdGlvbkVTM19OU18xNEVVc2VyVHJpZ2dlcmVkRQog X19aTjdXZWJDb3JlMTRJY29uQ29udHJvbGxlcjN1cmxFdgorX19aTjdXZWJDb3JlMTRSZW5kZXJU aGVtZUlPUzIyc2V0Q29udGVudFNpemVDYXRlZ29yeUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2Vi Q29yZTE0UmVzb3VyY2VIYW5kbGU2Y2FuY2VsRXYKIF9fWk43V2ViQ29yZTE0UmVzb3VyY2VIYW5k bGU5c2V0Q2xpZW50RVBOU18yMFJlc291cmNlSGFuZGxlQ2xpZW50RQogX19aTjdXZWJDb3JlMTRS ZXNvdXJjZUhhbmRsZUQxRXYKQEAgLTI2MjcsNiArMjYyOCw3IEBAIF9fWk43V2ViQ29yZTRGb250 QzFFUktOU18xNkZvbnRQbGF0Zm9ybURhdGFFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTJGb250U2Vs ZWN0b3JFCiBfX1pON1dlYkNvcmU0SWNvbjE4Y3JlYXRlSWNvbkZvckltYWdlRVA3Q0dJbWFnZQog X19aTjdXZWJDb3JlNE5vZGUxN2lzQ29udGVudEVkaXRhYmxlRU5TMF8yMlVzZXJTZWxlY3RBbGxU cmVhdG1lbnRFCiBfX1pON1dlYkNvcmU0Tm9kZTIzY29tcGFyZURvY3VtZW50UG9zaXRpb25FUFMw XworX19aTjdXZWJDb3JlNFBhZ2U1MnVwZGF0ZVN0eWxlRm9yQWxsUGFnZXNBZnRlckdsb2JhbENo YW5nZUluRW52aXJvbm1lbnRFdgogX19aTjdXZWJDb3JlNUNvbG9yQzFFUDdDR0NvbG9yCiBfX1pO N1dlYkNvcmU1RXZlbnRDMUVSS04zV1RGMTJBdG9taWNTdHJpbmdFYmIKIF9fWk43V2ViQ29yZTVG cmFtZTE1c2V0VGltZXJzUGF1c2VkRWIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBmMDhmMDQ0Li41MmIxZGY5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yMjY5 LDYgKzIyNjksNyBAQAogCQk3NTc5M0VEMzBEMENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2 ZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NTc5 M0VEMDBEMENFODVCMDA3RkMwQUMgLyogRE9NTWVzc2FnZUV2ZW50LmggKi87IH07CiAJCTc1Nzkz RUQ0MEQwQ0U4NUIwMDdGQzBBQyAvKiBET01NZXNzYWdlRXZlbnQubW0gaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NTc5M0VEMTBEMENFODVCMDA3RkMwQUMg LyogRE9NTWVzc2FnZUV2ZW50Lm1tICovOyB9OwogCQk3NTc5M0VENTBEMENFODVCMDA3RkMwQUMg LyogRE9NTWVzc2FnZUV2ZW50SW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDc1NzkzRUQyMEQwQ0U4NUIwMDdGQzBBQyAvKiBET01NZXNzYWdl RXZlbnRJbnRlcm5hbC5oICovOyB9OworCQk3NTlDQjgzNzE5MkRBOTE5MDAxMkJDNjQgLyogQ29u dHJvbFN0YXRlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMzExQzA4QkMxOEUzNUQ2ODAwQjY1NjE1IC8qIENvbnRyb2xTdGF0ZXMuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3NURDQzdCODE4QjgxQzg4 MDBBNTcxMjggLyogU2Vzc2lvbklESGFzaC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNzVEQ0M3QjcxOEI4MUM4ODAwQTU3MTI4IC8qIFNlc3Npb25JREhh c2guaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3 NjMzQTcyNjEzRDhCMzNBMDA4NTAxQjYgLyogTG9jYWxlVG9TY3JpcHRNYXBwaW5nLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3NjMzQTcyNDEzRDhCMzNB MDA4NTAxQjYgLyogTG9jYWxlVG9TY3JpcHRNYXBwaW5nLmggKi87IH07CiAJCTc2MzNBNzI3MTNE OEIzM0EwMDg1MDFCNiAvKiBMb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZhdWx0LmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDc2MzNBNzI1MTNEOEIzM0Ew MDg1MDFCNiAvKiBMb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZhdWx0LmNwcCAqLzsgfTsKQEAgLTUz OTAsNyArNTM5MSw3IEBACiAJCUJDRUE0ODg3MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVt ZU1hYy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNF QTQ4NDgwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRoZW1lTWFjLmggKi87IH07CiAJCUJDRUE0 ODg4MDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZU1hYy5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDRUE0ODQ5MDk3RDkzMDIwMDk0QzlFNCAv KiBSZW5kZXJUaGVtZU1hYy5tbSAqLzsgfTsKIAkJQkNFQTQ4ODkwOTdEOTMwMjAwOTRDOUU0IC8q IFJlbmRlclRoZW1lLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEJDRUE0ODRBMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZS5jcHAgKi87IH07 Ci0JCUJDRUE0ODhBMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUaGVtZS5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEIwOTdEOTMwMjAwOTRD OUU0IC8qIFJlbmRlclRoZW1lLmggKi87IH07CisJCUJDRUE0ODhBMDk3RDkzMDIwMDk0QzlFNCAv KiBSZW5kZXJUaGVtZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gQkNFQTQ4NEIwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRoZW1lLmggKi87IHNldHRp bmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQkNFQTQ4OEIwOTdEOTMw MjAwOTRDOUU0IC8qIFJlbmRlclRleHQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEMwOTdEOTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQu Y3BwICovOyB9OwogCQlCQ0VBNDg4QzA5N0Q5MzAyMDA5NEM5RTQgLyogUmVuZGVyVGV4dC5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNFQTQ4NEQwOTdE OTMwMjAwOTRDOUU0IC8qIFJlbmRlclRleHQuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQlCQ0VBNDg4RDA5N0Q5MzAyMDA5NEM5RTQgLyogUmVuZGVy VGV4dEZyYWdtZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEJDRUE0ODRFMDk3RDkzMDIwMDk0QzlFNCAvKiBSZW5kZXJUZXh0RnJhZ21lbnQuY3Bw ICovOyB9OwpAQCAtNjYwMCw3ICs2NjAxLDcgQEAKIAkJRkVEMTNEM0EwQ0VBOTM0NjAwRDg5NDY2 IC8qIEVkaXRvcklPUy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IEZFRDEzRDM5MENFQTkzNDYwMEQ4OTQ2NiAvKiBFZGl0b3JJT1MubW0gKi87IH07CiAJ CUZFRDEzRDNEMENFQTkzNkEwMEQ4OTQ2NiAvKiBGcmFtZUlPUy5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFRDEzRDNCMENFQTkzNkEwMEQ4OTQ2NiAv KiBGcmFtZUlPUy5tbSAqLzsgfTsKIAkJRkVEMTNENDAwQ0VBOTM5NDAwRDg5NDY2IC8qIEljb25J T1MubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQx M0QzRjBDRUE5Mzk0MDBEODk0NjYgLyogSWNvbklPUy5tbSAqLzsgfTsKLQkJRkVEMTNENTIwQ0VB OTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRoZW1lSU9TLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGRUQxM0Q1MDBDRUE5NDk3MDBEODk0NjYgLyogUmVuZGVy VGhlbWVJT1MuaCAqLzsgfTsKKwkJRkVEMTNENTIwQ0VBOTQ5NzAwRDg5NDY2IC8qIFJlbmRlclRo ZW1lSU9TLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBG RUQxM0Q1MDBDRUE5NDk3MDBEODk0NjYgLyogUmVuZGVyVGhlbWVJT1MuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlGRUQ0ODM5MENFRDY2QzMyNTVG NzJDNTkgLyogTWF0aE1MU2VsZWN0RWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBGNzVBMDU5QUYxNzBEOEZBQTVCOENBQkUgLyogTWF0aE1M U2VsZWN0RWxlbWVudC5jcHAgKi87IH07CiAJCUZFREVGODQxMTY3OTcxMDgwMDBFNDQ0QSAvKiBE YXRhYmFzZVN0cmF0ZWd5LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEZFREVGODNGMTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmNw cCAqLzsgfTsKIAkJRkVERUY4NDIxNjc5NzEwODAwMEU0NDRBIC8qIERhdGFiYXNlU3RyYXRlZ3ku aCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEZFREVGODQw MTY3OTcxMDgwMDBFNDQ0QSAvKiBEYXRhYmFzZVN0cmF0ZWd5LmggKi87IHNldHRpbmdzID0ge0FU VFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTI1NzYwLDYgKzI1NzYxLDcgQEAKIAkJ CQk5N0JDNkE0NTE1MDVGMDgxMDAxQjc0QUMgLyogU1FMUmVzdWx0U2V0Um93TGlzdC5oIGluIEhl YWRlcnMgKi8sCiAJCQkJOTdCQzZBNDgxNTA1RjA4MTAwMUI3NEFDIC8qIFNRTFN0YXRlbWVudC5o IGluIEhlYWRlcnMgKi8sCiAJCQkJRkU4QTY3NDgxNkNERDE5RTAwOTMwQkY4IC8qIFNRTFN0YXRl bWVudEJhY2tlbmQuaCBpbiBIZWFkZXJzICovLAorCQkJCTc1OUNCODM3MTkyREE5MTkwMDEyQkM2 NCAvKiBDb250cm9sU3RhdGVzLmggaW4gSGVhZGVycyAqLywKIAkJCQk5N0JDNkE0OTE1MDVGMDgx MDAxQjc0QUMgLyogU1FMU3RhdGVtZW50Q2FsbGJhY2suaCBpbiBIZWFkZXJzICovLAogCQkJCTk3 QkM2QTRCMTUwNUYwODEwMDFCNzRBQyAvKiBTUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmggaW4g SGVhZGVycyAqLywKIAkJCQk5N0JDNkE0RTE1MDVGMDgxMDAxQjc0QUMgLyogU1FMU3RhdGVtZW50 U3luYy5oIGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVJT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZUlPUy5oCmluZGV4IGM0MjMwMDguLjFiZTVlN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUlPUy5oCkBAIC00Nyw2ICs0Nyw4IEBAIHB1YmxpYzoKIAogICAgIHN0YXRp YyBDRlN0cmluZ1JlZiBjb250ZW50U2l6ZUNhdGVnb3J5KCk7CiAKKyAgICBzdGF0aWMgdm9pZCBz ZXRDb250ZW50U2l6ZUNhdGVnb3J5KGNvbnN0IFN0cmluZyYpOworCiBwcm90ZWN0ZWQ6CiAgICAg dmlydHVhbCBpbnQgYmFzZWxpbmVQb3NpdGlvbihjb25zdCBSZW5kZXJPYmplY3QmKSBjb25zdCBv dmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCmlu ZGV4IDgyZTFkMGMuLjY0NGIxZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVJT1MubW0KQEAgLTMwNiwxMSArMzA2LDI0IEBAIFBhc3NSZWZQdHI8UmVuZGVyVGhlbWU+ IFJlbmRlclRoZW1lSU9TOjpjcmVhdGUoKQogICAgIHJldHVybiBhZG9wdFJlZihuZXcgUmVuZGVy VGhlbWVJT1MpOwogfQogCitzdGF0aWMgU3RyaW5nJiBfY29udGVudFNpemVDYXRlZ29yeSgpCit7 CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFN0cmluZz4gX2NvbnRlbnRTaXplQ2F0ZWdvcnk7 CisgICAgcmV0dXJuIF9jb250ZW50U2l6ZUNhdGVnb3J5LmdldCgpOworfQorCiBDRlN0cmluZ1Jl ZiBSZW5kZXJUaGVtZUlPUzo6Y29udGVudFNpemVDYXRlZ29yeSgpCiB7CisgICAgaWYgKCFfY29u dGVudFNpemVDYXRlZ29yeSgpLmlzTnVsbCgpKQorICAgICAgICByZXR1cm4gKF9fYnJpZGdlIENG U3RyaW5nUmVmKXN0YXRpY19jYXN0PE5TU3RyaW5nKj4oX2NvbnRlbnRTaXplQ2F0ZWdvcnkoKSk7 CiAgICAgcmV0dXJuIChDRlN0cmluZ1JlZilbW2dldFVJQXBwbGljYXRpb25DbGFzcygpIHNoYXJl ZEFwcGxpY2F0aW9uXSBwcmVmZXJyZWRDb250ZW50U2l6ZUNhdGVnb3J5XTsKIH0KIAordm9pZCBS ZW5kZXJUaGVtZUlPUzo6c2V0Q29udGVudFNpemVDYXRlZ29yeShjb25zdCBTdHJpbmcmIGNvbnRl bnRTaXplQ2F0ZWdvcnkpCit7CisgICAgX2NvbnRlbnRTaXplQ2F0ZWdvcnkoKSA9IGNvbnRlbnRT aXplQ2F0ZWdvcnk7Cit9CisKIGNvbnN0IENvbG9yJiBSZW5kZXJUaGVtZUlPUzo6c2hhZG93Q29s b3IoKSBjb25zdAogewogICAgIHN0YXRpYyBDb2xvciBjb2xvcigwLjBmLCAwLjBmLCAwLjBmLCAw LjdmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwppbmRleCA3YWM2M2Y0Li5mYjhhMjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjMgQEAKKzIwMTQtMDUtMjIgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisg ICAgICAgIFtpT1NdIEVuYWJsZSAtYXBwbGUtc3lzdGVtLSBzdHlsZWQgZWxlbWVudHMgdG8gcmVz cG9uZCB0byBzeXN0ZW0gZm9udCBzaXplIGNoYW5nZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMxODYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzE2NTgzNzgyPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVucmljYSBDYXN1Y2NpLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2Vi VmlldyBpbml0V2l0aEZyYW1lOmNvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICgtW1dLV2ViVmll dyBfY29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZTpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3 IF9jb250ZW50U2l6ZUNhdGVnb3J5XSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UpOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb250 ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdlKToKKwogMjAxNC0wNS0yMiAgQWxleGV5IFByb3NrdXJ5 YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBBZGQgQ0ZCdW5kbGVBbGxvd01p eGVkTG9jYWxpemF0aW9ucyB0byBXZWJDb250ZW50U2VydmljZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBmMGM3MDE3Li5iYWM4NzBh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5t bQpAQCAtNzgsNiArNzgsNyBAQAogI2ltcG9ydCAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW1wb3J0 IDxDb3JlR3JhcGhpY3MvQ0dGbG9hdC5oPgogI2ltcG9ydCA8Q29yZUdyYXBoaWNzL0NHUERGRG9j dW1lbnRQcml2YXRlLmg+CisjaW1wb3J0IDxVSUtpdC9VSUFwcGxpY2F0aW9uLmg+CiAjaW1wb3J0 IDxVSUtpdC9VSVBlcmlwaGVyYWxIb3N0X1ByaXZhdGUuaD4KICNpbXBvcnQgPFF1YXJ0ekNvcmUv Q0FSZW5kZXJTZXJ2ZXIuaD4KICNpbXBvcnQgPFF1YXJ0ekNvcmUvUXVhcnR6Q29yZVByaXZhdGUu aD4KQEAgLTIzMiw2ICsyMzMsOCBAQCBXS1dlYlZpZXcqIGZyb21XZWJQYWdlUHJveHkoV2ViS2l0 OjpXZWJQYWdlUHJveHkmIHBhZ2UpCiAgICAgW2NlbnRlciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVj dG9yOkBzZWxlY3Rvcihfa2V5Ym9hcmREaWRDaGFuZ2VGcmFtZTopIG5hbWU6VUlLZXlib2FyZERp ZENoYW5nZUZyYW1lTm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwogICAgIFtjZW50ZXIgYWRkT2Jz ZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2tleWJvYXJkV2lsbFNob3c6KSBuYW1lOlVJ S2V5Ym9hcmRXaWxsU2hvd05vdGlmaWNhdGlvbiBvYmplY3Q6bmlsXTsKICAgICBbY2VudGVyIGFk ZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF9rZXlib2FyZFdpbGxIaWRlOikgbmFt ZTpVSUtleWJvYXJkV2lsbEhpZGVOb3RpZmljYXRpb24gb2JqZWN0Om5pbF07CisgICAgW2NlbnRl ciBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfY29udGVudFNpemVDYXRlZ29y eURpZENoYW5nZTopIG5hbWU6VUlDb250ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdlTm90aWZpY2F0 aW9uIG9iamVjdDpuaWxdOworICAgIF9wYWdlLT5jb250ZW50U2l6ZUNhdGVnb3J5RGlkQ2hhbmdl KFtzZWxmIF9jb250ZW50U2l6ZUNhdGVnb3J5XSk7CiAKICAgICBbW19jb25maWd1cmF0aW9uIF9j b250ZW50UHJvdmlkZXJSZWdpc3RyeV0gYWRkUGFnZToqX3BhZ2VdOwogI2VuZGlmCkBAIC0xMDMw LDYgKzEwMzMsMTYgQEAgc3RhdGljIGlubGluZSB2b2lkIHNldFZpZXdwb3J0Q29uZmlndXJhdGlv bk1pbmltdW1MYXlvdXRTaXplKFdlYktpdDo6V2ViUGFnZVByb3gKICAgICBbc2VsZiBfa2V5Ym9h cmRDaGFuZ2VkV2l0aEluZm86bm90aWZpY2F0aW9uLnVzZXJJbmZvIGFkanVzdFNjcm9sbFZpZXc6 WUVTXTsKIH0KIAorLSAodm9pZClfY29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZTooTlNOb3Rp ZmljYXRpb24gKilub3RpZmljYXRpb24KK3sKKyAgICBfcGFnZS0+Y29udGVudFNpemVDYXRlZ29y eURpZENoYW5nZShbc2VsZiBfY29udGVudFNpemVDYXRlZ29yeV0pOworfQorCistIChOU1N0cmlu ZyAqKV9jb250ZW50U2l6ZUNhdGVnb3J5Cit7CisgICAgcmV0dXJuIFtbVUlBcHBsaWNhdGlvbiBz aGFyZWRBcHBsaWNhdGlvbl0gcHJlZmVycmVkQ29udGVudFNpemVDYXRlZ29yeV07Cit9CisKIC0g KHZvaWQpc2V0QWxsb3dzQmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXM6KEJPT0wpYWxsb3dz QmFja0ZvcndhcmROYXZpZ2F0aW9uR2VzdHVyZXMKIHsKICAgICBpZiAoX2FsbG93c0JhY2tGb3J3 YXJkTmF2aWdhdGlvbkdlc3R1cmVzID09IGFsbG93c0JhY2tGb3J3YXJkTmF2aWdhdGlvbkdlc3R1 cmVzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGZiMjQ4MDQu LjZkYThkMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTYz NCw2ICs2MzQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWROb3RIYW5kbGVUYXBBc0NsaWNrKGNv bnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAgICAgdm9pZCB2aWV3cG9ydE1ldGFUYWdXaWR0aERp ZENoYW5nZShmbG9hdCB3aWR0aCk7CiAgICAgdm9pZCBkaWRGaW5pc2hEcmF3aW5nUGFnZXNUb1BE Rihjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmKTsKKyAgICB2b2lkIGNvbnRlbnRTaXplQ2F0ZWdv cnlEaWRDaGFuZ2UoY29uc3QgU3RyaW5nJiBjb250ZW50U2l6ZUNhdGVnb3J5KTsKICNlbmRpZgog CiAgICAgY29uc3QgRWRpdG9yU3RhdGUmIGVkaXRvclN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9l ZGl0b3JTdGF0ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X ZWJQYWdlUHJveHlJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQ cm94eUlPUy5tbQppbmRleCAzMDg4ZTI5Li4xNjk2Y2MwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQpAQCAtNjU0LDYgKzY1NCwxMSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoRHJhd2luZ1BhZ2VzVG9QREYoY29uc3QgSVBDOjpE YXRhUmVmZXJlbmNlJiBwZGZEYXRhKQogICAgIG1fcGFnZUNsaWVudC5kaWRGaW5pc2hEcmF3aW5n UGFnZXNUb1BERihwZGZEYXRhKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6OmNvbnRlbnRTaXpl Q2F0ZWdvcnlEaWRDaGFuZ2UoY29uc3QgU3RyaW5nJiBjb250ZW50U2l6ZUNhdGVnb3J5KQorewor ICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpDb250ZW50U2l6ZUNhdGVnb3J5 RGlkQ2hhbmdlKGNvbnRlbnRTaXplQ2F0ZWdvcnkpLCBtX3BhZ2VJRCk7Cit9CisKICNpZiBVU0Uo UVVJQ0tfTE9PSykKICAgICAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydExvYWRGb3JRdWlj a0xvb2tEb2N1bWVudEluTWFpbkZyYW1lKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IFN0 cmluZyYgdXRpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgK aW5kZXggMjlmNmFmZS4uYjIyM2NkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCkBAIC00ODcsNiArNDg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgdXBk YXRlU2VsZWN0aW9uQXBwZWFyYW5jZSgpOwogCiAgICAgdm9pZCBkaXNwYXRjaEFzeW5jaHJvbm91 c1RvdWNoRXZlbnRzKGNvbnN0IFZlY3RvcjxXZWJUb3VjaEV2ZW50LCAxPiYgcXVldWUpOworICAg IHZvaWQgY29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZShjb25zdCBTdHJpbmcmKTsKICNpZiBF TkFCTEUoSU5TUEVDVE9SKQogICAgIHZvaWQgc2hvd0luc3BlY3RvckluZGljYXRpb24oKTsKICAg ICB2b2lkIGhpZGVJbnNwZWN0b3JJbmRpY2F0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDFjMWNjYjAu LmFhY2IyZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC03OCw2ICs3OCw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBh Z2UgTGVnYWN5UmVjZWl2ZXIgewogICAgIEFwcGxpY2F0aW9uV2lsbFJlc2lnbkFjdGl2ZSgpCiAg ICAgQXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCkKICAgICBBcHBsaWNhdGlvbkRpZEJl Y29tZUFjdGl2ZSgpCisgICAgQ29udGVudFNpemVDYXRlZ29yeURpZENoYW5nZShTdHJpbmcgY29u dGVudFNpemVDYXRlZ29yeSkKICNlbmRpZgogCiAjaWYgRU5BQkxFKFJFTU9URV9JTlNQRUNUT1Ip CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW0KaW5kZXggZjI5YmZiYi4uMGJhMGJlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtNzYsNiArNzYsNyBAQAog I2ltcG9ydCA8V2ViQ29yZS9QbGF0Zm9ybU1vdXNlRXZlbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUv UmVuZGVyQmxvY2suaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVySW1hZ2UuaD4KKyNpbXBvcnQg PFdlYkNvcmUvUmVuZGVyVGhlbWVJT1MuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyVmlldy5o PgogI2ltcG9ydCA8V2ViQ29yZS9SZXNvdXJjZUJ1ZmZlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9T aGFyZWRCdWZmZXIuaD4KQEAgLTIzMjYsNiArMjMyNywxMiBAQCB2b2lkIFdlYlBhZ2U6OmNvbXB1 dGVQYWdlc0ZvclByaW50aW5nQW5kU3RhcnREcmF3aW5nVG9QREYodWludDY0X3QgZnJhbWVJRCwg Y29ucwogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmluaXNoRHJhd2luZ1Bh Z2VzVG9QREYoSVBDOjpEYXRhUmVmZXJlbmNlKENGRGF0YUdldEJ5dGVQdHIocGRmUGFnZURhdGEu Z2V0KCkpLCBDRkRhdGFHZXRMZW5ndGgocGRmUGFnZURhdGEuZ2V0KCkpKSkpOwogfQogCit2b2lk IFdlYlBhZ2U6OmNvbnRlbnRTaXplQ2F0ZWdvcnlEaWRDaGFuZ2UoY29uc3QgU3RyaW5nJiBjb250 ZW50U2l6ZUNhdGVnb3J5KQoreworICAgIFJlbmRlclRoZW1lSU9TOjpzZXRDb250ZW50U2l6ZUNh dGVnb3J5KGNvbnRlbnRTaXplQ2F0ZWdvcnkpOworICAgIFBhZ2U6OnVwZGF0ZVN0eWxlRm9yQWxs UGFnZXNBZnRlckdsb2JhbENoYW5nZUluRW52aXJvbm1lbnQoKTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQTEFURk9STShJT1MpCg==