39575 2010-05-23 17:47:54 -0700 Switch JS wrappers from inheriting from JSObject to inheriting from JSObjectWithGlobalObject 2010-05-23 20:30:55 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned abarth eric ossy webkit.review.bot oldest_to_newest 229538 0 sam 2010-05-23 17:47:54 -0700 Now that JavaScriptCore has JSObjectWithGlobalObject, we should move off of DOMObjectWithGlobalPointer and onto it. This is the first step which makes DOMObject inherit from JSObjectWithGlobalObject but keeps DOMObjectWithGlobalPointer around. I will remove it and condense the inheritance hierarchy in a subsequent patch. 229540 1 56839 sam 2010-05-23 17:51:12 -0700 Created attachment 56839 patch This still needs a change to the windows JSC exports file. Maybe the EWS bot will let me know what the correct mangled name is. 229552 2 56839 oliver 2010-05-23 18:22:37 -0700 Comment on attachment 56839 patch r=me 229571 3 sam 2010-05-23 19:15:52 -0700 Landed in r60057. 229573 4 webkit.review.bot 2010-05-23 19:40:16 -0700 http://trac.webkit.org/changeset/60057 might have broken Qt Linux ARMv5 Release 229576 5 eric 2010-05-23 19:56:59 -0700 No, the Qt builders just can't stay connected to save their lives. 229577 6 eric 2010-05-23 19:57:28 -0700 This is very exciting, btw! 229586 7 webkit.review.bot 2010-05-23 20:30:55 -0700 Attachment 56839 did not build on win: Build output: http://webkit-commit-queue.appspot.com/results/2313549 56839 2010-05-23 17:51:12 -0700 2010-05-23 18:22:36 -0700 patch patch.diff text/plain 19738 sam SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwMDUyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMjMgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zOTU3NQorICAgICAgICBNYWtlIEpTIERPTU9iamVjdCBpbmhlcml0IGZyb20gSlNPYmpl Y3RXaXRoR2xvYmFsT2JqZWN0IGluc3RlYWQgb2YgSlNPYmplY3QKKworICAgICAgICBFeHBvc2Ug dGhlIGdsb2JhbCBvYmplY3Qgc3RvcmVkIGluIEpTT2JqZWN0V2l0aEdsb2JhbE9iamVjdC4KKwor ICAgICAgICAqIEphdmFTY3JpcHRDb3JlLmV4cDoKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS54 Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmplY3RXaXRo R2xvYmFsT2JqZWN0LmNwcDoKKyAgICAgICAgKEpTQzo6SlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0 OjpKU09iamVjdFdpdGhHbG9iYWxPYmplY3QpOgorICAgICAgICAoSlNDOjpKU09iamVjdFdpdGhH bG9iYWxPYmplY3Q6Omdsb2JhbE9iamVjdCk6CisgICAgICAgICogcnVudGltZS9KU09iamVjdFdp dGhHbG9iYWxPYmplY3QuaDoKKwogMjAxMC0wNS0yMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBw bGUuY29tPgogCiAgICAgICAgICJhc20gdm9sYXRpbGUiIGlzbid0IHZhbGlkIG91dHNpZGUgb2Yg ZnVuY3Rpb25zLgpJbmRleDogSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAkocmV2aXNpb24gNjAw NDkpCisrKyBKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSwzIEBACi1fX1pON1dlYkNvcmUxMFN0cmluZ0ltcGw2Y3JlYXRlRVBLY2oKLV9f Wk43V2ViQ29yZTEyQXRvbWljU3RyaW5nMTFhZGRTbG93Q2FzZUVQTlNfMTBTdHJpbmdJbXBsRQog X0pTQ2hlY2tTY3JpcHRTeW50YXgKIF9KU0NsYXNzQ3JlYXRlCiBfSlNDbGFzc1JlbGVhc2UKQEAg LTEwMSw3ICs5OSw2IEBAIF9fWjEyanNSZWdFeHBGcmVlUDhKU1JlZ0V4cAogX19aMTVqc1JlZ0V4 cENvbXBpbGVQS3RpMjRKU1JlZ0V4cElnbm9yZUNhc2VPcHRpb24yM0pTUmVnRXhwTXVsdGlsaW5l T3B0aW9uUGpQUEtjCiBfX1oxNWpzUmVnRXhwRXhlY3V0ZVBLOEpTUmVnRXhwUEt0aWlQaWkKIF9f Wk4xNE9wYXF1ZUpTU3RyaW5nNmNyZWF0ZUVSS04zSlNDN1VTdHJpbmdFCi1fX1pOM0pTQzEwSlNG dW5jdGlvbkMxRVBOU185RXhlY1N0YXRlRVBOU18xNEpTR2xvYmFsT2JqZWN0RU4zV1RGMTdOb25O dWxsUGFzc1JlZlB0cklOU185U3RydWN0dXJlRUVFaVJLTlNfMTBJZGVudGlmaWVyRVBGTlNfN0pT VmFsdWVFUzJfUE5TXzhKU09iamVjdEVTQ19SS05TXzdBcmdMaXN0RUUKIF9fWk4zSlNDMTBJZGVu dGlmaWVyMTFhZGRTbG93Q2FzZUVQTlNfMTJKU0dsb2JhbERhdGFFUE43V2ViQ29yZTEwU3RyaW5n SW1wbEUKIF9fWk4zSlNDMTBJZGVudGlmaWVyMTFhZGRTbG93Q2FzZUVQTlNfOUV4ZWNTdGF0ZUVQ TjdXZWJDb3JlMTBTdHJpbmdJbXBsRQogX19aTjNKU0MxMElkZW50aWZpZXIyN2NoZWNrQ3VycmVu dElkZW50aWZpZXJUYWJsZUVQTlNfMTJKU0dsb2JhbERhdGFFCkBAIC0xMTIsNiArMTA5LDcgQEAg X19aTjNKU0MxMElkZW50aWZpZXI0ZnJvbUVQTlNfOUV4ZWNTdGF0ZQogX19aTjNKU0MxMElkZW50 aWZpZXI1ZXF1YWxFUEtON1dlYkNvcmUxMFN0cmluZ0ltcGxFUEtjCiBfX1pOM0pTQzEwSlNGdW5j dGlvbjRpbmZvRQogX19aTjNKU0MxMEpTRnVuY3Rpb240bmFtZUVQTlNfOUV4ZWNTdGF0ZUUKK19f Wk4zSlNDMTBKU0Z1bmN0aW9uQzFFUE5TXzlFeGVjU3RhdGVFUE5TXzE0SlNHbG9iYWxPYmplY3RF TjNXVEYxN05vbk51bGxQYXNzUmVmUHRySU5TXzlTdHJ1Y3R1cmVFRUVpUktOU18xMElkZW50aWZp ZXJFUEZOU183SlNWYWx1ZUVTMl9QTlNfOEpTT2JqZWN0RVNDX1JLTlNfN0FyZ0xpc3RFRQogX19a TjNKU0MxMHRocm93RXJyb3JFUE5TXzlFeGVjU3RhdGVFTlNfOUVycm9yVHlwZUUKIF9fWk4zSlND MTB0aHJvd0Vycm9yRVBOU185RXhlY1N0YXRlRU5TXzlFcnJvclR5cGVFUEtjCiBfX1pOM0pTQzEw dGhyb3dFcnJvckVQTlNfOUV4ZWNTdGF0ZUVOU185RXJyb3JUeXBlRVJLTlNfN1VTdHJpbmdFCkBA IC0xOTMsOCArMTkxLDggQEAgX19aTjNKU0MyME1hcmtlZEFyZ3VtZW50QnVmZmVyMTBzbG93QXBw ZQogX19aTjNKU0MyM0Fic3RyYWN0U2FtcGxpbmdDb3VudGVyNGR1bXBFdgogX19aTjNKU0MyM29i amVjdFByb3RvRnVuY1RvU3RyaW5nRVBOU185RXhlY1N0YXRlRVBOU184SlNPYmplY3RFTlNfN0pT VmFsdWVFUktOU183QXJnTGlzdEUKIF9fWk4zSlNDMjNzZXRVcFN0YXRpY0Z1bmN0aW9uU2xvdEVQ TlNfOUV4ZWNTdGF0ZUVQS05TXzlIYXNoRW50cnlFUE5TXzhKU09iamVjdEVSS05TXzEwSWRlbnRp ZmllckVSTlNfMTJQcm9wZXJ0eVNsb3RFCi1fX1pOM0pTQzI0Y3JlYXRlU3RhY2tPdmVyZmxvd0Vy cm9yRVBOU185RXhlY1N0YXRlRQogX19aTjNKU0MyNEpTT2JqZWN0V2l0aEdsb2JhbE9iamVjdEMy RVBOU18xNEpTR2xvYmFsT2JqZWN0RU4zV1RGMTdOb25OdWxsUGFzc1JlZlB0cklOU185U3RydWN0 dXJlRUVFCitfX1pOM0pTQzI0Y3JlYXRlU3RhY2tPdmVyZmxvd0Vycm9yRVBOU185RXhlY1N0YXRl RQogX19aTjNKU0MyNWV2YWx1YXRlSW5HbG9iYWxDYWxsRnJhbWVFUktOU183VVN0cmluZ0VSTlNf N0pTVmFsdWVFUE5TXzE0SlNHbG9iYWxPYmplY3RFCiBfX1pOM0pTQzM1Y3JlYXRlSW50ZXJydXB0 ZWRFeGVjdXRpb25FeGNlcHRpb25FUE5TXzEySlNHbG9iYWxEYXRhRQogX19aTjNKU0MzTmFORQpA QCAtMzk2LDYgKzM5NCw3IEBAIF9fWk43V2ViQ29yZTEwU3RyaW5nSW1wbDVsb3dlckV2CiBfX1pO N1dlYkNvcmUxMFN0cmluZ0ltcGw1dG9JbnRFUGIKIF9fWk43V2ViQ29yZTEwU3RyaW5nSW1wbDV1 cHBlckV2CiBfX1pON1dlYkNvcmUxMFN0cmluZ0ltcGw2Y3JlYXRlRVBLYworX19aTjdXZWJDb3Jl MTBTdHJpbmdJbXBsNmNyZWF0ZUVQS2NqCiBfX1pON1dlYkNvcmUxMFN0cmluZ0ltcGw2Y3JlYXRl RVBLdGoKIF9fWk43V2ViQ29yZTEwU3RyaW5nSW1wbDZjcmVhdGVFUEt0ak4zV1RGMTBQYXNzUmVm UHRySU5TM18yMUNyb3NzVGhyZWFkUmVmQ291bnRlZElOUzNfMTZPd25GYXN0TWFsbG9jUHRySVMx X0VFRUVFRQogX19aTjdXZWJDb3JlMTBTdHJpbmdJbXBsNnNlY3VyZUV0CkBAIC00MDcsNiArNDA2 LDcgQEAgX19aTjdXZWJDb3JlMTBTdHJpbmdJbXBsOGVuZHNXaXRoRVBTMF9iCiBfX1pON1dlYkNv cmUxMFN0cmluZ0ltcGw5c3Vic3RyaW5nRWpqCiBfX1pON1dlYkNvcmUxMFN0cmluZ0ltcGxEMUV2 CiBfX1pON1dlYkNvcmUxMWNvbW1lbnRBdG9tRQorX19aTjdXZWJDb3JlMTJBdG9taWNTdHJpbmcx MWFkZFNsb3dDYXNlRVBOU18xMFN0cmluZ0ltcGxFCiBfX1pON1dlYkNvcmUxMkF0b21pY1N0cmlu ZzNhZGRFUEtjCiBfX1pON1dlYkNvcmUxMkF0b21pY1N0cmluZzNhZGRFUEt0CiBfX1pON1dlYkNv cmUxMkF0b21pY1N0cmluZzNhZGRFUEt0agpAQCAtNDc0LDkgKzQ3NCwxMCBAQCBfX1pOSzNKU0Mx OFByb3BlcnR5RGVzY3JpcHRvcjIwaXNBY2Nlc3NvCiBfX1pOSzNKU0MxOFByb3BlcnR5RGVzY3Jp cHRvcjZnZXR0ZXJFdgogX19aTkszSlNDMThQcm9wZXJ0eURlc2NyaXB0b3I2c2V0dGVyRXYKIF9f Wk5LM0pTQzE4UHJvcGVydHlEZXNjcmlwdG9yOHdyaXRhYmxlRXYKLV9fWk5LM0pTQzRIZWFwNHNp emVFdgorX19aTkszSlNDMjRKU09iamVjdFdpdGhHbG9iYWxPYmplY3QxMmdsb2JhbE9iamVjdEV2 CiBfX1pOSzNKU0M0SGVhcDEwc3RhdGlzdGljc0V2CiBfX1pOSzNKU0M0SGVhcDExb2JqZWN0Q291 bnRFdgorX19aTkszSlNDNEhlYXA0c2l6ZUV2CiBfX1pOSzNKU0M2SlNDZWxsMTF0b1ByaW1pdGl2 ZUVQTlNfOUV4ZWNTdGF0ZUVOU18yMlByZWZlcnJlZFByaW1pdGl2ZVR5cGVFCiBfX1pOSzNKU0M2 SlNDZWxsMTJ0b1RoaXNPYmplY3RFUE5TXzlFeGVjU3RhdGVFCiBfX1pOSzNKU0M2SlNDZWxsMTRp c0dldHRlclNldHRlckV2CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL0phdmFT Y3JpcHRDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDYwMDQ5KQorKysg SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagko d29ya2luZyBjb3B5KQpAQCAtMzE5LDcgKzMxOSw2IEBACiAJCUE3QTFGN0FEMEYyNTJCM0MwMEUx ODRFMiAvKiBCeXRlQXJyYXkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEE3QTFGN0FCMEYyNTJCM0MwMEUxODRFMiAvKiBCeXRlQXJyYXkuaCAqLzsgc2V0 dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlBN0I0OEY0OTBFRTg5 MzZGMDBEQ0JEQjYgLyogRXhlY3V0YWJsZUFsbG9jYXRvci5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0I0OERCNjBFRTc0Q0ZDMDBEQ0JEQjYgLyog RXhlY3V0YWJsZUFsbG9jYXRvci5jcHAgKi87IH07CiAJCUE3QzFFOEU0MTEyRTcyRUYwMEEzN0Y5 OCAvKiBKSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE3QzFFOEM4MTEyRTcwMUMwMEEzN0Y5OCAvKiBKSVRQcm9w ZXJ0eUFjY2VzczMyXzY0LmNwcCAqLzsgfTsKLQkJQTdDMjIxNzgxMEM3NDc5NDAwRjk3OTEzIC8q IEpTWm9tYmllLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IEE3QzIyMTZCMTBDNzQ2OUMwMEY5NzkxMyAvKiBKU1pvbWJpZS5jcHAgKi87IH07CiAJCUE3 QzUzMEU0MTAyQTM4MTMwMDVCQzc0MSAvKiBNYXJrU3RhY2tQb3NpeC5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0M1MzBFMzEwMkEzODEzMDA1QkM3 NDEgLyogTWFya1N0YWNrUG9zaXguY3BwICovOyB9OwogCQlBN0Q2NDlBQTEwMTUyMjRFMDA5QjJF MUIgLyogUG9zc2libHlOdWxsLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBBN0Q2NDlBOTEwMTUyMjRFMDA5QjJFMUIgLyogUG9zc2libHlOdWxsLmggKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQTdFMkVBNkIw RkI0NjBDRjAwNjAxRjA2IC8qIExpdGVyYWxQYXJzZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE3RTJFQTY5MEZCNDYwQ0YwMDYwMUYwNiAvKiBMaXRl cmFsUGFyc2VyLmggKi87IH07CkBAIC0zMjgsNiArMzI3LDggQEAKIAkJQTdGOTkzNjAwRkQ3MzI1 MTAwQTBCMkQwIC8qIEpTT05PYmplY3QuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQTdGOTkzNUUwRkQ3MzI1MTAwQTBCMkQwIC8qIEpTT05PYmplY3Qu Y3BwICovOyB9OwogCQlBN0ZCNjBBNDEwM0Y3REMyMDAxN0EyODYgLyogUHJvcGVydHlEZXNjcmlw dG9yLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE3 RkI2MEEzMTAzRjdEQzIwMDE3QTI4NiAvKiBQcm9wZXJ0eURlc2NyaXB0b3IuY3BwICovOyB9Owog CQlBN0ZCNjEwMDEwNDBDMzhCMDAxN0EyODYgLyogUHJvcGVydHlEZXNjcmlwdG9yLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0ZCNjA0QjEwM0Y1RUFC MDAxN0EyODYgLyogUHJvcGVydHlEZXNjcmlwdG9yLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJQkMwMUQ0RjExMUE4RjFGRjAwQTU0QjJBIC8qIEpT Wm9tYmllLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IEJDMDFENEVGMTFBOEYxRkYwMEE1NEIyQSAvKiBKU1pvbWJpZS5jcHAgKi87IH07CisJCUJDMDFE NEYyMTFBOEYxRkYwMEE1NEIyQSAvKiBKU1pvbWJpZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMwMUQ0RjAxMUE4RjFGRjAwQTU0QjJBIC8qIEpTWm9t YmllLmggKi87IH07CiAJCUJDMDJFOTBEMEUxODM5REIwMDBGOTI5NyAvKiBFcnJvckNvbnN0cnVj dG9yLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzAy RTkwNTBFMTgzOURCMDAwRjkyOTcgLyogRXJyb3JDb25zdHJ1Y3Rvci5oICovOyB9OwogCQlCQzAy RTkwRjBFMTgzOURCMDAwRjkyOTcgLyogRXJyb3JQcm90b3R5cGUuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDMDJFOTA3MEUxODM5REIwMDBGOTI5NyAv KiBFcnJvclByb3RvdHlwZS5oICovOyB9OwogCQlCQzAyRTkxMTBFMTgzOURCMDAwRjkyOTcgLyog TmF0aXZlRXJyb3JDb25zdHJ1Y3Rvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQkMwMkU5MDkwRTE4MzlEQjAwMEY5Mjk3IC8qIE5hdGl2ZUVycm9yQ29u c3RydWN0b3IuaCAqLzsgfTsKQEAgLTkxNCw4ICs5MTUsNiBAQAogCQlBN0I0OERCNTBFRTc0Q0ZD MDBEQ0JEQjYgLyogRXhlY3V0YWJsZUFsbG9jYXRvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j Lmg7IHBhdGggPSBFeGVjdXRhYmxlQWxsb2NhdG9yLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCUE3QjQ4REI2MEVFNzRDRkMwMERDQkRCNiAvKiBFeGVjdXRhYmxlQWxsb2NhdG9yLmNw cCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEV4ZWN1dGFibGVBbGxvY2F0 b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBN0MxRThDODExMkU3MDFDMDBB MzdGOTggLyogSklUUHJvcGVydHlBY2Nlc3MzMl82NC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKSVRQcm9wZXJ0eUFjY2VzczMyXzY0LmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKLQkJQTdDMjIxNjgxMEM3NDVFMDAwRjk3OTEzIC8qIEpTWm9tYmllLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTWm9tYmllLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07Ci0JCUE3QzIyMTZCMTBDNzQ2OUMwMEY5NzkxMyAvKiBKU1pvbWJpZS5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1pvbWJpZS5jcHA7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE3QzUzMEUzMTAyQTM4MTMwMDVCQzc0MSAvKiBN YXJrU3RhY2tQb3NpeC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBN YXJrU3RhY2tQb3NpeC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE3RDY0OUE5 MTAxNTIyNEUwMDlCMkUxQiAvKiBQb3NzaWJseU51bGwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Yy5oOyBwYXRoID0gUG9zc2libHlOdWxsLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CUE3RTJFQTY5MEZCNDYwQ0YwMDYwMUYwNiAvKiBMaXRlcmFsUGFyc2VyLmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IExpdGVyYWxQYXJzZXIuaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKQEAgLTkzMCw2ICs5MjksOCBAQAogCQlBN0ZCNjBBMzEwM0Y3REMyMDAxN0EyODYg LyogUHJvcGVydHlEZXNjcmlwdG9yLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IFByb3BlcnR5RGVzY3JpcHRvci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUE4RTg5NDMxMENEMDYwMjQwMDM2NzE3OSAvKiBKU0NhbGxiYWNrT2JqZWN0RnVuY3Rpb25z LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTQ2FsbGJhY2tPYmplY3RGdW5j dGlvbnMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQThFODk0MzMwQ0QwNjAzRjAw MzY3MTc5IC8qIEpTR2xvYmFsT2JqZWN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IEpTR2xvYmFsT2JqZWN0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCUJDMDFE NEVGMTFBOEYxRkYwMEE1NEIyQSAvKiBKU1pvbWJpZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBKU1pvbWJpZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CisJCUJDMDFENEYwMTFBOEYxRkYwMEE1NEIyQSAvKiBKU1pvbWJpZS5oICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291 cmNlY29kZS5jLmg7IHBhdGggPSBKU1pvbWJpZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQlCQzAyRTkwNDBFMTgzOURCMDAwRjkyOTcgLyogRXJyb3JDb25zdHJ1Y3Rvci5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBFcnJvckNvbnN0cnVjdG9yLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMwMkU5MDUwRTE4MzlEQjAwMEY5Mjk3IC8q IEVycm9yQ29uc3RydWN0b3IuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gRXJy b3JDb25zdHJ1Y3Rvci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQzAyRTkwNjBF MTgzOURCMDAwRjkyOTcgLyogRXJyb3JQcm90b3R5cGUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gRXJyb3JQcm90b3R5cGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwpAQCAtMTYyMCw2ICsxNjIxLDggQEAKIAkJCQlCQzdGOEZCODBFMTlEMUMzMDA4NjMy QzAgLyogSlNOdW1iZXJDZWxsLmggKi8sCiAJCQkJQkMyMkEzOTgwRTE2RTE0ODAwQUYyMUM4IC8q IEpTT2JqZWN0LmNwcCAqLywKIAkJCQlCQzIyQTM5OTBFMTZFMTQ4MDBBRjIxQzggLyogSlNPYmpl Y3QuaCAqLywKKwkJCQlBNzgzQTJBQTExQTVCRTg0MDA1NjNEMjAgLyogSlNPYmplY3RXaXRoR2xv YmFsT2JqZWN0LmNwcCAqLywKKwkJCQlBNzgzQTBEMDExQTM2RENBMDA1NjNEMjAgLyogSlNPYmpl Y3RXaXRoR2xvYmFsT2JqZWN0LmggKi8sCiAJCQkJQTdGOTkzNUUwRkQ3MzI1MTAwQTBCMkQwIC8q IEpTT05PYmplY3QuY3BwICovLAogCQkJCUE3Rjk5MzVEMEZENzMyNTEwMEEwQjJEMCAvKiBKU09O T2JqZWN0LmggKi8sCiAJCQkJQTcyN0ZGNjYwREEzMDUzQjAwRTU0OEQ3IC8qIEpTUHJvcGVydHlO YW1lSXRlcmF0b3IuY3BwICovLApAQCAtMTYzNywxMCArMTY0MCw4IEBACiAJCQkJMTRGMjUyNTYw RDA4REQ4RDAwNEVDRkZGIC8qIEpTVmFyaWFibGVPYmplY3QuaCAqLywKIAkJCQk2NUM3QTE3MTBB OEVBQUNCMDBGQTM3RUEgLyogSlNXcmFwcGVyT2JqZWN0LmNwcCAqLywKIAkJCQk2NUM3QTE3MjBB OEVBQUNCMDBGQTM3RUEgLyogSlNXcmFwcGVyT2JqZWN0LmggKi8sCi0JCQkJQTdDMjIxNkIxMEM3 NDY5QzAwRjk3OTEzIC8qIEpTWm9tYmllLmNwcCAqLywKLQkJCQlBN0MyMjE2QjEwQzc0NjlDMDBG OTc5MTMgLyogSlNab21iaWUuY3BwICovLAotCQkJCUE3QzIyMTY4MTBDNzQ1RTAwMEY5NzkxMyAv KiBKU1pvbWJpZS5oICovLAotCQkJCUE3QzIyMTY4MTBDNzQ1RTAwMEY5NzkxMyAvKiBKU1pvbWJp ZS5oICovLAorCQkJCUJDMDFENEVGMTFBOEYxRkYwMEE1NEIyQSAvKiBKU1pvbWJpZS5jcHAgKi8s CisJCQkJQkMwMUQ0RjAxMUE4RjFGRjAwQTU0QjJBIC8qIEpTWm9tYmllLmggKi8sCiAJCQkJQTdF MkVBNkEwRkI0NjBDRjAwNjAxRjA2IC8qIExpdGVyYWxQYXJzZXIuY3BwICovLAogCQkJCUE3RTJF QTY5MEZCNDYwQ0YwMDYwMUYwNiAvKiBMaXRlcmFsUGFyc2VyLmggKi8sCiAJCQkJRjY5MkE4Njgw MjU1NTk3RDAxRkY2MEY3IC8qIExvb2t1cC5jcHAgKi8sCkBAIC0xNzIwLDggKzE3MjEsNiBAQAog CQkJCTE0QkZDRTY4MTBDREIxRkMwMDM2NENDRSAvKiBXZWFrR0NNYXAuaCAqLywKIAkJCQkxNDAz NURCMDEwREJGQjJBMDBGRkZGRTcgLyogV2Vha0dDUHRyLmggKi8sCiAJCQkJMTQyMEJFN0ExMEFB NkREQjAwRjQ1NUQyIC8qIFdlYWtSYW5kb20uaCAqLywKLQkJCQlBNzgzQTBEMDExQTM2RENBMDA1 NjNEMjAgLyogSlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0LmggKi8sCi0JCQkJQTc4M0EyQUExMUE1 QkU4NDAwNTYzRDIwIC8qIEpTT2JqZWN0V2l0aEdsb2JhbE9iamVjdC5jcHAgKi8sCiAJCQkpOwog CQkJcGF0aCA9IHJ1bnRpbWU7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpAQCAtMjE2MCw2 ICsyMTU5LDcgQEAKIAkJCQk4NkM1NjhFMTExQTIxM0VFMDAwN0Y3RjAgLyogTWFjcm9Bc3NlbWJs ZXJNSVBTLmggaW4gSGVhZGVycyAqLywKIAkJCQk4NkM1NjhFMjExQTIxM0VFMDAwN0Y3RjAgLyog TUlQU0Fzc2VtYmxlci5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQTc4M0EwRDExMUEzNkRDQTAwNTYz RDIwIC8qIEpTT2JqZWN0V2l0aEdsb2JhbE9iamVjdC5oIGluIEhlYWRlcnMgKi8sCisJCQkJQkMw MUQ0RjIxMUE4RjFGRjAwQTU0QjJBIC8qIEpTWm9tYmllLmggaW4gSGVhZGVycyAqLywKIAkJCSk7 CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKIAkJfTsKQEAgLTI1 MzUsNyArMjUzNSw2IEBACiAJCQkJMTRCRDVBMzIwQTNFOTFGNjAwQkFGNTlDIC8qIEpTVmFsdWVS ZWYuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMTQ3RjM5RDcxMDdFQzM3NjAwNDI3QTQ4IC8qIEpT VmFyaWFibGVPYmplY3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMTQyODA4NzAxMDdFQzEzNDAw MTNFN0IyIC8qIEpTV3JhcHBlck9iamVjdC5jcHAgaW4gU291cmNlcyAqLywKLQkJCQlBN0MyMjE3 ODEwQzc0Nzk0MDBGOTc5MTMgLyogSlNab21iaWUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkNG RDhDOTIwRUVCMkVFNzAwMjgzODQ4IC8qIEp1bXBUYWJsZS5jcHAgaW4gU291cmNlcyAqLywKIAkJ CQkxNDhGMjFCMDEwN0VDNTQxMDA0MkVDMkMgLyogTGV4ZXIuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkJQTdFMkVBNkMwRkI0NjBDRjAwNjAxRjA2IC8qIExpdGVyYWxQYXJzZXIuY3BwIGluIFNvdXJj ZXMgKi8sCkBAIC0yNjE2LDYgKzI2MTUsNyBAQAogCQkJCTg2QzU2OEUwMTFBMjEzRUUwMDA3RjdG MCAvKiBNYWNyb0Fzc2VtYmxlckFSTS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxNDZGRTUxMjEx QTcxMDQzMDA4N0FFNjYgLyogSklUQ2FsbDMyXzY0LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUE3 ODNBMkFCMTFBNUJFODQwMDU2M0QyMCAvKiBKU09iamVjdFdpdGhHbG9iYWxPYmplY3QuY3BwIGlu IFNvdXJjZXMgKi8sCisJCQkJQkMwMUQ0RjExMUE4RjFGRjAwQTU0QjJBIC8qIEpTWm9tYmllLmNw cCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nl c3NpbmcgPSAwOwogCQl9OwpJbmRleDogSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdFdp dGhHbG9iYWxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0LmNwcAkocmV2aXNpb24gNjAwNDkpCisrKyBKYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0V2l0aEdsb2JhbE9iamVjdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTMzLDggKzMzLDE0IEBAIG5hbWVzcGFjZSBKU0MgewogSlNPYmplY3RXaXRoR2xvYmFs T2JqZWN0OjpKU09iamVjdFdpdGhHbG9iYWxPYmplY3QoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9i amVjdCwgTm9uTnVsbFBhc3NSZWZQdHI8U3RydWN0dXJlPiBzdHJ1Y3R1cmUpCiAgICAgOiBKU09i amVjdChzdHJ1Y3R1cmUpCiB7CisgICAgQ09NUElMRV9BU1NFUlQoQW5vbnltb3VzU2xvdENvdW50 ID09IDEsIEFub255bW91c1Nsb3RDb3VudF9tdXN0X2JlX29uZSk7CiAgICAgQVNTRVJUKCFnbG9i YWxPYmplY3QgfHwgZ2xvYmFsT2JqZWN0LT5pc0dsb2JhbE9iamVjdCgpKTsKLSAgICBwdXRBbm9u eW1vdXNWYWx1ZSgwLCBnbG9iYWxPYmplY3QpOworICAgIHB1dEFub255bW91c1ZhbHVlKEdsb2Jh bE9iamVjdFNsb3QsIGdsb2JhbE9iamVjdCk7CiB9CiAKK0pTR2xvYmFsT2JqZWN0KiBKU09iamVj dFdpdGhHbG9iYWxPYmplY3Q6Omdsb2JhbE9iamVjdCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGFz R2xvYmFsT2JqZWN0KChnZXRBbm9ueW1vdXNWYWx1ZShHbG9iYWxPYmplY3RTbG90KS5hc0NlbGwo KSkpOwogfQorCit9IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IEphdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU09iamVjdFdpdGhHbG9iYWxPYmplY3QuaAkocmV2aXNpb24gNjAwNDkpCisr KyBKYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0V2l0aEdsb2JhbE9iamVjdC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOSw2ICszOSw4IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIFN0cnVj dHVyZTo6Y3JlYXRlKHByb3RvLCBUeXBlSW5mbyhPYmplY3RUeXBlLCBTdHJ1Y3R1cmVGbGFncyks IEFub255bW91c1Nsb3RDb3VudCk7CiAgICAgfQogCisgICAgSlNHbG9iYWxPYmplY3QqIGdsb2Jh bE9iamVjdCgpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAgICAgSlNPYmplY3RXaXRoR2xvYmFsT2Jq ZWN0KEpTR2xvYmFsT2JqZWN0KiwgTm9uTnVsbFBhc3NSZWZQdHI8U3RydWN0dXJlPik7CiAKQEAg LTQ4LDggKzUwLDkgQEAgcHJvdGVjdGVkOgogICAgICAgICAvLyBTaG91bGQgb25seSBiZSB1c2Vk IGJ5IEpTRnVuY3Rpb24gd2hlbiB3ZSBhcXVpcmUgdGhlIEpTRnVuY3Rpb24gdnB0ci4KICAgICB9 CiAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIEFub255bW91c1Nsb3RDb3VudCA9IEpTT2JqZWN0 OjpBbm9ueW1vdXNTbG90Q291bnQgKyAxOworICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBHbG9i YWxPYmplY3RTbG90ID0gMDsKIH07CiAKLX0KK30gLy8gbmFtZXNwYWNlIEpTQwogCiAjZW5kaWYg Ly8gSlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0X2gKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA2MDA1MikKKysrIFdlYkNv cmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTAtMDUtMjMg IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zOTU3NQorICAgICAgICBNYWtlIEpTIERPTU9iamVjdCBpbmhlcml0IGZy b20gSlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0IGluc3RlYWQgb2YgSlNPYmplY3QKKworICAgICAg ICAtIENoYW5nZXMgSlNET01XaW5kb3dTaGVsbCB0byBpbmhlcml0IGZyb20gSlNPYmplY3QgaW5z dGVhZCBvZgorICAgICAgICAgIERPTU9iamVjdCBzaW5jZSBpdCBkb2Vzbid0IGV2ZXIgZ28gaW50 byBhbnkgRE9NT2JqZWN0IHRhYmxlcy4KKyAgICAgICAgICBJbiBhIHNlcGFyYXRlIGNoYW5nZSwg d2UgbWF5IHdhbnQgdG8gbWFrZSB0aGlzIGluaGVyaXQgZnJvbSAKKyAgICAgICAgICBKU09iamVj dFdpdGhHbG9iYWxPYmplY3Qgc2luY2UgSlNET01XaW5kb3dTaGVsbCBkb2VzIHN0b3JlIGEKKyAg ICAgICAgICBnbG9iYWwgb2JqZWN0IHBvaW50ZXIuCisgICAgICAgIC0gQ2hhbmdlIERPTU9iamVj dCB0byBpbmhlcml0IGZyb20gSlNPYmplY3RXaXRoR2xvYmFsT2JqZWN0CisgICAgICAgICAgaW5z dGVhZCBvZiBKU09iamVjdC4gSW4gdGhpcyBjaGFuZ2UgSSBhbSBrZWVwaW5nIGFyb3VuZAorICAg ICAgICAgIERPTU9iamVjdFdpdGhHbG9iYWxQb2ludGVyLCB3aGljaCBub3cganVzdCB1c2VzIHRo ZSBjYXBhYmlsaXRpZXMKKyAgICAgICAgICBvZiBKU09iamVjdFdpdGhHbG9iYWxPYmplY3QgaW5z dGVhZCBvZiBpbXBsZW1lbnRpbmcgdGhlbQorICAgICAgICAgIGl0c2VsZi4gIERPTU9iamVjdFdp dGhHbG9iYWxQb2ludGVyIHdpbGwgZ28gYXdheSBpbiBhIHN1YnNlcXVlbnQKKyAgICAgICAgICBw YXRjaC4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NQmluZGluZy5oOgorICAgICAgICAo V2ViQ29yZTo6RE9NT2JqZWN0V2l0aEdsb2JhbFBvaW50ZXI6Omdsb2JhbE9iamVjdCk6CisgICAg ICAgIChXZWJDb3JlOjpET01PYmplY3RXaXRoR2xvYmFsUG9pbnRlcjo6RE9NT2JqZWN0V2l0aEds b2JhbFBvaW50ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NV2luZG93U2hlbGwuaDoK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RPTVdyYXBwZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkRPTU9iamVjdDo6RE9NT2JqZWN0KToKKwogMjAxMC0wNS0yMyAgU2FtIFdlaW5pZyAgPHNhbUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0RPTUJpbmRpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRE9NQmluZGluZy5oCShyZXZpc2lvbiA2MDA1MSkKKysrIFdlYkNvcmUvYmlu ZGluZ3MvanMvSlNET01CaW5kaW5nLmgJKHdvcmtpbmcgY29weSkKQEAgLTU4LDcgKzU4LDEwIEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyB1cGRhdGVkIHRvIHN0b3JlIGEgZ2xvYmFsT2Jq ZWN0IHBvaW50ZXIuCiAgICAgY2xhc3MgRE9NT2JqZWN0V2l0aEdsb2JhbFBvaW50ZXIgOiBwdWJs aWMgRE9NT2JqZWN0IHsKICAgICBwdWJsaWM6Ci0gICAgICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBn bG9iYWxPYmplY3QoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxKU0RPTUdsb2JhbE9iamVj dCo+KGdldEFub255bW91c1ZhbHVlKEdsb2JhbE9iamVjdFNsb3QpLmFzQ2VsbCgpKTsgfQorICAg ICAgICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KCkgY29uc3QKKyAgICAgICAgewor ICAgICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oRE9NT2Jq ZWN0OjpnbG9iYWxPYmplY3QoKSk7CisgICAgICAgIH0KIAogICAgICAgICBTY3JpcHRFeGVjdXRp b25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkgY29uc3QKICAgICAgICAgewpAQCAt NzIsMTkgKzc1LDE0IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgfQogCiAgICAgcHJv dGVjdGVkOgotICAgICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgQW5vbnltb3VzU2xvdENvdW50 ID0gMSArIERPTU9iamVjdDo6QW5vbnltb3VzU2xvdENvdW50OwotICAgICAgICBzdGF0aWMgY29u c3QgdW5zaWduZWQgR2xvYmFsT2JqZWN0U2xvdCA9IEFub255bW91c1Nsb3RDb3VudCAtIDE7Ci0K ICAgICAgICAgRE9NT2JqZWN0V2l0aEdsb2JhbFBvaW50ZXIoTm9uTnVsbFBhc3NSZWZQdHI8SlND OjpTdHJ1Y3R1cmU+IHN0cnVjdHVyZSwgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkK LSAgICAgICAgICAgIDogRE9NT2JqZWN0KHN0cnVjdHVyZSkKKyAgICAgICAgICAgIDogRE9NT2Jq ZWN0KGdsb2JhbE9iamVjdCwgc3RydWN0dXJlKQogICAgICAgICB7CiAgICAgICAgICAgICAvLyBG SVhNRTogVGhpcyBBU1NFUlQgaXMgdmFsaWQsIGJ1dCBmaXJlcyBpbiBmYXN0L2RvbS9nYy02Lmh0 bWwgd2hlbiB0cnlpbmcgdG8gY3JlYXRlCiAgICAgICAgICAgICAvLyBuZXcgSmF2YVNjcmlwdCBv YmplY3RzIG9uIGRldGFjaGVkIHdpbmRvd3MgZHVlIHRvIERPTVdpbmRvdzo6ZG9jdW1lbnQoKQog ICAgICAgICAgICAgLy8gbmVlZGluZyB0byByZWFjaCB0aHJvdWdoIHRoZSBmcmFtZSB0byBnZXQg dG8gdGhlIERvY3VtZW50Ki4gIFNlZSBidWcgMjc2NDAuCiAgICAgICAgICAgICAvLyBBU1NFUlQo Z2xvYmFsT2JqZWN0LT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwotICAgICAgICAgICAgcHV0 QW5vbnltb3VzVmFsdWUoR2xvYmFsT2JqZWN0U2xvdCwgZ2xvYmFsT2JqZWN0KTsKICAgICAgICAg fQotICAgICAgICB2aXJ0dWFsIH5ET01PYmplY3RXaXRoR2xvYmFsUG9pbnRlcigpIHsgfQogICAg IH07CiAKICAgICAvLyBCYXNlIGNsYXNzIGZvciBhbGwgY29uc3RydWN0b3Igb2JqZWN0cyBpbiB0 aGUgSlNDIGJpbmRpbmdzLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd1No ZWxsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd1NoZWxs LmgJKHJldmlzaW9uIDYwMDUxKQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0RPTVdpbmRvd1No ZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDggKzM3LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgIGNsYXNzIERPTVdpbmRvdzsKICAgICBjbGFzcyBGcmFtZTsKIAotICAgIGNsYXNzIEpT RE9NV2luZG93U2hlbGwgOiBwdWJsaWMgRE9NT2JqZWN0IHsKLSAgICAgICAgdHlwZWRlZiBET01P YmplY3QgQmFzZTsKKyAgICBjbGFzcyBKU0RPTVdpbmRvd1NoZWxsIDogcHVibGljIEpTQzo6SlNP YmplY3QgeworICAgICAgICB0eXBlZGVmIEpTQzo6SlNPYmplY3QgQmFzZTsKICAgICBwdWJsaWM6 CiAgICAgICAgIEpTRE9NV2luZG93U2hlbGwoUGFzc1JlZlB0cjxET01XaW5kb3c+LCBET01XcmFw cGVyV29ybGQqIHdvcmxkKTsKICAgICAgICAgdmlydHVhbCB+SlNET01XaW5kb3dTaGVsbCgpOwpA QCAtNjYsNyArNjYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIERPTVdyYXBwZXJX b3JsZCogd29ybGQoKSB7IHJldHVybiBtX3dvcmxkLmdldCgpOyB9CiAKICAgICBwcml2YXRlOgot ICAgICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgU3RydWN0dXJlRmxhZ3MgPSBKU0M6Ok92ZXJy aWRlc0dldE93blByb3BlcnR5U2xvdCB8IEpTQzo6T3ZlcnJpZGVzTWFya0NoaWxkcmVuIHwgSlND OjpPdmVycmlkZXNHZXRQcm9wZXJ0eU5hbWVzIHwgRE9NT2JqZWN0OjpTdHJ1Y3R1cmVGbGFnczsK KyAgICAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFN0cnVjdHVyZUZsYWdzID0gSlNDOjpPdmVy cmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QgfCBKU0M6Ok92ZXJyaWRlc01hcmtDaGlsZHJlbiB8IEpT Qzo6T3ZlcnJpZGVzR2V0UHJvcGVydHlOYW1lcyB8IEJhc2U6OlN0cnVjdHVyZUZsYWdzOwogCiAg ICAgICAgIHZpcnR1YWwgdm9pZCBtYXJrQ2hpbGRyZW4oSlNDOjpNYXJrU3RhY2smKTsKICAgICAg ICAgdmlydHVhbCBKU0M6OlVTdHJpbmcgY2xhc3NOYW1lKCkgY29uc3Q7CkluZGV4OiBXZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRE9NV3JhcHBlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGlu Z3MvanMvSlNET01XcmFwcGVyLmgJKHJldmlzaW9uIDYwMDUxKQorKysgV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTVdyYXBwZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjIsMTUgKzIyLDE1IEBACiAj aWZuZGVmIEpTRE9NV3JhcHBlcl9oCiAjZGVmaW5lIEpTRE9NV3JhcHBlcl9oCiAKLSNpbmNsdWRl IDxydW50aW1lL0pTT2JqZWN0Lmg+CisjaW5jbHVkZSA8cnVudGltZS9KU09iamVjdFdpdGhHbG9i YWxPYmplY3QuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0vLyBCYXNlIGNsYXNzIGZvciBh bGwgb2JqZWN0cyBpbiB0aGlzIGJpbmRpbmcgZXhjZXB0IFdpbmRvdy4KLWNsYXNzIERPTU9iamVj dCA6IHB1YmxpYyBKU0M6OkpTT2JqZWN0IHsKKy8vIEZJWE1FOiBSZW5hbWUgdG8gSlNET01XcmFw cGVyLgorY2xhc3MgRE9NT2JqZWN0IDogcHVibGljIEpTQzo6SlNPYmplY3RXaXRoR2xvYmFsT2Jq ZWN0IHsKIHByb3RlY3RlZDoKLSAgICBleHBsaWNpdCBET01PYmplY3QoTm9uTnVsbFBhc3NSZWZQ dHI8SlNDOjpTdHJ1Y3R1cmU+IHN0cnVjdHVyZSkgCi0gICAgICAgIDogSlNPYmplY3Qoc3RydWN0 dXJlKQorICAgIGV4cGxpY2l0IERPTU9iamVjdChKU0M6OkpTR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QsIE5vbk51bGxQYXNzUmVmUHRyPEpTQzo6U3RydWN0dXJlPiBzdHJ1Y3R1cmUpIAorICAg ICAgICA6IEpTT2JqZWN0V2l0aEdsb2JhbE9iamVjdChnbG9iYWxPYmplY3QsIHN0cnVjdHVyZSkK ICAgICB7CiAgICAgfQogCg==