22470 2008-11-24 15:18:46 -0800 remove unneeded URL argument from FrameLoaderClient::updateGlobalHistory 2008-11-24 15:32:47 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 100081 0 darin 2008-11-24 15:18:46 -0800 Looking at implementations of updateGlobalHistory, Qt is the only platform that uses the passed-in URL without also getting other data from the DocumentLoader. The Mac and Win platforms both get things like the page title from the DocumentLoader, and so they could just have easily gotten the URL that way too. I think that historically the URL was harder to get, but now there's the simple urlForHistory function that gives you just the right URL. So I want to remove this argument. 100082 1 25455 darin 2008-11-24 15:22:58 -0800 Created attachment 25455 patch 100089 2 darin 2008-11-24 15:32:47 -0800 http://trac.webkit.org/changeset/38732 25455 2008-11-24 15:22:58 -0800 2008-11-24 15:25:05 -0800 patch RemoveURLArgPatch.txt text/plain 14413 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzODczMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDgtMTEtMjQgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNDcwCisgICAgICAgICAgcmVt b3ZlIHVubmVlZGVkIFVSTCBhcmd1bWVudCBmcm9tIEZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVH bG9iYWxIaXN0b3J5CisKKyAgICAgICAgKiBsb2FkZXIvRW1wdHlDbGllbnRzLmg6CisgICAgICAg IChXZWJDb3JlOjpFbXB0eUZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KTog UmVtb3ZlIGFyZ3VtZW50LgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6dXBkYXRlSGlzdG9yeUZvclN0YW5kYXJkTG9hZCk6 IERvbid0IHBhc3MgdGhlIFVSTC4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjp1cGRh dGVIaXN0b3J5Rm9yUmVkaXJlY3RXaXRoTG9ja2VkSGlzdG9yeSk6IERpdHRvLgorICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oOiBSZW1vdmUgYXJndW1lbnQuCisKIDIwMDgtMTEt MjQgIEZpbm51ciBUaG9yYXJpbnNzb24gIDxmaW5udXIud2Via2l0QGdtYWlsLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0VtcHR5 Q2xpZW50cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCShy ZXZpc2lvbiAzODcyNykKKysrIFdlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNDgsNyArMjQ4LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCB0cmFu c2l0aW9uVG9Db21taXR0ZWRGcm9tQ2FjaGVkUGFnZShDYWNoZWRQYWdlKikgeyB9CiAgICAgdmly dHVhbCB2b2lkIHRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKSB7IH0gICAgCiAKLSAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2xvYmFsSGlzdG9yeShjb25zdCBLVVJMJikgeyB9CisgICAg dmlydHVhbCB2b2lkIHVwZGF0ZUdsb2JhbEhpc3RvcnkoKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wg c2hvdWxkR29Ub0hpc3RvcnlJdGVtKEhpc3RvcnlJdGVtKikgY29uc3QgeyByZXR1cm4gZmFsc2U7 IH0KICAgICB2aXJ0dWFsIHZvaWQgc2F2ZVZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSopIHsg fQogICAgIHZpcnR1YWwgYm9vbCBjYW5DYWNoZVBhZ2UoKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQpJbmRleDogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkocmV2aXNpb24gMzg3MjcpCisrKyBXZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1NjIsNyArNDU2Miw3 IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnVwZGF0ZUhpc3RvcnlGb3JTdGFuZGEKICAgICAgICAgaWYg KCFoaXN0b3J5VVJMLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgYWRkQmFja0ZvcndhcmRJdGVt Q2xpcHBlZEF0VGFyZ2V0KHRydWUpOwogICAgICAgICAgICAgaWYgKCFuZWVkUHJpdmFjeSkKLSAg ICAgICAgICAgICAgICBtX2NsaWVudC0+dXBkYXRlR2xvYmFsSGlzdG9yeShoaXN0b3J5VVJMKTsK KyAgICAgICAgICAgICAgICBtX2NsaWVudC0+dXBkYXRlR2xvYmFsSGlzdG9yeSgpOwogICAgICAg ICB9CiAgICAgfSBlbHNlIGlmIChkb2N1bWVudExvYWRlcigpLT51bnJlYWNoYWJsZVVSTCgpLmlz RW1wdHkoKSAmJiBtX2N1cnJlbnRIaXN0b3J5SXRlbSkgewogICAgICAgICBtX2N1cnJlbnRIaXN0 b3J5SXRlbS0+c2V0VVJMKGRvY3VtZW50TG9hZGVyKCktPnVybCgpKTsKQEAgLTQ2NDQsNyArNDY0 NCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnVwZGF0ZUhpc3RvcnlGb3JSZWRpcmUKICAgICAgICAg aWYgKCFtX2N1cnJlbnRIaXN0b3J5SXRlbSAmJiAhbV9mcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkg ewogICAgICAgICAgICAgYWRkQmFja0ZvcndhcmRJdGVtQ2xpcHBlZEF0VGFyZ2V0KHRydWUpOwog ICAgICAgICAgICAgaWYgKCFuZWVkUHJpdmFjeSAmJiAhaGlzdG9yeVVSTC5pc0VtcHR5KCkpCi0g ICAgICAgICAgICAgICAgbV9jbGllbnQtPnVwZGF0ZUdsb2JhbEhpc3RvcnkoaGlzdG9yeVVSTCk7 CisgICAgICAgICAgICAgICAgbV9jbGllbnQtPnVwZGF0ZUdsb2JhbEhpc3RvcnkoKTsKICAgICAg ICAgfQogICAgICAgICBpZiAobV9jdXJyZW50SGlzdG9yeUl0ZW0pIHsKICAgICAgICAgICAgIG1f Y3VycmVudEhpc3RvcnlJdGVtLT5zZXRVUkwoZG9jdW1lbnRMb2FkZXIoKS0+dXJsKCkpOwpJbmRl eDogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCShyZXZpc2lvbiAzODcyNykKKysrIFdlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0Nyw3ICsx NDcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBjb21taXR0 ZWRMb2FkKERvY3VtZW50TG9hZGVyKiwgY29uc3QgY2hhciosIGludCkgPSAwOwogICAgICAgICB2 aXJ0dWFsIHZvaWQgZmluaXNoZWRMb2FkaW5nKERvY3VtZW50TG9hZGVyKikgPSAwOwogICAgICAg ICAKLSAgICAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUdsb2JhbEhpc3RvcnkoY29uc3QgS1VSTCYp ID0gMDsKKyAgICAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUdsb2JhbEhpc3RvcnkoKSA9IDA7CiAg ICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRHb1RvSGlzdG9yeUl0ZW0oSGlzdG9yeUl0ZW0qKSBj b25zdCA9IDA7CiAKICAgICAgICAgdmlydHVhbCBSZXNvdXJjZUVycm9yIGNhbmNlbGxlZEVycm9y KGNvbnN0IFJlc291cmNlUmVxdWVzdCYpID0gMDsKSW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hhbmdlTG9nCShyZXZpc2lvbiAzODczMCkKKysr IFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MDgtMTEtMjQgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNDcwCisgICAgICAgICAgcmVtb3ZlIHVubmVlZGVkIFVSTCBh cmd1bWVudCBmcm9tIEZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5CisKKyAg ICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAg IChXZWJLaXQ6OkZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KTogUmVtb3Zl IGFyZ3VtZW50LgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr Lmg6IERpdHRvLgorCiAyMDA4LTExLTI0ICBDaHJpc3RpYW4gRHl3YW4gIDxjaHJpc3RpYW5AdHdv dG9hc3RzLmRlPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhvbGdlciBGcmV5dGhlci4KSW5kZXg6 IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsu Y3BwCShyZXZpc2lvbiAzODcyNykKKysrIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MzksNyArNzM5LDcgQEAgdm9p ZCBGcmFtZUxvYWRlckNsaWVudDo6c3RhcnREb3dubG9hZChjbwogICAgIG5vdEltcGxlbWVudGVk KCk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnkoY29u c3QgS1VSTCYpCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KCkK IHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQpJbmRleDogV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuaAkocmV2aXNpb24gMzg3MjcpCisrKyBX ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmgJKHdvcmtpbmcg Y29weSkKQEAgLTEyOSw3ICsxMjksNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICAgICAgdmly dHVhbCB2b2lkIGNvbW1pdHRlZExvYWQoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqLCBjb25zdCBj aGFyKiwgaW50KTsKICAgICAgICAgdmlydHVhbCB2b2lkIGZpbmlzaGVkTG9hZGluZyhXZWJDb3Jl OjpEb2N1bWVudExvYWRlciopOwogCi0gICAgICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVHbG9iYWxI aXN0b3J5KGNvbnN0IFdlYkNvcmU6OktVUkwmKTsKKyAgICAgICAgdmlydHVhbCB2b2lkIHVwZGF0 ZUdsb2JhbEhpc3RvcnkoKTsKICAgICAgICAgdmlydHVhbCBib29sIHNob3VsZEdvVG9IaXN0b3J5 SXRlbShXZWJDb3JlOjpIaXN0b3J5SXRlbSopIGNvbnN0OwogCiAgICAgICAgIHZpcnR1YWwgV2Vi Q29yZTo6UmVzb3VyY2VFcnJvciBjYW5jZWxsZWRFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZVJlcXVlc3QmKTsKSW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAzODczMCkKKysrIFdlYktpdC9tYWMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDgtMTEtMjQgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIyNDcwCisgICAgICAgICAgcmVtb3ZlIHVubmVlZGVkIFVSTCBhcmd1bWVudCBmcm9tIEZyYW1l TG9hZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5CisKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oOiBSZW1vdmUgYXJndW1lbnQuCisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChXZWJGcmFt ZUxvYWRlckNsaWVudDo6dXBkYXRlR2xvYmFsSGlzdG9yeSk6IEdldCB0aGUgVVJMIGZyb20gdGhl CisgICAgICAgIERvY3VtZW50TG9hZGVyLCBqdXN0IGFzIHdlIGRvIHRoZSB0aXRsZSBhbmQgdGhl IGZhaWx1cmUgZmxhZy4KKwogMjAwOC0xMS0yNCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9u IDM4NzI3KQorKysgV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsNyArMTM2LDcgQEAgcHJpdmF0ZToKIAogICAgIHZp cnR1YWwgdm9pZCBjb21taXR0ZWRMb2FkKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyKiwgY29uc3Qg Y2hhciosIGludCk7CiAgICAgdmlydHVhbCB2b2lkIGZpbmlzaGVkTG9hZGluZyhXZWJDb3JlOjpE b2N1bWVudExvYWRlciopOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVHbG9iYWxIaXN0b3J5KGNv bnN0IFdlYkNvcmU6OktVUkwmKTsKKyAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2xvYmFsSGlzdG9y eSgpOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRHb1RvSGlzdG9yeUl0ZW0oV2ViQ29yZTo6SGlz dG9yeUl0ZW0qKSBjb25zdDsKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBj YW5jZWxsZWRFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKSW5kZXg6IFdl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQko cmV2aXNpb24gMzg3MjgpCisrKyBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC03MTUsMTIgKzcxNSwxMiBAQCB2b2lkIFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpmaW5pc2hlZExvYWRpCiAgICAgW2RhdGFTb3VyY2UobG9hZGVy KSBfZmluaXNoZWRMb2FkaW5nXTsKIH0KIAotdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dXBk YXRlR2xvYmFsSGlzdG9yeShjb25zdCBLVVJMJiB1cmwpCit2b2lkIFdlYkZyYW1lTG9hZGVyQ2xp ZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KCkKIHsKLSAgICBEb2N1bWVudExvYWRlciogZG9jdW1l bnRMb2FkZXIgPSBjb3JlKG1fd2ViRnJhbWUuZ2V0KCkpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2Fk ZXIoKTsKLSAgICBBU1NFUlQodXJsID09IGRvY3VtZW50TG9hZGVyLT51cmxGb3JIaXN0b3J5KCkp OwotICAgIGNvbnN0IFN0cmluZyYgdGl0bGUgPSBkb2N1bWVudExvYWRlci0+dGl0bGUoKTsKLSAg ICBib29sIHdhc0ZhaWx1cmUgPSBkb2N1bWVudExvYWRlci0+dXJsRm9ySGlzdG9yeVJlZmxlY3Rz RmFpbHVyZSgpOworICAgIERvY3VtZW50TG9hZGVyKiBsb2FkZXIgPSBjb3JlKG1fd2ViRnJhbWUu Z2V0KCkpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKTsKKyAgICBjb25zdCBLVVJMJiB1cmwg PSBsb2FkZXItPnVybEZvckhpc3RvcnkoKTsKKyAgICBjb25zdCBTdHJpbmcmIHRpdGxlID0gbG9h ZGVyLT50aXRsZSgpOworICAgIGJvb2wgd2FzRmFpbHVyZSA9IGxvYWRlci0+dXJsRm9ySGlzdG9y eVJlZmxlY3RzRmFpbHVyZSgpOwogICAgIFtbV2ViSGlzdG9yeSBvcHRpb25hbFNoYXJlZEhpc3Rv cnldIF92aXNpdGVkVVJMOnVybCB3aXRoVGl0bGU6dGl0bGUgd2FzRmFpbHVyZTp3YXNGYWlsdXJl XTsKIH0KIApJbmRleDogV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv cXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAzODczMCkKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAwOC0xMS0yNCAgRGFyaW4gQWRsZXIgIDxk YXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgLSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NzAK KyAgICAgICAgICByZW1vdmUgdW5uZWVkZWQgVVJMIGFyZ3VtZW50IGZyb20gRnJhbWVMb2FkZXJD bGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnkKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGll bnRRdDo6dXBkYXRlR2xvYmFsSGlzdG9yeSk6IEdldCB0aGUgVVJMIGZyb20gdGhlCisgICAgICAg IERvY3VtZW50TG9hZGVyLgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuaDogUmVtb3ZlIGFyZ3VtZW50LgorCiAyMDA4LTExLTIwICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IFF0IGJ1aWxkLgpJbmRleDogV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcAkocmV2aXNpb24gMzg3 MjcpCisrKyBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTYwNCwxMSArNjA0LDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGll bnRRdDo6cmVnaXN0ZXJGb3JJY28KICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi12b2lkIEZy YW1lTG9hZGVyQ2xpZW50UXQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnkoY29uc3QgV2ViQ29yZTo6S1VS TCYgdXJsKQordm9pZCBGcmFtZUxvYWRlckNsaWVudFF0Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KCkK IHsKICAgICBRV2ViSGlzdG9yeUludGVyZmFjZSAqaGlzdG9yeSA9IFFXZWJIaXN0b3J5SW50ZXJm YWNlOjpkZWZhdWx0SW50ZXJmYWNlKCk7CiAgICAgaWYgKGhpc3RvcnkpCi0gICAgICAgIGhpc3Rv cnktPmFkZEhpc3RvcnlFbnRyeSh1cmwucHJldHR5VVJMKCkpOworICAgICAgICBoaXN0b3J5LT5h ZGRIaXN0b3J5RW50cnkobV93ZWJGcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnVy bEZvckhpc3RvcnkoKS5wcmV0dHlVUkwoKSk7CiB9CiAKIGJvb2wgRnJhbWVMb2FkZXJDbGllbnRR dDo6c2hvdWxkR29Ub0hpc3RvcnlJdGVtKFdlYkNvcmU6Okhpc3RvcnlJdGVtICppdGVtKSBjb25z dApJbmRleDogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5oCShyZXZpc2lvbiAzODcyNykKKysrIFdlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudFF0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0NCw3ICsxNDQsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBjb21taXR0ZWRMb2FkKFdlYkNvcmU6 OkRvY3VtZW50TG9hZGVyKiwgY29uc3QgY2hhciosIGludCk7CiAgICAgICAgIHZpcnR1YWwgdm9p ZCBmaW5pc2hlZExvYWRpbmcoRG9jdW1lbnRMb2FkZXIqKTsKIAotICAgICAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlR2xvYmFsSGlzdG9yeShjb25zdCBLVVJMJik7CisgICAgICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVHbG9iYWxIaXN0b3J5KCk7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91bGRHb1Rv SGlzdG9yeUl0ZW0oSGlzdG9yeUl0ZW0qKSBjb25zdDsKIAogICAgICAgICB2aXJ0dWFsIFJlc291 cmNlRXJyb3IgY2FuY2VsbGVkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CkluZGV4OiBX ZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL0NoYW5nZUxvZwko cmV2aXNpb24gMzg3MzApCisrKyBXZWJLaXQvd2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDA4LTExLTI0ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MAorICAgICAgICAgIHJl bW92ZSB1bm5lZWRlZCBVUkwgYXJndW1lbnQgZnJvbSBGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRl R2xvYmFsSGlzdG9yeQorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhp c3RvcnkpOiBHZXQgdGhlIFVSTCBmcm9tIHRoZQorICAgICAgICBEb2N1bWVudExvYWRlciwganVz dCBhcyB3ZSBkbyB0aGUgdGl0bGUgYW5kIHRoZSBmYWlsdXJlIGZsYWcuCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaDogUmVtb3ZlIGFyZ3VtZW50LgorCiAy MDA4LTExLTI0ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDM4NzI4KQorKysgV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQxNywxMyArNDE3LDEzIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmZp bmlzaGVkTG9hZGkKICAgICBtX2hhc1NlbnRSZXNwb25zZVRvUGx1Z2luID0gZmFsc2U7CiB9CiAK LXZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnkoY29uc3QgS1VS TCYgdXJsKQordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dXBkYXRlR2xvYmFsSGlzdG9yeSgp CiB7CiAgICAgV2ViSGlzdG9yeSogaGlzdG9yeSA9IFdlYkhpc3Rvcnk6OnNoYXJlZEhpc3Rvcnko KTsKICAgICBpZiAoIWhpc3RvcnkpCiAgICAgICAgIHJldHVybjsKICAgICBEb2N1bWVudExvYWRl ciogbG9hZGVyID0gY29yZShtX3dlYkZyYW1lKS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCk7 Ci0gICAgaGlzdG9yeS0+YWRkSXRlbSh1cmwsIGxvYWRlci0+dGl0bGUoKSwgbG9hZGVyLT51cmxG b3JIaXN0b3J5UmVmbGVjdHNGYWlsdXJlKCkpOyAgICAgICAgICAgICAgICAgCisgICAgaGlzdG9y eS0+YWRkSXRlbShsb2FkZXItPnVybEZvckhpc3RvcnkoKSwgbG9hZGVyLT50aXRsZSgpLCBsb2Fk ZXItPnVybEZvckhpc3RvcnlSZWZsZWN0c0ZhaWx1cmUoKSk7ICAgICAgICAgICAgICAgICAKIH0K IAogYm9vbCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2hvdWxkR29Ub0hpc3RvcnlJdGVtKEhpc3Rv cnlJdGVtKikgY29uc3QKSW5kZXg6IFdlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVM b2FkZXJDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDM4NzI3KQorKysgV2ViS2l0L3dpbi9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Myw3 ICs4Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY29tbWl0dGVkTG9hZChXZWJDb3Jl OjpEb2N1bWVudExvYWRlciosIGNvbnN0IGNoYXIqLCBpbnQpOwogICAgIHZpcnR1YWwgdm9pZCBm aW5pc2hlZExvYWRpbmcoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXIqKTsKIAotICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVHbG9iYWxIaXN0b3J5KGNvbnN0IFdlYkNvcmU6OktVUkwmKTsKKyAgICB2aXJ0 dWFsIHZvaWQgdXBkYXRlR2xvYmFsSGlzdG9yeSgpOwogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRH b1RvSGlzdG9yeUl0ZW0oV2ViQ29yZTo6SGlzdG9yeUl0ZW0qKSBjb25zdDsKIAogICAgIHZpcnR1 YWwgUGFzc1JlZlB0cjxXZWJDb3JlOjpEb2N1bWVudExvYWRlcj4gY3JlYXRlRG9jdW1lbnRMb2Fk ZXIoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6U3Vic3Rp dHV0ZURhdGEmKTsKSW5kZXg6IFdlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L3d4L0NoYW5nZUxvZwkocmV2aXNpb24gMzg3MzApCisrKyBXZWJLaXQvd3gvQ2hhbmdlTG9n CSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDgtMTEtMjQgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NDcwCisgICAgICAgICAgcmVtb3ZlIHVubmVlZGVkIFVSTCBhcmd1bWVudCBmcm9tIEZyYW1lTG9h ZGVyQ2xpZW50Ojp1cGRhdGVHbG9iYWxIaXN0b3J5CisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJD bGllbnRXeDo6dXBkYXRlR2xvYmFsSGlzdG9yeSk6IFJlbW92ZSBhcmd1bWVudC4KKyAgICAgICAg KiBXZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guaDogRGl0dG8uCisKIDIwMDgtMTEt MjEgIEtldmluIFdhdHRlcnMgIDxrZXZpbndhdHRlcnNAZ21haWwuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEtldmluIE9sbGl2aWVyLgpJbmRleDogV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRXeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L1dlYktpdFN1 cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRXeC5jcHAJKHJldmlzaW9uIDM4NzI3KQorKysgV2ViS2l0 L3d4L1dlYktpdFN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRXeC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUyOSw3ICs1MjksNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50V3g6OnBhcnRDbGVhcmVk SW5CCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlckNsaWVudFd4 Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KGNvbnN0IFdlYkNvcmU6OktVUkwmKQordm9pZCBGcmFtZUxv YWRlckNsaWVudFd4Ojp1cGRhdGVHbG9iYWxIaXN0b3J5KCkKIHsKICAgICBub3RJbXBsZW1lbnRl ZCgpOwogfQpJbmRleDogV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRX eC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50V3guaAkocmV2aXNpb24gMzg3MjcpCisrKyBXZWJLaXQvd3gvV2ViS2l0U3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudFd4LmgJKHdvcmtpbmcgY29weSkKQEAgLTE0OSw3ICsxNDksNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgdm9pZCB0cmFuc2l0aW9uVG9Db21taXR0 ZWRGcm9tQ2FjaGVkUGFnZShXZWJDb3JlOjpDYWNoZWRQYWdlKik7CiAgICAgICAgIHZpcnR1YWwg dm9pZCB0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCk7CiAgICAgICAgIAotICAgICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlR2xvYmFsSGlzdG9yeShjb25zdCBLVVJMJik7CisgICAgICAg IHZpcnR1YWwgdm9pZCB1cGRhdGVHbG9iYWxIaXN0b3J5KCk7CiAgICAgICAgIHZpcnR1YWwgYm9v bCBzaG91bGRHb1RvSGlzdG9yeUl0ZW0oSGlzdG9yeUl0ZW0qKSBjb25zdDsKICAgICAgICAgdmly dHVhbCB2b2lkIHNhdmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRl bSopOwogICAgICAgICB2aXJ0dWFsIGJvb2wgY2FuQ2FjaGVQYWdlKCkgY29uc3Q7Cg==