131194 2014-04-03 17:03:37 -0700 [Win] Load Media Controls js/css from bundle 2014-04-04 09:13:05 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 131086 1 bfulgham bfulgham bfulgham commit-queue dino eric.carlson esprehn+autocc glenn jer.noble kondapallykalyan oldest_to_newest 997381 0 bfulgham 2014-04-03 17:03:37 -0700 We can load the mediaControls*.{js,css} files from the bundle, rather than inserting encoding versions into the C source code on Windows, just like we can for Mac/iOS. 997469 1 228578 bfulgham 2014-04-03 22:11:12 -0700 Created attachment 228578 Patch 997470 2 228578 dino 2014-04-03 22:17:09 -0700 Comment on attachment 228578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228578&action=review > Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters:7092 > + <ClCompile Include="..\platform\DisplaySleepDisabler.cpp" /> > + <ClCompile Include="..\platform\SystemSleepListener.cpp" /> There are a lot of changes to this file, but I assume it's either unintentional and you'll remove it, or intentional and you know what you are doing! > Source/WebCore/rendering/RenderThemeSafari.h:188 > + bool m_mediaControlsScriptLoaded; > + bool m_mediaControlsStyleSheetLoaded; There was a followup commit where I skipped the booleans and just checked if the string was empty. > Source/WebCore/rendering/RenderThemeWin.cpp:1117 > + // Open the file Nit: end with . 997579 3 228578 bfulgham 2014-04-04 09:08:14 -0700 Comment on attachment 228578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228578&action=review >> Source/WebCore/rendering/RenderThemeWin.cpp:1117 >> + // Open the file > > Nit: end with . Even better -- why have this stupid comment at all!?! :-) 997580 4 228578 bfulgham 2014-04-04 09:08:22 -0700 Comment on attachment 228578 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228578&action=review >> Source/WebCore/rendering/RenderThemeWin.cpp:1117 >> + // Open the file > > Nit: end with . Even better -- why have this stupid comment at all!?! :-) 997582 5 bfulgham 2014-04-04 09:13:05 -0700 Committed r166782: <http://trac.webkit.org/changeset/166782> 228578 2014-04-03 22:11:12 -0700 2014-04-04 09:08:21 -0700 Patch bug-131194-20140403221051.patch text/plain 25155 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Njc2NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA0LTAzICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIExvYWQgTWVkaWEg Q29udHJvbHMganMvY3NzIGZyb20gYnVuZGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzExOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIERlcml2ZWRTb3VyY2VzLmNwcDogUmVtb3ZlIG5vLWxvbmdl ciBnZW5lcmF0ZWQgZmlsZS4KKyAgICAgICAgKiBEZXJpdmVkU291cmNlcy5tYWtlOiBEb24ndCBn ZW5lcmF0ZSB1bm5lZWRlZCBmaWxlcy4KKyAgICAgICAgKiBXZWJDb3JlLnZjeHByb2ovV2ViQ29y ZS52Y3hwcm9qOiBEb24ndCBjb21waWxlIHVubmVlZGVkIGZpbGVzLgorICAgICAgICAqIFdlYkNv cmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2ouZmlsdGVyczogRGl0dG8uCisgICAgICAgICogV2Vi Q29yZS52Y3hwcm9qL2NvcHlXZWJDb3JlUmVzb3VyY2VGaWxlcy5jbWQ6IENvcHkgY3NzL2pzIHRv IHJlc291cmNlCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcDoKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuaDoKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGhlbWVXaW4uY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5oOgorCiAyMDE0LTA0LTAzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAog ICAgICAgICBGYXN0LXBhdGggZm9yIGNhc3RpbmcgSlMgd3JhcHBlcnMgdG8gSlNFbGVtZW50LgpJ bmRleDogU291cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLmNwcAkocmV2aXNpb24gMTY2NzUyKQorKysgU291 cmNlL1dlYkNvcmUvRGVyaXZlZFNvdXJjZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDYsNyAr MjQ2LDYgQEAKICNpbmNsdWRlICJKU01lZGlhQ29udHJvbGxlci5jcHAiCiAjaWYgRU5BQkxFKE1F RElBX0NPTlRST0xTX1NDUklQVCkKICNpbmNsdWRlICJKU01lZGlhQ29udHJvbHNIb3N0LmNwcCIK LSNpbmNsdWRlICJVc2VyQWdlbnRTY3JpcHRzRGF0YS5jcHAiCiAjZW5kaWYKICNpbmNsdWRlICJK U01lZGlhRXJyb3IuY3BwIgogI2luY2x1ZGUgIkpTTWVkaWFMaXN0LmNwcCIKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL0Rlcml2ZWRTb3VyY2VzLm1ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvRGVyaXZlZFNvdXJjZXMubWFrZQkocmV2aXNpb24gMTY2NzUyKQorKysgU291cmNlL1dlYkNv cmUvRGVyaXZlZFNvdXJjZXMubWFrZQkod29ya2luZyBjb3B5KQpAQCAtODgyLDEyICs4ODIsNiBA QCBpZmVxICgkKGZpbmRzdHJpbmcgRU5BQkxFX0ZVTExTQ1JFRU5fQVBJCiAgICAgVVNFUl9BR0VO VF9TVFlMRV9TSEVFVFMgOj0gJChVU0VSX0FHRU5UX1NUWUxFX1NIRUVUUykgJChXZWJDb3JlKS9j c3MvZnVsbHNjcmVlbi5jc3MKIGVuZGlmCiAKLWlmZXEgKCQoT1MpLFdpbmRvd3NfTlQpCi1pZmVx ICgkKGZpbmRzdHJpbmcgRU5BQkxFX01FRElBX0NPTlRST0xTX1NDUklQVCwkKEZFQVRVUkVfREVG SU5FUykpLCBFTkFCTEVfTUVESUFfQ09OVFJPTFNfU0NSSVBUKQotCVVTRVJfQUdFTlRfU1RZTEVf U0hFRVRTIDo9ICQoVVNFUl9BR0VOVF9TVFlMRV9TSEVFVFMpICQoV2ViQ29yZSkvTW9kdWxlcy9t ZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5jc3MKLWVuZGlmCi1lbmRpZgotCiBpZmVx ICgkKGZpbmRzdHJpbmcgRU5BQkxFX0lNQUdFX0NPTlRST0xTLCQoRkVBVFVSRV9ERUZJTkVTKSks IEVOQUJMRV9JTUFHRV9DT05UUk9MUykKIAlVU0VSX0FHRU5UX1NUWUxFX1NIRUVUUyA6PSAkKFVT RVJfQUdFTlRfU1RZTEVfU0hFRVRTKSAkKFdlYkNvcmUpL2h0bWwvc2hhZG93L21hYy9pbWFnZUNv bnRyb2xzTWFjLmNzcwogZW5kaWYKQEAgLTkwNSwxMiArODk5LDYgQEAgVXNlckFnZW50U3R5bGVT aGVldHMuaCA6IGNzcy9tYWtlLWNzcy1maQogCiBVU0VSX0FHRU5UX1NDUklQVFMgPSAKIAotaWZl cSAoJChPUyksV2luZG93c19OVCkKLWlmZXEgKCQoZmluZHN0cmluZyBFTkFCTEVfTUVESUFfQ09O VFJPTFNfU0NSSVBULCQoRkVBVFVSRV9ERUZJTkVTKSksIEVOQUJMRV9NRURJQV9DT05UUk9MU19T Q1JJUFQpCi0JVVNFUl9BR0VOVF9TQ1JJUFRTIDo9ICQoVVNFUl9BR0VOVF9TQ1JJUFRTKSAkKFdl YkNvcmUpL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMKLWVuZGlm Ci1lbmRpZgotCiBpZmVxICgkKE9TKSxNQUNPUykKIAlVU0VSX0FHRU5UX1NDUklQVFMgOj0gJChV U0VSX0FHRU5UX1NDUklQVFMpICQoV2ViQ29yZSkvTW9kdWxlcy9wbHVnaW5zL1F1aWNrVGltZVBs dWdpblJlcGxhY2VtZW50LmpzCiBlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3hwcm9qL1dlYkNvcmUudmN4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qCShyZXZpc2lvbiAxNjY3NTIpCisrKyBTb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qCSh3b3JraW5nIGNvcHkpCkBA IC02NDI1LDIwICs2NDI1LDYgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9IiQoQ29uZmlndXJh dGlvbkJ1aWxkRGlyKVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVwkKFByb2plY3ROYW1lKVxE ZXJpdmVkU291cmNlc1xNYXRoTUxOYW1lcy5jcHAiIC8+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRl PSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcJChQ cm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcU1ZHRWxlbWVudEZhY3RvcnkuY3BwIiAvPgogICAg IDxDbENvbXBpbGUgSW5jbHVkZT0iJChDb25maWd1cmF0aW9uQnVpbGREaXIpXG9iaiQoUGxhdGZv cm1BcmNoaXRlY3R1cmUpXCQoUHJvamVjdE5hbWUpXERlcml2ZWRTb3VyY2VzXFNWR05hbWVzLmNw cCIgLz4KLSAgICA8Q2xDb21waWxlIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxv YmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xV c2VyQWdlbnRTY3JpcHRzRGF0YS5jcHAiPgotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRp dGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8V2luMzInIj50cnVl PC9FeGNsdWRlZEZyb21CdWlsZD4KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249 IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnfHg2NCciPnRydWU8L0V4Y2x1 ZGVkRnJvbUJ1aWxkPgotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29u ZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWdfV2luQ2Fpcm98V2luMzInIj50cnVlPC9F eGNsdWRlZEZyb21CdWlsZD4KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249Iick KENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnX1dpbkNhaXJvfHg2NCciPnRydWU8 L0V4Y2x1ZGVkRnJvbUJ1aWxkPgotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0i JyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzInIj50cnVl PC9FeGNsdWRlZEZyb21CdWlsZD4KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249 IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnU3VmZml4fHg2NCciPnRydWU8 L0V4Y2x1ZGVkRnJvbUJ1aWxkPgotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0i JyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXxXaW4zMiciPnRydWU8L0V4 Y2x1ZGVkRnJvbUJ1aWxkPgotICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQo Q29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRl ZEZyb21CdWlsZD4KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZp Z3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1JlbGVhc2VfV2luQ2Fpcm98V2luMzInIj50cnVlPC9F eGNsdWRlZEZyb21CdWlsZD4KLSAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249Iick KENvbmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J1JlbGVhc2VfV2luQ2Fpcm98eDY0JyI+dHJ1 ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+Ci0gICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9u PSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1 ZTwvRXhjbHVkZWRGcm9tQnVpbGQ+Ci0gICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9u PSInJChDb25maWd1cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufHg2NCciPnRydWU8 L0V4Y2x1ZGVkRnJvbUJ1aWxkPgotICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5j bHVkZT0iJChDb25maWd1cmF0aW9uQnVpbGREaXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRlY3R1cmUp XCQoUHJvamVjdE5hbWUpXERlcml2ZWRTb3VyY2VzXFVzZXJBZ2VudFN0eWxlU2hlZXRzRGF0YS5j cHAiPgogICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlv bil8JChQbGF0Zm9ybSknPT0nRGVidWd8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4K ICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J0RlYnVnfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgpAQCAtMTg1 MzksNyArMTg1MjUsNiBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iJChDb25maWd1cmF0aW9u QnVpbGREaXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRlY3R1cmUpXCQoUHJvamVjdE5hbWUpXERlcml2 ZWRTb3VyY2VzXFNWR0VsZW1lbnRGYWN0b3J5LmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRl PSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcJChQ cm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcU1ZHRWxlbWVudFR5cGVIZWxwZXJzLmgiIC8+CiAg ICAgPENsSW5jbHVkZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0 Zm9ybUFyY2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcU1ZHTmFtZXMu aCIgLz4KLSAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxv YmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xV c2VyQWdlbnRTY3JpcHRzLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIkKENvbmZpZ3Vy YXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlc RGVyaXZlZFNvdXJjZXNcVXNlckFnZW50U3R5bGVTaGVldHMuaCIgLz4KICAgICA8Q2xJbmNsdWRl IEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0 dXJlKVwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xXZWJLaXRGb250RmFtaWx5TmFtZXMu aCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxv YmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xY TUxOYW1lcy5oIiAvPgpAQCAtMjExNTUsNCArMjExNDAsNCBAQAogICA8SW1wb3J0R3JvdXAgTGFi ZWw9IkV4dGVuc2lvblRhcmdldHMiPgogICAgIDxJbXBvcnQgUHJvamVjdD0iJChWQ1RhcmdldHNQ YXRoKVxCdWlsZEN1c3RvbWl6YXRpb25zXG1hc20udGFyZ2V0cyIgLz4KICAgPC9JbXBvcnRHcm91 cD4KLTwvUHJvamVjdD4KKzwvUHJvamVjdD4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qLmZpbHRl cnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUu dmN4cHJvai5maWx0ZXJzCShyZXZpc2lvbiAxNjY3NTIpCisrKyBTb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnZjeHByb2ovV2ViQ29yZS52Y3hwcm9qLmZpbHRlcnMJKHdvcmtpbmcgY29weSkKQEAgLTIw NSw5ICsyMDUsNiBAQAogICAgIDxGaWx0ZXIgSW5jbHVkZT0iZG9tIj4KICAgICAgIDxVbmlxdWVJ ZGVudGlmaWVyPnsxYzIzZjE2Mi1kZjA0LTQ4NjgtODc5Ny0yNjFkYjQwMWVjYTh9PC9VbmlxdWVJ ZGVudGlmaWVyPgogICAgIDwvRmlsdGVyPgotICAgIDxGaWx0ZXIgSW5jbHVkZT0id29ya2VycyI+ Ci0gICAgICA8VW5pcXVlSWRlbnRpZmllcj57YmUxZWY1ZDktZTFkOC00YmQ1LWJlMjgtZWIxZTQ5 OGVmMWMyfTwvVW5pcXVlSWRlbnRpZmllcj4KLSAgICA8L0ZpbHRlcj4KICAgICA8RmlsdGVyIElu Y2x1ZGU9ImVkaXRpbmciPgogICAgICAgPFVuaXF1ZUlkZW50aWZpZXI+e2I1MTBiM2YyLTU3MDEt NDMwYi1hOTQxLTdlZWJiNTJkYWM4MX08L1VuaXF1ZUlkZW50aWZpZXI+CiAgICAgPC9GaWx0ZXI+ CkBAIC0zNDAsNiArMzM3LDkgQEAKICAgICA8RmlsdGVyIEluY2x1ZGU9InBsYXRmb3JtXHNvdXAi PgogICAgICAgPFVuaXF1ZUlkZW50aWZpZXI+e2IzNTM0NzlhLWE2YmYtNDFhZC1iNjU1LTg3NjE2 NTc4OWI5OX08L1VuaXF1ZUlkZW50aWZpZXI+CiAgICAgPC9GaWx0ZXI+CisgICAgPEZpbHRlciBJ bmNsdWRlPSJyZW5kZXJpbmdcd29ya2VycyI+CisgICAgICA8VW5pcXVlSWRlbnRpZmllcj57YmUx ZWY1ZDktZTFkOC00YmQ1LWJlMjgtZWIxZTQ5OGVmMWMyfTwvVW5pcXVlSWRlbnRpZmllcj4KKyAg ICA8L0ZpbHRlcj4KICAgPC9JdGVtR3JvdXA+CiAgIDxJdGVtR3JvdXA+CiAgICAgPENsQ29tcGls ZSBJbmNsdWRlPSIuLlxEZXJpdmVkU291cmNlcy5jcHAiPgpAQCAtMzM5Nyw0OSArMzM5Nyw0OSBA QAogICAgICAgPEZpbHRlcj5kb208L0ZpbHRlcj4KICAgICA8L0NsQ29tcGlsZT4KICAgICA8Q2xD b21waWxlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcQWJzdHJhY3RXb3JrZXIuY3BwIj4KLSAgICAgIDxG aWx0ZXI+d29ya2VyczwvRmlsdGVyPgorICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcd29ya2Vyczwv RmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cd29y a2Vyc1xEZWRpY2F0ZWRXb3JrZXJHbG9iYWxTY29wZS5jcHAiPgotICAgICAgPEZpbHRlcj53b3Jr ZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAg ICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlx3b3JrZXJzXERlZGlj YXRlZFdvcmtlclRocmVhZC5jcHAiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+Cisg ICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+ CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlx3b3JrZXJzXERlZmF1bHRTaGFyZWRXb3JrZXJS ZXBvc2l0b3J5LmNwcCI+Ci0gICAgICA8RmlsdGVyPndvcmtlcnM8L0ZpbHRlcj4KKyAgICAgIDxG aWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0ZpbHRlcj4KICAgICA8L0NsQ29tcGlsZT4KICAgICA8 Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcU2hhcmVkV29ya2VyLmNwcCI+Ci0gICAgICA8 RmlsdGVyPndvcmtlcnM8L0ZpbHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8 L0ZpbHRlcj4KICAgICA8L0NsQ29tcGlsZT4KICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHdv cmtlcnNcU2hhcmVkV29ya2VyR2xvYmFsU2NvcGUuY3BwIj4KLSAgICAgIDxGaWx0ZXI+d29ya2Vy czwvRmlsdGVyPgorICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmlsdGVyPgogICAg IDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cd29ya2Vyc1xTaGFyZWRX b3JrZXJUaHJlYWQuY3BwIj4KLSAgICAgIDxGaWx0ZXI+d29ya2VyczwvRmlsdGVyPgorICAgICAg PEZpbHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgogICAg IDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cd29ya2Vyc1xXb3JrZXIuY3BwIj4KLSAgICAgIDxGaWx0 ZXI+d29ya2VyczwvRmlsdGVyPgorICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmls dGVyPgogICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cd29ya2Vy c1xXb3JrZXJHbG9iYWxTY29wZS5jcHAiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+ CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBp bGU+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFdvcmtlckV2ZW50UXVldWUu Y3BwIj4KLSAgICAgIDxGaWx0ZXI+d29ya2VyczwvRmlsdGVyPgorICAgICAgPEZpbHRlcj5yZW5k ZXJpbmdcd29ya2VyczwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUg SW5jbHVkZT0iLi5cd29ya2Vyc1xXb3JrZXJMb2NhdGlvbi5jcHAiPgotICAgICAgPEZpbHRlcj53 b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+ CiAgICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFdv cmtlck1lc3NhZ2luZ1Byb3h5LmNwcCI+Ci0gICAgICA8RmlsdGVyPndvcmtlcnM8L0ZpbHRlcj4K KyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0ZpbHRlcj4KICAgICA8L0NsQ29tcGls ZT4KICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcV29ya2VyUnVuTG9vcC5jcHAi PgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmlu Z1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNs dWRlPSIuLlx3b3JrZXJzXFdvcmtlclNjcmlwdExvYWRlci5jcHAiPgotICAgICAgPEZpbHRlcj53 b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+ CiAgICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFdv cmtlclRocmVhZC5jcHAiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8 RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+CiAgICAg PENsQ29tcGlsZSBJbmNsdWRlPSIuLlxlZGl0aW5nXEFwcGVuZE5vZGVDb21tYW5kLmNwcCI+CiAg ICAgICA8RmlsdGVyPmVkaXRpbmc8L0ZpbHRlcj4KQEAgLTUxMTQsNyArNTExNCw3IEBACiAgICAg ICA8RmlsdGVyPk1vZHVsZXNccXVvdGE8L0ZpbHRlcj4KICAgICA8L0NsQ29tcGlsZT4KICAgICA8 Q2xDb21waWxlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcU2hhcmVkV29ya2VyUmVwb3NpdG9yeS5jcHAi PgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmlu Z1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNs dWRlPSIuLlxwbGF0Zm9ybVxncmFwaGljc1xjYVx3aW5cUGxhdGZvcm1DQUZpbHRlcnNXaW4uY3Bw Ij4KICAgICAgIDxGaWx0ZXI+cGxhdGZvcm1cZ3JhcGhpY3NcY2Fcd2luPC9GaWx0ZXI+CkBAIC02 ODAyLDkgKzY4MDIsNiBAQAogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5ccmVuZGVyaW5nXHNo YXBlc1xTaGFwZS5jcHAiPgogICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcc2hhcGVzPC9GaWx0ZXI+ CiAgICAgPC9DbENvbXBpbGU+Ci0gICAgPENsQ29tcGlsZSBJbmNsdWRlPSIuLlxyZW5kZXJpbmdc c2hhcGVzXFNoYXBlSW5zaWRlSW5mby5jcHAiPgotICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcc2hh cGVzPC9GaWx0ZXI+Ci0gICAgPC9DbENvbXBpbGU+CiAgICAgPENsQ29tcGlsZSBJbmNsdWRlPSIu LlxyZW5kZXJpbmdcc2hhcGVzXFNoYXBlT3V0c2lkZUluZm8uY3BwIj4KICAgICAgIDxGaWx0ZXI+ cmVuZGVyaW5nXHNoYXBlczwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgpAQCAtNjgyOSw5ICs2 ODI2LDYgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9IiQoQ29uZmlndXJhdGlvbkJ1aWxkRGly KVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNl c1xKU0JlZm9yZVVubG9hZEV2ZW50LmNwcCI+CiAgICAgICA8RmlsdGVyPkRlcml2ZWRTb3VyY2Vz PC9GaWx0ZXI+CiAgICAgPC9DbENvbXBpbGU+Ci0gICAgPENsQ29tcGlsZSBJbmNsdWRlPSIkKENv bmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcJChQcm9qZWN0 TmFtZSlcRGVyaXZlZFNvdXJjZXNcVXNlckFnZW50U2NyaXB0c0RhdGEuY3BwIj4KLSAgICAgIDxG aWx0ZXI+RGVyaXZlZFNvdXJjZXM8L0ZpbHRlcj4KLSAgICA8L0NsQ29tcGlsZT4KICAgICA8Q2xD b21waWxlIEluY2x1ZGU9Ii4uXE1vZHVsZXNcbWVkaWFjb250cm9sc1xNZWRpYUNvbnRyb2xzSG9z dC5jcHAiPgogICAgICAgPEZpbHRlcj5Nb2R1bGVzXG1lZGlhY29udHJvbHM8L0ZpbHRlcj4KICAg ICA8L0NsQ29tcGlsZT4KQEAgLTcwOTQsNiArNzA4OCw4IEBACiAgICAgPENsQ29tcGlsZSBJbmNs dWRlPSIuLlxodG1sXHRyYWNrXFZUVFJlZ2lvbkxpc3QuY3BwIj4KICAgICAgIDxGaWx0ZXI+aHRt bFx0cmFjazwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgorICAgIDxDbENvbXBpbGUgSW5jbHVk ZT0iLi5ccGxhdGZvcm1cRGlzcGxheVNsZWVwRGlzYWJsZXIuY3BwIiAvPgorICAgIDxDbENvbXBp bGUgSW5jbHVkZT0iLi5ccGxhdGZvcm1cU3lzdGVtU2xlZXBMaXN0ZW5lci5jcHAiIC8+CiAgIDwv SXRlbUdyb3VwPgogICA8SXRlbUdyb3VwPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cTW9k dWxlc1xnZW9sb2NhdGlvblxDb29yZGluYXRlcy5oIj4KQEAgLTEwNDAzLDcwICsxMDM5OSw3MCBA QAogICAgICAgPEZpbHRlcj5kb208L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4KICAgICA8Q2xJ bmNsdWRlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcQWJzdHJhY3RXb3JrZXIuaCI+Ci0gICAgICA8Rmls dGVyPndvcmtlcnM8L0ZpbHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0Zp bHRlcj4KICAgICA8L0NsSW5jbHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHdvcmtl cnNcRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGUuaCI+Ci0gICAgICA8RmlsdGVyPndvcmtlcnM8 L0ZpbHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0ZpbHRlcj4KICAgICA8 L0NsSW5jbHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcRGVkaWNhdGVk V29ya2VyVGhyZWFkLmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8 RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAg PENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3b3JrZXJzXERlZmF1bHRTaGFyZWRXb3JrZXJSZXBvc2l0 b3J5LmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJl bmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVk ZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFNoYXJlZFdvcmtlci5oIj4KLSAgICAgIDxGaWx0ZXI+d29y a2VyczwvRmlsdGVyPgorICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmlsdGVyPgog ICAgIDwvQ2xJbmNsdWRlPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cd29ya2Vyc1xTaGFy ZWRXb3JrZXJHbG9iYWxTY29wZS5oIj4KLSAgICAgIDxGaWx0ZXI+d29ya2VyczwvRmlsdGVyPgor ICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmlsdGVyPgogICAgIDwvQ2xJbmNsdWRl PgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cd29ya2Vyc1xTaGFyZWRXb3JrZXJSZXBvc2l0 b3J5LmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJl bmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVk ZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFNoYXJlZFdvcmtlclN0cmF0ZWd5LmgiPgotICAgICAgPEZp bHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9G aWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3b3Jr ZXJzXFNoYXJlZFdvcmtlclRocmVhZC5oIj4KLSAgICAgIDxGaWx0ZXI+d29ya2VyczwvRmlsdGVy PgorICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmlsdGVyPgogICAgIDwvQ2xJbmNs dWRlPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cd29ya2Vyc1xXb3JrZXIuaCI+Ci0gICAg ICA8RmlsdGVyPndvcmtlcnM8L0ZpbHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtl cnM8L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4u XHdvcmtlcnNcV29ya2VyR2xvYmFsU2NvcGUuaCI+Ci0gICAgICA8RmlsdGVyPndvcmtlcnM8L0Zp bHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0ZpbHRlcj4KICAgICA8L0Ns SW5jbHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcV29ya2VyR2xvYmFs U2NvcGVQcm94eS5oIj4KLSAgICAgIDxGaWx0ZXI+d29ya2VyczwvRmlsdGVyPgorICAgICAgPEZp bHRlcj5yZW5kZXJpbmdcd29ya2VyczwvRmlsdGVyPgogICAgIDwvQ2xJbmNsdWRlPgogICAgIDxD bEluY2x1ZGUgSW5jbHVkZT0iLi5cd29ya2Vyc1xXb3JrZXJFdmVudFF1ZXVlLmgiPgotICAgICAg PEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJz PC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3 b3JrZXJzXFdvcmtlckxvYWRlclByb3h5LmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0 ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbElu Y2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFdvcmtlckxvY2F0aW9u LmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRl cmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJ bmNsdWRlPSIuLlx3b3JrZXJzXFdvcmtlck1lc3NhZ2luZ1Byb3h5LmgiPgotICAgICAgPEZpbHRl cj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0 ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3b3JrZXJz XFdvcmtlck9iamVjdFByb3h5LmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+Cisg ICAgICA8RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+ CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFdvcmtlclJlcG9ydGluZ1Byb3h5 LmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8RmlsdGVyPnJlbmRl cmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJ bmNsdWRlPSIuLlx3b3JrZXJzXFdvcmtlclJ1bkxvb3AuaCI+Ci0gICAgICA8RmlsdGVyPndvcmtl cnM8L0ZpbHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0ZpbHRlcj4KICAg ICA8L0NsSW5jbHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHdvcmtlcnNcV29ya2Vy U2NyaXB0TG9hZGVyLmgiPgotICAgICAgPEZpbHRlcj53b3JrZXJzPC9GaWx0ZXI+CisgICAgICA8 RmlsdGVyPnJlbmRlcmluZ1x3b3JrZXJzPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CiAgICAg PENsSW5jbHVkZSBJbmNsdWRlPSIuLlx3b3JrZXJzXFdvcmtlclNjcmlwdExvYWRlckNsaWVudC5o Ij4KLSAgICAgIDxGaWx0ZXI+d29ya2VyczwvRmlsdGVyPgorICAgICAgPEZpbHRlcj5yZW5kZXJp bmdcd29ya2VyczwvRmlsdGVyPgogICAgIDwvQ2xJbmNsdWRlPgogICAgIDxDbEluY2x1ZGUgSW5j bHVkZT0iLi5cd29ya2Vyc1xXb3JrZXJUaHJlYWQuaCI+Ci0gICAgICA8RmlsdGVyPndvcmtlcnM8 L0ZpbHRlcj4KKyAgICAgIDxGaWx0ZXI+cmVuZGVyaW5nXHdvcmtlcnM8L0ZpbHRlcj4KICAgICA8 L0NsSW5jbHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGVkaXRpbmdcQXBwZW5kTm9k ZUNvbW1hbmQuaCI+CiAgICAgICA8RmlsdGVyPmVkaXRpbmc8L0ZpbHRlcj4KQEAgLTE0NjQwLDkg KzE0NjM2LDYgQEAKICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHJlbmRlcmluZ1xzaGFwZXNc U2hhcGUuaCI+CiAgICAgICA8RmlsdGVyPnJlbmRlcmluZ1xzaGFwZXM8L0ZpbHRlcj4KICAgICA8 L0NsSW5jbHVkZT4KLSAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHJlbmRlcmluZ1xzaGFwZXNc U2hhcGVJbnNpZGVJbmZvLmgiPgotICAgICAgPEZpbHRlcj5yZW5kZXJpbmdcc2hhcGVzPC9GaWx0 ZXI+Ci0gICAgPC9DbEluY2x1ZGU+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxyZW5kZXJp bmdcc2hhcGVzXFNoYXBlSW50ZXJ2YWwuaCI+CiAgICAgICA8RmlsdGVyPnJlbmRlcmluZ1xzaGFw ZXM8L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4KQEAgLTE0ODI5LDkgKzE0ODIyLDYgQEAKICAg ICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHJlbmRlcmluZ1xUZXh0UGFpbnRTdHlsZS5oIj4KICAg ICAgIDxGaWx0ZXI+cmVuZGVyaW5nPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+Ci0gICAgPENs SW5jbHVkZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFy Y2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcVXNlckFnZW50U2NyaXB0 cy5oIj4KLSAgICAgIDxGaWx0ZXI+RGVyaXZlZFNvdXJjZXM8L0ZpbHRlcj4KLSAgICA8L0NsSW5j bHVkZT4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXHJlbmRlcmluZ1xPcmRlckl0ZXJhdG9y LmgiPgogICAgICAgPEZpbHRlcj5yZW5kZXJpbmc8L0ZpbHRlcj4KICAgICA8L0NsSW5jbHVkZT4K QEAgLTE0OTUyLDYgKzE0OTQyLDkgQEAKICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9IiQoQ29uZmln dXJhdGlvbkJ1aWxkRGlyKVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVwkKFByb2plY3ROYW1l KVxEZXJpdmVkU291cmNlc1xKU1ZUVFJlZ2lvbi5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVk ZT0iJChDb25maWd1cmF0aW9uQnVpbGREaXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRlY3R1cmUpXCQo UHJvamVjdE5hbWUpXERlcml2ZWRTb3VyY2VzXEpTVlRUUmVnaW9uTGlzdC5jcHAiIC8+CiAgICAg PENsSW5jbHVkZSBJbmNsdWRlPSIkKENvbmZpZ3VyYXRpb25CdWlsZERpcilcb2JqJChQbGF0Zm9y bUFyY2hpdGVjdHVyZSlcJChQcm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcSlNWVFRSZWdpb25M aXN0LmgiIC8+CisgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxwbGF0Zm9ybVxEaXNwbGF5U2xl ZXBEaXNhYmxlci5oIiAvPgorICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5ccGxhdGZvcm1cZ3Jh cGhpY3NcY2Fcd2luXFBsYXRmb3JtQ0FBbmltYXRpb25XaW4uaCIgLz4KKyAgICA8Q2xJbmNsdWRl IEluY2x1ZGU9Ii4uXHBsYXRmb3JtXFN5c3RlbVNsZWVwTGlzdGVuZXIuaCIgLz4KICAgPC9JdGVt R3JvdXA+CiAgIDxJdGVtR3JvdXA+CiAgICAgPE5vbmUgSW5jbHVkZT0iLi5cY3NzXENTU0dyYW1t YXIueS5pbiI+CkBAIC0xNTE1OSw0ICsxNTE1Miw0IEBACiAgICAgICA8RmlsdGVyPnBsYXRmb3Jt XHdpbjwvRmlsdGVyPgogICAgIDwvTUFTTT4KICAgPC9JdGVtR3JvdXA+Ci08L1Byb2plY3Q+Cis8 L1Byb2plY3Q+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpJbmRleDogU291cmNlL1dlYkNv cmUvV2ViQ29yZS52Y3hwcm9qL2NvcHlXZWJDb3JlUmVzb3VyY2VGaWxlcy5jbWQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL2NvcHlXZWJDb3JlUmVzb3VyY2VG aWxlcy5jbWQJKHJldmlzaW9uIDE2Njc1MikKKysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4 cHJvai9jb3B5V2ViQ29yZVJlc291cmNlRmlsZXMuY21kCSh3b3JraW5nIGNvcHkpCkBAIC0xLDIg KzEsNCBAQAogbWtkaXIgMj5OVUwgIiVDT05GSUdVUkFUSU9OQlVJTERESVIlXGJpbiVQbGF0Zm9y bUFyY2hpdGVjdHVyZSVcV2ViS2l0LnJlc291cmNlc1xlbi5scHJvaiIKIHhjb3B5IC95IC9kIC9z IC9leGNsdWRlOnhjb3B5LmV4Y2x1ZGVzICIlUHJvamVjdERpciUuLlxFbmdsaXNoLmxwcm9qXExv Y2FsaXphYmxlLnN0cmluZ3MiICIlQ09ORklHVVJBVElPTkJVSUxERElSJVxiaW4lUGxhdGZvcm1B cmNoaXRlY3R1cmUlXFdlYktpdC5yZXNvdXJjZXNcZW4ubHByb2oiCit4Y29weSAveSAvZCAvcyAi JVByb2plY3REaXIlLi5cTW9kdWxlc1xtZWRpYWNvbnRyb2xzXG1lZGlhQ29udHJvbHNBcHBsZS5j c3MiICIlQ09ORklHVVJBVElPTkJVSUxERElSJVxiaW4lUGxhdGZvcm1BcmNoaXRlY3R1cmUlXFdl YktpdC5yZXNvdXJjZXMiCit4Y29weSAveSAvZCAvcyAiJVByb2plY3REaXIlLi5cTW9kdWxlc1xt ZWRpYWNvbnRyb2xzXG1lZGlhQ29udHJvbHNBcHBsZS5qcyIgIiVDT05GSUdVUkFUSU9OQlVJTERE SVIlXGJpbiVQbGF0Zm9ybUFyY2hpdGVjdHVyZSVcV2ViS2l0LnJlc291cmNlcyIKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcAkocmV2aXNp b24gMTY2NzUyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJp LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsMTMgKzQ2LDEwIEBACiAjaW5jbHVkZSAiU29mdExp bmtpbmcuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAjaW5jbHVkZSAiVXNlckFnZW50 U3R5bGVTaGVldHMuaCIKKyNpbmNsdWRlICJXZWJDb3JlQnVuZGxlV2luLmgiCiAjaW5jbHVkZSA8 Q29yZUdyYXBoaWNzL0NvcmVHcmFwaGljcy5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4K IAotI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCi0jaW5jbHVkZSAiVXNlckFnZW50 U2NyaXB0cy5oIgotI2VuZGlmCi0KIHVzaW5nIHN0ZDo6bWluOwogCiAvLyBGSVhNRTogVGhlIHBs YXRmb3JtLWluZGVwZW5kZW50IGNvZGUgaW4gdGhpcyBjbGFzcyBzaG91bGQgYmUgZmFjdG9yZWQg b3V0IGFuZCBtZXJnZWQgd2l0aCBSZW5kZXJUaGVtZU1hYy4gCkBAIC0xNDksNiArMTQ2LDggQEAg c3RhdGljIE5TQ29udHJvbFNpemUgY29udHJvbFNpemVGcm9tUmVjdAogfQogCiBSZW5kZXJUaGVt ZVNhZmFyaTo6UmVuZGVyVGhlbWVTYWZhcmkoKQorICAgIDogbV9tZWRpYUNvbnRyb2xzU2NyaXB0 TG9hZGVkKGZhbHNlKQorICAgICwgbV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldExvYWRlZChmYWxz ZSkKIHsKIH0KIApAQCAtMTE3OCw3ICsxMTc3LDExIEBAIGJvb2wgUmVuZGVyVGhlbWVTYWZhcmk6 OnBhaW50U2VhcmNoRmllbGQKIFN0cmluZyBSZW5kZXJUaGVtZVNhZmFyaTo6bWVkaWFDb250cm9s c1N0eWxlU2hlZXQoKQogewogI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCi0gICAg cmV0dXJuIFN0cmluZyhtZWRpYUNvbnRyb2xzQXBwbGVVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXpl b2YobWVkaWFDb250cm9sc0FwcGxlVXNlckFnZW50U3R5bGVTaGVldCkpOworICAgIGlmICghbV9t ZWRpYUNvbnRyb2xzU3R5bGVTaGVldExvYWRlZCkgeworICAgICAgICBtX21lZGlhQ29udHJvbHNT dHlsZVNoZWV0ID0gUmVuZGVyVGhlbWVXaW46OnN0cmluZ1dpdGhDb250ZW50c09mRmlsZShDRlNU UigibWVkaWFDb250cm9sc0FwcGxlIiksIENGU1RSKCJjc3MiKSk7CisgICAgICAgIG1fbWVkaWFD b250cm9sc1N0eWxlU2hlZXRMb2FkZWQgPSB0cnVlOworICAgIH0KKyAgICByZXR1cm4gbV9tZWRp YUNvbnRyb2xzU3R5bGVTaGVldDsKICNlbHNlCiAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CiAj ZW5kaWYKQEAgLTExODcsNyArMTE5MCwxMSBAQCBTdHJpbmcgUmVuZGVyVGhlbWVTYWZhcmk6Om1l ZGlhQ29udHJvbHNTCiBTdHJpbmcgUmVuZGVyVGhlbWVTYWZhcmk6Om1lZGlhQ29udHJvbHNTY3Jp cHQoKQogewogI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCi0gICAgcmV0dXJuIFN0 cmluZyhtZWRpYUNvbnRyb2xzQXBwbGVKYXZhU2NyaXB0LCBzaXplb2YobWVkaWFDb250cm9sc0Fw cGxlSmF2YVNjcmlwdCkpOworICAgIGlmICghbV9tZWRpYUNvbnRyb2xzU2NyaXB0TG9hZGVkKSB7 CisgICAgICAgIG1fbWVkaWFDb250cm9sc1NjcmlwdCA9IFJlbmRlclRoZW1lV2luOjpzdHJpbmdX aXRoQ29udGVudHNPZkZpbGUoQ0ZTVFIoIm1lZGlhQ29udHJvbHNBcHBsZSIpLCBDRlNUUigianMi KSk7CisgICAgICAgIG1fbWVkaWFDb250cm9sc1NjcmlwdExvYWRlZCA9IHRydWU7CisgICAgfQor ICAgIHJldHVybiBtX21lZGlhQ29udHJvbHNTY3JpcHQ7CiAjZWxzZQogICAgIHJldHVybiBlbXB0 eVN0cmluZygpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVTYWZhcmkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVTYWZhcmkuaAkocmV2aXNpb24gMTY2NzUyKQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBA CiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDEzIEFwcGxlIEluYy4KKyAqIENv cHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAxMywgMjAxNCBBcHBsZSBJbmMuCiAgKiBDb3B5cmln aHQgKEMpIDIwMDkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4KICAqCiAgKiBUaGlzIGxpYnJh cnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCkBAIC0x ODEsNiArMTgxLDExIEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRTZWFyY2hGaWVsZFNpemUoUmVu ZGVyU3R5bGUqKSBjb25zdDsKIAogICAgIFRoZW1lQ29udHJvbFN0YXRlIGRldGVybWluZVN0YXRl KFJlbmRlck9iamVjdCopIGNvbnN0OworCisgICAgU3RyaW5nIG1fbWVkaWFDb250cm9sc1Njcmlw dDsKKyAgICBTdHJpbmcgbV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldDsKKyAgICBib29sIG1fbWVk aWFDb250cm9sc1NjcmlwdExvYWRlZDsKKyAgICBib29sIG1fbWVkaWFDb250cm9sc1N0eWxlU2hl ZXRMb2FkZWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAJKHJldmlzaW9uIDE2Njc1MikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM3LDEyICszNyw5IEBACiAjaW5jbHVkZSAiU29mdExpbmtpbmcuaCIKICNpbmNsdWRl ICJTeXN0ZW1JbmZvLmgiCiAjaW5jbHVkZSAiVXNlckFnZW50U3R5bGVTaGVldHMuaCIKKyNpbmNs dWRlICJXZWJDb3JlQnVuZGxlV2luLmgiCiAjaW5jbHVkZSA8d3RmL3dpbi9HRElPYmplY3QuaD4K IAotI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCi0jaW5jbHVkZSAiVXNlckFnZW50 U2NyaXB0cy5oIgotI2VuZGlmCi0KICNpZiBFTkFCTEUoVklERU8pCiAjaW5jbHVkZSAiUmVuZGVy TWVkaWFDb250cm9scy5oIgogI2VuZGlmCkBAIC0yMDUsNiArMjAyLDggQEAgUmVuZGVyVGhlbWVX aW46OlJlbmRlclRoZW1lV2luKCkKICAgICAsIG1fc2xpZGVyVGhlbWUoMCkKICAgICAsIG1fc3Bp bkJ1dHRvblRoZW1lKDApCiAgICAgLCBtX3Byb2dyZXNzQmFyVGhlbWUoMCkKKyAgICAsIG1fbWVk aWFDb250cm9sc1NjcmlwdExvYWRlZChmYWxzZSkKKyAgICAsIG1fbWVkaWFDb250cm9sc1N0eWxl U2hlZXRMb2FkZWQoZmFsc2UpCiB7CiAgICAgaGF2ZVRoZW1lID0gdXh0aGVtZUxpYnJhcnkoKSAm JiBJc1RoZW1lQWN0aXZlKCk7CiB9CkBAIC0xMDc5LDEwICsxMDc4LDY4IEBAIENvbG9yIFJlbmRl clRoZW1lV2luOjpzeXN0ZW1Db2xvcihDU1NWYWwKIH0KIAogI2lmIEVOQUJMRShWSURFTykKK3N0 YXRpYyBjb25zdCBzaXplX3QgbWF4aW11bVJlYXNvbmFibGVCdWZmZXJTaXplID0gMzI3Njg7CisK K3N0YXRpYyB2b2lkIGZpbGxCdWZmZXJXaXRoQ29udGVudHNPZkZpbGUoUGxhdGZvcm1GaWxlSGFu ZGxlIGZpbGUsIGxvbmcgbG9uZyBmaWxlc2l6ZSwgVmVjdG9yPGNoYXI+JiBidWZmZXIpCit7Cisg ICAgLy8gTG9hZCB0aGUgZmlsZSBjb250ZW50IGludG8gYnVmZmVyCisgICAgYnVmZmVyLnJlc2l6 ZShmaWxlc2l6ZSArIDEpOworCisgICAgaW50IGJ1ZmZlclBvc2l0aW9uID0gMDsKKyAgICBpbnQg YnVmZmVyUmVhZFNpemUgPSA0MDk2OworICAgIGludCBieXRlc1JlYWQgPSAwOworICAgIHdoaWxl IChmaWxlc2l6ZSA+IGJ1ZmZlclBvc2l0aW9uKSB7CisgICAgICAgIGlmIChmaWxlc2l6ZSAtIGJ1 ZmZlclBvc2l0aW9uIDwgYnVmZmVyUmVhZFNpemUpCisgICAgICAgICAgICBidWZmZXJSZWFkU2l6 ZSA9IGZpbGVzaXplIC0gYnVmZmVyUG9zaXRpb247CisKKyAgICAgICAgYnl0ZXNSZWFkID0gcmVh ZEZyb21GaWxlKGZpbGUsIGJ1ZmZlci5kYXRhKCkgKyBidWZmZXJQb3NpdGlvbiwgYnVmZmVyUmVh ZFNpemUpOworICAgICAgICBpZiAoYnl0ZXNSZWFkICE9IGJ1ZmZlclJlYWRTaXplKSB7CisgICAg ICAgICAgICBidWZmZXIuY2xlYXIoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor CisgICAgICAgIGJ1ZmZlclBvc2l0aW9uICs9IGJ1ZmZlclJlYWRTaXplOworICAgIH0KKworICAg IGJ1ZmZlcltmaWxlc2l6ZV0gPSAwOworfQorCitTdHJpbmcgUmVuZGVyVGhlbWVXaW46OnN0cmlu Z1dpdGhDb250ZW50c09mRmlsZShDRlN0cmluZ1JlZiBuYW1lLCBDRlN0cmluZ1JlZiB0eXBlKQor eworICAgIFJldGFpblB0cjxDRlVSTFJlZj4gcmVxdWVzdGVkVVJMUmVmID0gYWRvcHRDRihDRkJ1 bmRsZUNvcHlSZXNvdXJjZVVSTCh3ZWJLaXRCdW5kbGUoKSwgbmFtZSwgdHlwZSwgMCkpOworICAg IGlmICghcmVxdWVzdGVkVVJMUmVmKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICBV SW50OCByZXF1ZXN0ZWRGaWxlUGF0aFtNQVhfUEFUSF07CisgICAgaWYgKCFDRlVSTEdldEZpbGVT eXN0ZW1SZXByZXNlbnRhdGlvbihyZXF1ZXN0ZWRVUkxSZWYuZ2V0KCksIGZhbHNlLCByZXF1ZXN0 ZWRGaWxlUGF0aCwgTUFYX1BBVEgpKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICAv LyBPcGVuIHRoZSBmaWxlCisgICAgUGxhdGZvcm1GaWxlSGFuZGxlIHJlcXVlc3RlZEZpbGVIYW5k bGUgPSBvcGVuRmlsZShyZXF1ZXN0ZWRGaWxlUGF0aCwgT3BlbkZvclJlYWQpOworICAgIGlmICgh aXNIYW5kbGVWYWxpZChyZXF1ZXN0ZWRGaWxlSGFuZGxlKSkKKyAgICAgICAgcmV0dXJuIFN0cmlu ZygpOworCisgICAgbG9uZyBsb25nIGZpbGVzaXplID0gLTE7CisgICAgaWYgKCFnZXRGaWxlU2l6 ZShyZXF1ZXN0ZWRGaWxlUGF0aCwgZmlsZXNpemUpKSB7CisgICAgICAgIGNsb3NlRmlsZShyZXF1 ZXN0ZWRGaWxlSGFuZGxlKTsKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgIH0KKworICAg IFZlY3RvcjxjaGFyPiBmaWxlQ29udGVudHM7CisgICAgZmlsbEJ1ZmZlcldpdGhDb250ZW50c09m RmlsZShyZXF1ZXN0ZWRGaWxlSGFuZGxlLCBmaWxlc2l6ZSwgZmlsZUNvbnRlbnRzKTsKKyAgICBj bG9zZUZpbGUocmVxdWVzdGVkRmlsZUhhbmRsZSk7CisKKyAgICByZXR1cm4gU3RyaW5nKGZpbGVD b250ZW50cy5kYXRhKCksIHN0YXRpY19jYXN0PHNpemVfdD4oZmlsZXNpemUpKTsKK30KKwogU3Ry aW5nIFJlbmRlclRoZW1lV2luOjptZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpCiB7CiAjaWYgRU5B QkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKLSAgICByZXR1cm4gU3RyaW5nKG1lZGlhQ29udHJv bHNBcHBsZVVzZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZihtZWRpYUNvbnRyb2xzQXBwbGVVc2Vy QWdlbnRTdHlsZVNoZWV0KSk7CisgICAgaWYgKCFtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0TG9h ZGVkKSB7CisgICAgICAgIG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQgPSBzdHJpbmdXaXRoQ29u dGVudHNPZkZpbGUoQ0ZTVFIoIm1lZGlhQ29udHJvbHNBcHBsZSIpLCBDRlNUUigiY3NzIikpOwor ICAgICAgICBtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0TG9hZGVkID0gdHJ1ZTsKKyAgICB9Cisg ICAgcmV0dXJuIG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQ7CiAjZWxzZQogICAgIHJldHVybiBl bXB0eVN0cmluZygpOwogI2VuZGlmCkBAIC0xMDkxLDcgKzExNDgsMTEgQEAgU3RyaW5nIFJlbmRl clRoZW1lV2luOjptZWRpYUNvbnRyb2xzU3R5bAogU3RyaW5nIFJlbmRlclRoZW1lV2luOjptZWRp YUNvbnRyb2xzU2NyaXB0KCkKIHsKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQot ICAgIHJldHVybiBTdHJpbmcobWVkaWFDb250cm9sc0FwcGxlSmF2YVNjcmlwdCwgc2l6ZW9mKG1l ZGlhQ29udHJvbHNBcHBsZUphdmFTY3JpcHQpKTsKKyAgICBpZiAoIW1fbWVkaWFDb250cm9sc1Nj cmlwdExvYWRlZCkgeworICAgICAgICBtX21lZGlhQ29udHJvbHNTY3JpcHQgPSBzdHJpbmdXaXRo Q29udGVudHNPZkZpbGUoQ0ZTVFIoIm1lZGlhQ29udHJvbHNBcHBsZSIpLCBDRlNUUigianMiKSk7 CisgICAgICAgIG1fbWVkaWFDb250cm9sc1NjcmlwdExvYWRlZCA9IHRydWU7CisgICAgfQorICAg IHJldHVybiBtX21lZGlhQ29udHJvbHNTY3JpcHQ7CiAjZWxzZQogICAgIHJldHVybiBlbXB0eVN0 cmluZygpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVXaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWVXaW4uaAkocmV2aXNpb24gMTY2NzUyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lV2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNyArMSw3IEBACiAvKgogICogVGhp cyBmaWxlIGlzIHBhcnQgb2YgdGhlIFdlYktpdCBwcm9qZWN0LgogICoKLSAqIENvcHlyaWdodCAo QykgMjAwNiwgMjAwOCwgMjAxMyBBcHBsZSBJbmMuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIw MDgsIDIwMTMsIDIwMTQgQXBwbGUgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA5IEtlbm5ldGgg Um9oZGUgQ2hyaXN0aWFuc2VuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7 IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtMTIwLDYgKzEyMCw4IEBAIHB1Ymxp YzoKIAogICAgIHN0YXRpYyB2b2lkIHNldFdlYktpdElzQmVpbmdVbmxvYWRlZCgpOwogCisgICAg c3RhdGljIFN0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGUoQ0ZTdHJpbmdSZWYgbmFtZSwg Q0ZTdHJpbmdSZWYgdHlwZSk7CisKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNGb2N1c1Jpbmco Y29uc3QgUmVuZGVyU3R5bGUqKSBjb25zdDsKIAogI2lmIEVOQUJMRShWSURFTykKQEAgLTE3Myw2 ICsxNzUsMTEgQEAgcHJpdmF0ZToKICAgICBtdXRhYmxlIEhBTkRMRSBtX3NsaWRlclRoZW1lOwog ICAgIG11dGFibGUgSEFORExFIG1fc3BpbkJ1dHRvblRoZW1lOwogICAgIG11dGFibGUgSEFORExF IG1fcHJvZ3Jlc3NCYXJUaGVtZTsKKworICAgIFN0cmluZyBtX21lZGlhQ29udHJvbHNTY3JpcHQ7 CisgICAgU3RyaW5nIG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQ7CisgICAgYm9vbCBtX21lZGlh Q29udHJvbHNTY3JpcHRMb2FkZWQ7CisgICAgYm9vbCBtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0 TG9hZGVkOwogfTsKIAogfTsK