158046 2016-05-24 16:35:56 -0700 Update constructRevalidationRequest() to stop returning a unique_ptr<ResourceRequest> 2016-05-25 03:58:02 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez cgarcia commit-queue koivisto oldest_to_newest 1196069 0 cdumez 2016-05-24 16:35:56 -0700 Update constructRevalidationRequest() to stop returning a unique_ptr<ResourceRequest> and to return a ResourceRequest instead. There is no reason for it to return a pointer. 1196073 1 279721 cdumez 2016-05-24 16:37:29 -0700 Created attachment 279721 Patch 1196275 2 279721 commit-queue 2016-05-25 03:57:58 -0700 Comment on attachment 279721 Patch Clearing flags on attachment: 279721 Committed r201376: <http://trac.webkit.org/changeset/201376> 1196276 3 commit-queue 2016-05-25 03:58:02 -0700 All reviewed patches have been landed. Closing bug. 279721 2016-05-24 16:37:29 -0700 2016-05-25 03:57:58 -0700 Patch bug-158046-20160524163835.patch text/plain 8344 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTY1OGIwNDY5NWRmYmM2 OTBiMjJmNmY3NWM0N2JmMzJmNjEwY2ExYS4uMWMyMzVjY2UwMGQxMTc2ZTExM2M4NmU3NjEwNzI2 MjZiZWZkYjMzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE2LTA1LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGNvbnN0cnVjdFJl dmFsaWRhdGlvblJlcXVlc3QoKSB0byBzdG9wIHJldHVybmluZyBhIHVuaXF1ZV9wdHI8UmVzb3Vy Y2VSZXF1ZXN0PgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU4MDQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVXBkYXRlIGNvbnN0cnVjdFJldmFsaWRhdGlvblJlcXVlc3QoKSB0byBzdG9wIHJldHVybmlu ZyBhIHVuaXF1ZV9wdHI8UmVzb3VyY2VSZXF1ZXN0PgorICAgICAgICBhbmQgdG8gcmV0dXJuIGEg UmVzb3VyY2VSZXF1ZXN0IGluc3RlYWQuIFRoZXJlIGlzIG5vIHJlYXNvbiBmb3IgaXQgdG8gcmV0 dXJuIGEKKyAgICAgICAgcG9pbnRlci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrQ2FjaGU6OmNvbnN0cnVjdFJldmFsaWRhdGlvblJlcXVlc3QpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlNwZWN1bGF0aXZlTG9hZE1hbmFnZXI6OlByZWxvYWRlZEVu dHJ5OjpQcmVsb2FkZWRFbnRyeSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3Bl Y3VsYXRpdmVMb2FkTWFuYWdlcjo6UHJlbG9hZGVkRW50cnk6OnJldmFsaWRhdGlvblJlcXVlc3Qp OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlNwZWN1bGF0aXZlTG9hZE1hbmFnZXI6 OmFkZFByZWxvYWRlZEVudHJ5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTcGVj dWxhdGl2ZUxvYWRNYW5hZ2VyOjpyZXZhbGlkYXRlRW50cnkpOgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaDoKKwogMjAx Ni0wNS0yNCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMjAxMzQ5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2FkTWFuYWdl ci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVT cGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcAppbmRleCBiZDllNTE2M2QyMjNkYTUwZjFiNGExNWFh Nzg1MGZlZjU1YjllOGZiLi44OWI2MDdlNmVlZDBlZThjNzIwZGYwNjA0MDNlNTk5ZDgyOGQxY2Jj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmNwcApA QCAtODQsMjUgKzg0LDI1IEBAIHN0YXRpYyBpbmxpbmUgS2V5IG1ha2VTdWJyZXNvdXJjZXNLZXko Y29uc3QgS2V5JiByZXNvdXJjZUtleSkKICAgICByZXR1cm4gS2V5KHJlc291cmNlS2V5LnBhcnRp dGlvbigpLCBzdWJyZXNvdXJjZXNUeXBlKCksIHJlc291cmNlS2V5LnJhbmdlKCksIHJlc291cmNl S2V5LmlkZW50aWZpZXIoKSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPFJl c291cmNlUmVxdWVzdD4gY29uc3RydWN0UmV2YWxpZGF0aW9uUmVxdWVzdChjb25zdCBFbnRyeSYg ZW50cnksIGNvbnN0IFN1YnJlc291cmNlSW5mbyYgc3ViUmVzb3VyY2VJbmZvKQorc3RhdGljIGlu bGluZSBSZXNvdXJjZVJlcXVlc3QgY29uc3RydWN0UmV2YWxpZGF0aW9uUmVxdWVzdChjb25zdCBF bnRyeSYgZW50cnksIGNvbnN0IFN1YnJlc291cmNlSW5mbyYgc3ViUmVzb3VyY2VJbmZvKQogewot ICAgIGF1dG8gcmV2YWxpZGF0aW9uUmVxdWVzdCA9IHN0ZDo6bWFrZV91bmlxdWU8UmVzb3VyY2VS ZXF1ZXN0PihlbnRyeS5rZXkoKS5pZGVudGlmaWVyKCkpOwotICAgIHJldmFsaWRhdGlvblJlcXVl c3QtPnNldEhUVFBIZWFkZXJGaWVsZHMoc3ViUmVzb3VyY2VJbmZvLnJlcXVlc3RIZWFkZXJzKTsK LSAgICByZXZhbGlkYXRpb25SZXF1ZXN0LT5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhzdWJSZXNv dXJjZUluZm8uZmlyc3RQYXJ0eUZvckNvb2tpZXMpOworICAgIFJlc291cmNlUmVxdWVzdCByZXZh bGlkYXRpb25SZXF1ZXN0KGVudHJ5LmtleSgpLmlkZW50aWZpZXIoKSk7CisgICAgcmV2YWxpZGF0 aW9uUmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGRzKHN1YlJlc291cmNlSW5mby5yZXF1ZXN0SGVh ZGVycyk7CisgICAgcmV2YWxpZGF0aW9uUmVxdWVzdC5zZXRGaXJzdFBhcnR5Rm9yQ29va2llcyhz dWJSZXNvdXJjZUluZm8uZmlyc3RQYXJ0eUZvckNvb2tpZXMpOwogI2lmIEVOQUJMRShDQUNIRV9Q QVJUSVRJT05JTkcpCiAgICAgaWYgKGVudHJ5LmtleSgpLmhhc1BhcnRpdGlvbigpKQotICAgICAg ICByZXZhbGlkYXRpb25SZXF1ZXN0LT5zZXRDYWNoZVBhcnRpdGlvbihlbnRyeS5rZXkoKS5wYXJ0 aXRpb24oKSk7CisgICAgICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0Q2FjaGVQYXJ0aXRpb24o ZW50cnkua2V5KCkucGFydGl0aW9uKCkpOwogI2VuZGlmCiAgICAgQVNTRVJUX1dJVEhfTUVTU0FH RShlbnRyeS5rZXkoKS5yYW5nZSgpLmlzRW1wdHkoKSwgInJhbmdlIGlzIG5vdCBzdXBwb3J0ZWQi KTsKIAotICAgIHJldmFsaWRhdGlvblJlcXVlc3QtPm1ha2VVbmNvbmRpdGlvbmFsKCk7CisgICAg cmV2YWxpZGF0aW9uUmVxdWVzdC5tYWtlVW5jb25kaXRpb25hbCgpOwogICAgIFN0cmluZyBlVGFn ID0gZW50cnkucmVzcG9uc2UoKS5odHRwSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OkVUYWcp OwogICAgIGlmICghZVRhZy5pc0VtcHR5KCkpCi0gICAgICAgIHJldmFsaWRhdGlvblJlcXVlc3Qt PnNldEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6SWZOb25lTWF0Y2gsIGVUYWcpOwor ICAgICAgICByZXZhbGlkYXRpb25SZXF1ZXN0LnNldEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVy TmFtZTo6SWZOb25lTWF0Y2gsIGVUYWcpOwogCiAgICAgU3RyaW5nIGxhc3RNb2RpZmllZCA9IGVu dHJ5LnJlc3BvbnNlKCkuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpMYXN0TW9kaWZp ZWQpOwogICAgIGlmICghbGFzdE1vZGlmaWVkLmlzRW1wdHkoKSkKLSAgICAgICAgcmV2YWxpZGF0 aW9uUmVxdWVzdC0+c2V0SFRUUEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpJZk1vZGlmaWVk U2luY2UsIGxhc3RNb2RpZmllZCk7CisgICAgICAgIHJldmFsaWRhdGlvblJlcXVlc3Quc2V0SFRU UEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpJZk1vZGlmaWVkU2luY2UsIGxhc3RNb2RpZmll ZCk7CiAKICAgICByZXR1cm4gcmV2YWxpZGF0aW9uUmVxdWVzdDsKIH0KQEAgLTEzMyw3ICsxMzMs NyBAQCBwcml2YXRlOgogY2xhc3MgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6UHJlbG9hZGVkRW50 cnkgOiBwcml2YXRlIEV4cGlyaW5nRW50cnkgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVE OwogcHVibGljOgotICAgIFByZWxvYWRlZEVudHJ5KHN0ZDo6dW5pcXVlX3B0cjxFbnRyeT4gZW50 cnksIHN0ZDo6dW5pcXVlX3B0cjxSZXNvdXJjZVJlcXVlc3Q+IHNwZWN1bGF0aXZlVmFsaWRhdGlv blJlcXVlc3QsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiYmIGxpZmV0aW1lUmVhY2hlZEhhbmRsZXIp CisgICAgUHJlbG9hZGVkRW50cnkoc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBlbnRyeSwgT3B0aW9u YWw8UmVzb3VyY2VSZXF1ZXN0PiYmIHNwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVlc3QsIHN0ZDo6 ZnVuY3Rpb248dm9pZCgpPiYmIGxpZmV0aW1lUmVhY2hlZEhhbmRsZXIpCiAgICAgICAgIDogRXhw aXJpbmdFbnRyeShXVEZNb3ZlKGxpZmV0aW1lUmVhY2hlZEhhbmRsZXIpKQogICAgICAgICAsIG1f ZW50cnkoV1RGTW92ZShlbnRyeSkpCiAgICAgICAgICwgbV9zcGVjdWxhdGl2ZVZhbGlkYXRpb25S ZXF1ZXN0KFdURk1vdmUoc3BlY3VsYXRpdmVWYWxpZGF0aW9uUmVxdWVzdCkpCkBAIC0xNDUsMTIg KzE0NSwxMiBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiBXVEZNb3ZlKG1fZW50cnkpOwogICAg IH0KIAotICAgIFJlc291cmNlUmVxdWVzdCogcmV2YWxpZGF0aW9uUmVxdWVzdCgpIGNvbnN0IHsg cmV0dXJuIG1fc3BlY3VsYXRpdmVWYWxpZGF0aW9uUmVxdWVzdC5nZXQoKTsgfQorICAgIGNvbnN0 IE9wdGlvbmFsPFJlc291cmNlUmVxdWVzdD4mIHJldmFsaWRhdGlvblJlcXVlc3QoKSBjb25zdCB7 IHJldHVybiBtX3NwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVlc3Q7IH0KICAgICBib29sIHdhc1Jl dmFsaWRhdGVkKCkgY29uc3QgeyByZXR1cm4gISFtX3NwZWN1bGF0aXZlVmFsaWRhdGlvblJlcXVl c3Q7IH0KIAogcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IG1fZW50cnk7Ci0g ICAgc3RkOjp1bmlxdWVfcHRyPFJlc291cmNlUmVxdWVzdD4gbV9zcGVjdWxhdGl2ZVZhbGlkYXRp b25SZXF1ZXN0OworICAgIE9wdGlvbmFsPFJlc291cmNlUmVxdWVzdD4gbV9zcGVjdWxhdGl2ZVZh bGlkYXRpb25SZXF1ZXN0OwogfTsKIAogY2xhc3MgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6UGVu ZGluZ0ZyYW1lTG9hZCA6IHB1YmxpYyBSZWZDb3VudGVkPFBlbmRpbmdGcmFtZUxvYWQ+IHsKQEAg LTM5Miw3ICszOTIsNyBAQCB2b2lkIFNwZWN1bGF0aXZlTG9hZE1hbmFnZXI6OnJlZ2lzdGVyTG9h ZChjb25zdCBHbG9iYWxGcmFtZUlEJiBmcmFtZUlELCBjb25zdCBSZQogICAgICAgICBwZW5kaW5n RnJhbWVMb2FkLT5yZWdpc3RlclN1YnJlc291cmNlTG9hZChyZXF1ZXN0LCByZXNvdXJjZUtleSk7 CiB9CiAKLXZvaWQgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6YWRkUHJlbG9hZGVkRW50cnkoc3Rk Ojp1bmlxdWVfcHRyPEVudHJ5PiBlbnRyeSwgY29uc3QgR2xvYmFsRnJhbWVJRCYgZnJhbWVJRCwg c3RkOjp1bmlxdWVfcHRyPFJlc291cmNlUmVxdWVzdD4gcmV2YWxpZGF0aW9uUmVxdWVzdCkKK3Zv aWQgU3BlY3VsYXRpdmVMb2FkTWFuYWdlcjo6YWRkUHJlbG9hZGVkRW50cnkoc3RkOjp1bmlxdWVf cHRyPEVudHJ5PiBlbnRyeSwgY29uc3QgR2xvYmFsRnJhbWVJRCYgZnJhbWVJRCwgT3B0aW9uYWw8 UmVzb3VyY2VSZXF1ZXN0PiYmIHJldmFsaWRhdGlvblJlcXVlc3QpCiB7CiAgICAgQVNTRVJUKGVu dHJ5KTsKICAgICBBU1NFUlQoIWVudHJ5LT5uZWVkc1ZhbGlkYXRpb24oKSk7CkBAIC00NjMsMTUg KzQ2MywxNCBAQCB2b2lkIFNwZWN1bGF0aXZlTG9hZE1hbmFnZXI6OnJldmFsaWRhdGVFbnRyeShz dGQ6OnVuaXF1ZV9wdHI8RW50cnk+IGVudHJ5LCBjb25zdAogICAgIGlmICgha2V5LnJhbmdlKCku aXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZXNvdXJjZVJlcXVlc3QqIHJldmFs aWRhdGlvblJlcXVlc3RQdHIgPSBjb25zdHJ1Y3RSZXZhbGlkYXRpb25SZXF1ZXN0KCplbnRyeSwg c3VicmVzb3VyY2VJbmZvKS5yZWxlYXNlKCk7CisgICAgUmVzb3VyY2VSZXF1ZXN0IHJldmFsaWRh dGlvblJlcXVlc3QgPSBjb25zdHJ1Y3RSZXZhbGlkYXRpb25SZXF1ZXN0KCplbnRyeSwgc3VicmVz b3VyY2VJbmZvKTsKIAogICAgIExPRyhOZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVByZWxvYWRpbmcs ICIoTmV0d29ya1Byb2Nlc3MpIFNwZWN1bGF0aXZlbHkgcmV2YWxpZGF0aW5nICclcyc6Iiwga2V5 LmlkZW50aWZpZXIoKS51dGY4KCkuZGF0YSgpKTsKIAotICAgIGF1dG8gcmV2YWxpZGF0b3IgPSBz dGQ6Om1ha2VfdW5pcXVlPFNwZWN1bGF0aXZlTG9hZD4oZnJhbWVJRCwgKnJldmFsaWRhdGlvblJl cXVlc3RQdHIsIFdURk1vdmUoZW50cnkpLCBbdGhpcywga2V5LCByZXZhbGlkYXRpb25SZXF1ZXN0 UHRyLCBmcmFtZUlEXShzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IHJldmFsaWRhdGVkRW50cnkpIHsK KyAgICBhdXRvIHJldmFsaWRhdG9yID0gc3RkOjptYWtlX3VuaXF1ZTxTcGVjdWxhdGl2ZUxvYWQ+ KGZyYW1lSUQsIHJldmFsaWRhdGlvblJlcXVlc3QsIFdURk1vdmUoZW50cnkpLCBbdGhpcywga2V5 LCByZXZhbGlkYXRpb25SZXF1ZXN0LCBmcmFtZUlEXShzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+IHJl dmFsaWRhdGVkRW50cnkpIHsKICAgICAgICAgQVNTRVJUKCFyZXZhbGlkYXRlZEVudHJ5IHx8ICFy ZXZhbGlkYXRlZEVudHJ5LT5uZWVkc1ZhbGlkYXRpb24oKSk7CiAgICAgICAgIEFTU0VSVCghcmV2 YWxpZGF0ZWRFbnRyeSB8fCByZXZhbGlkYXRlZEVudHJ5LT5rZXkoKSA9PSBrZXkpOwogCi0gICAg ICAgIGF1dG8gcmV2YWxpZGF0aW9uUmVxdWVzdCA9IHN0ZDo6dW5pcXVlX3B0cjxSZXNvdXJjZVJl cXVlc3Q+KHJldmFsaWRhdGlvblJlcXVlc3RQdHIpOwogICAgICAgICBhdXRvIHByb3RlY3RSZXZh bGlkYXRvciA9IG1fcGVuZGluZ1ByZWxvYWRzLnRha2Uoa2V5KTsKICAgICAgICAgTE9HKE5ldHdv cmtDYWNoZVNwZWN1bGF0aXZlUHJlbG9hZGluZywgIihOZXR3b3JrUHJvY2VzcykgU3BlY3VsYXRp dmUgcmV2YWxpZGF0aW9uIGNvbXBsZXRlZCBmb3IgJyVzJzoiLCBrZXkuaWRlbnRpZmllcigpLnV0 ZjgoKS5kYXRhKCkpOwogCkBAIC00ODIsNyArNDgxLDcgQEAgdm9pZCBTcGVjdWxhdGl2ZUxvYWRN YW5hZ2VyOjpyZXZhbGlkYXRlRW50cnkoc3RkOjp1bmlxdWVfcHRyPEVudHJ5PiBlbnRyeSwgY29u c3QKICAgICAgICAgfQogCiAgICAgICAgIGlmIChyZXZhbGlkYXRlZEVudHJ5KQotICAgICAgICAg ICAgYWRkUHJlbG9hZGVkRW50cnkoV1RGTW92ZShyZXZhbGlkYXRlZEVudHJ5KSwgZnJhbWVJRCwg V1RGTW92ZShyZXZhbGlkYXRpb25SZXF1ZXN0KSk7CisgICAgICAgICAgICBhZGRQcmVsb2FkZWRF bnRyeShXVEZNb3ZlKHJldmFsaWRhdGVkRW50cnkpLCBmcmFtZUlELCByZXZhbGlkYXRpb25SZXF1 ZXN0KTsKICAgICB9KTsKICAgICBtX3BlbmRpbmdQcmVsb2Fkcy5hZGQoa2V5LCBXVEZNb3ZlKHJl dmFsaWRhdG9yKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5hZ2VyLmggYi9Tb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZUxvYWRNYW5h Z2VyLmgKaW5kZXggYWI3ZjdhZTNjZjdlYzdmYjAxYmM3YjUxNTU5YjhmZjU0ZDBlNWNhMi4uYjBl NmI0YzI5NzU5N2VkM2U4NGRmOGQwZDA5OWJkNzdhZDc4OGNmMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVMb2Fk TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVNwZWN1bGF0aXZlTG9hZE1hbmFnZXIuaApAQCAtNTcsNyArNTcsNyBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIGNsYXNzIFByZWxvYWRlZEVudHJ5OwogCi0gICAgdm9pZCBhZGRQcmVs b2FkZWRFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+LCBjb25zdCBHbG9iYWxGcmFtZUlEJiwg c3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdD4gcmV2YWxpZGF0aW9uUmVx dWVzdCA9IG51bGxwdHIpOworICAgIHZvaWQgYWRkUHJlbG9hZGVkRW50cnkoc3RkOjp1bmlxdWVf cHRyPEVudHJ5PiwgY29uc3QgR2xvYmFsRnJhbWVJRCYsIE9wdGlvbmFsPFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdD4mJiByZXZhbGlkYXRpb25SZXF1ZXN0ID0gTnVsbG9wdCk7CiAgICAgdm9pZCBw cmVsb2FkRW50cnkoY29uc3QgS2V5JiwgY29uc3QgU3VicmVzb3VyY2VJbmZvJiwgY29uc3QgR2xv YmFsRnJhbWVJRCYpOwogICAgIHZvaWQgcmV0cmlldmVFbnRyeUZyb21TdG9yYWdlKGNvbnN0IEtl eSYsIGNvbnN0IFJldHJpZXZlQ29tcGxldGlvbkhhbmRsZXImKTsKICAgICB2b2lkIHJldmFsaWRh dGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8RW50cnk+LCBjb25zdCBTdWJyZXNvdXJjZUluZm8mLCBj b25zdCBHbG9iYWxGcmFtZUlEJik7Cg==