143504 2015-04-07 17:00:01 -0700 Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy 2015-04-08 09:12:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1083490 0 andersca 2015-04-07 17:00:01 -0700 Get rid of uses of ApplicationCacheStorage::singleton() from WebKitLegacy 1083494 1 250318 andersca 2015-04-07 17:05:35 -0700 Created attachment 250318 Patch 1083626 2 andersca 2015-04-08 09:12:16 -0700 Committed r182540: <http://trac.webkit.org/changeset/182540> 250318 2015-04-07 17:05:35 -0700 2015-04-07 19:19:05 -0700 Patch bug-143504-20150407170445.patch text/plain 13887 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg3NjhjNWMzZmJlM2Y5NmQ1 ZmI5NTlkMjYyNDdiNzBjMjE1MzE3YWIuLjI0M2I0MDZiYzU1NzgxY2FhNjFkODQyMWFiMmJiYWRh MjM0YzllNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDQtMDcgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBHZXQgcmlkIG9mIHVzZXMg b2YgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpIGZyb20gV2ViS2l0TGVnYWN5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM1MDQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktp dC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICBBZGQgV2ViQXBwbGljYXRpb25D YWNoZUludGVybmFsLmguCisKIDIwMTUtMDQtMDUgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtp bUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBVc2UgY29uc3RhbnRzIG9mIHNxbGl0ZTMgZGlyZWN0 bHkgZm9yIHN0YXR1cyBvZiBTUUwgcmVzdWx0IGluIHdlYmRhdGFiYXNlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK aW5kZXggMTllOTZlZjRmZjRmNDU3MzE2NTY4YTM0MWEyMjQ2NjkxMzdkM2VkNy4uZDMxYTkzOWMy OWJkOTcwMDQ1NWYzYWU2ODg4ZGNhNTJmMGQ1ZTRmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMxIEBACisyMDE1LTA0LTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CisKKyAgICAgICAgR2V0IHJpZCBvZiB1c2VzIG9mIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl OjpzaW5nbGV0b24oKSBmcm9tIFdlYktpdExlZ2FjeQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNTA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgd2ViQXBwbGljYXRpb25DYWNoZVN0b3JhZ2Uo KSBmdW5jdGlvbiBhbmQgdXNlIGl0IHRocm91Z2hvdXQgV2ViS2l0TGVnYWN5LgorICAgICAgICBJ biB0aGUgZnV0dXJlLCB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSB3aWxsIHJldHVybiBhIGN1 c3RvbSBzaW5nbGV0b24sIGJ1dCBmb3Igbm93CisgICAgICAgIGl0IGp1c3QgcmV0dXJucyBBcHBs aWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuCisKKyAgICAgICAgKiBNaXNjL1dlYkNh Y2hlLm1tOgorICAgICAgICAoK1tXZWJDYWNoZSBlbXB0eV0pOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2FjaGUubW06CisgICAgICAgICgrW1dlYkFwcGxpY2F0aW9u Q2FjaGUgbWF4aW11bVNpemVdKToKKyAgICAgICAgKCtbV2ViQXBwbGljYXRpb25DYWNoZSBzZXRN YXhpbXVtU2l6ZTpdKToKKyAgICAgICAgKCtbV2ViQXBwbGljYXRpb25DYWNoZSBkZWZhdWx0T3Jp Z2luUXVvdGFdKToKKyAgICAgICAgKCtbV2ViQXBwbGljYXRpb25DYWNoZSBzZXREZWZhdWx0T3Jp Z2luUXVvdGE6XSk6CisgICAgICAgICgrW1dlYkFwcGxpY2F0aW9uQ2FjaGUgb3JpZ2luc1dpdGhD YWNoZV0pOgorICAgICAgICAod2ViQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UpOgorICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2FjaGVJbnRlcm5hbC5oOiBBZGRlZC4KKyAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hlUXVvdGFNYW5hZ2VyLm1t OgorICAgICAgICAoLVtXZWJBcHBsaWNhdGlvbkNhY2hlUXVvdGFNYW5hZ2VyIHVzYWdlXSk6Cisg ICAgICAgICgtW1dlYkFwcGxpY2F0aW9uQ2FjaGVRdW90YU1hbmFnZXIgcXVvdGFdKToKKyAgICAg ICAgKC1bV2ViQXBwbGljYXRpb25DYWNoZVF1b3RhTWFuYWdlciBzZXRRdW90YTpdKToKKyAgICAg ICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgIChXZWJLaXRJbml0aWFsaXplQXBwbGlj YXRpb25DYWNoZVBhdGhJZk5lY2Vzc2FyeSk6CisKIDIwMTUtMDQtMDcgIEJyYWR5IEVpZHNvbiAg PGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIENvbnRleHRNZW51SXRlbSByZWZhY3Rvcmlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5k ZXggOTM5OGM2ZGMzZjQ4OGYzMmFmODA5OTExNTZmMTIxOTlmZDgyMTNhYi4uMTBjNzI4OGM2YzU0 MjdkNGY5ZDJkM2U1YmFjYWJmMWMxYTFhYjg0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktp dC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC01Miw2ICs1Miw3IEBACiAJCTFBNzRBMjhG MEY0Rjc1NDAwMDgyRTIyOCAvKiBXZWJUZXh0SW5wdXRXaW5kb3dDb250cm9sbGVyLm0gaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTc0QTI4RDBGNEY3NTQw MDA4MkUyMjggLyogV2ViVGV4dElucHV0V2luZG93Q29udHJvbGxlci5tICovOyB9OwogCQkxQTc3 QjAyRTBFRTc3MzA1MDBDOEExRjkgLyogV2ViUGx1Z2luUmVxdWVzdC5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE3N0IwMkMwRUU3NzMwNTAwQzhBMUY5 IC8qIFdlYlBsdWdpblJlcXVlc3QuaCAqLzsgfTsKIAkJMUE3N0IwMkYwRUU3NzMwNTAwQzhBMUY5 IC8qIFdlYlBsdWdpblJlcXVlc3QubSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBNzdCMDJEMEVFNzczMDUwMEM4QTFGOSAvKiBXZWJQbHVnaW5SZXF1ZXN0 Lm0gKi87IH07CisJCTFBODZDQ0Q0MUFENDhBNjIwMDc0QkE4OSAvKiBXZWJBcHBsaWNhdGlvbkNh Y2hlSW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBODZDQ0QzMUFENDhBNjIwMDc0QkE4OSAvKiBXZWJBcHBsaWNhdGlvbkNhY2hlSW50ZXJu YWwuaCAqLzsgfTsKIAkJMUE4REVENTAwRUU4OEI4QTAwRjI1MDIyIC8qIEhvc3RlZE5ldHNjYXBl UGx1Z2luU3RyZWFtLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAxQThERUQ0RTBFRTg4QjhBMDBGMjUwMjIgLyogSG9zdGVkTmV0c2NhcGVQbHVnaW5TdHJl YW0uaCAqLzsgfTsKIAkJMUE4REVENTEwRUU4OEI4QTAwRjI1MDIyIC8qIEhvc3RlZE5ldHNjYXBl UGx1Z2luU3RyZWFtLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUE4REVENEYwRUU4OEI4QTAwRjI1MDIyIC8qIEhvc3RlZE5ldHNjYXBlUGx1Z2luU3Ry ZWFtLm1tICovOyB9OwogCQkxQUE4M0Y4MzFBNUM0QUU0MDAwMjZFQzYgLyogV2ViRGF0YWJhc2VQ cm92aWRlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSAxQUE4M0Y4MTFBNUM0QUU0MDAwMjZFQzYgLyogV2ViRGF0YWJhc2VQcm92aWRlci5jcHAgKi87 IH07CkBAIC01MTcsNiArNTE4LDcgQEAKIAkJMUE3NEEyOEQwRjRGNzU0MDAwODJFMjI4IC8qIFdl YlRleHRJbnB1dFdpbmRvd0NvbnRyb2xsZXIubSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBleHBsaWNpdEZpbGVUeXBlID0gc291cmNlY29kZS5jLm9iamM7IGZpbGVFbmNvZGluZyA9IDQ7 IHBhdGggPSBXZWJUZXh0SW5wdXRXaW5kb3dDb250cm9sbGVyLm07IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTFBNzdCMDJDMEVFNzczMDUwMEM4QTFGOSAvKiBXZWJQbHVnaW5SZXF1ZXN0 LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlBsdWdpblJlcXVlc3QuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE3N0IwMkQwRUU3NzMwNTAwQzhBMUY5IC8q IFdlYlBsdWdpblJlcXVlc3QubSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5vYmpjOyBwYXRoID0g V2ViUGx1Z2luUmVxdWVzdC5tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQTg2Q0NE MzFBRDQ4QTYyMDA3NEJBODkgLyogV2ViQXBwbGljYXRpb25DYWNoZUludGVybmFsLmggKi8gPSB7 aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYkFwcGxpY2F0aW9uQ2FjaGVJbnRlcm5hbC5o OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQThERUQ0RTBFRTg4QjhBMDBGMjUwMjIg LyogSG9zdGVkTmV0c2NhcGVQbHVnaW5TdHJlYW0uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gSG9zdGVkTmV0c2NhcGVQbHVnaW5TdHJlYW0uaDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJMUE4REVENEYwRUU4OEI4QTAwRjI1MDIyIC8qIEhvc3RlZE5ldHNjYXBlUGx1 Z2luU3RyZWFtLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gSG9z dGVkTmV0c2NhcGVQbHVnaW5TdHJlYW0ubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJ CTFBQTgzRjgxMUE1QzRBRTQwMDAyNkVDNiAvKiBXZWJEYXRhYmFzZVByb3ZpZGVyLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFdlYkRhdGFiYXNlUHJvdmlkZXIuY3Bw OyBwYXRoID0gLi4vLi4vU3RvcmFnZS9XZWJEYXRhYmFzZVByb3ZpZGVyLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE1ODcsNiArMTU4OSw3IEBACiAJCQkJQ0VEQTEyRDkxNTJD QkU2ODAwRDlFMDhEIC8qIFdlYkFsdGVybmF0aXZlVGV4dENsaWVudC5tbSAqLywKIAkJCQlCNjgw NDk3MTBGRkJDRUMxMDA5RjdGNjIgLyogV2ViQXBwbGljYXRpb25DYWNoZS5oICovLAogCQkJCUI2 ODA0OTcyMEZGQkNFQzEwMDlGN0Y2MiAvKiBXZWJBcHBsaWNhdGlvbkNhY2hlLm1tICovLAorCQkJ CTFBODZDQ0QzMUFENDhBNjIwMDc0QkE4OSAvKiBXZWJBcHBsaWNhdGlvbkNhY2hlSW50ZXJuYWwu aCAqLywKIAkJCQlBNURFRkMxMTExRDUzNDRCMDA4ODUyNzMgLyogV2ViQXBwbGljYXRpb25DYWNo ZVF1b3RhTWFuYWdlci5oICovLAogCQkJCUE1REVGQzEyMTFENTM0NEIwMDg4NTI3MyAvKiBXZWJB cHBsaWNhdGlvbkNhY2hlUXVvdGFNYW5hZ2VyLm1tICovLAogCQkJCTUxQ0JGQ0FDMEQxMEU2QzUw MDJEQkY1MSAvKiBXZWJDYWNoZWRGcmFtZVBsYXRmb3JtRGF0YS5oICovLApAQCAtMTkzMyw2ICsx OTM2LDcgQEAKIAkJCQk5Mzk4MTBBNTA4MjRCRjAxMDA4REYwMzggLyogV2ViUERGUmVwcmVzZW50 YXRpb24uaCBpbiBIZWFkZXJzICovLAogCQkJCTkzOTgxMEE0MDgyNEJGMDEwMDhERjAzOCAvKiBX ZWJQREZWaWV3LmggaW4gSGVhZGVycyAqLywKIAkJCQkxQUE4NzlCNjExQ0JFOUJGMDAzQzY2NEYg LyogV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmggaW4gSGVhZGVycyAqLywKKwkJCQkxQTg2Q0NENDFB RDQ4QTYyMDA3NEJBODkgLyogV2ViQXBwbGljYXRpb25DYWNoZUludGVybmFsLmggaW4gSGVhZGVy cyAqLywKIAkJCQk5Mzk4MTAzNTA4MjRCRjAxMDA4REYwMzggLyogV2ViUGx1Z2luLmggaW4gSGVh ZGVycyAqLywKIAkJCQk5Mzk4MTAzNjA4MjRCRjAxMDA4REYwMzggLyogV2ViUGx1Z2luQ29udGFp bmVyLmggaW4gSGVhZGVycyAqLywKIAkJCQlBMTBDMUQ4MDE4MjAzMDNEMDAzNjg4M0EgLyogV2Vi TWFpbERlbGVnYXRlLmggaW4gSGVhZGVycyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv bWFjL01pc2MvV2ViQ2FjaGUubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYkNhY2hlLm1t CmluZGV4IDZmYjVkODUyYWViNjFmZjk0Yjk0NDM0ZjkyYjE5NzgyYTUwZGRhMDMuLjk3M2Y5MDY1 ZDMyMDQwNDI5MDI2YmJiMWQ0MDE5ZGNhNzlmMzE1OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvbWFjL01pc2MvV2ViQ2FjaGUubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJD YWNoZS5tbQpAQCAtMjUsNiArMjUsNyBAQAogCiAjaW1wb3J0ICJXZWJDYWNoZS5oIgogCisjaW1w b3J0ICJXZWJBcHBsaWNhdGlvbkNhY2hlSW50ZXJuYWwuaCIKICNpbXBvcnQgIldlYk5TT2JqZWN0 RXh0cmFzLmgiCiAjaW1wb3J0ICJXZWJQcmVmZXJlbmNlcy5oIgogI2ltcG9ydCAiV2ViU3lzdGVt SW50ZXJmYWNlLmgiCkBAIC0xMTksNyArMTIwLDcgQEAKICAgICBbV2ViVmlldyBfc2V0Q2FjaGVN b2RlbDpjYWNoZU1vZGVsXTsKIAogICAgIC8vIEVtcHR5IHRoZSBhcHBsaWNhdGlvbiBjYWNoZS4K LSAgICBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuZW1wdHko KTsKKyAgICB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLmVtcHR5KCk7CiAKICAgICAvLyBF bXB0eSB0aGUgQ3Jvc3MtT3JpZ2luIFByZWZsaWdodCBjYWNoZQogICAgIFdlYkNvcmU6OkNyb3Nz T3JpZ2luUHJlZmxpZ2h0UmVzdWx0Q2FjaGU6OnNpbmdsZXRvbigpLmVtcHR5KCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hl Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQXBwbGljYXRpb25DYWNo ZS5tbQppbmRleCA0OWZmYjA4Yjk3YWIxODZlZGIwOTEzYzE2ZmU5ZDQ4ZjE0MmMyM2RmLi5kMTdm MDdkYmJkNmUzZTBiNjlmNDJmZGRkOWJiNTI1MDIwOGMzMjliIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hlLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2FjaGUubW0KQEAg LTIzLDcgKzIzLDcgQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAogICovCiAKLSNpbXBvcnQgIldlYkFwcGxp Y2F0aW9uQ2FjaGUuaCIKKyNpbXBvcnQgIldlYkFwcGxpY2F0aW9uQ2FjaGVJbnRlcm5hbC5oIgog CiAjaW1wb3J0ICJXZWJTZWN1cml0eU9yaWdpbkludGVybmFsLmgiCiAjaW1wb3J0IDxXZWJDb3Jl L0FwcGxpY2F0aW9uQ2FjaGUuaD4KQEAgLTUzLDcgKzUzLDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAgICAgCiAgICAgU1FMaXRlRGF0YWJhc2VUcmFja2VyOjpzZXRDbGllbnQoV2ViU1FM aXRlRGF0YWJhc2VUcmFja2VyQ2xpZW50OjpzaGFyZWRXZWJTUUxpdGVEYXRhYmFzZVRyYWNrZXJD bGllbnQoKSk7CiAKLSAgICBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuc2V0 Q2FjaGVEaXJlY3RvcnkoW05TU3RyaW5nIF93ZWJraXRfbG9jYWxDYWNoZURpcmVjdG9yeVdpdGhC dW5kbGVJZGVudGlmaWVyOmJ1bmRsZUlkZW50aWZpZXJdKTsKKyAgICB3ZWJBcHBsaWNhdGlvbkNh Y2hlU3RvcmFnZSgpLnNldENhY2hlRGlyZWN0b3J5KFtOU1N0cmluZyBfd2Via2l0X2xvY2FsQ2Fj aGVEaXJlY3RvcnlXaXRoQnVuZGxlSWRlbnRpZmllcjpidW5kbGVJZGVudGlmaWVyXSk7CiAgICAg CiAgICAgaW5pdGlhbGl6ZWQgPSBZRVM7CiB9CkBAIC02MSwyNCArNjEsMjMgQEAgdXNpbmcgbmFt ZXNwYWNlIFdlYkNvcmU7CiAKICsgKGxvbmcgbG9uZyltYXhpbXVtU2l6ZQogewotICAgIHJldHVy biBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkubWF4aW11bVNpemUoKTsKKyAg ICByZXR1cm4gd2ViQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5tYXhpbXVtU2l6ZSgpOwogfQog CiArICh2b2lkKXNldE1heGltdW1TaXplOihsb25nIGxvbmcpc2l6ZQogewotICAgIGF1dG8mIGNh Y2hlU3RvcmFnZSA9IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKTsKLSAgICBj YWNoZVN0b3JhZ2UuZGVsZXRlQWxsRW50cmllcygpOwotICAgIGNhY2hlU3RvcmFnZS5zZXRNYXhp bXVtU2l6ZShzaXplKTsKKyAgICB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLmRlbGV0ZUFs bEVudHJpZXMoKTsKKyAgICB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLnNldE1heGltdW1T aXplKHNpemUpOwogfQogCiArIChsb25nIGxvbmcpZGVmYXVsdE9yaWdpblF1b3RhCiB7Ci0gICAg cmV0dXJuIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5kZWZhdWx0T3JpZ2lu UXVvdGEoKTsKKyAgICByZXR1cm4gd2ViQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5kZWZhdWx0 T3JpZ2luUXVvdGEoKTsKIH0KIAogKyAodm9pZClzZXREZWZhdWx0T3JpZ2luUXVvdGE6KGxvbmcg bG9uZylzaXplCiB7Ci0gICAgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLnNl dERlZmF1bHRPcmlnaW5RdW90YShzaXplKTsKKyAgICB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFn ZSgpLnNldERlZmF1bHRPcmlnaW5RdW90YShzaXplKTsKIH0KIAogKyAobG9uZyBsb25nKWRpc2tV c2FnZUZvck9yaWdpbjooV2ViU2VjdXJpdHlPcmlnaW4gKilvcmlnaW4KQEAgLTk5LDcgKzk4LDcg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiArIChOU0FycmF5ICopb3JpZ2luc1dpdGhDYWNo ZQogewogICAgIEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gY29yZU9yaWdpbnM7Ci0g ICAgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLmdldE9yaWdpbnNXaXRoQ2Fj aGUoY29yZU9yaWdpbnMpOworICAgIHdlYkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkuZ2V0T3Jp Z2luc1dpdGhDYWNoZShjb3JlT3JpZ2lucyk7CiAgICAgCiAgICAgTlNNdXRhYmxlQXJyYXkgKndl Yk9yaWdpbnMgPSBbW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTpjb3Jl T3JpZ2lucy5zaXplKCldIGF1dG9yZWxlYXNlXTsKICAgICAKQEAgLTExMywzICsxMTIsOCBAQCB1 c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIH0KIAogQGVuZAorCitXZWJDb3JlOjpBcHBsaWNhdGlv bkNhY2hlU3RvcmFnZSYgd2ViQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKQoreworICAgIHJldHVy biBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCk7Cit9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hlSW50ZXJu YWwuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2Fj aGVJbnRlcm5hbC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE5ZmNjZGEwNGU3OWMxZTVlNTBlYTAxNjQ3OGUyNmIy ZDk3ZjUyMTMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hlSW50ZXJuYWwuaApAQCAtMCwwICsxLDMzIEBACisvKgor ICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAq CisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1 dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5E IElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBM SUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExF IElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQg T0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBP UiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBB TkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CisgKi8KKworI2ltcG9ydCAiV2ViQXBwbGljYXRpb25DYWNoZS5oIgorCituYW1lc3BhY2UgV2Vi Q29yZSB7CitjbGFzcyBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTsKK30KKworV2ViQ29yZTo6QXBw bGljYXRpb25DYWNoZVN0b3JhZ2UmIHdlYkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCk7CisKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkFwcGxpY2F0aW9u Q2FjaGVRdW90YU1hbmFnZXIubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJBcHBsaWNhdGlvbkNhY2hlUXVvdGFNYW5hZ2VyLm1tCmluZGV4IGY5Nzk1MjhiMjc5ODM1MTBh NGJkY2YxMTI2NGMzMDEwZGQ5ZjEzODAuLjNiM2MzYTQyOTRjMTdjNTc4YjgxOTE1ZGEwYjFjNGY4 YmZhMjNlYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkFwcGxpY2F0aW9uQ2FjaGVRdW90YU1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViQXBwbGljYXRpb25DYWNoZVF1b3RhTWFuYWdlci5tbQpAQCAtMjUs NiArMjUsNyBAQAogCiAjaW1wb3J0ICJXZWJBcHBsaWNhdGlvbkNhY2hlUXVvdGFNYW5hZ2VyLmgi CiAKKyNpbXBvcnQgIldlYkFwcGxpY2F0aW9uQ2FjaGVJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2Vi U2VjdXJpdHlPcmlnaW5JbnRlcm5hbC5oIgogI2ltcG9ydCA8V2ViQ29yZS9BcHBsaWNhdGlvbkNh Y2hlU3RvcmFnZS5oPgogCkBAIC01MCw3ICs1MSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogLSAodW5zaWduZWQgbG9uZyBsb25nKXVzYWdlCiB7CiAgICAgbG9uZyBsb25nIHVzYWdlOwot ICAgIGlmIChBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuY2FsY3VsYXRlVXNh Z2VGb3JPcmlnaW4oW19vcmlnaW4gX2NvcmVdLCB1c2FnZSkpCisgICAgaWYgKHdlYkFwcGxpY2F0 aW9uQ2FjaGVTdG9yYWdlKCkuY2FsY3VsYXRlVXNhZ2VGb3JPcmlnaW4oW19vcmlnaW4gX2NvcmVd LCB1c2FnZSkpCiAgICAgICAgIHJldHVybiB1c2FnZTsKICAgICByZXR1cm4gMDsKIH0KQEAgLTU4 LDE0ICs1OSwxNCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIC0gKHVuc2lnbmVkIGxvbmcg bG9uZylxdW90YQogewogICAgIGxvbmcgbG9uZyBxdW90YTsKLSAgICBpZiAoQXBwbGljYXRpb25D YWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLmNhbGN1bGF0ZVF1b3RhRm9yT3JpZ2luKFtfb3JpZ2lu IF9jb3JlXSwgcXVvdGEpKQorICAgIGlmICh3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLmNh bGN1bGF0ZVF1b3RhRm9yT3JpZ2luKFtfb3JpZ2luIF9jb3JlXSwgcXVvdGEpKQogICAgICAgICBy ZXR1cm4gcXVvdGE7CiAgICAgcmV0dXJuIDA7CiB9CiAKIC0gKHZvaWQpc2V0UXVvdGE6KHVuc2ln bmVkIGxvbmcgbG9uZylxdW90YQogewotICAgIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5n bGV0b24oKS5zdG9yZVVwZGF0ZWRRdW90YUZvck9yaWdpbihbX29yaWdpbiBfY29yZV0sIHF1b3Rh KTsKKyAgICB3ZWJBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpLnN0b3JlVXBkYXRlZFF1b3RhRm9y T3JpZ2luKFtfb3JpZ2luIF9jb3JlXSwgcXVvdGEpOwogfQogCiBAZW5kCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggNWNjOWIxY2RiZTU2ZGJlOTIxYjZhMWRiZWVkYzk4YjVk NmU5OTllOS4uZGViOGU2MDA4MmIzZTZhMjVlZTdhNTg2YmFkZTU0MzhkZjVmMDM3YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMzgsNyArMzgsNyBAQAogI2ltcG9ydCAi RGljdGlvbmFyeVBvcHVwSW5mby5oIgogI2ltcG9ydCAiU3RvcmFnZVRocmVhZC5oIgogI2ltcG9y dCAiV2ViQWx0ZXJuYXRpdmVUZXh0Q2xpZW50LmgiCi0jaW1wb3J0ICJXZWJBcHBsaWNhdGlvbkNh Y2hlLmgiCisjaW1wb3J0ICJXZWJBcHBsaWNhdGlvbkNhY2hlSW50ZXJuYWwuaCIKICNpbXBvcnQg IldlYkJhY2tGb3J3YXJkTGlzdEludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJCYXNlTmV0c2NhcGVQ bHVnaW5WaWV3LmgiCiAjaW1wb3J0ICJXZWJDYWNoZS5oIgpAQCAtNzQ0LDcgKzc0NCw3IEBAIHN0 YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVBcHBsaWNhdGlvbkNhY2hlUGF0aElmTmVjZXNzYXJ5 KCkKIAogICAgIE5TU3RyaW5nKiBjYWNoZURpciA9IFtOU1N0cmluZyBfd2Via2l0X2xvY2FsQ2Fj aGVEaXJlY3RvcnlXaXRoQnVuZGxlSWRlbnRpZmllcjphcHBOYW1lXTsKIAotICAgIEFwcGxpY2F0 aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5zZXRDYWNoZURpcmVjdG9yeShjYWNoZURpcik7 CisgICAgd2ViQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UoKS5zZXRDYWNoZURpcmVjdG9yeShjYWNo ZURpcik7CiAgICAgaW5pdGlhbGl6ZWQgPSBZRVM7CiB9CiAK