145145 2015-05-18 15:16:55 -0700 WKWebsiteDataStore should fully support session storage 2015-05-18 15:39:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1095698 0 andersca 2015-05-18 15:16:55 -0700 WKWebsiteDataStore should fully support session storage 1095701 1 253346 andersca 2015-05-18 15:19:42 -0700 Created attachment 253346 Patch 1095703 2 commit-queue 2015-05-18 15:22:42 -0700 Attachment 253346 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:62: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:63: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.h:64: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:555: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:573: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/Storage/StorageManager.cpp:585: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 6 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1095713 3 andersca 2015-05-18 15:39:05 -0700 Committed r184516: <http://trac.webkit.org/changeset/184516> 253346 2015-05-18 15:19:42 -0700 2015-05-18 15:21:20 -0700 Patch bug-145145-20150518151940.patch text/plain 14930 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTc2YjU2ZjdiNmEyODE2 ODA4YzgyMTIyNDNjMDNkYWZlZjI2Y2YwZi4uMTY4NmY5ZGZmMzczMDU1ZDhiYjE4ZmI1ZmIyMzVi NGEwYWQ0YzM2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE1LTA1LTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgV0tXZWJzaXRlRGF0 YVN0b3JlIHNob3VsZCBmdWxseSBzdXBwb3J0IHNlc3Npb24gc3RvcmFnZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MTQ1CisgICAgICAgIHJkYXI6 Ly9wcm9ibGVtLzEwNjkwNDQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGEgc2Vzc2lvbiBzdG9yZSBkYXRhIHR5cGUgYW5kIGhhbmRsZSBpdCB3 aGVuIGNsZWFyaW5nIGFuZCBmZXRjaGluZyBkYXRhLgorCisgICAgICAgICogU2hhcmVkL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhVHlwZXMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29h L1dLV2Vic2l0ZURhdGFSZWNvcmQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFSZWNvcmQubW06CisgICAgICAgIChkYXRhVHlwZXNUb1N0cmluZyk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaDoK KyAgICAgICAgKFdlYktpdDo6dG9XZWJzaXRlRGF0YVR5cGVzKToKKyAgICAgICAgKFdlYktpdDo6 dG9XS1dlYnNpdGVEYXRhVHlwZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoK1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vi c2l0ZURhdGFUeXBlc10pOgorICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlNlc3Npb25TdG9yYWdl TmFtZXNwYWNlOjpvcmlnaW5zKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlNl c3Npb25TdG9yYWdlTmFtZXNwYWNlOjpjbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKToK KyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlNlc3Npb25TdG9yYWdlTmFtZXNwYWNl OjpjbGVhckFsbFN0b3JhZ2VBcmVhcyk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2Vy OjpnZXRTZXNzaW9uU3RvcmFnZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFu YWdlcjo6ZGVsZXRlU2Vzc2lvblN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAgKFdlYktpdDo6U3Rv cmFnZU1hbmFnZXI6OmRlbGV0ZVNlc3Npb25TdG9yYWdlRW50cmllc0Zvck9yaWdpbnMpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmg6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRl RGF0YVN0b3JlOjpyZW1vdmVEYXRhKToKKwogMjAxNS0wNS0xOCAgQ3NhYmEgT3N6dHJvZ29uw6Fj ICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtHVEtdIFVSVEJGIGFmdGVyIHIxODQ1MDMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFUeXBlcy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh VHlwZXMuaAppbmRleCBlNjNmOTZmODgxNjQ4MWViMWYwMmQ4YjE2N2JmMDE3NzI4NTg3ODc1Li5i YjUwZjUzOTQ5NDJkNTU1ZWYwYzJlYjA5NTFjMDEzYjJkYzBhNDY5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlcy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmgKQEAgLTMz LDkgKzMzLDEwIEBAIGVudW0gV2Vic2l0ZURhdGFUeXBlcyB7CiAgICAgV2Vic2l0ZURhdGFUeXBl RGlza0NhY2hlID0gMSA8PCAxLAogICAgIFdlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlID0gMSA8 PCAyLAogICAgIFdlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlID0gMSA8 PCAzLAotICAgIFdlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSA9IDEgPDwgNCwKLSAgICBXZWJz aXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMgPSAxIDw8IDUsCi0gICAgV2Vic2l0ZURhdGFUeXBl SW5kZXhlZERCRGF0YWJhc2VzID0gMSA8PCA2LAorICAgIFdlYnNpdGVEYXRhVHlwZVNlc3Npb25T dG9yYWdlID0gMSA8PCA0LAorICAgIFdlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSA9IDEgPDwg NSwKKyAgICBXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMgPSAxIDw8IDYsCisgICAgV2Vi c2l0ZURhdGFUeXBlSW5kZXhlZERCRGF0YWJhc2VzID0gMSA8PCA3LAogfTsKIAogfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJl Y29yZC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRh UmVjb3JkLmgKaW5kZXggMzI5OThmMThjOWY2ZDRiOTRiMTdmYzNiMTBiOGU2NDQxZTdjOWZkYy4u NTBmYjUwNThmNmY3NmVlMTUxZWEwNzUxYmY4NTFmZGI5MDk3ZTI2NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3Jk LmgKQEAgLTQzLDYgKzQzLDkgQEAgV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgV0tXZWJzaXRl RGF0YVR5cGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSBXS19BVkFJTEEKIC8qISBAY29uc3Rh bnQgV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzIENvb2tpZXMuICovCiBXS19FWFRFUk4gTlNTdHJp bmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZUNvb2tpZXMgV0tfQVZBSUxBQkxFKFdLX01BQ19U QkEsIFdLX0lPU19UQkEpOwogCisvKiEgQGNvbnN0YW50IFdLV2Vic2l0ZURhdGFUeXBlU2Vzc2lv blN0b3JhZ2UgSFRNTCBzZXNzaW9uIHN0b3JhZ2UuICovCitXS19FWFRFUk4gTlNTdHJpbmcgKiBj b25zdCBXS1dlYnNpdGVEYXRhVHlwZVNlc3Npb25TdG9yYWdlIFdLX0FWQUlMQUJMRShXS19NQUNf VEJBLCBXS19JT1NfVEJBKTsKKwogLyohIEBjb25zdGFudCBXS1dlYnNpdGVEYXRhVHlwZUxvY2Fs U3RvcmFnZSBIVE1MIGxvY2FsIHN0b3JhZ2UuICovCiBXS19FWFRFUk4gTlNTdHJpbmcgKiBjb25z dCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSBXS19BVkFJTEFCTEUoV0tfTUFDX1RCQSwg V0tfSU9TX1RCQSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQppbmRleCBjZWY3MTdlOTU5MmZlY2RkNTUy YTgyYWJjOGVhMDYxODA3MDgyNGIyLi4wNGJhMDdiY2YxNjZlNWQxOWVlN2Q2NTkxYmM0NTIzZTk3 NjFiYTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2Vic2l0ZURhdGFSZWNvcmQubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCkBAIC0zMyw2ICszMyw4IEBAIE5TU3RyaW5nICog Y29uc3QgV0tXZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZSA9IEAiV0tXZWJzaXRlRGF0YVR5cGVN ZW1vcnlDYWNoZSI7CiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdl YkFwcGxpY2F0aW9uQ2FjaGUgPSBAIldLV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0 aW9uQ2FjaGUiOwogCiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlQ29va2llcyA9 IEAiV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzIjsKK05TU3RyaW5nICogY29uc3QgV0tXZWJzaXRl RGF0YVR5cGVTZXNzaW9uU3RvcmFnZSA9IEAiV0tXZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFn ZSI7CisKIE5TU3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UgPSBA IldLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlIjsKIE5TU3RyaW5nICogY29uc3QgV0tXZWJz aXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMgPSBAIldLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0 YWJhc2VzIjsKIE5TU3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVJbmRleGVkREJEYXRh YmFzZXMgPSBAIldLV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERCRGF0YWJhc2VzIjsKQEAgLTU4LDYg KzYwLDggQEAgc3RhdGljIE5TU3RyaW5nICpkYXRhVHlwZXNUb1N0cmluZyhOU1NldCAqZGF0YVR5 cGVzKQogICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiT2ZmbGluZSBXZWIgQXBwbGljYXRpb24g Q2FjaGUiXTsKICAgICBpZiAoW2RhdGFUeXBlcyBjb250YWluc09iamVjdDpXS1dlYnNpdGVEYXRh VHlwZUNvb2tpZXNdKQogICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiQ29va2llcyJdOworICAg IGlmIChbZGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0 b3JhZ2VdKQorICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiU2Vzc2lvbiBTdG9yYWdlIl07CiAg ICAgaWYgKFtkYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6V0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0 b3JhZ2VdKQogICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiTG9jYWwgU3RvcmFnZSJdOwogICAg IGlmIChbZGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0 YWJhc2VzXSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oCmluZGV4IGJkNDAyNTUwZTBi NjZkN2MxN2M0YWE4ODlhZTM0ZTkwMzA3YjY4MmEuLmVlYTA1NmIxY2U2NDE0ZTNjZDRiNjdmNTA5 Yjc2YzY5M2VjNDIwZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaApAQCAtNTIs NiArNTIsOCBAQCBzdGF0aWMgaW5saW5lIFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlcyB0b1dlYnNp dGVEYXRhVHlwZXMoTlNTZXQgKndrV2Vic2l0ZURhdGFUeQogICAgICAgICB3ZWJzaXRlRGF0YVR5 cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlOwogICAg IGlmIChbd2tXZWJzaXRlRGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBl T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVdKQogICAgICAgICB3ZWJzaXRlRGF0YVR5cGVzIHw9 IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlOworICAgIGlmIChbd2tXZWJzaXRlRGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0 ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2VdKQorICAgICAgICB3ZWJzaXRlRGF0YVR5cGVzIHw9IFdl YnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZVNlc3Npb25TdG9yYWdlOwogICAgIGlmIChb d2tXZWJzaXRlRGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlTG9jYWxT dG9yYWdlXSkKICAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpX ZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2U7CiAgICAgaWYgKFt3a1dlYnNpdGVEYXRhVHlwZXMg Y29udGFpbnNPYmplY3Q6V0tXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXNdKQpAQCAtNzYs NiArNzgsOCBAQCBzdGF0aWMgaW5saW5lIFJldGFpblB0cjxOU1NldD4gdG9XS1dlYnNpdGVEYXRh VHlwZXMoaW50IHdlYnNpdGVEYXRhVHlwZXMpCiAgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlwZXMg YWRkT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlTWVtb3J5Q2FjaGVdOwogICAgIGlmICh3ZWJzaXRl RGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFw cGxpY2F0aW9uQ2FjaGUpCiAgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlwZXMgYWRkT2JqZWN0OldL V2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVdOworICAgIGlmICh3ZWJz aXRlRGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0 b3JhZ2UpCisgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlwZXMgYWRkT2JqZWN0OldLV2Vic2l0ZURh dGFUeXBlU2Vzc2lvblN0b3JhZ2VdOwogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0 ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlKQogICAgICAgICBbd2tXZWJz aXRlRGF0YVR5cGVzIGFkZE9iamVjdDpXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZV07CiAg ICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5 cGVXZWJTUUxEYXRhYmFzZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCmluZGV4IDM2MDVjMjZjYWE0ZTk5ZDY2 NmRlYWNlN2MzNjhmNTk3NjdkZjQ3MDMuLjllMDU2MzM1ZGQ4OTIwZDc4OTg5ZmZlMDkzYzRkYmNi NTdlMWQ3NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJzaXRlRGF0YVN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCkBAIC02MCw3ICs2MCw3IEBACiAgICAgc3RhdGlj IGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CiAgICAgc3RhdGljIE5TU2V0ICphbGxXZWJzaXRl RGF0YVR5cGVzOwogICAgIGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKLSAgICAgICAgYWxs V2Vic2l0ZURhdGFUeXBlcyA9IFtbTlNTZXQgYWxsb2NdIGluaXRXaXRoQXJyYXk6QFsgV0tXZWJz aXRlRGF0YVR5cGVEaXNrQ2FjaGUsIFdLV2Vic2l0ZURhdGFUeXBlTWVtb3J5Q2FjaGUsIFdLV2Vi c2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUsIFdLV2Vic2l0ZURhdGFUeXBl Q29va2llcywgV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UsIFdLV2Vic2l0ZURhdGFUeXBl V2ViU1FMRGF0YWJhc2VzIF1dOworICAgICAgICBhbGxXZWJzaXRlRGF0YVR5cGVzID0gW1tOU1Nl dCBhbGxvY10gaW5pdFdpdGhBcnJheTpAWyBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZSwgV0tX ZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBw bGljYXRpb25DYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzLCBXS1dlYnNpdGVEYXRhVHlw ZVNlc3Npb25TdG9yYWdlLCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSwgV0tXZWJzaXRl RGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMgXV07CiAgICAgfSk7CiAKICAgICByZXR1cm4gYWxsV2Vi c2l0ZURhdGFUeXBlczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9y YWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdl L1N0b3JhZ2VNYW5hZ2VyLmNwcAppbmRleCBkMGJiMTFkOTE3OWY3NzZmMGYxNGNhMDY4NjVlMjBl MmE3OWU3Y2YxLi43ODA4NWJhM2NiODBkYjkwZjZhMzlmY2NiOWU3NmZlNzU3YjVlMjk3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIu Y3BwCkBAIC0zODAsNiArMzgwLDMyIEBAIHB1YmxpYzoKIAogICAgIHZvaWQgY2xvbmVUbyhTZXNz aW9uU3RvcmFnZU5hbWVzcGFjZSYgbmV3U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOwogCisgICAg VmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnMoKSBjb25zdAorICAgIHsKKyAg ICAgICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdpbj4+IG9yaWdpbnM7CisKKyAgICAgICAg Zm9yIChjb25zdCBhdXRvJiBzdG9yYWdlQXJlYSA6IG1fc3RvcmFnZUFyZWFNYXAudmFsdWVzKCkp IHsKKyAgICAgICAgICAgIGlmICghc3RvcmFnZUFyZWEtPml0ZW1zKCkuaXNFbXB0eSgpKQorICAg ICAgICAgICAgICAgIG9yaWdpbnMuYXBwZW5kKHN0b3JhZ2VBcmVhLT5zZWN1cml0eU9yaWdpbigp KTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybiBvcmlnaW5zOworICAgIH0KKworICAgIHZv aWQgY2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiYg c2VjdXJpdHlPcmlnaW4pCisgICAgeworICAgICAgICBmb3IgKGF1dG8mIHN0b3JhZ2VBcmVhIDog bV9zdG9yYWdlQXJlYU1hcC52YWx1ZXMoKSkgeworICAgICAgICAgICAgaWYgKHN0b3JhZ2VBcmVh LT5zZWN1cml0eU9yaWdpbigpLT5lcXVhbCgmc2VjdXJpdHlPcmlnaW4pKQorICAgICAgICAgICAg ICAgIHN0b3JhZ2VBcmVhLT5jbGVhcigpOworICAgICAgICB9CisgICAgfQorCisgICAgdm9pZCBj bGVhckFsbFN0b3JhZ2VBcmVhcygpCisgICAgeworICAgICAgICBmb3IgKGF1dG8mIHN0b3JhZ2VB cmVhIDogbV9zdG9yYWdlQXJlYU1hcC52YWx1ZXMoKSkKKyAgICAgICAgICAgIHN0b3JhZ2VBcmVh LT5jbGVhcigpOworICAgIH0KKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBTZXNzaW9uU3RvcmFn ZU5hbWVzcGFjZSh1bnNpZ25lZCBxdW90YUluQnl0ZXMpOwogCkBAIC01MjYsNiArNTUyLDU1IEBA IHZvaWQgU3RvcmFnZU1hbmFnZXI6OnByb2Nlc3NEaWRDbG9zZUNvbm5lY3Rpb24oV2ViUHJvY2Vz c1Byb3h5JiwgSVBDOjpDb25uZWN0aW9uCiAgICAgfSk7CiB9CiAKK3ZvaWQgU3RvcmFnZU1hbmFn ZXI6OmdldFNlc3Npb25TdG9yYWdlT3JpZ2lucyhzdGQ6OmZ1bmN0aW9uPHZvaWQgKEhhc2hTZXQ8 UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mJik+IGNvbXBsZXRpb25IYW5kbGVyKQor eworICAgIFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gc3RvcmFnZU1hbmFnZXIodGhpcyk7CisKKyAg ICBtX3F1ZXVlLT5kaXNwYXRjaChbc3RvcmFnZU1hbmFnZXIsIGNvbXBsZXRpb25IYW5kbGVyXSB7 CisgICAgICAgIEhhc2hTZXQ8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPj4gb3JpZ2luczsKKworICAg ICAgICBmb3IgKGNvbnN0IGF1dG8mIHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlIDogc3RvcmFnZU1h bmFnZXItPm1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKSB7CisgICAgICAgICAg ICBmb3IgKGF1dG8mIG9yaWdpbiA6IHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlLT5vcmlnaW5zKCkp CisgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQoV1RGOjptb3ZlKG9yaWdpbikpOworICAgICAg ICB9CisKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtvcmlnaW5zLCBjb21wbGV0 aW9uSGFuZGxlcl0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdU Rjo6bW92ZShvcmlnaW5zKSk7CisgICAgICAgIH0pOworICAgIH0pOworfQorCit2b2lkIFN0b3Jh Z2VNYW5hZ2VyOjpkZWxldGVTZXNzaW9uU3RvcmFnZU9yaWdpbnMoc3RkOjpmdW5jdGlvbjx2b2lk ICgpPiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0 b3JhZ2VNYW5hZ2VyKHRoaXMpOworCisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3N0b3JhZ2VNYW5h Z2VyLCBjb21wbGV0aW9uSGFuZGxlcl0geworICAgICAgICBmb3IgKGF1dG8mIHNlc3Npb25TdG9y YWdlTmFtZXNwYWNlIDogc3RvcmFnZU1hbmFnZXItPm1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2Vz LnZhbHVlcygpKQorICAgICAgICAgICAgc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UtPmNsZWFyQWxs U3RvcmFnZUFyZWFzKCk7CisKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKGNvbXBs ZXRpb25IYW5kbGVyKTsKKyAgICB9KTsKK30KKwordm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRl U2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNv cmU6OlNlY3VyaXR5T3JpZ2luPj4mIG9yaWdpbnMsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29t cGxldGlvbkhhbmRsZXIpCit7CisgICAgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9y aWdpbj4+IGNvcGllZE9yaWdpbnM7CisgICAgY29waWVkT3JpZ2lucy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KG9yaWdpbnMuc2l6ZSgpKTsKKworICAgIGZvciAoYXV0byYgb3JpZ2luIDogb3JpZ2lu cykKKyAgICAgICAgY29waWVkT3JpZ2lucy51bmNoZWNrZWRBcHBlbmQob3JpZ2luLT5pc29sYXRl ZENvcHkoKSk7CisKKyAgICBSZWZQdHI8U3RvcmFnZU1hbmFnZXI+IHN0b3JhZ2VNYW5hZ2VyKHRo aXMpOworICAgIG1fcXVldWUtPmRpc3BhdGNoKFtzdG9yYWdlTWFuYWdlciwgY29waWVkT3JpZ2lu cywgY29tcGxldGlvbkhhbmRsZXJdIHsKKyAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBjb3Bp ZWRPcmlnaW5zKSB7CisgICAgICAgICAgICBmb3IgKGF1dG8mIHNlc3Npb25TdG9yYWdlTmFtZXNw YWNlIDogc3RvcmFnZU1hbmFnZXItPm1fc2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygp KQorICAgICAgICAgICAgICAgIHNlc3Npb25TdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VB cmVhc01hdGNoaW5nT3JpZ2luKCpvcmlnaW4pOworICAgICAgICB9CisKKyAgICAgICAgUnVuTG9v cDo6bWFpbigpLmRpc3BhdGNoKGNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICB9KTsKK30KKwogdm9p ZCBTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3JpZ2lucyhzdGQ6OmZ1bmN0aW9uPHZv aWQgKEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mJik+IGNvbXBsZXRp b25IYW5kbGVyKQogewogICAgIFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gc3RvcmFnZU1hbmFnZXIo dGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9y YWdlTWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1h bmFnZXIuaAppbmRleCAyYWFkNGEwYzgyOWQ5Y2RjNTljZDg3MzJiYmEzMWZiZmRiNDI2Y2ZkLi43 ZWQ1MjRiYWJlYTU0YjM0NjUyNzBjN2NiN2Y4NTQ5NGUzYzIyZTliIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTU5LDYgKzU5 LDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIHByb2Nlc3NEaWRDbG9zZUNvbm5lY3Rpb24oV2ViUHJv Y2Vzc1Byb3h5JiwgSVBDOjpDb25uZWN0aW9uJik7CiAgICAgdm9pZCBhcHBsaWNhdGlvbldpbGxU ZXJtaW5hdGUoKTsKIAorICAgIHZvaWQgZ2V0U2Vzc2lvblN0b3JhZ2VPcmlnaW5zKHN0ZDo6ZnVu Y3Rpb248dm9pZCAoSGFzaFNldDxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiYmKT4g Y29tcGxldGlvbkhhbmRsZXIpOworICAgIHZvaWQgZGVsZXRlU2Vzc2lvblN0b3JhZ2VPcmlnaW5z KHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29tcGxldGlvbkhhbmRsZXIpOworICAgIHZvaWQgZGVs ZXRlU2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhjb25zdCBWZWN0b3I8UmVmUHRyPFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+IGNvbXBsZXRp b25IYW5kbGVyKTsKKwogICAgIHZvaWQgZ2V0TG9jYWxTdG9yYWdlT3JpZ2lucyhzdGQ6OmZ1bmN0 aW9uPHZvaWQgKEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mJik+IGNv bXBsZXRpb25IYW5kbGVyKTsKICAgICB2b2lkIGdldExvY2FsU3RvcmFnZURldGFpbHNCeU9yaWdp bihzdGQ6OmZ1bmN0aW9uPHZvaWQgKFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPik+IGNvbXBs ZXRpb25IYW5kbGVyKTsKICAgICB2b2lkIGRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmln aW4oY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4mKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRl eCAzYmY5NzhlY2FmYTExMjQ2MzJmZDBiNzdlZDA1ZGI1ODNmZGVmMTAzLi45NjA5ZGFlYzIzNjgx MWEyOTk5ODI0MTUyMjEwNjZhZjFjNzFiMjRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0yNjYs NiArMjY2LDE5IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhKFdlYnNpdGVEYXRh VHlwZXMgZGF0YVR5cGVzLCBzdGQ6OmZ1bmN0aW9uPHZvaWQKICAgICAgICAgfQogICAgIH0KIAor ICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSAmJiBtX3N0 b3JhZ2VNYW5hZ2VyKSB7CisgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0Nh bGxiYWNrKCk7CisKKyAgICAgICAgbV9zdG9yYWdlTWFuYWdlci0+Z2V0U2Vzc2lvblN0b3JhZ2VP cmlnaW5zKFtjYWxsYmFja0FnZ3JlZ2F0b3JdKEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3Vy aXR5T3JpZ2luPj4mJiBvcmlnaW5zKSB7CisgICAgICAgICAgICBXZWJzaXRlRGF0YSB3ZWJzaXRl RGF0YTsKKworICAgICAgICAgICAgd2hpbGUgKCFvcmlnaW5zLmlzRW1wdHkoKSkKKyAgICAgICAg ICAgICAgICB3ZWJzaXRlRGF0YS5lbnRyaWVzLmFwcGVuZChXZWJzaXRlRGF0YTo6RW50cnkgeyBv cmlnaW5zLnRha2VBbnkoKSwgV2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2UgfSk7CisKKyAg ICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+cmVtb3ZlUGVuZGluZ0NhbGxiYWNrKFdURjo6 bW92ZSh3ZWJzaXRlRGF0YSkpOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBpZiAoZGF0YVR5 cGVzICYgV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlICYmIG1fc3RvcmFnZU1hbmFnZXIpIHsK ICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJhY2soKTsKIApAQCAt NDU1LDYgKzQ2OCwxNCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoV2Vic2l0 ZURhdGFUeXBlcyBkYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZQogICAgICAgICB9CiAgICAg fQogCisgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZVNlc3Npb25TdG9yYWdlICYm IG1fc3RvcmFnZU1hbmFnZXIpIHsKKyAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5k aW5nQ2FsbGJhY2soKTsKKworICAgICAgICBtX3N0b3JhZ2VNYW5hZ2VyLT5kZWxldGVTZXNzaW9u U3RvcmFnZU9yaWdpbnMoW2NhbGxiYWNrQWdncmVnYXRvcl0geworICAgICAgICAgICAgY2FsbGJh Y2tBZ2dyZWdhdG9yLT5yZW1vdmVQZW5kaW5nQ2FsbGJhY2soKTsKKyAgICAgICAgfSk7CisgICAg fQorCiAgICAgaWYgKGRhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSAmJiBt X3N0b3JhZ2VNYW5hZ2VyKSB7CiAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGlu Z0NhbGxiYWNrKCk7CiAKQEAgLTYxNCw2ICs2MzUsMTQgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3Jl OjpyZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMgZGF0YVR5cGVzLCBjb25zdCBWZWN0b3I8V2Vi c2kKICAgICAgICAgfQogICAgIH0KIAorICAgIGlmIChkYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5 cGVTZXNzaW9uU3RvcmFnZSAmJiBtX3N0b3JhZ2VNYW5hZ2VyKSB7CisgICAgICAgIGNhbGxiYWNr QWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7CisKKyAgICAgICAgbV9zdG9yYWdlTWFu YWdlci0+ZGVsZXRlU2Vzc2lvblN0b3JhZ2VFbnRyaWVzRm9yT3JpZ2lucyhvcmlnaW5zLCBbY2Fs bGJhY2tBZ2dyZWdhdG9yXSB7CisgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPnJlbW92 ZVBlbmRpbmdDYWxsYmFjaygpOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBpZiAoZGF0YVR5 cGVzICYgV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlICYmIG1fc3RvcmFnZU1hbmFnZXIpIHsK ICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2FsbGJhY2soKTsKIAo=