145459 2015-05-29 09:11:55 -0700 Small FrameLoader refactoring 2015-05-29 09:32:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson commit-queue japhet oldest_to_newest 1098121 0 beidson 2015-05-29 09:11:55 -0700 Small FrameLoader refactoring A couple of the load methods take a whole bunch of arguments broken out from a FrameLoadRequest. The callers already *have* a FrameLoadRequest. They should just pass along the entire FrameLoadRequest. 1098122 1 253902 beidson 2015-05-29 09:14:33 -0700 Created attachment 253902 Patch v1 1098125 2 253902 achristensen 2015-05-29 09:26:14 -0700 Comment on attachment 253902 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=253902&action=review lgtm except one thing: > Source/WebCore/loader/FrameLoader.cpp:918 > + FrameLoadRequest frameLoadRequest(m_frame.document()->securityOrigin(), ResourceRequest(url), "_self", LockHistory::No, LockBackForwardList::No, ShouldSendReferrer::MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Suppress, ReplaceDocumentIfJavaScriptURL); I think this should have LockBackForwardList::Yes instead of no. 1098126 3 beidson 2015-05-29 09:32:22 -0700 http://trac.webkit.org/changeset/184987 253902 2015-05-29 09:14:33 -0700 2015-05-29 09:26:14 -0700 Patch v1 patch text/plain 7809 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhZTIzOWFiLi5iMjBjNWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTUtMDUtMjkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFNtYWxsIEZyYW1lTG9hZGVyIHJlZmFjdG9yaW5nLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1NDU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChObyBiZWhhdmlvciBjaGFu Z2UpLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpsb2FkVVJMSW50b0NoaWxkRnJhbWUpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVMb2FkZXI6OmxvYWRGcmFtZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXI6OmxvYWRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRQ b3N0UmVxdWVzdCk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisKIDIwMTUtMDUt MjkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAogICAgICAg ICBNZWRpYURldmljZXMuZ2V0VXNlck1lZGlhIHNob3VsZCByZWplY3QgcHJvbWlzZSBpbnN0ZWFk IG9mIHRocm93aW5nIGV4Y2VwdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CmluZGV4IGYzYjY5OGEuLmUzN2VlMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVy LmNwcApAQCAtOTE1LDggKzkxNSw4IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRVUkxJbnRvQ2hp bGRGcmFtZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcmVyLCBGCiAgICAgICAg IH0KICAgICB9CiAKLSAgICBjaGlsZEZyYW1lLT5sb2FkZXIoKS5sb2FkVVJMKHVybCwgcmVmZXJl ciwgIl9zZWxmIiwgTG9ja0hpc3Rvcnk6Ok5vLCBGcmFtZUxvYWRUeXBlOjpSZWRpcmVjdFdpdGhM b2NrZWRCYWNrRm9yd2FyZExpc3QsIDAsIDAsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTDo6 WWVzLCBOZXdGcmFtZU9wZW5lclBvbGljeTo6U3VwcHJlc3MpOwotfQorICAgIEZyYW1lTG9hZFJl cXVlc3QgZnJhbWVMb2FkUmVxdWVzdChtX2ZyYW1lLmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2lu KCksIFJlc291cmNlUmVxdWVzdCh1cmwpLCAiX3NlbGYiLCBMb2NrSGlzdG9yeTo6Tm8sIExvY2tC YWNrRm9yd2FyZExpc3Q6Ok5vLCBTaG91bGRTZW5kUmVmZXJyZXI6Ok1heWJlU2VuZFJlZmVycmVy LCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6 OlN1cHByZXNzLCBSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwpOworICAgIGNoaWxkRnJh bWUtPmxvYWRlcigpLmxvYWRVUkwoZnJhbWVMb2FkUmVxdWVzdCwgcmVmZXJlciwgRnJhbWVMb2Fk VHlwZTo6UmVkaXJlY3RXaXRoTG9ja2VkQmFja0ZvcndhcmRMaXN0LCAwLCAwKTt9CiAKICNpZiBF TkFCTEUoV0VCX0FSQ0hJVkUpIHx8IEVOQUJMRShNSFRNTCkKIHZvaWQgRnJhbWVMb2FkZXI6Omxv YWRBcmNoaXZlKFBhc3NSZWZQdHI8QXJjaGl2ZT4gYXJjaGl2ZSkKQEAgLTExNzAsOSArMTE3MCw5 IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRGcmFtZVJlcXVlc3QoY29uc3QgRnJhbWVMb2FkUmVx dWVzdCYgcmVxdWVzdCwgUGFzc1JlZlB0cjxFCiAgICAgICAgIGxvYWRUeXBlID0gRnJhbWVMb2Fk VHlwZTo6U3RhbmRhcmQ7CiAKICAgICBpZiAocmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS5odHRw TWV0aG9kKCkgPT0gIlBPU1QiKQotICAgICAgICBsb2FkUG9zdFJlcXVlc3QocmVxdWVzdC5yZXNv dXJjZVJlcXVlc3QoKSwgcmVmZXJyZXIsIHJlcXVlc3QuZnJhbWVOYW1lKCksIHJlcXVlc3QubG9j a0hpc3RvcnkoKSwgbG9hZFR5cGUsIGV2ZW50LCBmb3JtU3RhdGUuZ2V0KCksIHJlcXVlc3QuYWxs b3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMKCksIHJlcXVlc3QubmV3RnJhbWVPcGVuZXJQb2xpY3ko KSk7CisgICAgICAgIGxvYWRQb3N0UmVxdWVzdChyZXF1ZXN0LCByZWZlcnJlciwgbG9hZFR5cGUs IGV2ZW50LCBmb3JtU3RhdGUuZ2V0KCkpOwogICAgIGVsc2UKLSAgICAgICAgbG9hZFVSTChyZXF1 ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpLCByZWZlcnJlciwgcmVxdWVzdC5mcmFtZU5hbWUo KSwgcmVxdWVzdC5sb2NrSGlzdG9yeSgpLCBsb2FkVHlwZSwgZXZlbnQsIGZvcm1TdGF0ZS5nZXQo KSwgcmVxdWVzdC5hbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwoKSwgcmVxdWVzdC5uZXdGcmFt ZU9wZW5lclBvbGljeSgpKTsKKyAgICAgICAgbG9hZFVSTChyZXF1ZXN0LCByZWZlcnJlciwgbG9h ZFR5cGUsIGV2ZW50LCBmb3JtU3RhdGUuZ2V0KCkpOwogCiAgICAgLy8gRklYTUU6IEl0J3MgcG9z c2libGUgdGhpcyB0YXJnZXRGcmFtZSB3aWxsIG5vdCBiZSB0aGUgc2FtZSBmcmFtZSB0aGF0IHdh cyB0YXJnZXRlZCBieSB0aGUgYWN0dWFsCiAgICAgLy8gbG9hZCBpZiBmcmFtZSBuYW1lcyBoYXZl IGNoYW5nZWQuCkBAIC0xMTg2LDE3ICsxMTg2LDIxIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRG cmFtZVJlcXVlc3QoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgcmVxdWVzdCwgUGFzc1JlZlB0cjxF CiAgICAgfQogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpsb2FkVVJMKGNvbnN0IFVSTCYgbmV3VVJM LCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgTG9ja0hp c3RvcnkgbG9ja0hpc3RvcnksIEZyYW1lTG9hZFR5cGUgbmV3TG9hZFR5cGUsCi0gICAgUGFzc1Jl ZlB0cjxFdmVudD4gZXZlbnQsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiBwcnBGb3JtU3RhdGUsIEFs bG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCBhbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIE5l d0ZyYW1lT3BlbmVyUG9saWN5IG9wZW5lclBvbGljeSkKK3ZvaWQgRnJhbWVMb2FkZXI6OmxvYWRV UkwoY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgZnJhbWVMb2FkUmVxdWVzdCwgY29uc3QgU3RyaW5n JiByZWZlcnJlciwgRnJhbWVMb2FkVHlwZSBuZXdMb2FkVHlwZSwgUGFzc1JlZlB0cjxFdmVudD4g ZXZlbnQsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiBwcnBGb3JtU3RhdGUpCiB7CiAgICAgaWYgKG1f aW5TdG9wQWxsTG9hZGVycykKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVmPEZyYW1lPiBwcm90 ZWN0KG1fZnJhbWUpOwogCisgICAgU3RyaW5nIGZyYW1lTmFtZSA9IGZyYW1lTG9hZFJlcXVlc3Qu ZnJhbWVOYW1lKCk7CisgICAgQWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMIGFsbG93TmF2aWdh dGlvblRvSW52YWxpZFVSTCA9IGZyYW1lTG9hZFJlcXVlc3QuYWxsb3dOYXZpZ2F0aW9uVG9JbnZh bGlkVVJMKCk7CisgICAgTmV3RnJhbWVPcGVuZXJQb2xpY3kgb3BlbmVyUG9saWN5ID0gZnJhbWVM b2FkUmVxdWVzdC5uZXdGcmFtZU9wZW5lclBvbGljeSgpOworICAgIExvY2tIaXN0b3J5IGxvY2tI aXN0b3J5ID0gZnJhbWVMb2FkUmVxdWVzdC5sb2NrSGlzdG9yeSgpOwogICAgIFJlZlB0cjxGb3Jt U3RhdGU+IGZvcm1TdGF0ZSA9IHBycEZvcm1TdGF0ZTsKICAgICBib29sIGlzRm9ybVN1Ym1pc3Np b24gPSBmb3JtU3RhdGU7Ci0gICAgCisKKyAgICBjb25zdCBVUkwmIG5ld1VSTCA9IGZyYW1lTG9h ZFJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCkudXJsKCk7CiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl cXVlc3QobmV3VVJMKTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkgewogICAgICAgICBy ZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CkBAIC0xMjE2LDcgKzEyMjAsOSBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpsb2FkVVJMKGNvbnN0IFVSTCYgbmV3VVJMLCBjb25zdCBTdHJpbmcm IHJlZmVycmVyLCBjb25zdCBTdHJpbgogICAgIC8vIFRoZSBzZWFyY2ggZm9yIGEgdGFyZ2V0IGZy YW1lIGlzIGRvbmUgZWFybGllciBpbiB0aGUgY2FzZSBvZiBmb3JtIHN1Ym1pc3Npb24uCiAgICAg RnJhbWUqIHRhcmdldEZyYW1lID0gaXNGb3JtU3VibWlzc2lvbiA/IDAgOiBmaW5kRnJhbWVGb3JO YXZpZ2F0aW9uKGZyYW1lTmFtZSk7CiAgICAgaWYgKHRhcmdldEZyYW1lICYmIHRhcmdldEZyYW1l ICE9ICZtX2ZyYW1lKSB7Ci0gICAgICAgIHRhcmdldEZyYW1lLT5sb2FkZXIoKS5sb2FkVVJMKG5l d1VSTCwgcmVmZXJyZXIsICJfc2VsZiIsIGxvY2tIaXN0b3J5LCBuZXdMb2FkVHlwZSwgZXZlbnQs IGZvcm1TdGF0ZS5yZWxlYXNlKCksIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgb3BlbmVy UG9saWN5KTsKKyAgICAgICAgRnJhbWVMb2FkUmVxdWVzdCBuZXdGcmFtZUxvYWRSZXF1ZXN0KGZy YW1lTG9hZFJlcXVlc3QpOworICAgICAgICBuZXdGcmFtZUxvYWRSZXF1ZXN0LnNldEZyYW1lTmFt ZSgiX3NlbGYiKTsKKyAgICAgICAgdGFyZ2V0RnJhbWUtPmxvYWRlcigpLmxvYWRVUkwobmV3RnJh bWVMb2FkUmVxdWVzdCwgcmVmZXJyZXIsIG5ld0xvYWRUeXBlLCBldmVudCwgZm9ybVN0YXRlLnJl bGVhc2UoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI2MTEsMTQgKzI2MTcsMTYg QEAgdm9pZCBGcmFtZUxvYWRlcjo6YWRkSFRUUE9yaWdpbklmTmVlZGVkKFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgY29uc3QgU3RyaW5nJgogICAgIHJlcXVlc3Quc2V0SFRUUE9yaWdpbihvcmln aW4pOwogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpsb2FkUG9zdFJlcXVlc3QoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiBpblJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIGNvbnN0IFN0cmlu ZyYgZnJhbWVOYW1lLCBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSwgRnJhbWVMb2FkVHlwZSBsb2Fk VHlwZSwgUGFzc1JlZlB0cjxFdmVudD4gZXZlbnQsIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPiBwcnBG b3JtU3RhdGUsIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCBhbGxvd05hdmlnYXRpb25Ub0lu dmFsaWRVUkwsIE5ld0ZyYW1lT3BlbmVyUG9saWN5IG9wZW5lclBvbGljeSkKK3ZvaWQgRnJhbWVM b2FkZXI6OmxvYWRQb3N0UmVxdWVzdChjb25zdCBGcmFtZUxvYWRSZXF1ZXN0JiByZXF1ZXN0LCBj b25zdCBTdHJpbmcmIHJlZmVycmVyLCBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlLCBQYXNzUmVmUHRy PEV2ZW50PiBldmVudCwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+IHBycEZvcm1TdGF0ZSkKIHsKICAg ICBSZWZQdHI8Rm9ybVN0YXRlPiBmb3JtU3RhdGUgPSBwcnBGb3JtU3RhdGU7CiAKLSAgICAvLyBQ cmV2aW91c2x5IHdoZW4gdGhpcyBtZXRob2Qgd2FzIHJlYWNoZWQsIHRoZSBvcmlnaW5hbCBGcmFt ZUxvYWRSZXF1ZXN0IGhhZCBiZWVuIGRlY29uc3RydWN0ZWQgdG8gYnVpbGQgYSAKLSAgICAvLyBi dW5jaCBvZiBwYXJhbWV0ZXJzIHRoYXQgd291bGQgY29tZSBpbiBoZXJlIGFuZCB0aGVuIGJlIGJ1 aWx0IGJhY2sgdXAgdG8gYSBSZXNvdXJjZVJlcXVlc3QuICBJbiBjYXNlCi0gICAgLy8gYW55IGNh bGxlciBkZXBlbmRzIG9uIHRoZSBpbW11dGFiaWxpdHkgb2YgdGhlIG9yaWdpbmFsIFJlc291cmNl UmVxdWVzdCwgSSdtIHJlYnVpbGRpbmcgYSBSZXNvdXJjZVJlcXVlc3QKLSAgICAvLyBmcm9tIHNj cmF0Y2ggYXMgaXQgZGlkIGFsbCBhbG9uZy4KKyAgICBTdHJpbmcgZnJhbWVOYW1lID0gcmVxdWVz dC5mcmFtZU5hbWUoKTsKKyAgICBMb2NrSGlzdG9yeSBsb2NrSGlzdG9yeSA9IHJlcXVlc3QubG9j a0hpc3RvcnkoKTsKKyAgICBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwgYWxsb3dOYXZpZ2F0 aW9uVG9JbnZhbGlkVVJMID0gcmVxdWVzdC5hbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwoKTsK KyAgICBOZXdGcmFtZU9wZW5lclBvbGljeSBvcGVuZXJQb2xpY3kgPSByZXF1ZXN0Lm5ld0ZyYW1l T3BlbmVyUG9saWN5KCk7CisKKyAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIGluUmVxdWVzdCA9 IHJlcXVlc3QucmVzb3VyY2VSZXF1ZXN0KCk7CiAgICAgY29uc3QgVVJMJiB1cmwgPSBpblJlcXVl c3QudXJsKCk7CiAgICAgUmVmUHRyPEZvcm1EYXRhPiBmb3JtRGF0YSA9IGluUmVxdWVzdC5odHRw Qm9keSgpOwogICAgIGNvbnN0IFN0cmluZyYgY29udGVudFR5cGUgPSBpblJlcXVlc3QuaHR0cENv bnRlbnRUeXBlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IDU3OTgwN2Eu LmFlM2IxYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0zNTIsMTAgKzM1 Miw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBsb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24oY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYsICAgICAgLy8gQ2FsbHMg bG9hZFdpdGhEb2N1bWVudExvYWRlcgogICAgICAgICBMb2NrSGlzdG9yeSwgRnJhbWVMb2FkVHlw ZSwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+LCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwpOwog Ci0gICAgdm9pZCBsb2FkUG9zdFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3Qg U3RyaW5nJiByZWZlcnJlciwgICAgICAgICAgICAgICAgLy8gQ2FsbGVkIGJ5IGxvYWRGcmFtZVJl cXVlc3QsIGNhbGxzIGxvYWRXaXRoTmF2aWdhdGlvbkFjdGlvbgotICAgICAgICBjb25zdCBTdHJp bmcmIGZyYW1lTmFtZSwgTG9ja0hpc3RvcnksIEZyYW1lTG9hZFR5cGUsIFBhc3NSZWZQdHI8RXZl bnQ+LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4sIEFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwg TmV3RnJhbWVPcGVuZXJQb2xpY3kpOwotICAgIHZvaWQgbG9hZFVSTChjb25zdCBVUkwmLCBjb25z dCBTdHJpbmcmIHJlZmVycmVyLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgICAgICAgICAgLy8g Q2FsbGVkIGJ5IGxvYWRGcmFtZVJlcXVlc3QsIGNhbGxzIGxvYWRXaXRoTmF2aWdhdGlvbkFjdGlv biBvciBkaXNwYXRjaGVzIHRvIG5hdmlnYXRpb24gcG9saWN5IGRlbGVnYXRlCi0gICAgICAgIExv Y2tIaXN0b3J5LCBGcmFtZUxvYWRUeXBlLCBQYXNzUmVmUHRyPEV2ZW50PiwgUGFzc1JlZlB0cjxG b3JtU3RhdGU+LCBBbGxvd05hdmlnYXRpb25Ub0ludmFsaWRVUkwsIE5ld0ZyYW1lT3BlbmVyUG9s aWN5KTsKKyAgICB2b2lkIGxvYWRQb3N0UmVxdWVzdChjb25zdCBGcmFtZUxvYWRSZXF1ZXN0Jiwg Y29uc3QgU3RyaW5nJiByZWZlcnJlciwgRnJhbWVMb2FkVHlwZSwgUGFzc1JlZlB0cjxFdmVudD4s IFBhc3NSZWZQdHI8Rm9ybVN0YXRlPik7CisgICAgdm9pZCBsb2FkVVJMKGNvbnN0IEZyYW1lTG9h ZFJlcXVlc3QmLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBGcmFtZUxvYWRUeXBlLCBQYXNzUmVm UHRyPEV2ZW50PiwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+KTsKIAogICAgIGJvb2wgc2hvdWxkUmVs b2FkKGNvbnN0IFVSTCYgY3VycmVudFVSTCwgY29uc3QgVVJMJiBkZXN0aW5hdGlvblVSTCk7CiAK