134693 2014-07-07 13:47:53 -0700 Add SPI for saving and restoring a WKWebView's _WKSessionState 2014-07-07 13:53:10 -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 1020897 0 andersca 2014-07-07 13:47:53 -0700 Add SPI for saving and restoring a WKWebView's _WKSessionState 1020898 1 234508 andersca 2014-07-07 13:48:50 -0700 Created attachment 234508 Patch 1020899 2 commit-queue 2014-07-07 13:49:50 -0700 Attachment 234508 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1597: The parameter name "]" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 1020900 3 andersca 2014-07-07 13:53:10 -0700 Committed r170856: <http://trac.webkit.org/changeset/170856> 234508 2014-07-07 13:48:50 -0700 2014-07-07 13:51:56 -0700 Patch bug-134693-20140707134832.patch text/plain 9569 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTMzM2NhODA3NmU5MDJj M2E3N2RlMGVjMTkyNzdkZTIwOWY0YTVmNi4uMjg3MTk3MzU0MmU4YWIwMTNhMzliN2M5ZmVlOWZh NTAwZjA1NTRjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA3LTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIFNQSSBmb3Ig c2F2aW5nIGFuZCByZXN0b3JpbmcgYSBXS1dlYlZpZXcncyBfV0tTZXNzaW9uU3RhdGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDY5MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9DL1dLUGFnZS5jcHA6CisgICAgICAgIChXS1BhZ2VSZXN0b3JlRnJvbVNlc3Npb25TdGF0ZSk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgt W1dLV2ViVmlldyBfc2Vzc2lvblN0YXRlXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfcmVzdG9y ZUZyb21TZXNzaW9uU3RhdGVEYXRhOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3Jlc3RvcmVG cm9tU2Vzc2lvblN0YXRlOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3Jlc3RvcmVTZXNzaW9u U3RhdGU6YW5kTmF2aWdhdGU6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tTZXNzaW9u U3RhdGUubW06CisgICAgICAgICgtW19XS1Nlc3Npb25TdGF0ZSBfaW5pdFdpdGhTZXNzaW9uU3Rh dGU6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tTZXNzaW9uU3RhdGVJbnRl cm5hbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisKKzIwMTQtMDctMDcgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgYSBzdHViYmVkIG91dCBfV0tT ZXNzaW9uU3RhdGUgY2xhc3MKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNDY5MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwCmluZGV4IDQ5OTI0YjliMjgyODBiMTNhZWI0MTY0ZjIxNzRmYjc1OTNlZThkNDMuLjMwNmFh MDc3ZjJlMDhiNDQ0Y2RiOGViMWVmNGYwYjI3MTU2YjI2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCkBAIC0zODksNyArMzg5LDcgQEAgdm9pZCBXS1BhZ2VS ZXN0b3JlRnJvbVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZVJlZiwgV0tUeXBlUmVmIHNlc3Np b25TdGF0ZVJlZikKICAgICAgICAgc2Vzc2lvblN0YXRlID0gdG9JbXBsKHN0YXRpY19jYXN0PFdL U2Vzc2lvblN0YXRlUmVmPihzZXNzaW9uU3RhdGVSZWYpKS0+c2Vzc2lvblN0YXRlKCk7CiAgICAg fQogCi0gICAgdG9JbXBsKHBhZ2VSZWYpLT5yZXN0b3JlRnJvbVNlc3Npb25TdGF0ZShXVEY6Om1v dmUoc2Vzc2lvblN0YXRlKSk7CisgICAgdG9JbXBsKHBhZ2VSZWYpLT5yZXN0b3JlRnJvbVNlc3Np b25TdGF0ZShXVEY6Om1vdmUoc2Vzc2lvblN0YXRlKSwgdHJ1ZSk7CiB9CiAKIGRvdWJsZSBXS1Bh Z2VHZXRUZXh0Wm9vbUZhY3RvcihXS1BhZ2VSZWYgcGFnZVJlZikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggODA0MGQ0NzFhOWQ5Y2Jk N2Y0ZWNlZTY0MzVhYjc4MzEzNjZhYjcyNC4uY2JhNDU3Zjg1MzA2NGU3YTU0ZjJlYmQ4ZGUyZWYx M2I0ZWE1ZjFiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW0KQEAgLTY3LDYgKzY3LDcgQEAKICNpbXBvcnQgIl9XS0ZpbmREZWxlZ2F0ZS5o IgogI2ltcG9ydCAiX1dLRm9ybURlbGVnYXRlLmgiCiAjaW1wb3J0ICJfV0tSZW1vdGVPYmplY3RS ZWdpc3RyeUludGVybmFsLmgiCisjaW1wb3J0ICJfV0tTZXNzaW9uU3RhdGVJbnRlcm5hbC5oIgog I2ltcG9ydCAiX1dLVmlzaXRlZExpbmtQcm92aWRlckludGVybmFsLmgiCiAjaW1wb3J0ICJfV0tX ZWJzaXRlRGF0YVN0b3JlSW50ZXJuYWwuaCIKICNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL0pTQ29u dGV4dC5oPgpAQCAtMTU5MSw5ICsxNTkyLDkgQEAgc3RhdGljIGludDMyX3QgYWN0aXZlT3JpZW50 YXRpb24oV0tXZWJWaWV3ICp3ZWJWaWV3KQogfQogCiAvLyBGSVhNRTogVGhpcyBzaG91bGQgcmV0 dXJuIGEgX1dLU2Vzc2lvblN0YXRlIG9iamVjdC4KLS0gKE5TRGF0YSAqKV9zZXNzaW9uU3RhdGUK Ky0gKGlkKV9zZXNzaW9uU3RhdGUKIHsKLSAgICByZXR1cm4gW3NlbGYgX3Nlc3Npb25TdGF0ZURh dGFdOworICAgIHJldHVybiBhZG9wdE5TKFtbX1dLU2Vzc2lvblN0YXRlIGFsbG9jXSBfaW5pdFdp dGhTZXNzaW9uU3RhdGU6X3BhZ2UtPnNlc3Npb25TdGF0ZSgpXSkuYXV0b3JlbGVhc2UoKTsKIH0K IAogLSAodm9pZClfcmVzdG9yZUZyb21TZXNzaW9uU3RhdGVEYXRhOihOU0RhdGEgKilzZXNzaW9u U3RhdGVEYXRhCkBAIC0xNjAzLDE3ICsxNjA0LDI2IEBAIHN0YXRpYyBpbnQzMl90IGFjdGl2ZU9y aWVudGF0aW9uKFdLV2ViVmlldyAqd2ViVmlldykKICAgICBpZiAoIVdlYktpdDo6ZGVjb2RlTGVn YWN5U2Vzc2lvblN0YXRlKHN0YXRpY19jYXN0PGNvbnN0IHVpbnQ4X3QqPihzZXNzaW9uU3RhdGVE YXRhLmJ5dGVzKSwgc2Vzc2lvblN0YXRlRGF0YS5sZW5ndGgsIHNlc3Npb25TdGF0ZSkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHVpbnQ2NF90IG5hdmlnYXRpb25JRCA9IF9wYWdlLT5yZXN0b3Jl RnJvbVNlc3Npb25TdGF0ZShXVEY6Om1vdmUoc2Vzc2lvblN0YXRlKSk7Ci0gICAgaWYgKG5hdmln YXRpb25JRCkgeworICAgIGlmICh1aW50NjRfdCBuYXZpZ2F0aW9uSUQgPSBfcGFnZS0+cmVzdG9y ZUZyb21TZXNzaW9uU3RhdGUoV1RGOjptb3ZlKHNlc3Npb25TdGF0ZSksIHRydWUpKSB7CiAgICAg ICAgIC8vIEZJWE1FOiBUaGlzIGlzIG5vdCBuZWNlc3NhcmlseSBhbHdheXMgYSByZWxvYWQgbmF2 aWdhdGlvbi4KICAgICAgICAgX25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlUmVsb2FkTmF2aWdhdGlv bihuYXZpZ2F0aW9uSUQpOwogICAgIH0KIH0KIAotLy8gRklYTUU6IFRoaXMgc2hvdWxkIHRha2Ug YSBfV0tTZXNzaW9uU3RhdGUgb2JqZWN0LgotLSAodm9pZClfcmVzdG9yZUZyb21TZXNzaW9uU3Rh dGU6KE5TRGF0YSAqKXNlc3Npb25TdGF0ZURhdGEKKy8vIEZJWE1FOiBSZW1vdmUgdGhpcyBvbmNl IG5vYm9keSBpcyB1c2luZyBpdC4KKy0gKHZvaWQpX3Jlc3RvcmVGcm9tU2Vzc2lvblN0YXRlOihp ZClzZXNzaW9uU3RhdGUKIHsKLSAgICBbc2VsZiBfcmVzdG9yZUZyb21TZXNzaW9uU3RhdGVEYXRh OnNlc3Npb25TdGF0ZURhdGFdOworICAgIFtzZWxmIF9yZXN0b3JlU2Vzc2lvblN0YXRlOnNlc3Np b25TdGF0ZSBhbmROYXZpZ2F0ZTpZRVNdOworfQorCistIChXS05hdmlnYXRpb24gKilfcmVzdG9y ZVNlc3Npb25TdGF0ZTooX1dLU2Vzc2lvblN0YXRlICopc2Vzc2lvblN0YXRlIGFuZE5hdmlnYXRl OihCT09MKW5hdmlnYXRlCit7CisgICAgaWYgKHVpbnQ2NF90IG5hdmlnYXRpb25JRCA9IF9wYWdl LT5yZXN0b3JlRnJvbVNlc3Npb25TdGF0ZShzZXNzaW9uU3RhdGUtPl9zZXNzaW9uU3RhdGUsIG5h dmlnYXRlKSkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBub3QgbmVjZXNzYXJpbHkgYWx3 YXlzIGEgcmVsb2FkIG5hdmlnYXRpb24uCisgICAgICAgIHJldHVybiBfbmF2aWdhdGlvblN0YXRl LT5jcmVhdGVSZWxvYWROYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkuYXV0b3JlbGVhc2UoKTsKKyAg ICB9CisKKyAgICByZXR1cm4gbmlsOwogfQogCiAtICh2b2lkKV9jbG9zZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAppbmRl eCBlZWZkMmY0NDBkYzg5YzUwMjA2NzUzZjc1MjVlNDhjMzViOWI1NTU1Li4yM2U4MGU3ODU4MTdl MzIzYjVlNDM4MDllZjAwZGVjOGI2YWM1NjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZhdGUuaApAQCAtNTQsNiArNTQsNyBA QCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgX1dLRmluZE9wdGlvbnMpIHsKIAogQGNs YXNzIFdLQnJvd3NpbmdDb250ZXh0SGFuZGxlOwogQGNsYXNzIF9XS1JlbW90ZU9iamVjdFJlZ2lz dHJ5OworQGNsYXNzIF9XS1Nlc3Npb25TdGF0ZTsKIEBjbGFzcyBfV0tXZWJWaWV3UHJpbnRGb3Jt YXR0ZXI7CiAKIEBwcm90b2NvbCBXS0hpc3RvcnlEZWxlZ2F0ZVByaXZhdGU7CkBAIC04MywxMiAr ODQsMTYgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIsIF9XS0ZpbmRPcHRpb25zKSB7 CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgcGlkX3QgX3dlYlByb2Nlc3NJZGVu dGlmaWVyOwogCisvLyBGSVhNRTogUmVtb3ZlIHRoZXNlIG9uY2Ugbm9ib2R5IGlzIHVzaW5nIHRo ZW0uCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TRGF0YSAqX3Nlc3Npb25TdGF0 ZURhdGE7CiAtICh2b2lkKV9yZXN0b3JlRnJvbVNlc3Npb25TdGF0ZURhdGE6KE5TRGF0YSAqKXNl c3Npb25TdGF0ZURhdGE7CiAKLS8vIEZJWE1FOiBSZW1vdmUgdGhlc2Ugb25jZSBub2JvZHkgaXMg dXNpbmcgdGhlbS4KLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNEYXRhICpfc2Vz c2lvblN0YXRlOwotLSAodm9pZClfcmVzdG9yZUZyb21TZXNzaW9uU3RhdGU6KE5TRGF0YSAqKXNl c3Npb25TdGF0ZTsKKy8vIEZJWE1FOiBUaGlzIHNob3VsZCByZXR1cm4gYSBfV0tTZXNzaW9uU3Rh dGUgb2JqZWN0LCBub3QgYW4gaWQuCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIGlk IF9zZXNzaW9uU3RhdGU7CistIChXS05hdmlnYXRpb24gKilfcmVzdG9yZVNlc3Npb25TdGF0ZToo X1dLU2Vzc2lvblN0YXRlICopc2Vzc2lvblN0YXRlIGFuZE5hdmlnYXRlOihCT09MKW5hdmlnYXRl OworCisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgb25jZSBub2JvZHkgaXMgdXNpbmcgaXQuCistICh2 b2lkKV9yZXN0b3JlRnJvbVNlc3Npb25TdGF0ZTooaWQpc2Vzc2lvblN0YXRlOwogCiBAcHJvcGVy dHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRBbGxvd3NSZW1vdGVJbnNwZWN0aW9uOikgQk9PTCBf YWxsb3dzUmVtb3RlSW5zcGVjdGlvbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tTZXNzaW9uU3RhdGUubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Nlc3Npb25TdGF0ZS5tbQppbmRleCBhMGY1ZjczM2ZjNDYxYzhm Mjg1YzczNDVlMWVhNTc3ZTQ4ODI3Mzk1Li4wYjcwYzZhMDdlNDUxNmE2ZGI5OWZmOGI1MmY4OGM5 OWVkNGIwZjI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1Nlc3Npb25TdGF0ZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1Nlc3Npb25TdGF0ZS5tbQpAQCAtNDUsNiArNDUsMTYgQEAKICAgICByZXR1cm4gc2Vs ZjsKIH0KIAorLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aFNlc3Npb25TdGF0ZTooV2ViS2l0OjpT ZXNzaW9uU3RhdGUpc2Vzc2lvblN0YXRlCit7CisgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0 XSkpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBfc2Vzc2lvblN0YXRlID0gc3RkOjptb3Zl KHNlc3Npb25TdGF0ZSk7CisKKyAgICByZXR1cm4gc2VsZjsKK30KKwogLSAoTlNEYXRhICopZGF0 YQogewogICAgIHJldHVybiBXZWJLaXQ6OmVuY29kZVNlc3Npb25TdGF0ZShfc2Vzc2lvblN0YXRl KS5hdXRvcmVsZWFzZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tTZXNzaW9uU3RhdGVJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tTZXNzaW9uU3RhdGVJbnRlcm5hbC5oCmluZGV4IDU4NDRiOGZjY2Ji MmM3NDUzOTMzNTBiMjFlMDc5MzQyYWQ2NGI5MDAuLjdkZDM3OGI2MTc1YzUzOWUxMzgyZjQ2NDBk MTg4YTEzNTk4NWU1MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLU2Vzc2lvblN0YXRlSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1Nlc3Npb25TdGF0ZUludGVybmFsLmgKQEAgLTMwLDkgKzMwLDEy IEBACiAjaW1wb3J0ICJTZXNzaW9uU3RhdGUuaCIKIAogQGludGVyZmFjZSBfV0tTZXNzaW9uU3Rh dGUgKCkgeworQHBhY2thZ2UKICAgICBXZWJLaXQ6OlNlc3Npb25TdGF0ZSBfc2Vzc2lvblN0YXRl OwogfQogCistIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoU2Vzc2lvblN0YXRlOihXZWJLaXQ6OlNl c3Npb25TdGF0ZSlzZXNzaW9uU3RhdGU7CisKIEBlbmQKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGUyZTQzM2EwOGJkMjEwMDM5MmEyODEw ODFjYWY4ZTliMWUwMGVlNWEuLjY2NmI2ZDE3OGEzOTBlOTQ3YmJlNmY2ZWJhMjQ1YTUxZjdjNjA4 YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xODU5 LDcgKzE4NTksNyBAQCBTZXNzaW9uU3RhdGUgV2ViUGFnZVByb3h5OjpzZXNzaW9uU3RhdGUoY29u c3Qgc3RkOjpmdW5jdGlvbjxib29sIChXZWJCYWNrRm9yd2FyZAogICAgIHJldHVybiBzZXNzaW9u U3RhdGU7CiB9CiAKLXVpbnQ2NF90IFdlYlBhZ2VQcm94eTo6cmVzdG9yZUZyb21TZXNzaW9uU3Rh dGUoU2Vzc2lvblN0YXRlIHNlc3Npb25TdGF0ZSkKK3VpbnQ2NF90IFdlYlBhZ2VQcm94eTo6cmVz dG9yZUZyb21TZXNzaW9uU3RhdGUoU2Vzc2lvblN0YXRlIHNlc3Npb25TdGF0ZSwgYm9vbCBuYXZp Z2F0ZSkKIHsKICAgICBib29sIGhhc0JhY2tGb3J3YXJkTGlzdCA9ICEhc2Vzc2lvblN0YXRlLmJh Y2tGb3J3YXJkTGlzdFN0YXRlLmN1cnJlbnRJbmRleDsKIApAQCAtMTg3MiwxNSArMTg3MiwxNyBA QCB1aW50NjRfdCBXZWJQYWdlUHJveHk6OnJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFNlc3Npb25T dGF0ZSBzZXNzaW9uU3RhdGUpCiAgICAgICAgIHByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlOjpSZXN0b3JlU2Vzc2lvbihtX2JhY2tGb3J3YXJkTGlzdC0+aXRlbVN0YXRlcygpKSwgbV9w YWdlSUQpOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBOYXZpZ2F0aW5nIHNob3VsZCBiZSBzZXBh cmF0ZSBmcm9tIHN0YXRlIHJlc3RvcmF0aW9uLgorICAgIGlmIChuYXZpZ2F0ZSkgeworICAgICAg ICAvLyBGSVhNRTogTmF2aWdhdGluZyBzaG91bGQgYmUgc2VwYXJhdGUgZnJvbSBzdGF0ZSByZXN0 b3JhdGlvbi4KIAotICAgIGlmICghc2Vzc2lvblN0YXRlLnByb3Zpc2lvbmFsVVJMLmlzTnVsbCgp KQotICAgICAgICByZXR1cm4gbG9hZFJlcXVlc3Qoc2Vzc2lvblN0YXRlLnByb3Zpc2lvbmFsVVJM KTsKKyAgICAgICAgaWYgKCFzZXNzaW9uU3RhdGUucHJvdmlzaW9uYWxVUkwuaXNOdWxsKCkpCisg ICAgICAgICAgICByZXR1cm4gbG9hZFJlcXVlc3Qoc2Vzc2lvblN0YXRlLnByb3Zpc2lvbmFsVVJM KTsKIAotICAgIGlmIChoYXNCYWNrRm9yd2FyZExpc3QpIHsKLSAgICAgICAgLy8gRklYTUU6IERv IHdlIGhhdmUgdG8gbnVsbCBjaGVjayB0aGUgYmFjayBmb3J3YXJkIGxpc3QgaXRlbSBoZXJlPwot ICAgICAgICBpZiAoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogaXRlbSA9IG1fYmFja0ZvcndhcmRM aXN0LT5jdXJyZW50SXRlbSgpKQotICAgICAgICAgICAgcmV0dXJuIGdvVG9CYWNrRm9yd2FyZEl0 ZW0oaXRlbSk7CisgICAgICAgIGlmIChoYXNCYWNrRm9yd2FyZExpc3QpIHsKKyAgICAgICAgICAg IC8vIEZJWE1FOiBEbyB3ZSBoYXZlIHRvIG51bGwgY2hlY2sgdGhlIGJhY2sgZm9yd2FyZCBsaXN0 IGl0ZW0gaGVyZT8KKyAgICAgICAgICAgIGlmIChXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiBpdGVt ID0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpCisgICAgICAgICAgICAgICAgcmV0 dXJuIGdvVG9CYWNrRm9yd2FyZEl0ZW0oaXRlbSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBy ZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBlZWU2 ZGMxOGFhMDUxZjE1MDNmY2E3OGJkZmUyMjI3MDg1ZWQ3YTQ3Li45NTA1OGY0YzIxMzRkNDE2MTgz M2MyN2NmOTJhMDdmZmRkY2JiZWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCkBAIC01NTAsNyArNTUwLDcgQEAgcHVibGljOgogICAgIHZvaWQgdGVybWluYXRlUHJv Y2VzcygpOwogCiAgICAgU2Vzc2lvblN0YXRlIHNlc3Npb25TdGF0ZShjb25zdCBzdGQ6OmZ1bmN0 aW9uPGJvb2wgKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0mKT4mID0gbnVsbHB0cikgY29uc3Q7Ci0g ICAgdWludDY0X3QgcmVzdG9yZUZyb21TZXNzaW9uU3RhdGUoU2Vzc2lvblN0YXRlKTsKKyAgICB1 aW50NjRfdCByZXN0b3JlRnJvbVNlc3Npb25TdGF0ZShTZXNzaW9uU3RhdGUsIGJvb2wgbmF2aWdh dGUpOwogCiAgICAgYm9vbCBzdXBwb3J0c1RleHRab29tKCkgY29uc3Q7CiAgICAgZG91YmxlIHRl eHRab29tRmFjdG9yKCkgY29uc3QgeyByZXR1cm4gbV90ZXh0Wm9vbUZhY3RvcjsgfQo=