195647 2019-03-12 15:37:09 -0700 Add WebFrameProxy::loadData 2019-03-12 17:36:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 1 jiewen_tan jiewen_tan bfulgham commit-queue jiewen_tan webkit-bug-importer youennf oldest_to_newest 1515721 0 jiewen_tan 2019-03-12 15:37:09 -0700 Add WebFrameProxy::loadData. 1515723 1 webkit-bug-importer 2019-03-12 15:38:15 -0700 <rdar://problem/48826856> 1515725 2 jiewen_tan 2019-03-12 15:44:42 -0700 The Internal counterpart is within: <rdar://problem/48048800>. 1515729 3 364463 jiewen_tan 2019-03-12 15:47:13 -0700 Created attachment 364463 Patch 1515744 4 364463 youennf 2019-03-12 16:25:15 -0700 Comment on attachment 364463 Patch It might be good to add a test for that if it is difficult to test it without additional features. Maybe we could expose a private API on the web view for testing purposes only. This API could take a frameId and some data to be loaded. TestRunner would then grab the frameId and call that new API. View in context: https://bugs.webkit.org/attachment.cgi?id=364463&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:1401 > + SubstituteData substituteData(WTFMove(sharedBuffer), URL(), WTFMove(response), SubstituteData::SessionHistoryVisibility::Hidden); It is true that the above code is not doing that but I would tend to set the correct URL in both response and substituteData. 1515749 5 jiewen_tan 2019-03-12 16:47:33 -0700 (In reply to youenn fablet from comment #4) > Comment on attachment 364463 [details] > Patch > > It might be good to add a test for that if it is difficult to test it > without additional features. > > Maybe we could expose a private API on the web view for testing purposes > only. > This API could take a frameId and some data to be loaded. > TestRunner would then grab the frameId and call that new API. I am not sure whether it will be good idea to expose this into SPI, which will then be misused probably. Do we have test only SPIs? > > View in context: > https://bugs.webkit.org/attachment.cgi?id=364463&action=review > > > Source/WebKit/WebProcess/WebPage/WebPage.cpp:1401 > > + SubstituteData substituteData(WTFMove(sharedBuffer), URL(), WTFMove(response), SubstituteData::SessionHistoryVisibility::Hidden); > > It is true that the above code is not doing that but I would tend to set the > correct URL in both response and substituteData. Sure. 1515757 6 364475 jiewen_tan 2019-03-12 16:58:42 -0700 Created attachment 364475 Patch for landing 1515783 7 364475 commit-queue 2019-03-12 17:36:08 -0700 Comment on attachment 364475 Patch for landing Clearing flags on attachment: 364475 Committed r242836: <https://trac.webkit.org/changeset/242836> 364463 2019-03-12 15:47:13 -0700 2019-03-12 16:25:15 -0700 Patch bug-195647-20190312154712.patch text/plain 5522 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjN2VmMTc3NjQ4NDUzYjNm NDJjNzJkYzc1NDg1ZDYxMTUzYjRiOTUuLmQ1ZjcyZDQzOWU2MTU1MzM3ZjI3NzdkNWM3YzdiM2Jh MzcwODkxNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDMtMTIgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgV2ViRnJhbWVQcm94eTo6 bG9hZERhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NTY0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg4MjY4NTY+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIFdlYkZy YW1lUHJveHk6OmxvYWREYXRhIHdoaWNoIGlzIGEgc2ltcGxpZmllZCB2ZXJzaW9uIG9mIFdlYlBh Z2VQcm94eTo6bG9hZERhdGEgdGhhdAorICAgICAgICBsb2FkcyBzdWJzdGl0dXRlIGRhdGEgdG8g YW4gaWZyYW1lLiBUaGlzIGlzIG5lZWRlZCBieSB0aGUgTG9hZCBPcHRpbWl6ZXIuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZy YW1lUHJveHk6OmxvYWREYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5o OgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6bG9hZERhdGFJbkZyYW1lKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1l c3NhZ2VzLmluOgorCiAyMDE5LTAzLTA5ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5j b20+CiAKICAgICAgICAgT3B0aW1pemluZyBsb2FkcyB3aGVuIGNyZWF0aW5nIG5ldyBwYWdlcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcAppbmRleCA5ZjQ2ODQ2NTFl M2NjZThlYzAwYTQ2OTFlNThlMGIxNWUyZjY5ZDYwLi40ZGZlMWMzYmZiZGE1YzQ5ZmY4NTZjYTBh ODgxOGFlMTBlZTAzNzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJG cmFtZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5 LmNwcApAQCAtODYsNiArODYsMTQgQEAgdm9pZCBXZWJGcmFtZVByb3h5Ojpsb2FkVVJMKGNvbnN0 IFVSTCYgdXJsKQogICAgIG1fcGFnZS0+cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkxvYWRVUkxJbkZyYW1lKHVybCwgbV9mcmFtZUlEKSwgbV9wYWdlLT5wYWdlSUQoKSk7CiB9CiAK K3ZvaWQgV2ViRnJhbWVQcm94eTo6bG9hZERhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBk YXRhLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFtZSwg Y29uc3QgVVJMJiBiYXNlVVJMKQoreworICAgIGlmICghbV9wYWdlKQorICAgICAgICByZXR1cm47 CisKKyAgICBtX3BhZ2UtPnByb2Nlc3MoKS5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkRGF0 YUluRnJhbWUoZGF0YSwgTUlNRVR5cGUsIGVuY29kaW5nTmFtZSwgYmFzZVVSTCwgbV9mcmFtZUlE KSwgbV9wYWdlLT5wYWdlSUQoKSk7Cit9CisKIHZvaWQgV2ViRnJhbWVQcm94eTo6c3RvcExvYWRp bmcoKSBjb25zdAogewogICAgIGlmICghbV9wYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5oCmluZGV4IDY2MjM4ZDExYmM3OTFmZWRkOGVlY2ZlYjdlYzQ1YzdjYjIzNjgz MzAuLmFkOWFmOTI1OTM2NjgzN2Y4MTNkYjA2MzUzOTQ3MzVkZjYwYzZlYmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmgKQEAgLTgxLDYgKzgxLDcgQEAgcHVibGljOgog ICAgIEZyYW1lTG9hZFN0YXRlJiBmcmFtZUxvYWRTdGF0ZSgpIHsgcmV0dXJuIG1fZnJhbWVMb2Fk U3RhdGU7IH0KIAogICAgIHZvaWQgbG9hZFVSTChjb25zdCBVUkwmKTsKKyAgICB2b2lkIGxvYWRE YXRhKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNv bnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBjb25zdCBVUkwmIGJhc2VVUkwpOwogICAgIHZvaWQg c3RvcExvYWRpbmcoKSBjb25zdDsKIAogICAgIGNvbnN0IFVSTCYgdXJsKCkgY29uc3QgeyByZXR1 cm4gbV9mcmFtZUxvYWRTdGF0ZS51cmwoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCA0MWUxNTJhMmU0MmI0YTY4NzZlYjc0YzVhN2RlNjcx ZmVjYjcxMDRlLi40NWMwZTY1OGY4MWEwNTNiMmUzZjU3MjYzNmQ1OGZjNzYzM2IyMTUzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTM5MCw2 ICsxMzkwLDE4IEBAIHZvaWQgV2ViUGFnZTo6bG9hZFVSTEluRnJhbWUoVVJMJiYgdXJsLCB1aW50 NjRfdCBmcmFtZUlEKQogICAgIGZyYW1lLT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkubG9hZChGcmFt ZUxvYWRSZXF1ZXN0KCpmcmFtZS0+Y29yZUZyYW1lKCksIFJlc291cmNlUmVxdWVzdCh1cmwpLCBT aG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9saWN5OjpTaG91bGROb3RBbGxvdykpOwogfQogCit2b2lk IFdlYlBhZ2U6OmxvYWREYXRhSW5GcmFtZShJUEM6OkRhdGFSZWZlcmVuY2UmJiBkYXRhLCBTdHJp bmcmJiBNSU1FVHlwZSwgU3RyaW5nJiYgZW5jb2RpbmdOYW1lLCBVUkwmJiBiYXNlVVJMLCB1aW50 NjRfdCBmcmFtZUlEKQoreworICAgIFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6OnNpbmds ZXRvbigpLndlYkZyYW1lKGZyYW1lSUQpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVy bjsKKworICAgIGF1dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUocmVpbnRl cnByZXRfY2FzdDxjb25zdCBjaGFyKj4oZGF0YS5kYXRhKCkpLCBkYXRhLnNpemUoKSk7CisgICAg UmVzb3VyY2VSZXNwb25zZSByZXNwb25zZShVUkwoKSwgTUlNRVR5cGUsIHNoYXJlZEJ1ZmZlci0+ c2l6ZSgpLCBlbmNvZGluZ05hbWUpOworICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVEYXRh KFdURk1vdmUoc2hhcmVkQnVmZmVyKSwgVVJMKCksIFdURk1vdmUocmVzcG9uc2UpLCBTdWJzdGl0 dXRlRGF0YTo6U2Vzc2lvbkhpc3RvcnlWaXNpYmlsaXR5OjpIaWRkZW4pOworICAgIGZyYW1lLT5j b3JlRnJhbWUoKS0+bG9hZGVyKCkubG9hZChGcmFtZUxvYWRSZXF1ZXN0KCpmcmFtZS0+Y29yZUZy YW1lKCksIFJlc291cmNlUmVxdWVzdChiYXNlVVJMKSwgU2hvdWxkT3BlbkV4dGVybmFsVVJMc1Bv bGljeTo6U2hvdWxkTm90QWxsb3csIFdURk1vdmUoc3Vic3RpdHV0ZURhdGEpKSk7Cit9CisKICNp ZiAhUExBVEZPUk0oQ09DT0EpCiB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxvYWRQ YXJhbWV0ZXJzKGNvbnN0IExvYWRQYXJhbWV0ZXJzJiBsb2FkUGFyYW1ldGVycykKIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA5ZjczZjgzOWIzOTU0 OTlmNDMxNjM4ZGZjNDk2ZDQ0MjYxNmQzNGJjLi4yNzI3MGE0MjRkYjhkZmYwZDIyZDliOWY4YTA5 NGZmOWFjNzE4ZDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCkBAIC0xMjg3LDYgKzEyODcsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBib29sIGxvZ2lj YWxTY3JvbGwoV2ViQ29yZTo6UGFnZSosIFdlYkNvcmU6OlNjcm9sbExvZ2ljYWxEaXJlY3Rpb24s IFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5KTsKIAogICAgIHZvaWQgbG9hZFVSTEluRnJhbWUo VVJMJiYsIHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgbG9hZERhdGFJbkZyYW1lKElQQzo6 RGF0YVJlZmVyZW5jZSYmLCBTdHJpbmcmJiBNSU1FVHlwZSwgU3RyaW5nJiYgZW5jb2RpbmdOYW1l LCBVUkwmJiBiYXNlVVJMLCB1aW50NjRfdCBmcmFtZUlEKTsKIAogICAgIGVudW0gY2xhc3MgV2Fz UmVzdG9yZWRCeUFQSVJlcXVlc3QgeyBObywgWWVzIH07CiAgICAgdm9pZCByZXN0b3JlU2Vzc2lv bkludGVybmFsKGNvbnN0IFZlY3RvcjxCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+JiwgV2FzUmVz dG9yZWRCeUFQSVJlcXVlc3QsIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjpPdmVyd3JpdGVFeGlz dGluZ0l0ZW0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMjBlYjFhOTI0YmQ1M2E3N2MxYjBiZmQ2OWFhNGI2YjJm YWRhMzFlNC4uOTVkYzNmNjA2ZDA1ZmM5MzdlNWFmZmJhMjExYjM1ZjI2MGJhYzRmOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5p bgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz LmluCkBAIC0xNTMsNiArMTUzLDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZl ciB7CiAgICAgVHJ5UmVzdG9yZVNjcm9sbFBvc2l0aW9uKCkKIAogICAgIExvYWRVUkxJbkZyYW1l KFVSTCB1cmwsIHVpbnQ2NF90IGZyYW1lSUQpCisgICAgTG9hZERhdGFJbkZyYW1lKElQQzo6RGF0 YVJlZmVyZW5jZSBkYXRhLCBTdHJpbmcgTUlNRVR5cGUsIFN0cmluZyBlbmNvZGluZ05hbWUsIFVS TCBiYXNlVVJMLCB1aW50NjRfdCBmcmFtZUlEKQogICAgIExvYWRSZXF1ZXN0KHN0cnVjdCBXZWJL aXQ6OkxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzKQogICAgIExvYWREYXRhKHN0cnVjdCBX ZWJLaXQ6OkxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzKQogICAgIExvYWRBbHRlcm5hdGVI VE1MKHN0cnVjdCBXZWJLaXQ6OkxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzKQo= 364475 2019-03-12 16:58:42 -0700 2019-03-12 17:36:08 -0700 Patch for landing bug-195647-20190312165841.patch text/plain 5525 jiewen_tan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjN2VmMTc3NjQ4NDUzYjNm NDJjNzJkYzc1NDg1ZDYxMTUzYjRiOTUuLjdhODFiOWViMTg4ODcxODk1ZjdkOTc1OWIwZGY5YjQ1 ZmE1MmFkYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTktMDMtMTIgIEppZXdlbiBU YW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgV2ViRnJhbWVQcm94eTo6 bG9hZERhdGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5NTY0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDg4MjY4NTY+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBUaGlzIHBhdGNoIGFkZHMgV2ViRnJh bWVQcm94eTo6bG9hZERhdGEgd2hpY2ggaXMgYSBzaW1wbGlmaWVkIHZlcnNpb24gb2YgV2ViUGFn ZVByb3h5Ojpsb2FkRGF0YSB0aGF0CisgICAgICAgIGxvYWRzIHN1YnN0aXR1dGUgZGF0YSB0byBh biBpZnJhbWUuIFRoaXMgaXMgbmVlZGVkIGJ5IHRoZSBMb2FkIE9wdGltaXplci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWVQcm94eTo6bG9hZERhdGEpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJGcmFtZVByb3h5Lmg6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpsb2FkRGF0YUluRnJhbWUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW46CisKIDIwMTktMDMtMDkgIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBPcHRpbWl6aW5nIGxvYWRzIHdoZW4gY3JlYXRpbmcgbmV3IHBhZ2VzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCmluZGV4IDlmNDY4NDY1MWUz Y2NlOGVjMDBhNDY5MWU1OGUwYjE1ZTJmNjlkNjAuLjRkZmUxYzNiZmJkYTVjNDlmZjg1NmNhMGE4 ODE4YWUxMGVlMDM3M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZy YW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHku Y3BwCkBAIC04Niw2ICs4NiwxNCBAQCB2b2lkIFdlYkZyYW1lUHJveHk6OmxvYWRVUkwoY29uc3Qg VVJMJiB1cmwpCiAgICAgbV9wYWdlLT5wcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 TG9hZFVSTEluRnJhbWUodXJsLCBtX2ZyYW1lSUQpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIH0KIAor dm9pZCBXZWJGcmFtZVByb3h5Ojpsb2FkRGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRh dGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBj b25zdCBVUkwmIGJhc2VVUkwpCit7CisgICAgaWYgKCFtX3BhZ2UpCisgICAgICAgIHJldHVybjsK KworICAgIG1fcGFnZS0+cHJvY2VzcygpLnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWREYXRh SW5GcmFtZShkYXRhLCBNSU1FVHlwZSwgZW5jb2RpbmdOYW1lLCBiYXNlVVJMLCBtX2ZyYW1lSUQp LCBtX3BhZ2UtPnBhZ2VJRCgpKTsKK30KKwogdm9pZCBXZWJGcmFtZVByb3h5OjpzdG9wTG9hZGlu ZygpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3BhZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJG cmFtZVByb3h5LmgKaW5kZXggNjYyMzhkMTFiYzc5MWZlZGQ4ZWVjZmViN2VjNDVjN2NiMjM2ODMz MC4uYWQ5YWY5MjU5MzY2ODM3ZjgxM2RiMDYzNTM5NDczNWRmNjBjNmViZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuaApAQCAtODEsNiArODEsNyBAQCBwdWJsaWM6CiAg ICAgRnJhbWVMb2FkU3RhdGUmIGZyYW1lTG9hZFN0YXRlKCkgeyByZXR1cm4gbV9mcmFtZUxvYWRT dGF0ZTsgfQogCiAgICAgdm9pZCBsb2FkVVJMKGNvbnN0IFVSTCYpOworICAgIHZvaWQgbG9hZERh dGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29u c3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFVSTCYgYmFzZVVSTCk7CiAgICAgdm9pZCBz dG9wTG9hZGluZygpIGNvbnN0OwogCiAgICAgY29uc3QgVVJMJiB1cmwoKSBjb25zdCB7IHJldHVy biBtX2ZyYW1lTG9hZFN0YXRlLnVybCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDQxZTE1MmEyZTQyYjRhNjg3NmViNzRjNWE3ZGU2NzFm ZWNiNzEwNGUuLmQ5MzhkY2UzMDQ5YzJmYzllNGM5NWUzNmM2MWNiNGI2M2Q2MmZiMGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xMzkwLDYg KzEzOTAsMTggQEAgdm9pZCBXZWJQYWdlOjpsb2FkVVJMSW5GcmFtZShVUkwmJiB1cmwsIHVpbnQ2 NF90IGZyYW1lSUQpCiAgICAgZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkKEZyYW1l TG9hZFJlcXVlc3QoKmZyYW1lLT5jb3JlRnJhbWUoKSwgUmVzb3VyY2VSZXF1ZXN0KHVybCksIFNo b3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3k6OlNob3VsZE5vdEFsbG93KSk7CiB9CiAKK3ZvaWQg V2ViUGFnZTo6bG9hZERhdGFJbkZyYW1lKElQQzo6RGF0YVJlZmVyZW5jZSYmIGRhdGEsIFN0cmlu ZyYmIE1JTUVUeXBlLCBTdHJpbmcmJiBlbmNvZGluZ05hbWUsIFVSTCYmIGJhc2VVUkwsIHVpbnQ2 NF90IGZyYW1lSUQpCit7CisgICAgV2ViRnJhbWUqIGZyYW1lID0gV2ViUHJvY2Vzczo6c2luZ2xl dG9uKCkud2ViRnJhbWUoZnJhbWVJRCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJu OworCisgICAgYXV0byBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVy cHJldF9jYXN0PGNvbnN0IGNoYXIqPihkYXRhLmRhdGEoKSksIGRhdGEuc2l6ZSgpKTsKKyAgICBS ZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlKGJhc2VVUkwsIE1JTUVUeXBlLCBzaGFyZWRCdWZmZXIt PnNpemUoKSwgZW5jb2RpbmdOYW1lKTsKKyAgICBTdWJzdGl0dXRlRGF0YSBzdWJzdGl0dXRlRGF0 YShXVEZNb3ZlKHNoYXJlZEJ1ZmZlciksIGJhc2VVUkwsIFdURk1vdmUocmVzcG9uc2UpLCBTdWJz dGl0dXRlRGF0YTo6U2Vzc2lvbkhpc3RvcnlWaXNpYmlsaXR5OjpIaWRkZW4pOworICAgIGZyYW1l LT5jb3JlRnJhbWUoKS0+bG9hZGVyKCkubG9hZChGcmFtZUxvYWRSZXF1ZXN0KCpmcmFtZS0+Y29y ZUZyYW1lKCksIFJlc291cmNlUmVxdWVzdChiYXNlVVJMKSwgU2hvdWxkT3BlbkV4dGVybmFsVVJM c1BvbGljeTo6U2hvdWxkTm90QWxsb3csIFdURk1vdmUoc3Vic3RpdHV0ZURhdGEpKSk7Cit9CisK ICNpZiAhUExBVEZPUk0oQ09DT0EpCiB2b2lkIFdlYlBhZ2U6OnBsYXRmb3JtRGlkUmVjZWl2ZUxv YWRQYXJhbWV0ZXJzKGNvbnN0IExvYWRQYXJhbWV0ZXJzJiBsb2FkUGFyYW1ldGVycykKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA5ZjczZjgzOWIz OTU0OTlmNDMxNjM4ZGZjNDk2ZDQ0MjYxNmQzNGJjLi4yNzI3MGE0MjRkYjhkZmYwZDIyZDliOWY4 YTA5NGZmOWFjNzE4ZDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oCkBAIC0xMjg3LDYgKzEyODcsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBib29sIGxv Z2ljYWxTY3JvbGwoV2ViQ29yZTo6UGFnZSosIFdlYkNvcmU6OlNjcm9sbExvZ2ljYWxEaXJlY3Rp b24sIFdlYkNvcmU6OlNjcm9sbEdyYW51bGFyaXR5KTsKIAogICAgIHZvaWQgbG9hZFVSTEluRnJh bWUoVVJMJiYsIHVpbnQ2NF90IGZyYW1lSUQpOworICAgIHZvaWQgbG9hZERhdGFJbkZyYW1lKElQ Qzo6RGF0YVJlZmVyZW5jZSYmLCBTdHJpbmcmJiBNSU1FVHlwZSwgU3RyaW5nJiYgZW5jb2RpbmdO YW1lLCBVUkwmJiBiYXNlVVJMLCB1aW50NjRfdCBmcmFtZUlEKTsKIAogICAgIGVudW0gY2xhc3Mg V2FzUmVzdG9yZWRCeUFQSVJlcXVlc3QgeyBObywgWWVzIH07CiAgICAgdm9pZCByZXN0b3JlU2Vz c2lvbkludGVybmFsKGNvbnN0IFZlY3RvcjxCYWNrRm9yd2FyZExpc3RJdGVtU3RhdGU+JiwgV2Fz UmVzdG9yZWRCeUFQSVJlcXVlc3QsIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjpPdmVyd3JpdGVF eGlzdGluZ0l0ZW0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMjBlYjFhOTI0YmQ1M2E3N2MxYjBiZmQ2OWFhNGI2 YjJmYWRhMzFlNC4uOTVkYzNmNjA2ZDA1ZmM5MzdlNWFmZmJhMjExYjM1ZjI2MGJhYzRmOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluCkBAIC0xNTMsNiArMTUzLDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNl aXZlciB7CiAgICAgVHJ5UmVzdG9yZVNjcm9sbFBvc2l0aW9uKCkKIAogICAgIExvYWRVUkxJbkZy YW1lKFVSTCB1cmwsIHVpbnQ2NF90IGZyYW1lSUQpCisgICAgTG9hZERhdGFJbkZyYW1lKElQQzo6 RGF0YVJlZmVyZW5jZSBkYXRhLCBTdHJpbmcgTUlNRVR5cGUsIFN0cmluZyBlbmNvZGluZ05hbWUs IFVSTCBiYXNlVVJMLCB1aW50NjRfdCBmcmFtZUlEKQogICAgIExvYWRSZXF1ZXN0KHN0cnVjdCBX ZWJLaXQ6OkxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzKQogICAgIExvYWREYXRhKHN0cnVj dCBXZWJLaXQ6OkxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzKQogICAgIExvYWRBbHRlcm5h dGVIVE1MKHN0cnVjdCBXZWJLaXQ6OkxvYWRQYXJhbWV0ZXJzIGxvYWRQYXJhbWV0ZXJzKQo=