170965 2017-04-18 13:53:52 -0700 Stop using deprecated APIs, part 2 2017-05-17 09:47:55 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=172227 P2 Normal --- 1 andersca andersca thorton oldest_to_newest 1298423 0 andersca 2017-04-18 13:53:52 -0700 Stop using deprecated APIs, part 2 1298428 1 307413 andersca 2017-04-18 14:01:12 -0700 Created attachment 307413 Patch 1298460 2 andersca 2017-04-18 15:22:10 -0700 Committed r215480: <http://trac.webkit.org/changeset/215480> 307413 2017-04-18 14:01:12 -0700 2017-04-18 14:02:52 -0700 Patch bug-170965-20170418140111.patch text/plain 11667 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA3MTFiMDhlNWNjMGRj ZDYwZTZhMjgwOWI1YTUwOTEwNjVjY2ZhZC4uMWEzYmMxM2MyODA2YzdmNTNkMWRkOWZmNWFmNmIw ZmYyOGE1ODVlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA0LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCB1c2luZyBk ZXByZWNhdGVkIEFQSXMsIHBhcnQgMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTcwOTY1CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzMxNTg5NjM1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNb2R1bGVz L2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0 QW5kVmFsaWRhdGUpOgorICAgICAgICBObyBuZWVkIHRvIGNvbnZlcnQgdGhlIHN0YXR1cyBhbnlt b3JlLgorCisgICAgICAgIChXZWJDb3JlOjpBcHBsZVBheVNlc3Npb246OmNvbXBsZXRlU2hpcHBp bmdDb250YWN0U2VsZWN0aW9uKToKKyAgICAgICAgQ3JlYXRlIGFuIEFwcGxlUGF5RXJyb3IgZ2l2 ZW4gdGhlIHN0YXR1cy4KKworICAgICAgICAqIE1vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTaGlw cGluZ0NvbnRhY3RVcGRhdGUuaDoKKyAgICAgICAgUmVtb3ZlIHRoZSBzdGF0dXMgbWVtYmVyIHZh cmlhYmxlLgorCisgICAgICAgICogTW9kdWxlcy9hcHBsZXBheS9QYXltZW50UmVxdWVzdC5oOgor ICAgICAgICBSZW1vdmUgdGhlIHN0YXR1cyBtZW1iZXIgdmFyaWFibGUuCisKIDIwMTctMDQtMTgg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5IHRv IGZpeCB0aGUgaU9TIERlYnVnIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzNhMTMxYzdmMTcwMTg5NDZk ZjRkNmI2NjFlMmZkMDIxNWMyZTQ2Ny4uM2M1MTU0Y2Q5NDM3NTk0MWMyZjM1ZmQyMmYzNzRiYWVk ZGIyZjAwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTA0LTE4ICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3RvcCB1c2luZyBkZXBy ZWNhdGVkIEFQSXMsIHBhcnQgMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTcwOTY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2EubW06 CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6U2hpcHBpbmdDb250YWN0VXBk YXRlPjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxXZWJDb3JlOjpTaGlw cGluZ0NvbnRhY3RVcGRhdGU+OjpkZWNvZGUpOgorICAgICAgICBSZW1vdmUgdGhlIHN0YXR1cyBt ZW1iZXIgdmFyaWFibGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQXBwbGVQYXkvY29jb2EvV2Vi UGF5bWVudENvb3JkaW5hdG9yUHJveHlDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6c3RhdHVz KToKKyAgICAgICAgTmV3IGZ1bmN0aW9uIHRvIGJlIHVzZWQgYnkgb2xkZXIgT1Nlcy4gVGhpcyB3 aWxsIHJlY3JlYXRlIGEgUEtQYXltZW50QXV0aG9yaXphdGlvblN0YXR1cyBnaXZlbiBhIFNoaXBw aW5nQ29udGFjdFVwZGF0ZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJQYXltZW50Q29vcmRpbmF0 b3JQcm94eTo6cGxhdGZvcm1Db21wbGV0ZVNoaXBwaW5nQ29udGFjdFNlbGVjdGlvbik6CisgICAg ICAgIFN0b3AgdXNpbmcgdGhlIGRlcHJlY2F0ZWQgQVBJLgorCiAyMDE3LTA0LTE4ICBUaW1vdGh5 IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBGb3JjZSBzY3Jv bGwgdmlldyBpbnNldHMgdG8gYmUgcmVzcGVjdGVkIHJlZ2FyZGxlc3Mgb2YgcnViYmVyLWJhbmRp bmcgc3RhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBw bGVQYXlTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQ YXlTZXNzaW9uLmNwcAppbmRleCBlYzBmOTY1OTc2NTU1YWJiM2QzNGM2NzViMmE3NDkyYzEwYzVi MjA3Li42NTJkYmNkYWQzN2M2ZTI5YzViZGI5MDExMmE1Y2FkNWQzNWFjZjJjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2Vzc2lvbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNlc3Npb24uY3BwCkBA IC00NjcsMjEgKzQ2Nyw3IEBAIHN0YXRpYyBFeGNlcHRpb25PcjxTaGlwcGluZ0NvbnRhY3RVcGRh dGU+IGNvbnZlcnRBbmRWYWxpZGF0ZShBcHBsZVBheVNoaXBwaW5nQ29uCiB7CiAgICAgU2hpcHBp bmdDb250YWN0VXBkYXRlIGNvbnZlcnRlZFVwZGF0ZTsKIAotICAgIGlmICghdXBkYXRlLnN0YXR1 cykgewotICAgICAgICBjb252ZXJ0ZWRVcGRhdGUuZXJyb3JzID0gY29udmVydCh1cGRhdGUuZXJy b3JzKTsKLSAgICAgICAgaWYgKGNvbnZlcnRlZFVwZGF0ZS5lcnJvcnMuaXNFbXB0eSgpKQotICAg ICAgICAgICAgY29udmVydGVkVXBkYXRlLnN0YXR1cyA9IFBheW1lbnRBdXRob3JpemF0aW9uU3Rh dHVzOjpTdWNjZXNzOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjb252ZXJ0ZWRVcGRhdGUu c3RhdHVzID0gUGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXM6OkZhaWx1cmU7Ci0gICAgfSBlbHNl IHsKLSAgICAgICAgQVNTRVJUKHVwZGF0ZS5lcnJvcnMuaXNFbXB0eSgpKTsKLQotICAgICAgICBh dXRvIGF1dGhvcml6YXRpb25TdGF0dXMgPSB0b1BheW1lbnRBdXRob3JpemF0aW9uU3RhdHVzKCp1 cGRhdGUuc3RhdHVzKTsKLSAgICAgICAgaWYgKCFhdXRob3JpemF0aW9uU3RhdHVzKQotICAgICAg ICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IElOVkFMSURfQUNDRVNTX0VSUiB9OwotCi0gICAgICAg IGNvbnZlcnRlZFVwZGF0ZS5zdGF0dXMgPSAqYXV0aG9yaXphdGlvblN0YXR1czsKLSAgICB9Cisg ICAgY29udmVydGVkVXBkYXRlLmVycm9ycyA9IGNvbnZlcnQodXBkYXRlLmVycm9ycyk7CiAKICAg ICBhdXRvIGNvbnZlcnRlZE5ld1NoaXBwaW5nTWV0aG9kcyA9IGNvbnZlcnRBbmRWYWxpZGF0ZShX VEZNb3ZlKHVwZGF0ZS5uZXdTaGlwcGluZ01ldGhvZHMpKTsKICAgICBpZiAoY29udmVydGVkTmV3 U2hpcHBpbmdNZXRob2RzLmhhc0V4Y2VwdGlvbigpKQpAQCAtODI5LDcgKzgxNSw0MSBAQCBFeGNl cHRpb25Pcjx2b2lkPiBBcHBsZVBheVNlc3Npb246OmNvbXBsZXRlU2hpcHBpbmdDb250YWN0U2Vs ZWN0aW9uKHVuc2lnbmVkIHNobwogewogICAgIEFwcGxlUGF5U2hpcHBpbmdDb250YWN0VXBkYXRl IHVwZGF0ZTsKIAotICAgIHVwZGF0ZS5zdGF0dXMgPSBzdGF0dXM7CisgICAgYXV0byBhdXRob3Jp emF0aW9uU3RhdHVzID0gdG9QYXltZW50QXV0aG9yaXphdGlvblN0YXR1cyhzdGF0dXMpOworICAg IGlmICghYXV0aG9yaXphdGlvblN0YXR1cykKKyAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IElO VkFMSURfQUNDRVNTX0VSUiB9OworCisgICAgc3RkOjpvcHRpb25hbDxBcHBsZVBheUVycm9yOjpD b2RlPiBlcnJvckNvZGU7CisgICAgc3RkOjpvcHRpb25hbDxBcHBsZVBheUVycm9yOjpDb250YWN0 RmllbGQ+IGNvbnRhY3RGaWVsZDsKKworICAgIHN3aXRjaCAoKmF1dGhvcml6YXRpb25TdGF0dXMp IHsKKyAgICBjYXNlIFBheW1lbnRBdXRob3JpemF0aW9uU3RhdHVzOjpTdWNjZXNzOgorICAgICAg ICBicmVhazsKKworICAgIGNhc2UgUGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXM6OkZhaWx1cmU6 CisgICAgY2FzZSBQYXltZW50QXV0aG9yaXphdGlvblN0YXR1czo6UElOUmVxdWlyZWQ6CisgICAg Y2FzZSBQYXltZW50QXV0aG9yaXphdGlvblN0YXR1czo6UElOSW5jb3JyZWN0OgorICAgIGNhc2Ug UGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXM6OlBJTkxvY2tvdXQ6CisgICAgICAgIGVycm9yQ29k ZSA9IEFwcGxlUGF5RXJyb3I6OkNvZGU6OlVua25vd247CisgICAgICAgIGJyZWFrOworCisgICAg Y2FzZSBQYXltZW50QXV0aG9yaXphdGlvblN0YXR1czo6SW52YWxpZEJpbGxpbmdQb3N0YWxBZGRy ZXNzOgorICAgICAgICBlcnJvckNvZGUgPSBBcHBsZVBheUVycm9yOjpDb2RlOjpCaWxsaW5nQ29u dGFjdEludmFsaWQ7CisgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBQYXltZW50QXV0aG9yaXph dGlvblN0YXR1czo6SW52YWxpZFNoaXBwaW5nUG9zdGFsQWRkcmVzczoKKyAgICAgICAgZXJyb3JD b2RlID0gQXBwbGVQYXlFcnJvcjo6Q29kZTo6U2hpcHBpbmdDb250YWN0SW52YWxpZDsKKyAgICAg ICAgY29udGFjdEZpZWxkID0gQXBwbGVQYXlFcnJvcjo6Q29udGFjdEZpZWxkOjpQb3N0YWxBZGRy ZXNzOworICAgICAgICBicmVhazsKKworICAgIGNhc2UgUGF5bWVudEF1dGhvcml6YXRpb25TdGF0 dXM6OkludmFsaWRTaGlwcGluZ0NvbnRhY3Q6CisgICAgICAgIGVycm9yQ29kZSA9IEFwcGxlUGF5 RXJyb3I6OkNvZGU6OlNoaXBwaW5nQ29udGFjdEludmFsaWQ7CisgICAgICAgIGJyZWFrOworICAg IH0KKworICAgIGlmIChlcnJvckNvZGUpCisgICAgICAgIHVwZGF0ZS5lcnJvcnMgPSB7IEFwcGxl UGF5RXJyb3I6OmNyZWF0ZSgqZXJyb3JDb2RlLCBjb250YWN0RmllbGQsIHsgfSkgfTsKKwogICAg IHVwZGF0ZS5uZXdTaGlwcGluZ01ldGhvZHMgPSBXVEZNb3ZlKG5ld1NoaXBwaW5nTWV0aG9kcyk7 CiAgICAgdXBkYXRlLm5ld1RvdGFsID0gV1RGTW92ZShuZXdUb3RhbCk7CiAgICAgdXBkYXRlLm5l d0xpbmVJdGVtcyA9IFdURk1vdmUobmV3TGluZUl0ZW1zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTaGlwcGluZ0NvbnRhY3RVcGRhdGUuaCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvQXBwbGVQYXlTaGlwcGluZ0NvbnRhY3RV cGRhdGUuaAppbmRleCAwYWFjYjZjZjU1Yjk3ODg2OTExNTgyOTJmODQ5NjA1MGQ4NzgyNmZlLi43 MjU5Nzc4ODhjOTZhMmRjZmNiNGM3ZWEzYjIwODdkOWU3OWI0ODUzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L0FwcGxlUGF5U2hpcHBpbmdDb250YWN0VXBkYXRl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9BcHBsZVBheVNoaXBwaW5n Q29udGFjdFVwZGF0ZS5oCkBAIC0zNCw3ICszNCw2IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHN0cnVjdCBBcHBsZVBheVNoaXBwaW5nQ29udGFjdFVwZGF0ZSB7Ci0gICAgc3RkOjpvcHRpb25h bDx1bnNpZ25lZCBzaG9ydD4gc3RhdHVzOwogICAgIFZlY3RvcjxSZWZQdHI8QXBwbGVQYXlFcnJv cj4+IGVycm9yczsKIAogICAgIFZlY3RvcjxBcHBsZVBheVNoaXBwaW5nTWV0aG9kPiBuZXdTaGlw cGluZ01ldGhvZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5 L1BheW1lbnRSZXF1ZXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2FwcGxlcGF5L1BheW1l bnRSZXF1ZXN0LmgKaW5kZXggMDhlMWI0YjAwMjYwNTUyMzBmZDMzNDkyYjZiODc3NmM4ZjYxMzJj Mi4uOWQ4ZDM2MjFhMTZiNzBjMThhNmU4YWZhMjUyM2U4NDdlMDBmZjIyZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9hcHBsZXBheS9QYXltZW50UmVxdWVzdC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvYXBwbGVwYXkvUGF5bWVudFJlcXVlc3QuaApAQCAtMTg1LDcg KzE4NSw2IEBAIHN0cnVjdCBQYXltZW50TWV0aG9kVXBkYXRlIHsKIH07CiAKIHN0cnVjdCBTaGlw cGluZ0NvbnRhY3RVcGRhdGUgewotICAgIFBheW1lbnRBdXRob3JpemF0aW9uU3RhdHVzIHN0YXR1 czsKICAgICBWZWN0b3I8UGF5bWVudEVycm9yPiBlcnJvcnM7CiAKICAgICBWZWN0b3I8UGF5bWVu dFJlcXVlc3Q6OlNoaXBwaW5nTWV0aG9kPiBuZXdTaGlwcGluZ01ldGhvZHM7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29jb2Eu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29jb2EvV2ViQ29yZUFyZ3VtZW50Q29kZXJzQ29j b2EubW0KaW5kZXggZmIxOWU0NGFhZGI4OTZjNWVhOGE5NzkyYjc3MDM3NWVmYTViZDNkYi4uZWJl MGUwZDYwOTczODAzNjFhMTFjOWI3NzllZThmMmQ2NDdlNzkxNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL0NvY29hL1dlYkNvcmVBcmd1bWVudENvZGVyc0NvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9XZWJDb3JlQXJndW1lbnRDb2RlcnNDb2NvYS5t bQpAQCAtNDIxLDcgKzQyMSw2IEBAIGJvb2wgQXJndW1lbnRDb2RlcjxQYXltZW50UmVxdWVzdDo6 VG90YWxBbmRMaW5lSXRlbXM+OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwKIAogdm9pZCBBcmd1 bWVudENvZGVyPFdlYkNvcmU6OlNoaXBwaW5nQ29udGFjdFVwZGF0ZT46OmVuY29kZShFbmNvZGVy JiBlbmNvZGVyLCBjb25zdCBXZWJDb3JlOjpTaGlwcGluZ0NvbnRhY3RVcGRhdGUmIHVwZGF0ZSkK IHsKLSAgICBlbmNvZGVyIDw8IHVwZGF0ZS5zdGF0dXM7CiAgICAgZW5jb2RlciA8PCB1cGRhdGUu ZXJyb3JzOwogICAgIGVuY29kZXIgPDwgdXBkYXRlLm5ld1NoaXBwaW5nTWV0aG9kczsKICAgICBl bmNvZGVyIDw8IHVwZGF0ZS5uZXdUb3RhbEFuZExpbmVJdGVtczsKQEAgLTQyOSw4ICs0MjgsNiBA QCB2b2lkIEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6U2hpcHBpbmdDb250YWN0VXBkYXRlPjo6ZW5j b2RlKEVuY29kZXImIGVuY29kZXIsIGNvbgogCiBib29sIEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6 U2hpcHBpbmdDb250YWN0VXBkYXRlPjo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIsIFdlYkNvcmU6 OlNoaXBwaW5nQ29udGFjdFVwZGF0ZSYgdXBkYXRlKQogewotICAgIGlmICghZGVjb2Rlci5kZWNv ZGUodXBkYXRlLnN0YXR1cykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHVwZGF0ZS5lcnJvcnMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYg KCFkZWNvZGVyLmRlY29kZSh1cGRhdGUubmV3U2hpcHBpbmdNZXRob2RzKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BcHBsZVBheS9jb2NvYS9XZWJQYXltZW50Q29vcmRp bmF0b3JQcm94eUNvY29hLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxlUGF5L2Nv Y29hL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Q29jb2EubW0KaW5kZXggMGYxNGI0YThlMWJm YTRhMDI5NGVkMzJjODJhYWI3YzIyOTA4MmFmOS4uN2MyNzdjODZjNjI5YjEwMDFlNDM3NGY5NmQ1 YzUzMjQzZDk0Yjc3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FwcGxl UGF5L2NvY29hL1dlYlBheW1lbnRDb29yZGluYXRvclByb3h5Q29jb2EubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FwcGxlUGF5L2NvY29hL1dlYlBheW1lbnRDb29yZGluYXRvclBy b3h5Q29jb2EubW0KQEAgLTcyNCwxMyArNzI0LDM5IEBAIHZvaWQgV2ViUGF5bWVudENvb3JkaW5h dG9yUHJveHk6OnBsYXRmb3JtQ29tcGxldGVTaGlwcGluZ01ldGhvZFNlbGVjdGlvbihjb25zdCBz CiAgICAgbV9wYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9kaWRT ZWxlY3RTaGlwcGluZ01ldGhvZENvbXBsZXRpb24gPSBudWxscHRyOwogfQogCisjaWYgKFBMQVRG T1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTMwMCkgfHwg KFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMTAw MDApCitzdGF0aWMgUEtQYXltZW50QXV0aG9yaXphdGlvblN0YXR1cyBzdGF0dXMoY29uc3Qgc3Rk OjpvcHRpb25hbDxXZWJDb3JlOjpTaGlwcGluZ0NvbnRhY3RVcGRhdGU+JiB1cGRhdGUpCit7Cisg ICAgaWYgKCF1cGRhdGUpCisgICAgICAgIHJldHVybiBQS1BheW1lbnRBdXRob3JpemF0aW9uU3Rh dHVzU3VjY2VzczsKKworICAgIGlmICh1cGRhdGUtPmVycm9ycy5zaXplKCkgPT0gMSkgeworICAg ICAgICBhdXRvJiBlcnJvciA9IHVwZGF0ZS0+ZXJyb3JzWzBdOworICAgICAgICBzd2l0Y2ggKGVy cm9yLmNvZGUpIHsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpQYXltZW50RXJyb3I6OkNvZGU6OlVu a25vd246CisgICAgICAgIGNhc2UgV2ViQ29yZTo6UGF5bWVudEVycm9yOjpDb2RlOjpBZGRyZXNz VW5zZXJ2aWNhYmxlOgorICAgICAgICAgICAgcmV0dXJuIFBLUGF5bWVudEF1dGhvcml6YXRpb25T dGF0dXNGYWlsdXJlOworCisgICAgICAgIGNhc2UgV2ViQ29yZTo6UGF5bWVudEVycm9yOjpDb2Rl OjpCaWxsaW5nQ29udGFjdEludmFsaWQ6CisgICAgICAgICAgICByZXR1cm4gUEtQYXltZW50QXV0 aG9yaXphdGlvblN0YXR1c0ludmFsaWRCaWxsaW5nUG9zdGFsQWRkcmVzczsKKworICAgICAgICBj YXNlIFdlYkNvcmU6OlBheW1lbnRFcnJvcjo6Q29kZTo6U2hpcHBpbmdDb250YWN0SW52YWxpZDoK KyAgICAgICAgICAgIGlmIChlcnJvci5jb250YWN0RmllbGQgJiYgZXJyb3IuY29udGFjdEZpZWxk ID09IFdlYkNvcmU6OlBheW1lbnRFcnJvcjo6Q29udGFjdEZpZWxkOjpQb3N0YWxBZGRyZXNzKQor ICAgICAgICAgICAgICAgIHJldHVybiBQS1BheW1lbnRBdXRob3JpemF0aW9uU3RhdHVzSW52YWxp ZFNoaXBwaW5nUG9zdGFsQWRkcmVzczsKKworICAgICAgICAgICAgcmV0dXJuIFBLUGF5bWVudEF1 dGhvcml6YXRpb25TdGF0dXNJbnZhbGlkU2hpcHBpbmdDb250YWN0OworICAgICAgICB9CisgICAg fQorCisgICAgcmV0dXJuIFBLUGF5bWVudEF1dGhvcml6YXRpb25TdGF0dXNGYWlsdXJlOworfQor I2VuZGlmCisKIHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnBsYXRmb3JtQ29tcGxl dGVTaGlwcGluZ0NvbnRhY3RTZWxlY3Rpb24oY29uc3Qgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpT aGlwcGluZ0NvbnRhY3RVcGRhdGU+JiB1cGRhdGUpCiB7CiAgICAgQVNTRVJUKG1fcGF5bWVudEF1 dGhvcml6YXRpb25WaWV3Q29udHJvbGxlcik7CiAgICAgQVNTRVJUKG1fcGF5bWVudEF1dGhvcml6 YXRpb25WaWV3Q29udHJvbGxlckRlbGVnYXRlKTsKIAotICAgIGF1dG8gc3RhdHVzID0gdXBkYXRl ID8gdXBkYXRlLT5zdGF0dXMgOiBXZWJDb3JlOjpQYXltZW50QXV0aG9yaXphdGlvblN0YXR1czo6 U3VjY2VzczsKLQogICAgIGlmICh1cGRhdGUpIHsKICAgICAgICAgbV9wYXltZW50QXV0aG9yaXph dGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9wYXltZW50U3VtbWFyeUl0ZW1zID0gdG9QS1Bh eW1lbnRTdW1tYXJ5SXRlbXModXBkYXRlLT5uZXdUb3RhbEFuZExpbmVJdGVtcyk7CiAKQEAgLTc0 MiwxMyArNzY4LDEyIEBAIHZvaWQgV2ViUGF5bWVudENvb3JkaW5hdG9yUHJveHk6OnBsYXRmb3Jt Q29tcGxldGVTaGlwcGluZ0NvbnRhY3RTZWxlY3Rpb24oY29uc3QKICAgICB9CiAKICNpZiAoUExB VEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTMwMCkg fHwgKFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTEwMDAwKQotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKLSNwcmFnbWEgY2xhbmcgZGlh Z25vc3RpYyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgotICAgIGF1dG8gcGtT aGlwcGluZ0NvbnRhY3RVcGRhdGUgPSBhZG9wdE5TKFthbGxvY1BLUGF5bWVudFJlcXVlc3RTaGlw cGluZ0NvbnRhY3RVcGRhdGVJbnN0YW5jZSgpIGluaXRXaXRoU3RhdHVzOnRvUEtQYXltZW50QXV0 aG9yaXphdGlvblN0YXR1cyhzdGF0dXMpIGVycm9yczp1cGRhdGUgPyB0b05TRXJyb3JzKHVwZGF0 ZS0+ZXJyb3JzKS5nZXQoKSA6IEBbIF0gcGF5bWVudFN1bW1hcnlJdGVtczptX3BheW1lbnRBdXRo b3JpemF0aW9uVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZS0+X3BheW1lbnRTdW1tYXJ5SXRlbXMuZ2V0 KCkgc2hpcHBpbmdNZXRob2RzOm1fcGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlckRl bGVnYXRlLT5fc2hpcHBpbmdNZXRob2RzLmdldCgpXSk7Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0 aWMgcG9wCisgICAgYXV0byBwa1NoaXBwaW5nQ29udGFjdFVwZGF0ZSA9IGFkb3B0TlMoW2FsbG9j UEtQYXltZW50UmVxdWVzdFNoaXBwaW5nQ29udGFjdFVwZGF0ZUluc3RhbmNlKCkgaW5pdFdpdGhF cnJvcnM6dXBkYXRlID8gdG9OU0Vycm9ycyh1cGRhdGUtPmVycm9ycykuZ2V0KCkgOiBAWyBdIHBh eW1lbnRTdW1tYXJ5SXRlbXM6bV9wYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyRGVs ZWdhdGUtPl9wYXltZW50U3VtbWFyeUl0ZW1zLmdldCgpIHNoaXBwaW5nTWV0aG9kczptX3BheW1l bnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZS0+X3NoaXBwaW5nTWV0aG9kcy5n ZXQoKV0pOworICAgIGlmIChbcGtTaGlwcGluZ0NvbnRhY3RVcGRhdGUgZXJyb3JzXS5jb3VudCkK KyAgICAgICAgW3BrU2hpcHBpbmdDb250YWN0VXBkYXRlIHNldFN0YXR1czpQS1BheW1lbnRBdXRo b3JpemF0aW9uU3RhdHVzRmFpbHVyZV07CiAgICAgbV9wYXltZW50QXV0aG9yaXphdGlvblZpZXdD b250cm9sbGVyRGVsZWdhdGUtPl9kaWRTZWxlY3RTaGlwcGluZ0NvbnRhY3RDb21wbGV0aW9uKHBr U2hpcHBpbmdDb250YWN0VXBkYXRlLmdldCgpKTsKICNlbHNlCi0gICAgbV9wYXltZW50QXV0aG9y aXphdGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9kaWRTZWxlY3RTaGlwcGluZ0NvbnRhY3RD b21wbGV0aW9uKHRvUEtQYXltZW50QXV0aG9yaXphdGlvblN0YXR1cyhzdGF0dXMpLCBtX3BheW1l bnRBdXRob3JpemF0aW9uVmlld0NvbnRyb2xsZXJEZWxlZ2F0ZS0+X3NoaXBwaW5nTWV0aG9kcy5n ZXQoKSwgbV9wYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9wYXlt ZW50U3VtbWFyeUl0ZW1zLmdldCgpKTsKKyAgICBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0Nv bnRyb2xsZXJEZWxlZ2F0ZS0+X2RpZFNlbGVjdFNoaXBwaW5nQ29udGFjdENvbXBsZXRpb24oc3Rh dHVzKHVwZGF0ZSksIG1fcGF5bWVudEF1dGhvcml6YXRpb25WaWV3Q29udHJvbGxlckRlbGVnYXRl LT5fc2hpcHBpbmdNZXRob2RzLmdldCgpLCBtX3BheW1lbnRBdXRob3JpemF0aW9uVmlld0NvbnRy b2xsZXJEZWxlZ2F0ZS0+X3BheW1lbnRTdW1tYXJ5SXRlbXMuZ2V0KCkpOwogI2VuZGlmCiAgICAg bV9wYXltZW50QXV0aG9yaXphdGlvblZpZXdDb250cm9sbGVyRGVsZWdhdGUtPl9kaWRTZWxlY3RT aGlwcGluZ0NvbnRhY3RDb21wbGV0aW9uID0gbnVsbHB0cjsKIH0K