107438 2013-01-21 03:50:58 -0800 [Qt][WK1] Permission request callbacks for non-legacy notifications 2013-01-21 06:31:54 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106699 1 allan.jensen allan.jensen jturcotte oldest_to_newest 812014 0 allan.jensen 2013-01-21 03:50:58 -0800 QtWebKit(1) is missing an implementation tracking and calling the permission request callbacks when using Web Nofications in non-legacy mode. 812018 1 183756 allan.jensen 2013-01-21 03:56:37 -0800 Created attachment 183756 Patch 812057 2 183756 jturcotte 2013-01-21 05:37:20 -0800 Comment on attachment 183756 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183756&action=review > Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp:332 > +#if ENABLE(NOTIFICATIONS) > +void NotificationPresenterClientQt::requestPermission(ScriptExecutionContext* context, PassRefPtr<NotificationPermissionCallback> callback) > +{ This is pretty much duplicated code, could you factor out the common code of the two implementations in a separate method? 812074 3 183768 allan.jensen 2013-01-21 06:02:15 -0800 Created attachment 183768 Patch 812088 4 183756 jturcotte 2013-01-21 06:18:59 -0800 Comment on attachment 183756 Patch Humm, it doesn't look as good as I thought, so we might as well duplicate the code. - NotificationPermissionCallback is defined behind ENABLE(NOTIFICATIONS) - Adding to a different list depending on the callback type isn't great r+ing the first one 812093 5 allan.jensen 2013-01-21 06:31:54 -0800 Committed r140330: <http://trac.webkit.org/changeset/140330> 183756 2013-01-21 03:56:37 -0800 2013-01-21 06:19:11 -0800 Patch bug-107438-20130121125254.patch text/plain 6151 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDI4Mjk2OTczZTNk ZmMwMDZmZDBiYzA3NThjZjIwZmNmMTUzZDAxYjAuLjI0NmM1N2JmZDc4NzY4NWVlODk2MzQwNzA2 Y2NhMjhkYTJmMGEzOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTMtMDEt MjEgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CiAKKyAg ICAgICAgW1F0XVtXSzFdIFBlcm1pc3Npb24gcmVxdWVzdCBjYWxsYmFja3MgZm9yIG5vbi1sZWdh Y3kgbm90aWZpY2F0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA3NDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVHJhY2tzIHRoZSBuZXcgY2FsbGJhY2tzIHRoZSBzYW1lIHdheSBsZWdhY3kgY2Fs bGJhY2tzIGFyZSB0cmFja2VkLgorCisgICAgICAgIE5vIHRlc3QgYWZmZWN0ZWQgeWV0IGFzIHdl IGFyZSBzdGlsbCBsYWNraW5nIHN1cHBvcnQgZm9yIHRlc3RpbmcKKyAgICAgICAgZmVhdHVyZSBw ZXJtaXNzaW9uIGNhbGxiYWNrcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNh dGlvblByZXNlbnRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlv blByZXNlbnRlckNsaWVudFF0OjpyZXF1ZXN0UGVybWlzc2lvbik6CisgICAgICAgIChXZWJDb3Jl OjpOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6YWxsb3dOb3RpZmljYXRpb25Gb3JGcmFt ZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50 UXQuaDoKKyAgICAgICAgKE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0KToKKyAgICAgICAg KENhbGxiYWNrc0luZm8pOgorCisyMDEzLTAxLTIxICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxh bGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCiAgICAgICAgIFtRdF0gQ3Jhc2ggaW4gZ21haWwgb24g ZW5hYmxpbmcgZGVza3RvcCBub3RpZmljYXRpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY2OTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5jcHAgYi9T b3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVu dFF0LmNwcAppbmRleCAyZjI1Yjg5NjBhYTQ4YmM3MzRlYzRmYzExODljZTAzOWJjY2EwZWY3Li5k M2E2ZDc0ZTFkYWRiMDFhZmY1NzRlMDQxOTFkN2UyOTljNDFmNzVjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblBy ZXNlbnRlckNsaWVudFF0LmNwcApAQCAtMzA0LDYgKzMwNCw3IEBAIHZvaWQgTm90aWZpY2F0aW9u UHJlc2VudGVyQ2xpZW50UXQ6Om5vdGlmaWNhdGlvbkNvbnRyb2xsZXJEZXN0cm95ZWQoKQogewog fQogCisjaWYgRU5BQkxFKExFR0FDWV9OT1RJRklDQVRJT05TKQogdm9pZCBOb3RpZmljYXRpb25Q cmVzZW50ZXJDbGllbnRRdDo6cmVxdWVzdFBlcm1pc3Npb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogY29udGV4dCwgUGFzc1JlZlB0cjxWb2lkQ2FsbGJhY2s+IGNhbGxiYWNrKQogeyAgCiAgICAg aWYgKGR1bXBOb3RpZmljYXRpb24pCkBAIC0zMTEsMTEgKzMxMiwzNCBAQCB2b2lkIE5vdGlmaWNh dGlvblByZXNlbnRlckNsaWVudFF0OjpyZXF1ZXN0UGVybWlzc2lvbihTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBjbwogCiAgICAgUUhhc2g8U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIENhbGxiYWNr c0luZm8gPjo6aXRlcmF0b3IgaXRlciA9IG1fcGVuZGluZ1Blcm1pc3Npb25SZXF1ZXN0cy5maW5k KGNvbnRleHQpOwogICAgIGlmIChpdGVyICE9IG1fcGVuZGluZ1Blcm1pc3Npb25SZXF1ZXN0cy5l bmQoKSkKLSAgICAgICAgaXRlci52YWx1ZSgpLm1fY2FsbGJhY2tzLmFwcGVuZChjYWxsYmFjayk7 CisgICAgICAgIGl0ZXIudmFsdWUoKS5tX3ZvaWRDYWxsYmFja3MuYXBwZW5kKGNhbGxiYWNrKTsK ICAgICBlbHNlIHsKICAgICAgICAgUmVmUHRyPFZvaWRDYWxsYmFjaz4gY2IgPSBjYWxsYmFjazsK ICAgICAgICAgQ2FsbGJhY2tzSW5mbyBpbmZvOwogICAgICAgICBpbmZvLm1fZnJhbWUgPSB0b0Zy YW1lKGNvbnRleHQpOworICAgICAgICBpbmZvLm1fdm9pZENhbGxiYWNrcy5hcHBlbmQoY2IpOwor CisgICAgICAgIGlmICh0b1BhZ2UoY29udGV4dCkgJiYgdG9GcmFtZShjb250ZXh0KSkgeworICAg ICAgICAgICAgbV9wZW5kaW5nUGVybWlzc2lvblJlcXVlc3RzLmluc2VydChjb250ZXh0LCBpbmZv KTsKKyAgICAgICAgICAgIHRvUGFnZShjb250ZXh0KS0+bm90aWZpY2F0aW9uc1Blcm1pc3Npb25S ZXF1ZXN0ZWQodG9GcmFtZShjb250ZXh0KSk7CisgICAgICAgIH0KKyAgICB9Cit9CisjZW5kaWYK KworI2lmIEVOQUJMRShOT1RJRklDQVRJT05TKQordm9pZCBOb3RpZmljYXRpb25QcmVzZW50ZXJD bGllbnRRdDo6cmVxdWVzdFBlcm1pc3Npb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4 dCwgUGFzc1JlZlB0cjxOb3RpZmljYXRpb25QZXJtaXNzaW9uQ2FsbGJhY2s+IGNhbGxiYWNrKQor eworICAgIGlmIChkdW1wTm90aWZpY2F0aW9uKQorICAgICAgICBwcmludGYoIkRFU0tUT1AgTk9U SUZJQ0FUSU9OIFBFUk1JU1NJT04gUkVRVUVTVEVEOiAlc1xuIiwgUVN0cmluZyhjb250ZXh0LT5z ZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKS50b1V0ZjgoKS5jb25zdERhdGEoKSk7CisKKyAg ICBRSGFzaDxTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgQ2FsbGJhY2tzSW5mbyA+OjppdGVyYXRv ciBpdGVyID0gbV9wZW5kaW5nUGVybWlzc2lvblJlcXVlc3RzLmZpbmQoY29udGV4dCk7CisgICAg aWYgKGl0ZXIgIT0gbV9wZW5kaW5nUGVybWlzc2lvblJlcXVlc3RzLmVuZCgpKQorICAgICAgICBp dGVyLnZhbHVlKCkubV9jYWxsYmFja3MuYXBwZW5kKGNhbGxiYWNrKTsKKyAgICBlbHNlIHsKKyAg ICAgICAgUmVmUHRyPE5vdGlmaWNhdGlvblBlcm1pc3Npb25DYWxsYmFjaz4gY2IgPSBjYWxsYmFj azsKKyAgICAgICAgQ2FsbGJhY2tzSW5mbyBpbmZvOworICAgICAgICBpbmZvLm1fZnJhbWUgPSB0 b0ZyYW1lKGNvbnRleHQpOwogICAgICAgICBpbmZvLm1fY2FsbGJhY2tzLmFwcGVuZChjYik7CiAK ICAgICAgICAgaWYgKHRvUGFnZShjb250ZXh0KSAmJiB0b0ZyYW1lKGNvbnRleHQpKSB7CkBAIC0z MjQsNiArMzQ4LDcgQEAgdm9pZCBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6cmVxdWVz dFBlcm1pc3Npb24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY28KICAgICAgICAgfQogICAgIH0K IH0KKyNlbmRpZgogCiBOb3RpZmljYXRpb25DbGllbnQ6OlBlcm1pc3Npb24gTm90aWZpY2F0aW9u UHJlc2VudGVyQ2xpZW50UXQ6OmNoZWNrUGVybWlzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiBjb250ZXh0KQogewpAQCAtMzY2LDExICszOTEsMjAgQEAgdm9pZCBOb3RpZmljYXRpb25QcmVz ZW50ZXJDbGllbnRRdDo6YWxsb3dOb3RpZmljYXRpb25Gb3JGcmFtZShGcmFtZSogZnJhbWUpCiAg ICAgaWYgKGl0ZXIgPT0gbV9wZW5kaW5nUGVybWlzc2lvblJlcXVlc3RzLmVuZCgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBRTGlzdDxSZWZQdHI8Vm9pZENhbGxiYWNrPiA+JiBjYWxsYmFja3Mg PSBpdGVyLnZhbHVlKCkubV9jYWxsYmFja3M7Ci0gICAgUV9GT1JFQUNIKGNvbnN0IFJlZlB0cjxW b2lkQ2FsbGJhY2s+JiBjYWxsYmFjaywgY2FsbGJhY2tzKSB7CisjaWYgRU5BQkxFKExFR0FDWV9O T1RJRklDQVRJT05TKQorICAgIFFMaXN0PFJlZlB0cjxWb2lkQ2FsbGJhY2s+ID4mIHZvaWRDYWxs YmFja3MgPSBpdGVyLnZhbHVlKCkubV92b2lkQ2FsbGJhY2tzOworICAgIFFfRk9SRUFDSChjb25z dCBSZWZQdHI8Vm9pZENhbGxiYWNrPiYgY2FsbGJhY2ssIHZvaWRDYWxsYmFja3MpIHsKICAgICAg ICAgaWYgKGNhbGxiYWNrKQogICAgICAgICAgICAgY2FsbGJhY2stPmhhbmRsZUV2ZW50KCk7CiAg ICAgfQorI2VuZGlmCisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCisgICAgUUxpc3Q8UmVmUHRy PE5vdGlmaWNhdGlvblBlcm1pc3Npb25DYWxsYmFjaz4gPiYgY2FsbGJhY2tzID0gaXRlci52YWx1 ZSgpLm1fY2FsbGJhY2tzOworICAgIFFfRk9SRUFDSChjb25zdCBSZWZQdHI8Tm90aWZpY2F0aW9u UGVybWlzc2lvbkNhbGxiYWNrPiYgY2FsbGJhY2ssIGNhbGxiYWNrcykgeworICAgICAgICBpZiAo Y2FsbGJhY2spCisgICAgICAgICAgICBjYWxsYmFjay0+aGFuZGxlRXZlbnQoTm90aWZpY2F0aW9u OjpwZXJtaXNzaW9uU3RyaW5nKE5vdGlmaWNhdGlvbkNsaWVudDo6UGVybWlzc2lvbkFsbG93ZWQp KTsKKyAgICB9CisjZW5kaWYKICAgICBtX3BlbmRpbmdQZXJtaXNzaW9uUmVxdWVzdHMucmVtb3Zl KGl0ZXIua2V5KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVT dXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmggYi9Tb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmgKaW5kZXggNzg2 NjhmMzVmNTc2NGIxZDk3MWJhZTg5YWNmNGNlM2I5M2JhZTNlZC4uMmM1MmY0MzVhMGFkNTA5ZTMx YWJjOThhMjI2NDFhZmE5YTFjZDhiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJD b3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaApA QCAtOTQsNyArOTQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RQZXJtaXNz aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPFZvaWRDYWxsYmFjaz4pOwog I2VuZGlmCiAjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCi0gICAgdmlydHVhbCB2b2lkIHJlcXVl c3RQZXJtaXNzaW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPE5vdGlmaWNh dGlvblBlcm1pc3Npb25DYWxsYmFjaz4pIHsgfQorICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0UGVy bWlzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxOb3RpZmljYXRpb25Q ZXJtaXNzaW9uQ2FsbGJhY2s+KTsKICNlbmRpZgogICAgIHZpcnR1YWwgTm90aWZpY2F0aW9uQ2xp ZW50OjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7 CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbFJlcXVlc3RzRm9yUGVybWlzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0Kik7CkBAIC0xMzEsNyArMTMxLDEyIEBAIHByaXZhdGU6CiAgICAgaW50IG1f Y2xpZW50Q291bnQ7CiAgICAgc3RydWN0IENhbGxiYWNrc0luZm8gewogICAgICAgICBRV2ViRnJh bWVBZGFwdGVyKiBtX2ZyYW1lOwotICAgICAgICBRTGlzdDxSZWZQdHI8Vm9pZENhbGxiYWNrPiA+ IG1fY2FsbGJhY2tzOworI2lmIEVOQUJMRShMRUdBQ1lfTk9USUZJQ0FUSU9OUykKKyAgICAgICAg UUxpc3Q8UmVmUHRyPFZvaWRDYWxsYmFjaz4gPiBtX3ZvaWRDYWxsYmFja3M7CisjZW5kaWYKKyNp ZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKKyAgICAgICAgUUxpc3Q8UmVmUHRyPE5vdGlmaWNhdGlv blBlcm1pc3Npb25DYWxsYmFjaz4gPiBtX2NhbGxiYWNrczsKKyNlbmRpZgogICAgIH07CiAgICAg UUhhc2g8U2NyaXB0RXhlY3V0aW9uQ29udGV4dCosICBDYWxsYmFja3NJbmZvID4gbV9wZW5kaW5n UGVybWlzc2lvblJlcXVlc3RzOwogICAgIFFIYXNoPFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBO b3RpZmljYXRpb25DbGllbnQ6OlBlcm1pc3Npb24+IG1fY2FjaGVkUGVybWlzc2lvbnM7Cg== 183768 2013-01-21 06:02:15 -0800 2013-01-21 06:19:47 -0800 Patch bug-107438-20130121145832.patch text/plain 5927 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDBhM2FhMDc5YWJh YWY0NzQ0MDFhMjA2OTMwNWQ2YmZiOWY4MmZmNDAuLjZkZGMwMzI4YTMzOGY1MTIzYzBiYWUyZjU0 YjI0YjRhYjdkNWQ0MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTMtMDEt MjEgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBkaWdpYS5jb20+CisKKyAg ICAgICAgW1F0XVtXSzFdIFBlcm1pc3Npb24gcmVxdWVzdCBjYWxsYmFja3MgZm9yIG5vbi1sZWdh Y3kgbm90aWZpY2F0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA3NDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVHJhY2tzIHRoZSBuZXcgY2FsbGJhY2tzIHRoZSBzYW1lIHdheSBsZWdhY3kgY2Fs bGJhY2tzIGFyZSB0cmFja2VkLgorCisgICAgICAgIE5vIHRlc3QgYWZmZWN0ZWQgeWV0IGFzIHdl IGFyZSBzdGlsbCBsYWNraW5nIHN1cHBvcnQgZm9yIHRlc3RpbmcKKyAgICAgICAgZmVhdHVyZSBw ZXJtaXNzaW9uIGNhbGxiYWNrcy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L05vdGlmaWNh dGlvblByZXNlbnRlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlv blByZXNlbnRlckNsaWVudFF0OjpyZXF1ZXN0UGVybWlzc2lvbik6CisgICAgICAgIChXZWJDb3Jl OjpOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdDo6YWxsb3dOb3RpZmljYXRpb25Gb3JGcmFt ZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50 UXQuaDoKKyAgICAgICAgKE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0KToKKyAgICAgICAg KENhbGxiYWNrc0luZm8pOgorCiAyMDEzLTAxLTIxICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5 bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKICAgICAgICAgW1F0XSBVcGRhdGUgdGhlIGRvY3VtZW50 YXRpb24gYWJvdXQgdGhlIHN0b3JhZ2Ugb2YgaW5zcGVjdG9yIHNldHRpbmdzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L05vdGlmaWNhdGlvblByZXNlbnRlckNs aWVudFF0LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9u UHJlc2VudGVyQ2xpZW50UXQuY3BwCmluZGV4IDJmMjViODk2MGFhNDhiYzczNGVjNGZjMTE4OWNl MDM5YmNjYTBlZjcuLmZiZGQyMGJiYTg3N2M5ZGFkZjA2NTk2MjQxMjU0ZjI2MWQ2MGU1MTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90aWZpY2F0aW9uUHJl c2VudGVyQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv Tm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuY3BwCkBAIC0zMDQsMTkgKzMwNCwzOCBAQCB2 b2lkIE5vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0Ojpub3RpZmljYXRpb25Db250cm9sbGVy RGVzdHJveWVkKCkKIHsKIH0KIAorI2lmIEVOQUJMRShMRUdBQ1lfTk9USUZJQ0FUSU9OUykKIHZv aWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OnJlcXVlc3RQZXJtaXNzaW9uKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPiBjYWxs YmFjaykKIHsgIAorICAgIHJlcXVlc3RQZXJtaXNzaW9uKGNvbnRleHQsIGNhbGxiYWNrLCAwKTsK K30KKyNlbmRpZgorCisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCit2b2lkIE5vdGlmaWNhdGlv blByZXNlbnRlckNsaWVudFF0OjpyZXF1ZXN0UGVybWlzc2lvbihTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBjb250ZXh0LCBQYXNzUmVmUHRyPE5vdGlmaWNhdGlvblBlcm1pc3Npb25DYWxsYmFjaz4g Y2FsbGJhY2spCit7CisgICAgcmVxdWVzdFBlcm1pc3Npb24oY29udGV4dCwgMCwgY2FsbGJhY2sp OworfQorI2VuZGlmCisKK3ZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQ6OnJlcXVl c3RQZXJtaXNzaW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFBhc3NSZWZQdHI8 Vm9pZENhbGxiYWNrPiBsZWdhY3lDYWxsYmFjaywgUGFzc1JlZlB0cjxOb3RpZmljYXRpb25QZXJt aXNzaW9uQ2FsbGJhY2s+IGNhbGxiYWNrKQorewogICAgIGlmIChkdW1wTm90aWZpY2F0aW9uKQog ICAgICAgICBwcmludGYoIkRFU0tUT1AgTk9USUZJQ0FUSU9OIFBFUk1JU1NJT04gUkVRVUVTVEVE OiAlc1xuIiwgUVN0cmluZyhjb250ZXh0LT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKS50 b1V0ZjgoKS5jb25zdERhdGEoKSk7CiAKICAgICBRSGFzaDxTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgQ2FsbGJhY2tzSW5mbyA+OjppdGVyYXRvciBpdGVyID0gbV9wZW5kaW5nUGVybWlzc2lvblJl cXVlc3RzLmZpbmQoY29udGV4dCk7Ci0gICAgaWYgKGl0ZXIgIT0gbV9wZW5kaW5nUGVybWlzc2lv blJlcXVlc3RzLmVuZCgpKQotICAgICAgICBpdGVyLnZhbHVlKCkubV9jYWxsYmFja3MuYXBwZW5k KGNhbGxiYWNrKTsKLSAgICBlbHNlIHsKLSAgICAgICAgUmVmUHRyPFZvaWRDYWxsYmFjaz4gY2Ig PSBjYWxsYmFjazsKKyAgICBpZiAoaXRlciAhPSBtX3BlbmRpbmdQZXJtaXNzaW9uUmVxdWVzdHMu ZW5kKCkpIHsKKyAgICAgICAgaWYgKGxlZ2FjeUNhbGxiYWNrKQorICAgICAgICAgICAgaXRlci0+ bV9sZWdhY3lDYWxsYmFja3MuYXBwZW5kKGxlZ2FjeUNhbGxiYWNrKTsKKyAgICAgICAgaWYgKGNh bGxiYWNrKQorICAgICAgICAgICAgaXRlci0+bV9jYWxsYmFja3MuYXBwZW5kKGNhbGxiYWNrKTsK KyAgICB9IGVsc2UgewogICAgICAgICBDYWxsYmFja3NJbmZvIGluZm87CiAgICAgICAgIGluZm8u bV9mcmFtZSA9IHRvRnJhbWUoY29udGV4dCk7Ci0gICAgICAgIGluZm8ubV9jYWxsYmFja3MuYXBw ZW5kKGNiKTsKKyAgICAgICAgaWYgKGxlZ2FjeUNhbGxiYWNrKQorICAgICAgICAgICAgaW5mby5t X2xlZ2FjeUNhbGxiYWNrcy5hcHBlbmQobGVnYWN5Q2FsbGJhY2spOworICAgICAgICBpZiAoY2Fs bGJhY2spCisgICAgICAgICAgICBpbmZvLm1fY2FsbGJhY2tzLmFwcGVuZChjYWxsYmFjayk7CiAK ICAgICAgICAgaWYgKHRvUGFnZShjb250ZXh0KSAmJiB0b0ZyYW1lKGNvbnRleHQpKSB7CiAgICAg ICAgICAgICBtX3BlbmRpbmdQZXJtaXNzaW9uUmVxdWVzdHMuaW5zZXJ0KGNvbnRleHQsIGluZm8p OwpAQCAtMzY2LDExICszODUsMjAgQEAgdm9pZCBOb3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRR dDo6YWxsb3dOb3RpZmljYXRpb25Gb3JGcmFtZShGcmFtZSogZnJhbWUpCiAgICAgaWYgKGl0ZXIg PT0gbV9wZW5kaW5nUGVybWlzc2lvblJlcXVlc3RzLmVuZCgpKQogICAgICAgICByZXR1cm47CiAK LSAgICBRTGlzdDxSZWZQdHI8Vm9pZENhbGxiYWNrPiA+JiBjYWxsYmFja3MgPSBpdGVyLnZhbHVl KCkubV9jYWxsYmFja3M7Ci0gICAgUV9GT1JFQUNIKGNvbnN0IFJlZlB0cjxWb2lkQ2FsbGJhY2s+ JiBjYWxsYmFjaywgY2FsbGJhY2tzKSB7CisjaWYgRU5BQkxFKExFR0FDWV9OT1RJRklDQVRJT05T KQorICAgIFFMaXN0PFJlZlB0cjxWb2lkQ2FsbGJhY2s+ID4mIHZvaWRDYWxsYmFja3MgPSBpdGVy LnZhbHVlKCkubV9sZWdhY3lDYWxsYmFja3M7CisgICAgUV9GT1JFQUNIKGNvbnN0IFJlZlB0cjxW b2lkQ2FsbGJhY2s+JiBjYWxsYmFjaywgdm9pZENhbGxiYWNrcykgewogICAgICAgICBpZiAoY2Fs bGJhY2spCiAgICAgICAgICAgICBjYWxsYmFjay0+aGFuZGxlRXZlbnQoKTsKICAgICB9CisjZW5k aWYKKyNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKKyAgICBRTGlzdDxSZWZQdHI8Tm90aWZpY2F0 aW9uUGVybWlzc2lvbkNhbGxiYWNrPiA+JiBjYWxsYmFja3MgPSBpdGVyLnZhbHVlKCkubV9jYWxs YmFja3M7CisgICAgUV9GT1JFQUNIKGNvbnN0IFJlZlB0cjxOb3RpZmljYXRpb25QZXJtaXNzaW9u Q2FsbGJhY2s+JiBjYWxsYmFjaywgY2FsbGJhY2tzKSB7CisgICAgICAgIGlmIChjYWxsYmFjaykK KyAgICAgICAgICAgIGNhbGxiYWNrLT5oYW5kbGVFdmVudChOb3RpZmljYXRpb246OnBlcm1pc3Np b25TdHJpbmcoTm90aWZpY2F0aW9uQ2xpZW50OjpQZXJtaXNzaW9uQWxsb3dlZCkpOworICAgIH0K KyNlbmRpZgogICAgIG1fcGVuZGluZ1Blcm1pc3Npb25SZXF1ZXN0cy5yZW1vdmUoaXRlci5rZXko KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvTm90 aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvTm90aWZpY2F0aW9uUHJlc2VudGVyQ2xpZW50UXQuaAppbmRleCA3ODY2OGYzNWY1NzY0 YjFkOTcxYmFlODlhY2Y0Y2UzYjkzYmFlM2VkLi40MmIzMWY5OTQ3NWUyYWJkNWE3ZmQ4YWM3YjI3 MzU4NTMzZjQwODZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L05vdGlmaWNhdGlvblByZXNlbnRlckNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktpdC9xdC9X ZWJDb3JlU3VwcG9ydC9Ob3RpZmljYXRpb25QcmVzZW50ZXJDbGllbnRRdC5oCkBAIC05NCw4ICs5 NCw5IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFBlcm1pc3Npb24oU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8Vm9pZENhbGxiYWNrPik7CiAjZW5kaWYKICNp ZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKLSAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFBlcm1pc3Np b24oU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFBhc3NSZWZQdHI8Tm90aWZpY2F0aW9uUGVybWlz c2lvbkNhbGxiYWNrPikgeyB9CisgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RQZXJtaXNzaW9uKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPE5vdGlmaWNhdGlvblBlcm1pc3Npb25D YWxsYmFjaz4pOwogI2VuZGlmCisgICAgdm9pZCByZXF1ZXN0UGVybWlzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjxWb2lkQ2FsbGJhY2s+LCBQYXNzUmVmUHRyPE5vdGlm aWNhdGlvblBlcm1pc3Npb25DYWxsYmFjaz4pOwogICAgIHZpcnR1YWwgTm90aWZpY2F0aW9uQ2xp ZW50OjpQZXJtaXNzaW9uIGNoZWNrUGVybWlzc2lvbihTY3JpcHRFeGVjdXRpb25Db250ZXh0Kik7 CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbFJlcXVlc3RzRm9yUGVybWlzc2lvbihTY3JpcHRFeGVj dXRpb25Db250ZXh0Kik7CiAKQEAgLTEzMSw3ICsxMzIsMTIgQEAgcHJpdmF0ZToKICAgICBpbnQg bV9jbGllbnRDb3VudDsKICAgICBzdHJ1Y3QgQ2FsbGJhY2tzSW5mbyB7CiAgICAgICAgIFFXZWJG cmFtZUFkYXB0ZXIqIG1fZnJhbWU7Ci0gICAgICAgIFFMaXN0PFJlZlB0cjxWb2lkQ2FsbGJhY2s+ ID4gbV9jYWxsYmFja3M7CisjaWYgRU5BQkxFKExFR0FDWV9OT1RJRklDQVRJT05TKQorICAgICAg ICBRTGlzdDxSZWZQdHI8Vm9pZENhbGxiYWNrPiA+IG1fbGVnYWN5Q2FsbGJhY2tzOworI2VuZGlm CisjaWYgRU5BQkxFKE5PVElGSUNBVElPTlMpCisgICAgICAgIFFMaXN0PFJlZlB0cjxOb3RpZmlj YXRpb25QZXJtaXNzaW9uQ2FsbGJhY2s+ID4gbV9jYWxsYmFja3M7CisjZW5kaWYKICAgICB9Owog ICAgIFFIYXNoPFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCAgQ2FsbGJhY2tzSW5mbyA+IG1fcGVu ZGluZ1Blcm1pc3Npb25SZXF1ZXN0czsKICAgICBRSGFzaDxTY3JpcHRFeGVjdXRpb25Db250ZXh0 KiwgTm90aWZpY2F0aW9uQ2xpZW50OjpQZXJtaXNzaW9uPiBtX2NhY2hlZFBlcm1pc3Npb25zOwo=