161932 2016-09-13 15:38:44 -0700 Merge Element::ScrollToOptions and DOMWindow::ScrollToOptions 2016-10-06 13:25:39 -0700 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 162912 P2 Normal --- 162912 1 cdumez cdumez cdumez cgarcia cmarcelo commit-queue darin dbates esprehn+autocc gyuyoung.kim kangil.han kondapallykalyan ryanhaddad sam simon.fraser oldest_to_newest 1229344 0 cdumez 2016-09-13 15:38:44 -0700 Merge Element::ScrollToOptions and DOMWindow::ScrollToOptions. 1229346 1 simon.fraser 2016-09-13 15:40:19 -0700 *** Bug 161643 has been marked as a duplicate of this bug. *** 1229348 2 288739 cdumez 2016-09-13 15:41:44 -0700 Created attachment 288739 Patch 1229349 3 288739 simon.fraser 2016-09-13 15:42:41 -0700 Comment on attachment 288739 Patch Sneaky inline! 1229368 4 288739 commit-queue 2016-09-13 16:29:54 -0700 Comment on attachment 288739 Patch Clearing flags on attachment: 288739 Committed r205887: <http://trac.webkit.org/changeset/205887> 1229369 5 commit-queue 2016-09-13 16:30:01 -0700 All reviewed patches have been landed. Closing bug. 1229440 6 ryanhaddad 2016-09-13 21:46:26 -0700 This change appears to have broken the Windows build: https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/80457 1229443 7 cdumez 2016-09-13 21:53:02 -0700 (In reply to comment #6) > This change appears to have broken the Windows build: > > https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/ > 80457 C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\DerivedSources\WebCore\JSElement.cpp(145): error C2766: explicit specialization; 'WTF::Optional<WebCore::ScrollToOptions> WebCore::convertDictionary<WebCore::ScrollToOptions>(JSC::ExecState &,JSC::JSValue)' has already been defined (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\DerivedSources.cpp) [C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\Source\WebCore\WebCoreDerivedSources.vcxproj] C:\cygwin\home\buildbot\slave\win-release\build\WebKitBuild\Release\DerivedSources\WebCore\JSDOMWindow.cpp(647): note: see previous definition of 'convertDictionary' (compiling source file C:\cygwin\home\buildbot\slave\win-release\build\Source\WebCore\DerivedSources.cpp) Hmm. The inlining trick did not work on Windows :( 1229448 8 cdumez 2016-09-13 21:59:06 -0700 Reverted r205887 for reason: Broke the Windows build Committed r205897: <http://trac.webkit.org/changeset/205897> 1229449 9 288771 cdumez 2016-09-13 22:00:21 -0700 Created attachment 288771 Patch 1229452 10 cdumez 2016-09-13 22:18:29 -0700 ALWAYS_INLINE does not seem to work on Windows either. Looks like we're going to have to find another way. 1229461 11 sam 2016-09-13 23:43:10 -0700 Instead of inlining, does wrapping the functions in an anonymous namespace work? 1229583 12 cdumez 2016-09-14 09:37:58 -0700 (In reply to comment #11) > Instead of inlining, does wrapping the functions in an anonymous namespace > work? This does not seem to work. I believe the template declaration and its specializations need to be in the same namespace. Error: /Volumes/Data/WebKit/OpenSource/WebKitBuild/Release/DerivedSources/WebCore/JSElement.cpp:116:58: error: no function template matches function template specialization 'convertDictionary' namespace { template<> Optional<Element::ShadowRootInit> convertDictionary<Element::ShadowRootInit>(ExecState& state, JSValue value) 1237304 13 cdumez 2016-10-06 13:25:39 -0700 *** This bug has been marked as a duplicate of bug 162912 *** 288739 2016-09-13 15:41:44 -0700 2016-09-13 22:00:16 -0700 Patch bug-161932-20160913153909.patch text/plain 14962 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1ODc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE4ZjM4MzY1ZGM4NWFk ZGM2OGU5MzI0M2Y1ZTdkMGM5MTYyMDE5NC4uYmRhNDVmMzMxYTVjN2VhOTY3NWJmMzlkNDExYjY5 NDgyMWJmZDExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE2LTA5LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWVyZ2UgRWxlbWVudDo6U2Ny b2xsVG9PcHRpb25zIGFuZCBET01XaW5kb3c6OlNjcm9sbFRvT3B0aW9ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxOTMyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVyZ2UgRWxlbWVudDo6U2Nyb2xs VG9PcHRpb25zIGFuZCBET01XaW5kb3c6OlNjcm9sbFRvT3B0aW9ucy4KKyAgICAgICAgSWRlYWxs eSB3ZSB3b3VsZCBtZXJnZSB0aGVtIG9uIElETCBzaWRlIGFzIHdlbGwgYnV0IHRoaXMgaXMgZm9y CisgICAgICAgIGFub3RoZXIgcGF0Y2guCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG06CisgICAgICAgIChHZW5lcmF0ZURpY3Rpb25hcnlJbXBsZW1lbnRhdGlvbkNvbnRlbnQp OgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeT4pOgor ICAgICAgICAoV2ViQ29yZTo6Y29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeVRo YXRTaG91bGROb3RUb2xlcmF0ZU51bGw+KToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZlcnREaWN0 aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPik6CisgICAg ICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFyeTxBbHRlcm5hdGVEaWN0aW9uYXJ5TmFtZT4p OgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgICogZG9tL0VsZW1lbnQuaWRsOgor ICAgICAgICAqIGRvbS9TY3JvbGxUb09wdGlvbnMuaDogQWRkZWQuCisgICAgICAgICogaHRtbC9I VE1MQm9keUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEJvZHlFbGVtZW50Ojpz Y3JvbGxUbyk6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuaDoKKyAgICAgICAgKiBwYWdlL0RP TVdpbmRvdy5pZGw6CisKIDIwMTYtMDktMTMgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2Fib3VoYWxs YXdhQGFwcGxlLmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIHRoZSBtX3ByZW11bHRpcGx5QWxw aGEgZmxhZyBvZiB0aGUgSW1hZ2VGcmFtZSBjbGFzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDYzMWVjNDgwMDg4OGU5ZDAyOTFm YmYyZTJiMGI0NzM1NWYxMTg5NzIuLjgxMjRkYzZjMjA0YjgzOTkzZWE2NzRlMDkwMmIwNGNiYjUx OTBlODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKQEAgLTI4NzMsNiArMjg3Myw3IEBACiAJCTgzNDhCRkFDMUI4NTcyOTgwMDkxMkYz NiAvKiBDbGFzc0NvbGxlY3Rpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDgzNDhCRkFBMUI4NTcyOTUwMDkxMkYzNiAvKiBDbGFzc0NvbGxlY3Rpb24u aCAqLzsgfTsKIAkJODM0REQ0RjQxQkUwODk4OTAwMkM5QzNFIC8qIFBhZ2VNYWMubW0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4MzRERDRGMzFCRTA4OTg5 MDAyQzlDM0UgLyogUGFnZU1hYy5tbSAqLzsgfTsKIAkJODM1MjBDN0UxQTcxQkZDQzAwNkJEMkFB IC8qIENTU0ZvbnRGYW1pbHkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDgzNTIwQzdEMUE3MUJGQ0MwMDZCRDJBQSAvKiBDU1NGb250RmFtaWx5LmggKi87 IH07CisJCTgzNTRBNzBFMUQ4OEFEMEYwMDg5QUE1NyAvKiBTY3JvbGxUb09wdGlvbnMuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDgzRjFENDVGMUQ4OEFD N0UwMDZBRTcyQiAvKiBTY3JvbGxUb09wdGlvbnMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk4MzU4Q0I2RjFDNTMyNzcyMDBFMEMyRDggLyogSlNY TUxEb2N1bWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA4M0Y1NzBBRTFDNTMyNjhFMDA3RkQ2Q0IgLyogSlNYTUxEb2N1bWVudC5jcHAgKi87IH07 CiAJCTgzNThDQjcwMUM1MzI3NzUwMEUwQzJEOCAvKiBKU1hNTERvY3VtZW50LmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA4M0Y1NzBBRDFDNTMyNjhFMDA3 RkQ2Q0IgLyogSlNYTUxEb2N1bWVudC5oICovOyB9OwogCQk4MzVEMzYzNzE5RkY2MTkzMDA0Qzkz QUIgLyogU3R5bGVCdWlsZGVyQ3VzdG9tLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA4MzVEMzYzNjE5RkY2MTkzMDA0QzkzQUIgLyogU3R5bGVCdWlsZGVy Q3VzdG9tLmggKi87IH07CkBAIC0xMDAzNyw2ICsxMDAzOCw3IEBACiAJCTgzRTM1OUExMUJCMTAz MUQwMDJDRUI5OCAvKiBKU0hUTUxUaW1lRWxlbWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKU0hUTUxUaW1lRWxlbWVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTgzRTk1OUUxMUI4QkMyMkIwMDREOTM4NSAvKiBOYXRpdmVOb2RlRmlsdGVy LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IE5hdGl2ZU5vZGVGaWx0ZXIuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJODNGMTIwNkExQjhDMTAzNjAwRDc1RjYzIC8q IEpTTm9kZUZpbHRlckN1c3RvbS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBKU05vZGVGaWx0ZXJDdXN0b20uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor CQk4M0YxRDQ1RjFEODhBQzdFMDA2QUU3MkIgLyogU2Nyb2xsVG9PcHRpb25zLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNjcm9sbFRvT3B0aW9ucy5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk4M0Y1NzBBRDFDNTMyNjhFMDA3RkQ2Q0IgLyogSlNYTUxEb2N1bWVu dC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1hNTERvY3VtZW50Lmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTgzRjU3MEFFMUM1MzI2OEUwMDdGRDZDQiAvKiBK U1hNTERvY3VtZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpT WE1MRG9jdW1lbnQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk4NDE5RDJBNDEy MEQ5MkQwMDAxNDFGOEYgLyogU1ZHUGF0aEJ5dGVTdHJlYW0uaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gU1ZHUGF0aEJ5dGVTdHJlYW0uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKQEAgLTIzMjM4LDYgKzIzMjQwLDcgQEAKIAkJCQlFMTFDOUQ5QTBFQjM2ODEyMDBFNDA5 REIgLyogU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oICovLAogCQkJCThBNDEzQURGMTIwN0JCQTUw MDgyMDE2RSAvKiBTY3JpcHRSdW5uZXIuY3BwICovLAogCQkJCThBNDEzQURFMTIwN0JCQTUwMDgy MDE2RSAvKiBTY3JpcHRSdW5uZXIuaCAqLywKKwkJCQk4M0YxRDQ1RjFEODhBQzdFMDA2QUU3MkIg LyogU2Nyb2xsVG9PcHRpb25zLmggKi8sCiAJCQkJOTc2RjM2RTgxNDY4NjIyNTAwNUU5M0I0IC8q IFNlY3VyaXR5Q29udGV4dC5jcHAgKi8sCiAJCQkJOTc2RjM2RTkxNDY4NjIyNTAwNUU5M0I0IC8q IFNlY3VyaXR5Q29udGV4dC5oICovLAogCQkJCTFBRjdBRkM1MUE0OEE4QkMwMEM4RTRFNyAvKiBT ZWN1cml0eU9yaWdpblBvbGljeS5jcHAgKi8sCkBAIC0yNjE3Niw2ICsyNjE3OSw3IEBACiAJCQkJ MDg1NEIwMTkxMjU1RTRFNjAwQjlDREQwIC8qIFJlbmRlclNWR1RleHQuaCBpbiBIZWFkZXJzICov LAogCQkJCTA4NTRCMDFCMTI1NUU0RTYwMEI5Q0REMCAvKiBSZW5kZXJTVkdUZXh0UGF0aC5oIGlu IEhlYWRlcnMgKi8sCiAJCQkJNDM2NzA4RTkxMkQ5Q0E0QjAwMDQ0MjM0IC8qIFJlbmRlclNWR1Ry YW5zZm9ybWFibGVDb250YWluZXIuaCBpbiBIZWFkZXJzICovLAorCQkJCTgzNTRBNzBFMUQ4OEFE MEYwMDg5QUE1NyAvKiBTY3JvbGxUb09wdGlvbnMuaCBpbiBIZWFkZXJzICovLAogCQkJCTA4NTRC MDFEMTI1NUU0RTYwMEI5Q0REMCAvKiBSZW5kZXJTVkdUU3Bhbi5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJNDM2NzA4RUIxMkQ5Q0E0QjAwMDQ0MjM0IC8qIFJlbmRlclNWR1ZpZXdwb3J0Q29udGFpbmVy LmggaW4gSGVhZGVycyAqLywKIAkJCQlBOERGNEFFQjA5ODBDNDJDMDA1Mjk4MUIgLyogUmVuZGVy VGFibGUuaCBpbiBIZWFkZXJzICovLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCBkZGQ2NTBkZmU5NDAxOGU4MmEzMTcwNTRh MjNhMWU0MDRjMzdiZjc3Li45ZWVlYmQ4MDM1N2U0ZDY5OTIzY2E5ZjdkMjY2ZjUwOTc0MjczNTU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbQpAQCAtMTAwOSw3ICsxMDA5LDcgQEAgc3ViIEdlbmVyYXRlRGljdGlvbmFyeUltcGxl bWVudGF0aW9uQ29udGVudAogICAgICAgICAgICAgJGNvbW1hID0gIiwgIjsKICAgICAgICAgfQog Ci0gICAgICAgICRyZXN1bHQgLj0gInRlbXBsYXRlPD4gT3B0aW9uYWw8JGNsYXNzTmFtZT4gY29u dmVydERpY3Rpb25hcnk8JGNsYXNzTmFtZT4oRXhlY1N0YXRlJiBzdGF0ZSwgSlNWYWx1ZSB2YWx1 ZSlcbiI7CisgICAgICAgICRyZXN1bHQgLj0gInRlbXBsYXRlPD4gaW5saW5lIE9wdGlvbmFsPCRj bGFzc05hbWU+IGNvbnZlcnREaWN0aW9uYXJ5PCRjbGFzc05hbWU+KEV4ZWNTdGF0ZSYgc3RhdGUs IEpTVmFsdWUgdmFsdWUpXG4iOwogICAgICAgICAkcmVzdWx0IC49ICJ7XG4iOwogICAgICAgICAk cmVzdWx0IC49ICIgICAgVk0mIHZtID0gc3RhdGUudm0oKTtcbiI7CiAgICAgICAgICRyZXN1bHQg Lj0gIiAgICBhdXRvIHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTtcbiI7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0 T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RP YmouY3BwCmluZGV4IDZkYmFkZWNkYzE0OTZiMDZjN2NkZjFmZTIxM2MxZDIyOTFhODgyNmIuLjY2 ODg4YjM5MWUxN2M1MzU3NmQ2MzM4YWQwY2Q4OGUzNzQ1YzFjZjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCkBAIC01 MTMsNyArNTEzLDcgQEAgdGVtcGxhdGU8PiBpbmxpbmUgY29uc3QgY2hhciogZXhwZWN0ZWRFbnVt ZXJhdGlvblZhbHVlczxUZXN0T2JqOjpDb25maWRlbmNlPigpCiAgICAgcmV0dXJuICJcImhpZ2hc IiwgXCJraW5kYS1sb3dcIiI7CiB9CiAKLXRlbXBsYXRlPD4gT3B0aW9uYWw8VGVzdE9iajo6RGlj dGlvbmFyeT4gY29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeT4oRXhlY1N0YXRl JiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSkKK3RlbXBsYXRlPD4gaW5saW5lIE9wdGlvbmFsPFRlc3RP Ymo6OkRpY3Rpb25hcnk+IGNvbnZlcnREaWN0aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnk+KEV4 ZWNTdGF0ZSYgc3RhdGUsIEpTVmFsdWUgdmFsdWUpCiB7CiAgICAgVk0mIHZtID0gc3RhdGUudm0o KTsKICAgICBhdXRvIHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKQEAgLTYy MSw3ICs2MjEsNyBAQCB0ZW1wbGF0ZTw+IE9wdGlvbmFsPFRlc3RPYmo6OkRpY3Rpb25hcnk+IGNv bnZlcnREaWN0aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnk+KAogICAgIHJldHVybiBUZXN0T2Jq OjpEaWN0aW9uYXJ5IHsgV1RGTW92ZShlbnVtZXJhdGlvblZhbHVlV2l0aG91dERlZmF1bHQpLCBX VEZNb3ZlKGVudW1lcmF0aW9uVmFsdWVXaXRoRGVmYXVsdCksIFdURk1vdmUoZW51bWVyYXRpb25W YWx1ZVdpdGhFbXB0eVN0cmluZ0RlZmF1bHQpLCBXVEZNb3ZlKHN0cmluZ1dpdGhEZWZhdWx0KSwg V1RGTW92ZShzdHJpbmdXaXRob3V0RGVmYXVsdCksIFdURk1vdmUoYm9vbGVhbldpdGhEZWZhdWx0 KSwgV1RGTW92ZShib29sZWFuV2l0aG91dERlZmF1bHQpLCBXVEZNb3ZlKHNlcXVlbmNlT2ZTdHJp bmdzKSwgV1RGTW92ZShyZXN0cmljdGVkRG91YmxlKSwgV1RGTW92ZSh1bnJlc3RyaWN0ZWREb3Vi bGUpLCBXVEZNb3ZlKHJlc3RyaWN0ZWREb3VibGVXaXRoRGVmYXVsdCksIFdURk1vdmUodW5yZXN0 cmljdGVkRG91YmxlV2l0aERlZmF1bHQpLCBXVEZNb3ZlKHJlc3RyaWN0ZWRGbG9hdCksIFdURk1v dmUodW5yZXN0cmljdGVkRmxvYXQpLCBXVEZNb3ZlKHJlc3RyaWN0ZWRGbG9hdFdpdGhEZWZhdWx0 KSwgV1RGTW92ZSh1bnJlc3RyaWN0ZWRGbG9hdFdpdGhEZWZhdWx0KSwgV1RGTW92ZShzbWFsbElu dGVnZXJDbGFtcGVkKSwgV1RGTW92ZShzbWFsbEludGVnZXJXaXRoRGVmYXVsdCksIFdURk1vdmUo c21hbGxVbnNpZ25lZEludGVnZXJFbmZvcmNlZFJhbmdlKSwgV1RGTW92ZShzbWFsbFVuc2lnbmVk SW50ZWdlcldpdGhEZWZhdWx0KSwgV1RGTW92ZShpbnRlZ2VyKSwgV1RGTW92ZShpbnRlZ2VyV2l0 aERlZmF1bHQpLCBXVEZNb3ZlKHVuc2lnbmVkSW50ZWdlciksIFdURk1vdmUodW5zaWduZWRJbnRl Z2VyV2l0aERlZmF1bHQpLCBXVEZNb3ZlKGxhcmdlSW50ZWdlciksIFdURk1vdmUobGFyZ2VJbnRl Z2VyV2l0aERlZmF1bHQpLCBXVEZNb3ZlKHVuc2lnbmVkTGFyZ2VJbnRlZ2VyKSwgV1RGTW92ZSh1 bnNpZ25lZExhcmdlSW50ZWdlcldpdGhEZWZhdWx0KSwgV1RGTW92ZShudWxsYWJsZU5vZGUpLCBX VEZNb3ZlKGFueVZhbHVlKSwgV1RGTW92ZShhbnlUeXBlZGVmVmFsdWUpLCBkaWN0aW9uYXJ5TWVt YmVyLnZhbHVlKCkgfTsKIH0KIAotdGVtcGxhdGU8PiBPcHRpb25hbDxUZXN0T2JqOjpEaWN0aW9u YXJ5VGhhdFNob3VsZE5vdFRvbGVyYXRlTnVsbD4gY29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6 RGljdGlvbmFyeVRoYXRTaG91bGROb3RUb2xlcmF0ZU51bGw+KEV4ZWNTdGF0ZSYgc3RhdGUsIEpT VmFsdWUgdmFsdWUpCit0ZW1wbGF0ZTw+IGlubGluZSBPcHRpb25hbDxUZXN0T2JqOjpEaWN0aW9u YXJ5VGhhdFNob3VsZE5vdFRvbGVyYXRlTnVsbD4gY29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6 RGljdGlvbmFyeVRoYXRTaG91bGROb3RUb2xlcmF0ZU51bGw+KEV4ZWNTdGF0ZSYgc3RhdGUsIEpT VmFsdWUgdmFsdWUpCiB7CiAgICAgVk0mIHZtID0gc3RhdGUudm0oKTsKICAgICBhdXRvIHRocm93 U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKQEAgLTY0Myw3ICs2NDMsNyBAQCB0ZW1w bGF0ZTw+IE9wdGlvbmFsPFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkTm90VG9sZXJhdGVO dWxsPiBjb252ZXJ0RGljdGlvbgogICAgIHJldHVybiBUZXN0T2JqOjpEaWN0aW9uYXJ5VGhhdFNo b3VsZE5vdFRvbGVyYXRlTnVsbCB7IFdURk1vdmUocmVxdWlyZWRFbnVtZXJhdGlvblZhbHVlKSwg V1RGTW92ZShib29sZWFuV2l0aG91dERlZmF1bHQpLCAqbm9uTnVsbGFibGVOb2RlLCByZXF1aXJl ZERpY3Rpb25hcnlNZW1iZXIudmFsdWUoKSB9OwogfQogCi10ZW1wbGF0ZTw+IE9wdGlvbmFsPFRl c3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPiBjb252ZXJ0RGljdGlvbmFy eTxUZXN0T2JqOjpEaWN0aW9uYXJ5VGhhdFNob3VsZFRvbGVyYXRlTnVsbD4oRXhlY1N0YXRlJiBz dGF0ZSwgSlNWYWx1ZSB2YWx1ZSkKK3RlbXBsYXRlPD4gaW5saW5lIE9wdGlvbmFsPFRlc3RPYmo6 OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPiBjb252ZXJ0RGljdGlvbmFyeTxUZXN0 T2JqOjpEaWN0aW9uYXJ5VGhhdFNob3VsZFRvbGVyYXRlTnVsbD4oRXhlY1N0YXRlJiBzdGF0ZSwg SlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBWTSYgdm0gPSBzdGF0ZS52bSgpOwogICAgIGF1dG8gdGhy b3dTY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpAQCAtNjYxLDcgKzY2MSw3IEBAIHRl bXBsYXRlPD4gT3B0aW9uYWw8VGVzdE9iajo6RGljdGlvbmFyeVRoYXRTaG91bGRUb2xlcmF0ZU51 bGw+IGNvbnZlcnREaWN0aW9uYXJ5CiAgICAgcmV0dXJuIFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0 U2hvdWxkVG9sZXJhdGVOdWxsIHsgV1RGTW92ZShlbnVtZXJhdGlvblZhbHVlKSwgV1RGTW92ZShi b29sZWFuV2l0aG91dERlZmF1bHQpIH07CiB9CiAKLXRlbXBsYXRlPD4gT3B0aW9uYWw8QWx0ZXJu YXRlRGljdGlvbmFyeU5hbWU+IGNvbnZlcnREaWN0aW9uYXJ5PEFsdGVybmF0ZURpY3Rpb25hcnlO YW1lPihFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVlKQordGVtcGxhdGU8PiBpbmxpbmUg T3B0aW9uYWw8QWx0ZXJuYXRlRGljdGlvbmFyeU5hbWU+IGNvbnZlcnREaWN0aW9uYXJ5PEFsdGVy bmF0ZURpY3Rpb25hcnlOYW1lPihFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVlKQogewog ICAgIFZNJiB2bSA9IHN0YXRlLnZtKCk7CiAgICAgYXV0byB0aHJvd1Njb3BlID0gREVDTEFSRV9U SFJPV19TQ09QRSh2bSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5o IGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAppbmRleCBjMTY3MWVhNDkzNWRlY2ZlNjQ4 ZDYwOTFiMjQ4ZjA2MTUzZGM0MDYwLi45ZjYxMDY1ODM5OTViYWNmN2E0MzMyY2Y1N2MzNmRiMDM2 ZTEzNTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJF bGVtZW50RGF0YS5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIlJlZ2lvbk92 ZXJzZXRTdGF0ZS5oIgorI2luY2x1ZGUgIlNjcm9sbFRvT3B0aW9ucy5oIgogI2luY2x1ZGUgIlNj cm9sbFR5cGVzLmgiCiAjaW5jbHVkZSAiU2ltdWxhdGVkQ2xpY2tPcHRpb25zLmgiCiAjaW5jbHVk ZSAiU3R5bGVDaGFuZ2UuaCIKQEAgLTEzNiwxMSArMTM3LDYgQEAgcHVibGljOgogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChib29sIGNlbnRlcklmTmVlZGVk ID0gdHJ1ZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY3JvbGxJbnRvVmlld0lmTm90Vmlz aWJsZShib29sIGNlbnRlcklmTm90VmlzaWJsZSA9IHRydWUpOwogCi0gICAgc3RydWN0IFNjcm9s bFRvT3B0aW9ucyB7Ci0gICAgICAgIE9wdGlvbmFsPGRvdWJsZT4gbGVmdDsKLSAgICAgICAgT3B0 aW9uYWw8ZG91YmxlPiB0b3A7Ci0gICAgfTsKLQogICAgIHZvaWQgc2Nyb2xsQnkoY29uc3QgU2Ny b2xsVG9PcHRpb25zJik7CiAgICAgdm9pZCBzY3JvbGxCeShkb3VibGUgeCwgZG91YmxlIHkpOwog ICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxUbyhjb25zdCBTY3JvbGxUb09wdGlvbnMmKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmlkbAppbmRleCA1YzQ2ZGZkZmM3ZjEyOThlOWM0NGE3ZDlkMjE3YzU0N2NiM2I2 ZThlLi45ZDExNzBlNzJjN2ZmNzc4YmJhYTE1NmVkZTdjYmRhODVkYTAyNWIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaWRsCkBAIC0xODksNyArMTg5LDkgQEAgZGljdGlvbmFyeSBTaGFkb3dSb290SW5p dCB7CiB9OwogCiAvLyBGSVhNRTogU3VwcG9ydCBTY3JvbGxCZWhhdmlvci4KLWRpY3Rpb25hcnkg U2Nyb2xsVG9PcHRpb25zIHsKK1sKKyAgICBJbXBsZW1lbnRlZEFzPVNjcm9sbFRvT3B0aW9ucwor XSAgZGljdGlvbmFyeSBTY3JvbGxUb09wdGlvbnMgewogICAgIHVucmVzdHJpY3RlZCBkb3VibGUg bGVmdDsKICAgICB1bnJlc3RyaWN0ZWQgZG91YmxlIHRvcDsKIH07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2Nyb2xsVG9PcHRpb25zLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2Ny b2xsVG9PcHRpb25zLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjU3OTc4ZWJlNWYzNThjMjgzMjc1MDk5YmQ2MjAx MDI1NzhjYTVmOQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JvbGxU b09wdGlvbnMuaApAQCAtMCwwICsxLDM3IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE2IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJ UycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJ U0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9S UworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMg T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwor ICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JU IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBX QVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisg KiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI3ByYWdtYSBvbmNlCisK KyNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitzdHJ1 Y3QgU2Nyb2xsVG9PcHRpb25zIHsKKyAgICBPcHRpb25hbDxkb3VibGU+IGxlZnQ7CisgICAgT3B0 aW9uYWw8ZG91YmxlPiB0b3A7Cit9OworCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxCb2R5RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxl bWVudC5jcHAKaW5kZXggZjcyODE4YjU5Nzk4NjE4ZGNiYTQzN2FjNzZlOWU2NjA3NzkwNzUyYy4u MWNkZjBiNTYwYTg4ODcyYmM4MDI2YjJkOTkwYWM4MGNkOTNjYjk3MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcApAQCAtMzA2LDcgKzMwNiw3IEBAIHZvaWQgSFRNTEJv ZHlFbGVtZW50OjpzY3JvbGxUbyhjb25zdCBTY3JvbGxUb09wdGlvbnMmIG9wdGlvbnMpCiAgICAg ICAgIGlmICghd2luZG93KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHdpbmRvdy0+ c2Nyb2xsVG8oeyBvcHRpb25zLmxlZnQsIG9wdGlvbnMudG9wIH0pOworICAgICAgICB3aW5kb3ct PnNjcm9sbFRvKG9wdGlvbnMpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIHJldHVybiBI VE1MRWxlbWVudDo6c2Nyb2xsVG8ob3B0aW9ucyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaAppbmRl eCA1YmRhOTUzZWU1OTBiNWExNjdkZjI5NTUyZjliOTJhZGQ3ZjllM2JiLi5jZWJiNTMwZDRmYzhl ODZkMjA4MTM1ODc4OTJjOWU4ZGFkMzRjNTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0RPTVdpbmRvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmgKQEAg LTMwLDggKzMwLDkgQEAKICNpbmNsdWRlICJDb250ZXh0RGVzdHJ1Y3Rpb25PYnNlcnZlci5oIgog I2luY2x1ZGUgIkV2ZW50VGFyZ2V0LmgiCiAjaW5jbHVkZSAiRnJhbWVEZXN0cnVjdGlvbk9ic2Vy dmVyLmgiCi0jaW5jbHVkZSAiVVJMLmgiCisjaW5jbHVkZSAiU2Nyb2xsVG9PcHRpb25zLmgiCiAj aW5jbHVkZSAiU3VwcGxlbWVudGFibGUuaCIKKyNpbmNsdWRlICJVUkwuaCIKICNpbmNsdWRlIDxm dW5jdGlvbmFsPgogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgpA QCAtMjQ4LDExICsyNDksNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgcG9z dE1lc3NhZ2VUaW1lckZpcmVkKFBvc3RNZXNzYWdlVGltZXImKTsKICAgICAgICAgdm9pZCBkaXNw YXRjaE1lc3NhZ2VFdmVudFdpdGhPcmlnaW5DaGVjayhTZWN1cml0eU9yaWdpbiogaW50ZW5kZWRU YXJnZXRPcmlnaW4sIEV2ZW50JiwgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlNjcmlwdENhbGxTdGFj az4pOwogCi0gICAgICAgIHN0cnVjdCBTY3JvbGxUb09wdGlvbnMgewotICAgICAgICAgICAgT3B0 aW9uYWw8ZG91YmxlPiBsZWZ0OwotICAgICAgICAgICAgT3B0aW9uYWw8ZG91YmxlPiB0b3A7Ci0g ICAgICAgIH07Ci0KICAgICAgICAgdm9pZCBzY3JvbGxCeShjb25zdCBTY3JvbGxUb09wdGlvbnMm KSBjb25zdDsKICAgICAgICAgdm9pZCBzY3JvbGxCeShkb3VibGUgeCwgZG91YmxlIHkpIGNvbnN0 OwogICAgICAgICB2b2lkIHNjcm9sbFRvKGNvbnN0IFNjcm9sbFRvT3B0aW9ucyYpIGNvbnN0Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaWRsIGIvU291cmNlL1dl YkNvcmUvcGFnZS9ET01XaW5kb3cuaWRsCmluZGV4IDkzMGNkZGNkNjRkMzY3Mzg3ZDRmMzU0OTU0 NDA4NWJjYTlmYTZjMGIuLjQ3MGQyZWM3N2JhMWRkZGU1ZTIwODIyMmQ0MzhiNGMyN2I1NzJiNzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwKQEAgLTIxMiw3ICsyMTIsOSBAQAogfTsKIAog Ly8gRklYTUU6IFN1cHBvcnQgU2Nyb2xsQmVoYXZpb3IuCi1kaWN0aW9uYXJ5IFNjcm9sbFRvT3B0 aW9ucyB7CitbCisgICAgSW1wbGVtZW50ZWRBcz1TY3JvbGxUb09wdGlvbnMKK10gZGljdGlvbmFy eSBTY3JvbGxUb09wdGlvbnMgewogICAgIHVucmVzdHJpY3RlZCBkb3VibGUgbGVmdDsKICAgICB1 bnJlc3RyaWN0ZWQgZG91YmxlIHRvcDsKIH07Cg== 288771 2016-09-13 22:00:21 -0700 2016-09-13 22:00:21 -0700 Patch bug-161932-20160913215745.patch text/plain 14990 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA1ODk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmViOGYzMWVkZmEwMTc1 OWI4OThmYzk1ZGFlNWFhNWI0MWY1NDcyZS4uNzNiMWEzODg0MjgyNWI4NTRhYjdlMDI4MTBiMjI1 Y2RhM2FiMzJiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE2LTA5LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgTWVyZ2UgRWxlbWVudDo6U2Ny b2xsVG9PcHRpb25zIGFuZCBET01XaW5kb3c6OlNjcm9sbFRvT3B0aW9ucworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxOTMyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWVyZ2UgRWxlbWVudDo6U2Nyb2xs VG9PcHRpb25zIGFuZCBET01XaW5kb3c6OlNjcm9sbFRvT3B0aW9ucy4KKyAgICAgICAgSWRlYWxs eSB3ZSB3b3VsZCBtZXJnZSB0aGVtIG9uIElETCBzaWRlIGFzIHdlbGwgYnV0IHRoaXMgaXMgZm9y CisgICAgICAgIGFub3RoZXIgcGF0Y2guCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2o6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG06CisgICAgICAgIChHZW5lcmF0ZURpY3Rpb25hcnlJbXBsZW1lbnRhdGlvbkNvbnRlbnQp OgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeT4pOgor ICAgICAgICAoV2ViQ29yZTo6Y29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeVRo YXRTaG91bGROb3RUb2xlcmF0ZU51bGw+KToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZlcnREaWN0 aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPik6CisgICAg ICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFyeTxBbHRlcm5hdGVEaWN0aW9uYXJ5TmFtZT4p OgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgICogZG9tL0VsZW1lbnQuaWRsOgor ICAgICAgICAqIGRvbS9TY3JvbGxUb09wdGlvbnMuaDogQWRkZWQuCisgICAgICAgICogaHRtbC9I VE1MQm9keUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEJvZHlFbGVtZW50Ojpz Y3JvbGxUbyk6CisgICAgICAgICogcGFnZS9ET01XaW5kb3cuaDoKKyAgICAgICAgKiBwYWdlL0RP TVdpbmRvdy5pZGw6CisKKzIwMTYtMDktMTMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KKwogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjA1ODg3LgogCiAgICAgICAg IEJyb2tlIHRoZSBXaW5kb3dzIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggZDBlODY2Yjk4ZDZhZmRlNWYxMjFlYTdhNGU2 YWU5OWRiNzUxZmQyNS4uOTZkNmI1MzMxNDMyYTNlN2EyNDVhYTk1ZDMzYzRmOGExMGEwNDI3MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtMjg3NSw2ICsyODc1LDcgQEAKIAkJODM0OEJGQUMxQjg1NzI5ODAwOTEyRjM2IC8qIENs YXNzQ29sbGVjdGlvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gODM0OEJGQUExQjg1NzI5NTAwOTEyRjM2IC8qIENsYXNzQ29sbGVjdGlvbi5oICovOyB9 OwogCQk4MzRERDRGNDFCRTA4OTg5MDAyQzlDM0UgLyogUGFnZU1hYy5tbSBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDgzNERENEYzMUJFMDg5ODkwMDJDOUMz RSAvKiBQYWdlTWFjLm1tICovOyB9OwogCQk4MzUyMEM3RTFBNzFCRkNDMDA2QkQyQUEgLyogQ1NT Rm9udEZhbWlseS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gODM1MjBDN0QxQTcxQkZDQzAwNkJEMkFBIC8qIENTU0ZvbnRGYW1pbHkuaCAqLzsgfTsKKwkJ ODM1NEE3MEUxRDg4QUQwRjAwODlBQTU3IC8qIFNjcm9sbFRvT3B0aW9ucy5oIGluIEhlYWRlcnMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gODNGMUQ0NUYxRDg4QUM3RTAwNkFF NzJCIC8qIFNjcm9sbFRvT3B0aW9ucy5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFBy aXZhdGUsICk7IH07IH07CiAJCTgzNThDQjZGMUM1MzI3NzIwMEUwQzJEOCAvKiBKU1hNTERvY3Vt ZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDgz RjU3MEFFMUM1MzI2OEUwMDdGRDZDQiAvKiBKU1hNTERvY3VtZW50LmNwcCAqLzsgfTsKIAkJODM1 OENCNzAxQzUzMjc3NTAwRTBDMkQ4IC8qIEpTWE1MRG9jdW1lbnQuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDgzRjU3MEFEMUM1MzI2OEUwMDdGRDZDQiAv KiBKU1hNTERvY3VtZW50LmggKi87IH07CiAJCTgzNUQzNjM3MTlGRjYxOTMwMDRDOTNBQiAvKiBT dHlsZUJ1aWxkZXJDdXN0b20uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDgzNUQzNjM2MTlGRjYxOTMwMDRDOTNBQiAvKiBTdHlsZUJ1aWxkZXJDdXN0b20u aCAqLzsgfTsKQEAgLTEwMDQ1LDYgKzEwMDQ2LDcgQEAKIAkJODNFMzU5QTExQkIxMDMxRDAwMkNF Qjk4IC8qIEpTSFRNTFRpbWVFbGVtZW50LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IEpTSFRNTFRpbWVFbGVtZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJODNFOTU5RTExQjhCQzIyQjAwNEQ5Mzg1IC8qIE5hdGl2ZU5vZGVGaWx0ZXIuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTmF0aXZlTm9kZUZpbHRlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk4M0YxMjA2QTFCOEMxMDM2MDBENzVGNjMgLyogSlNOb2Rl RmlsdGVyQ3VzdG9tLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEpT Tm9kZUZpbHRlckN1c3RvbS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTgzRjFE NDVGMUQ4OEFDN0UwMDZBRTcyQiAvKiBTY3JvbGxUb09wdGlvbnMuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gU2Nyb2xsVG9PcHRpb25zLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTgzRjU3MEFEMUM1MzI2OEUwMDdGRDZDQiAvKiBKU1hNTERvY3VtZW50LmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTWE1MRG9jdW1lbnQuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJODNGNTcwQUUxQzUzMjY4RTAwN0ZENkNCIC8qIEpTWE1MRG9j dW1lbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNYTUxEb2N1 bWVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTg0MTlEMkE0MTIwRDkyRDAw MDE0MUY4RiAvKiBTVkdQYXRoQnl0ZVN0cmVhbS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBTVkdQYXRoQnl0ZVN0cmVhbS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpA QCAtMjMyNTIsNiArMjMyNTQsNyBAQAogCQkJCUUxMUM5RDlBMEVCMzY4MTIwMEU0MDlEQiAvKiBT Y3JpcHRFeGVjdXRpb25Db250ZXh0LmggKi8sCiAJCQkJOEE0MTNBREYxMjA3QkJBNTAwODIwMTZF IC8qIFNjcmlwdFJ1bm5lci5jcHAgKi8sCiAJCQkJOEE0MTNBREUxMjA3QkJBNTAwODIwMTZFIC8q IFNjcmlwdFJ1bm5lci5oICovLAorCQkJCTgzRjFENDVGMUQ4OEFDN0UwMDZBRTcyQiAvKiBTY3Jv bGxUb09wdGlvbnMuaCAqLywKIAkJCQk5NzZGMzZFODE0Njg2MjI1MDA1RTkzQjQgLyogU2VjdXJp dHlDb250ZXh0LmNwcCAqLywKIAkJCQk5NzZGMzZFOTE0Njg2MjI1MDA1RTkzQjQgLyogU2VjdXJp dHlDb250ZXh0LmggKi8sCiAJCQkJMUFGN0FGQzUxQTQ4QThCQzAwQzhFNEU3IC8qIFNlY3VyaXR5 T3JpZ2luUG9saWN5LmNwcCAqLywKQEAgLTI2MTkwLDYgKzI2MTkzLDcgQEAKIAkJCQkwODU0QjAx OTEyNTVFNEU2MDBCOUNERDAgLyogUmVuZGVyU1ZHVGV4dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJ MDg1NEIwMUIxMjU1RTRFNjAwQjlDREQwIC8qIFJlbmRlclNWR1RleHRQYXRoLmggaW4gSGVhZGVy cyAqLywKIAkJCQk0MzY3MDhFOTEyRDlDQTRCMDAwNDQyMzQgLyogUmVuZGVyU1ZHVHJhbnNmb3Jt YWJsZUNvbnRhaW5lci5oIGluIEhlYWRlcnMgKi8sCisJCQkJODM1NEE3MEUxRDg4QUQwRjAwODlB QTU3IC8qIFNjcm9sbFRvT3B0aW9ucy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMDg1NEIwMUQxMjU1 RTRFNjAwQjlDREQwIC8qIFJlbmRlclNWR1RTcGFuLmggaW4gSGVhZGVycyAqLywKIAkJCQk0MzY3 MDhFQjEyRDlDQTRCMDAwNDQyMzQgLyogUmVuZGVyU1ZHVmlld3BvcnRDb250YWluZXIuaCBpbiBI ZWFkZXJzICovLAogCQkJCUE4REY0QUVCMDk4MEM0MkMwMDUyOTgxQiAvKiBSZW5kZXJUYWJsZS5o IGluIEhlYWRlcnMgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL0NvZGVHZW5lcmF0b3JKUy5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtCmluZGV4IGRkZDY1MGRmZTk0MDE4ZTgyYTMxNzA1NGEyM2ExZTQw NGMzN2JmNzcuLmYwOTBiYjViYmI4YWIzYzNiZDFlNGZhMjk2ZDcyZjMzNjcyZWJkZTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt CkBAIC0xMDA5LDcgKzEwMDksNyBAQCBzdWIgR2VuZXJhdGVEaWN0aW9uYXJ5SW1wbGVtZW50YXRp b25Db250ZW50CiAgICAgICAgICAgICAkY29tbWEgPSAiLCAiOwogICAgICAgICB9CiAKLSAgICAg ICAgJHJlc3VsdCAuPSAidGVtcGxhdGU8PiBPcHRpb25hbDwkY2xhc3NOYW1lPiBjb252ZXJ0RGlj dGlvbmFyeTwkY2xhc3NOYW1lPihFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVlKVxuIjsK KyAgICAgICAgJHJlc3VsdCAuPSAidGVtcGxhdGU8PiBBTFdBWVNfSU5MSU5FIE9wdGlvbmFsPCRj bGFzc05hbWU+IGNvbnZlcnREaWN0aW9uYXJ5PCRjbGFzc05hbWU+KEV4ZWNTdGF0ZSYgc3RhdGUs IEpTVmFsdWUgdmFsdWUpXG4iOwogICAgICAgICAkcmVzdWx0IC49ICJ7XG4iOwogICAgICAgICAk cmVzdWx0IC49ICIgICAgVk0mIHZtID0gc3RhdGUudm0oKTtcbiI7CiAgICAgICAgICRyZXN1bHQg Lj0gIiAgICBhdXRvIHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTtcbiI7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0 T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RP YmouY3BwCmluZGV4IDZkYmFkZWNkYzE0OTZiMDZjN2NkZjFmZTIxM2MxZDIyOTFhODgyNmIuLmJk Zjg3YjhiZTgwMTQ0YzllZjM4OTg5YWQ0YWJlMGMwNGU0ZjA4MTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCkBAIC01 MTMsNyArNTEzLDcgQEAgdGVtcGxhdGU8PiBpbmxpbmUgY29uc3QgY2hhciogZXhwZWN0ZWRFbnVt ZXJhdGlvblZhbHVlczxUZXN0T2JqOjpDb25maWRlbmNlPigpCiAgICAgcmV0dXJuICJcImhpZ2hc IiwgXCJraW5kYS1sb3dcIiI7CiB9CiAKLXRlbXBsYXRlPD4gT3B0aW9uYWw8VGVzdE9iajo6RGlj dGlvbmFyeT4gY29udmVydERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeT4oRXhlY1N0YXRl JiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSkKK3RlbXBsYXRlPD4gQUxXQVlTX0lOTElORSBPcHRpb25h bDxUZXN0T2JqOjpEaWN0aW9uYXJ5PiBjb252ZXJ0RGljdGlvbmFyeTxUZXN0T2JqOjpEaWN0aW9u YXJ5PihFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVlKQogewogICAgIFZNJiB2bSA9IHN0 YXRlLnZtKCk7CiAgICAgYXV0byB0aHJvd1Njb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7 CkBAIC02MjEsNyArNjIxLDcgQEAgdGVtcGxhdGU8PiBPcHRpb25hbDxUZXN0T2JqOjpEaWN0aW9u YXJ5PiBjb252ZXJ0RGljdGlvbmFyeTxUZXN0T2JqOjpEaWN0aW9uYXJ5PigKICAgICByZXR1cm4g VGVzdE9iajo6RGljdGlvbmFyeSB7IFdURk1vdmUoZW51bWVyYXRpb25WYWx1ZVdpdGhvdXREZWZh dWx0KSwgV1RGTW92ZShlbnVtZXJhdGlvblZhbHVlV2l0aERlZmF1bHQpLCBXVEZNb3ZlKGVudW1l cmF0aW9uVmFsdWVXaXRoRW1wdHlTdHJpbmdEZWZhdWx0KSwgV1RGTW92ZShzdHJpbmdXaXRoRGVm YXVsdCksIFdURk1vdmUoc3RyaW5nV2l0aG91dERlZmF1bHQpLCBXVEZNb3ZlKGJvb2xlYW5XaXRo RGVmYXVsdCksIFdURk1vdmUoYm9vbGVhbldpdGhvdXREZWZhdWx0KSwgV1RGTW92ZShzZXF1ZW5j ZU9mU3RyaW5ncyksIFdURk1vdmUocmVzdHJpY3RlZERvdWJsZSksIFdURk1vdmUodW5yZXN0cmlj dGVkRG91YmxlKSwgV1RGTW92ZShyZXN0cmljdGVkRG91YmxlV2l0aERlZmF1bHQpLCBXVEZNb3Zl KHVucmVzdHJpY3RlZERvdWJsZVdpdGhEZWZhdWx0KSwgV1RGTW92ZShyZXN0cmljdGVkRmxvYXQp LCBXVEZNb3ZlKHVucmVzdHJpY3RlZEZsb2F0KSwgV1RGTW92ZShyZXN0cmljdGVkRmxvYXRXaXRo RGVmYXVsdCksIFdURk1vdmUodW5yZXN0cmljdGVkRmxvYXRXaXRoRGVmYXVsdCksIFdURk1vdmUo c21hbGxJbnRlZ2VyQ2xhbXBlZCksIFdURk1vdmUoc21hbGxJbnRlZ2VyV2l0aERlZmF1bHQpLCBX VEZNb3ZlKHNtYWxsVW5zaWduZWRJbnRlZ2VyRW5mb3JjZWRSYW5nZSksIFdURk1vdmUoc21hbGxV bnNpZ25lZEludGVnZXJXaXRoRGVmYXVsdCksIFdURk1vdmUoaW50ZWdlciksIFdURk1vdmUoaW50 ZWdlcldpdGhEZWZhdWx0KSwgV1RGTW92ZSh1bnNpZ25lZEludGVnZXIpLCBXVEZNb3ZlKHVuc2ln bmVkSW50ZWdlcldpdGhEZWZhdWx0KSwgV1RGTW92ZShsYXJnZUludGVnZXIpLCBXVEZNb3ZlKGxh cmdlSW50ZWdlcldpdGhEZWZhdWx0KSwgV1RGTW92ZSh1bnNpZ25lZExhcmdlSW50ZWdlciksIFdU Rk1vdmUodW5zaWduZWRMYXJnZUludGVnZXJXaXRoRGVmYXVsdCksIFdURk1vdmUobnVsbGFibGVO b2RlKSwgV1RGTW92ZShhbnlWYWx1ZSksIFdURk1vdmUoYW55VHlwZWRlZlZhbHVlKSwgZGljdGlv bmFyeU1lbWJlci52YWx1ZSgpIH07CiB9CiAKLXRlbXBsYXRlPD4gT3B0aW9uYWw8VGVzdE9iajo6 RGljdGlvbmFyeVRoYXRTaG91bGROb3RUb2xlcmF0ZU51bGw+IGNvbnZlcnREaWN0aW9uYXJ5PFRl c3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkTm90VG9sZXJhdGVOdWxsPihFeGVjU3RhdGUmIHN0 YXRlLCBKU1ZhbHVlIHZhbHVlKQordGVtcGxhdGU8PiBBTFdBWVNfSU5MSU5FIE9wdGlvbmFsPFRl c3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkTm90VG9sZXJhdGVOdWxsPiBjb252ZXJ0RGljdGlv bmFyeTxUZXN0T2JqOjpEaWN0aW9uYXJ5VGhhdFNob3VsZE5vdFRvbGVyYXRlTnVsbD4oRXhlY1N0 YXRlJiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBWTSYgdm0gPSBzdGF0ZS52bSgpOwog ICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpAQCAtNjQzLDcg KzY0Myw3IEBAIHRlbXBsYXRlPD4gT3B0aW9uYWw8VGVzdE9iajo6RGljdGlvbmFyeVRoYXRTaG91 bGROb3RUb2xlcmF0ZU51bGw+IGNvbnZlcnREaWN0aW9uCiAgICAgcmV0dXJuIFRlc3RPYmo6OkRp Y3Rpb25hcnlUaGF0U2hvdWxkTm90VG9sZXJhdGVOdWxsIHsgV1RGTW92ZShyZXF1aXJlZEVudW1l cmF0aW9uVmFsdWUpLCBXVEZNb3ZlKGJvb2xlYW5XaXRob3V0RGVmYXVsdCksICpub25OdWxsYWJs ZU5vZGUsIHJlcXVpcmVkRGljdGlvbmFyeU1lbWJlci52YWx1ZSgpIH07CiB9CiAKLXRlbXBsYXRl PD4gT3B0aW9uYWw8VGVzdE9iajo6RGljdGlvbmFyeVRoYXRTaG91bGRUb2xlcmF0ZU51bGw+IGNv bnZlcnREaWN0aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxs PihFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVlKQordGVtcGxhdGU8PiBBTFdBWVNfSU5M SU5FIE9wdGlvbmFsPFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPiBj b252ZXJ0RGljdGlvbmFyeTxUZXN0T2JqOjpEaWN0aW9uYXJ5VGhhdFNob3VsZFRvbGVyYXRlTnVs bD4oRXhlY1N0YXRlJiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBWTSYgdm0gPSBzdGF0 ZS52bSgpOwogICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpA QCAtNjYxLDcgKzY2MSw3IEBAIHRlbXBsYXRlPD4gT3B0aW9uYWw8VGVzdE9iajo6RGljdGlvbmFy eVRoYXRTaG91bGRUb2xlcmF0ZU51bGw+IGNvbnZlcnREaWN0aW9uYXJ5CiAgICAgcmV0dXJuIFRl c3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsIHsgV1RGTW92ZShlbnVtZXJh dGlvblZhbHVlKSwgV1RGTW92ZShib29sZWFuV2l0aG91dERlZmF1bHQpIH07CiB9CiAKLXRlbXBs YXRlPD4gT3B0aW9uYWw8QWx0ZXJuYXRlRGljdGlvbmFyeU5hbWU+IGNvbnZlcnREaWN0aW9uYXJ5 PEFsdGVybmF0ZURpY3Rpb25hcnlOYW1lPihFeGVjU3RhdGUmIHN0YXRlLCBKU1ZhbHVlIHZhbHVl KQordGVtcGxhdGU8PiBBTFdBWVNfSU5MSU5FIE9wdGlvbmFsPEFsdGVybmF0ZURpY3Rpb25hcnlO YW1lPiBjb252ZXJ0RGljdGlvbmFyeTxBbHRlcm5hdGVEaWN0aW9uYXJ5TmFtZT4oRXhlY1N0YXRl JiBzdGF0ZSwgSlNWYWx1ZSB2YWx1ZSkKIHsKICAgICBWTSYgdm0gPSBzdGF0ZS52bSgpOwogICAg IGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmgKaW5kZXggYzE2NzFlYTQ5MzVkZWNmZTY0OGQ2MDkxYjI0OGYwNjE1M2RjNDA2MC4uOWY2MTA2 NTgzOTk1YmFjZjdhNDMzMmNmNTdjMzZkYjAzNmUxMzUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCkBA IC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiRWxlbWVudERhdGEuaCIKICNpbmNsdWRlICJIVE1M TmFtZXMuaCIKICNpbmNsdWRlICJSZWdpb25PdmVyc2V0U3RhdGUuaCIKKyNpbmNsdWRlICJTY3Jv bGxUb09wdGlvbnMuaCIKICNpbmNsdWRlICJTY3JvbGxUeXBlcy5oIgogI2luY2x1ZGUgIlNpbXVs YXRlZENsaWNrT3B0aW9ucy5oIgogI2luY2x1ZGUgIlN0eWxlQ2hhbmdlLmgiCkBAIC0xMzYsMTEg KzEzNyw2IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNjcm9sbEludG9WaWV3 SWZOZWVkZWQoYm9vbCBjZW50ZXJJZk5lZWRlZCA9IHRydWUpOwogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgc2Nyb2xsSW50b1ZpZXdJZk5vdFZpc2libGUoYm9vbCBjZW50ZXJJZk5vdFZpc2libGUg PSB0cnVlKTsKIAotICAgIHN0cnVjdCBTY3JvbGxUb09wdGlvbnMgewotICAgICAgICBPcHRpb25h bDxkb3VibGU+IGxlZnQ7Ci0gICAgICAgIE9wdGlvbmFsPGRvdWJsZT4gdG9wOwotICAgIH07Ci0K ICAgICB2b2lkIHNjcm9sbEJ5KGNvbnN0IFNjcm9sbFRvT3B0aW9ucyYpOwogICAgIHZvaWQgc2Ny b2xsQnkoZG91YmxlIHgsIGRvdWJsZSB5KTsKICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsVG8oY29u c3QgU2Nyb2xsVG9PcHRpb25zJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5pZGwKaW5kZXggNWM0NmRmZGZj N2YxMjk4ZTljNDRhN2Q5ZDIxN2M1NDdjYjNiNmU4ZS4uOWQxMTcwZTcyYzdmZjc3OGJiYWExNTZl ZGU3Y2JkYTg1ZGEwMjViMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu aWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmlkbApAQCAtMTg5LDcgKzE4OSw5 IEBAIGRpY3Rpb25hcnkgU2hhZG93Um9vdEluaXQgewogfTsKIAogLy8gRklYTUU6IFN1cHBvcnQg U2Nyb2xsQmVoYXZpb3IuCi1kaWN0aW9uYXJ5IFNjcm9sbFRvT3B0aW9ucyB7CitbCisgICAgSW1w bGVtZW50ZWRBcz1TY3JvbGxUb09wdGlvbnMKK10gIGRpY3Rpb25hcnkgU2Nyb2xsVG9PcHRpb25z IHsKICAgICB1bnJlc3RyaWN0ZWQgZG91YmxlIGxlZnQ7CiAgICAgdW5yZXN0cmljdGVkIGRvdWJs ZSB0b3A7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1Njcm9sbFRvT3B0aW9u cy5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1Njcm9sbFRvT3B0aW9ucy5oCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY1 Nzk3OGViZTVmMzU4YzI4MzI3NTA5OWJkNjIwMTAyNTc4Y2E1ZjkKLS0tIC9kZXYvbnVsbAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vU2Nyb2xsVG9PcHRpb25zLmgKQEAgLTAsMCArMSwzNyBAQAor LyoKKyAqIENvcHlyaWdodCAoQykgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMu IEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBB UFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVD VCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNF UVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVN RU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFU QSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFD VCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+CisK K25hbWVzcGFjZSBXZWJDb3JlIHsKKworc3RydWN0IFNjcm9sbFRvT3B0aW9ucyB7CisgICAgT3B0 aW9uYWw8ZG91YmxlPiBsZWZ0OworICAgIE9wdGlvbmFsPGRvdWJsZT4gdG9wOworfTsKKworfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MQm9keUVsZW1lbnQuY3BwCmluZGV4IGY3MjgxOGI1OTc5ODYx OGRjYmE0MzdhYzc2ZTllNjYwNzc5MDc1MmMuLjFjZGYwYjU2MGE4ODg3MmJjODAyNmIyZDk5MGFj ODBjZDkzY2I5NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAKQEAg LTMwNiw3ICszMDYsNyBAQCB2b2lkIEhUTUxCb2R5RWxlbWVudDo6c2Nyb2xsVG8oY29uc3QgU2Ny b2xsVG9PcHRpb25zJiBvcHRpb25zKQogICAgICAgICBpZiAoIXdpbmRvdykKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICB3aW5kb3ctPnNjcm9sbFRvKHsgb3B0aW9ucy5sZWZ0LCBvcHRp b25zLnRvcCB9KTsKKyAgICAgICAgd2luZG93LT5zY3JvbGxUbyhvcHRpb25zKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KICAgICByZXR1cm4gSFRNTEVsZW1lbnQ6OnNjcm9sbFRvKG9wdGlvbnMp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRE9NV2luZG93LmgKaW5kZXggNWJkYTk1M2VlNTkwYjVhMTY3ZGYyOTU1MmY5 YjkyYWRkN2Y5ZTNiYi4uY2ViYjUzMGQ0ZmM4ZTg2ZDIwODEzNTg3ODkyYzllOGRhZDM0YzU0NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5oCkBAIC0zMCw4ICszMCw5IEBACiAjaW5jbHVkZSAiQ29u dGV4dERlc3RydWN0aW9uT2JzZXJ2ZXIuaCIKICNpbmNsdWRlICJFdmVudFRhcmdldC5oIgogI2lu Y2x1ZGUgIkZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlci5oIgotI2luY2x1ZGUgIlVSTC5oIgorI2lu Y2x1ZGUgIlNjcm9sbFRvT3B0aW9ucy5oIgogI2luY2x1ZGUgIlN1cHBsZW1lbnRhYmxlLmgiCisj aW5jbHVkZSAiVVJMLmgiCiAjaW5jbHVkZSA8ZnVuY3Rpb25hbD4KICNpbmNsdWRlIDxtZW1vcnk+ CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KQEAgLTI0OCwxMSArMjQ5LDYgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICB2b2lkIHBvc3RNZXNzYWdlVGltZXJGaXJlZChQb3N0TWVzc2Fn ZVRpbWVyJik7CiAgICAgICAgIHZvaWQgZGlzcGF0Y2hNZXNzYWdlRXZlbnRXaXRoT3JpZ2luQ2hl Y2soU2VjdXJpdHlPcmlnaW4qIGludGVuZGVkVGFyZ2V0T3JpZ2luLCBFdmVudCYsIFBhc3NSZWZQ dHI8SW5zcGVjdG9yOjpTY3JpcHRDYWxsU3RhY2s+KTsKIAotICAgICAgICBzdHJ1Y3QgU2Nyb2xs VG9PcHRpb25zIHsKLSAgICAgICAgICAgIE9wdGlvbmFsPGRvdWJsZT4gbGVmdDsKLSAgICAgICAg ICAgIE9wdGlvbmFsPGRvdWJsZT4gdG9wOwotICAgICAgICB9OwotCiAgICAgICAgIHZvaWQgc2Ny b2xsQnkoY29uc3QgU2Nyb2xsVG9PcHRpb25zJikgY29uc3Q7CiAgICAgICAgIHZvaWQgc2Nyb2xs QnkoZG91YmxlIHgsIGRvdWJsZSB5KSBjb25zdDsKICAgICAgICAgdm9pZCBzY3JvbGxUbyhjb25z dCBTY3JvbGxUb09wdGlvbnMmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRE9NV2luZG93LmlkbCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmlkbAppbmRl eCA5MzBjZGRjZDY0ZDM2NzM4N2Q0ZjM1NDk1NDQwODViY2E5ZmE2YzBiLi40NzBkMmVjNzdiYTFk ZGRlNWUyMDgyMjJkNDM4YjRjMjdiNTcyYjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0RPTVdpbmRvdy5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuaWRs CkBAIC0yMTIsNyArMjEyLDkgQEAKIH07CiAKIC8vIEZJWE1FOiBTdXBwb3J0IFNjcm9sbEJlaGF2 aW9yLgotZGljdGlvbmFyeSBTY3JvbGxUb09wdGlvbnMgeworWworICAgIEltcGxlbWVudGVkQXM9 U2Nyb2xsVG9PcHRpb25zCitdIGRpY3Rpb25hcnkgU2Nyb2xsVG9PcHRpb25zIHsKICAgICB1bnJl c3RyaWN0ZWQgZG91YmxlIGxlZnQ7CiAgICAgdW5yZXN0cmljdGVkIGRvdWJsZSB0b3A7CiB9Owo=