155127 2016-03-07 13:07:21 -0800 Cleanup: Add convenience function URL::procotolIsBlob() 2016-03-07 14:17:49 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates bfulgham darin webkit-bug-importer oldest_to_newest 1171708 0 dbates 2016-03-07 13:07:21 -0800 Similar to the class member function URL::protocolIsData(), we should add a convenience class member function to class URL to determine if a URL is a blob URL. 1171710 1 273202 dbates 2016-03-07 13:08:39 -0800 Created attachment 273202 Patch 1171711 2 273202 bfulgham 2016-03-07 13:10:40 -0800 Comment on attachment 273202 Patch Thank you for this cleanup! r=me. 1171746 3 webkit-bug-importer 2016-03-07 14:14:50 -0800 <rdar://problem/25016829> 1171747 4 dbates 2016-03-07 14:17:49 -0800 Committed r197706: <http://trac.webkit.org/changeset/197706> 273202 2016-03-07 13:08:39 -0800 2016-03-07 13:10:40 -0800 Patch bug-155127-20160307130825.patch text/plain 9121 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3Njk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFiY2VmMGJkMzEwODkz ZGIwNzk1MmNkYjVlMzdmODgwMGQxNWQ1MC4uZjViMjg1Mzg5ZjQ2ODZkZDVhZTgxYjZmYzA0OGFh ZTYyNzBhYzEzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDE2LTAzLTA3ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbnVwOiBBZGQgY29u dmVuaWVuY2UgZnVuY3Rpb24gVVJMOjpwcm9jb3RvbElzQmxvYigpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUxMjcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1pbGFyIHRvIHRoZSBjbGFzcyBtZW1i ZXIgZnVuY3Rpb24gVVJMOjpwcm90b2NvbElzRGF0YSgpLCBhZGQgYSBjbGFzcyBtZW1iZXIgZnVu Y3Rpb24gdG8KKyAgICAgICAgY2xhc3MgVVJMIHRvIGRldGVybWluZSBpZiBhIFVSTCBpcyBhIGJs b2IgVVJMLgorCisgICAgICAgIE5vIGZ1bmN0aW9uYWxpdHkgd2FzIGNoYW5nZWQuIFNvLCBubyBu ZXcgdGVzdHMuCisKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luOjpzaG91bGRVc2VJbm5lclVSTCk6IE1vZGlmaWVkIHRv IHVzZSBVUkw6OnByb3RvY29sSXNCbG9iKCkuCisgICAgICAgIChXZWJDb3JlOjpnZXRDYWNoZWRP cmlnaW4pOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9VUkwuaDoKKyAgICAgICAgKFdlYkNv cmU6OlVSTDo6cHJvdG9jb2xJc0Jsb2IpOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdl YktpdFdlYlNyY1N0YXJ0KTogTW9kaWZpZWQgdG8gdXNlIFVSTDo6cHJvdG9jb2xJc0Jsb2IoKS4K KyAgICAgICAgKHVybEhhc1N1cHBvcnRlZFByb3RvY29sKTogRGl0dG8uCisgICAgICAgICogd29y a2Vycy9Xb3JrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyOjpkaWRSZWNlaXZlUmVz cG9uc2UpOiBEaXR0by4KKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmNyZWF0ZVJlcXVlc3QpOiBEaXR0by4KKworMjAx Ni0wMy0wNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKICAgICAgICAgQ1NQ OiBvYmplY3Qtc3JjIGRpcmVjdGl2ZSBzaG91bGQgcHJvaGliaXQgY3JlYXRpb24gb2YgbmVzdGVk IGJyb3dzaW5nIGNvbnRleHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MzE1MwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjQzODMyMDk+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggMjBlMjMzM2FjYTM5YTVlMjAxNmNhNGY0ZjcyZjJjNjM5ZDViM2IyNS4uMjU2MDdm MDk2MmRjYmVhMjIxN2ZmODI3YTc4Y2QyOWQ5NjE1YzhmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE2LTAzLTA3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKwor ICAgICAgICBDbGVhbnVwOiBBZGQgY29udmVuaWVuY2UgZnVuY3Rpb24gVVJMOjpwcm9jb3RvbElz QmxvYigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NTUxMjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0xvYWQ6Ok5ldHdvcmtMb2FkKTogTW9kaWZpZWQgdG8gdXNlIFVSTDo6cHJvdG9jb2xJc0Jsb2Io KS4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6Ok5ldHdvcmtSZXNvdXJjZUxv YWRlcik6IERpdHRvLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y2FuSGFuZGxlUmVxdWVzdCk6IERpdHRvLgorCiAy MDE2LTAzLTA3ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIFVzZSBDR0NvbG9yU3BhY2VDb3B5SUNDRGF0YSBpbnN0ZWFkIG9mIENHQ29sb3JTcGFjZUNv cHlJQ0NQcm9maWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3Jp Z2luLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IGZi YTZmYzFhNTZjNWE0Mzk0YTA2ZjEzMmU5ZmJkOWJkY2RhOThlMjEuLjk5N2E3NDg4MjE0ZDBhYmQ5 ZmRhNTc5YzFjYzM0NjdhNWM4ODNhYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv U2VjdXJpdHlPcmlnaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmln aW4uY3BwCkBAIC01Niw3ICs1Niw3IEBAIHN0YXRpYyBib29sIHNjaGVtZVJlcXVpcmVzSG9zdChj b25zdCBVUkwmIHVybCkKIGJvb2wgU2VjdXJpdHlPcmlnaW46OnNob3VsZFVzZUlubmVyVVJMKGNv bnN0IFVSTCYgdXJsKQogewogICAgIC8vIEZJWE1FOiBCbG9iIFVSTHMgZG9uJ3QgaGF2ZSBpbm5l ciBVUkxzLiBUaGVpciBmb3JtIGlzICJibG9iOjxpbm5lci1vcmlnaW4+LzxVVUlEPiIsIHNvIHRy ZWF0aW5nIHRoZSBwYXJ0IGFmdGVyICJibG9iOiIgYXMgYSBVUkwgaXMgaW5jb3JyZWN0LgotICAg IGlmICh1cmwucHJvdG9jb2xJcygiYmxvYiIpKQorICAgIGlmICh1cmwucHJvdG9jb2xJc0Jsb2Io KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgVU5VU0VEX1BBUkFNKHVybCk7CiAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtNzYsNyArNzYsNyBAQCBVUkwgU2VjdXJpdHlPcmlnaW46OmV4dHJhY3RJ bm5lclVSTChjb25zdCBVUkwmIHVybCkKIAogc3RhdGljIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4g Z2V0Q2FjaGVkT3JpZ2luKGNvbnN0IFVSTCYgdXJsKQogewotICAgIGlmICh1cmwucHJvdG9jb2xJ cygiYmxvYiIpKQorICAgIGlmICh1cmwucHJvdG9jb2xJc0Jsb2IoKSkKICAgICAgICAgcmV0dXJu IFRocmVhZGFibGVCbG9iUmVnaXN0cnk6OmdldENhY2hlZE9yaWdpbih1cmwpOwogICAgIHJldHVy biBudWxscHRyOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVVJMLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaAppbmRleCA0ZTA5OGE3MWQ1OTFiOTE4N2Yy MjIxODRlZGRhYTliOGU0MzY3ZWQxLi5hYzRkNDEzMzcyYTQ0YjI0MzMyZDM0NzNkZDMxYTE2ZGFk ZmFiYjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkwuaApAQCAtMTI2LDYgKzEyNiw3IEBAIHB1YmxpYzoK ICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGN1cnJlbnQgVVJMJ3MgcHJvdG9jb2wgaXMgdGhl IHNhbWUgYXMgdGhlIG51bGwtCiAgICAgLy8gdGVybWluYXRlZCBBU0NJSSBhcmd1bWVudC4gVGhl IGFyZ3VtZW50IG11c3QgYmUgbG93ZXItY2FzZS4KICAgICBXRUJDT1JFX0VYUE9SVCBib29sIHBy b3RvY29sSXMoY29uc3QgY2hhciopIGNvbnN0OworICAgIGJvb2wgcHJvdG9jb2xJc0Jsb2IoKSBj b25zdCB7IHJldHVybiBwcm90b2NvbElzKCJibG9iIik7IH0KICAgICBib29sIHByb3RvY29sSXNE YXRhKCkgY29uc3QgeyByZXR1cm4gcHJvdG9jb2xJcygiZGF0YSIpOyB9CiAgICAgYm9vbCBwcm90 b2NvbElzSW5IVFRQRmFtaWx5KCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0xv Y2FsRmlsZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVy LmNwcAppbmRleCA2Y2QwMzIzZGVkYjJlNTJkNjE4YTU1MGQ4YWM1NWNhYzg3N2I1YjQ4Li44NmY3 ZTVhMjI1NzU2YTNkYzkwZTM3NzQ5ZjFhNjZhYWEyY2M5MDQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVh bWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv V2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNTg0LDcgKzU4NCw3IEBAIHN0YXRpYyB2 b2lkIHdlYktpdFdlYlNyY1N0YXJ0KFdlYktpdFdlYlNyYyogc3JjKQogCiAgICAgaWYgKHByaXYt PmxvYWRlcikgewogICAgICAgICBQbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXI6OkxvYWRPcHRp b25zIGxvYWRPcHRpb25zID0gMDsKLSAgICAgICAgaWYgKHJlcXVlc3QudXJsKCkucHJvdG9jb2xJ cygiYmxvYiIpKQorICAgICAgICBpZiAocmVxdWVzdC51cmwoKS5wcm90b2NvbElzQmxvYigpKQog ICAgICAgICAgICAgbG9hZE9wdGlvbnMgfD0gUGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVyOjpM b2FkT3B0aW9uOjpCdWZmZXJEYXRhOwogICAgICAgICBwcml2LT5yZXNvdXJjZSA9IHByaXYtPmxv YWRlci0+cmVxdWVzdFJlc291cmNlKHJlcXVlc3QsIGxvYWRPcHRpb25zKTsKICAgICAgICAgbG9h ZEZhaWxlZCA9ICFwcml2LT5yZXNvdXJjZTsKQEAgLTcxMCw3ICs3MTAsNyBAQCBzdGF0aWMgZ2Jv b2xlYW4gd2ViS2l0V2ViU3JjUXVlcnlXaXRoUGFyZW50KEdzdFBhZCogcGFkLCBHc3RPYmplY3Qq IHBhcmVudCwgR3N0UQogCiBzdGF0aWMgYm9vbCB1cmxIYXNTdXBwb3J0ZWRQcm90b2NvbChjb25z dCBVUkwmIHVybCkKIHsKLSAgICByZXR1cm4gdXJsLmlzVmFsaWQoKSAmJiAodXJsLnByb3RvY29s SXNJbkhUVFBGYW1pbHkoKSB8fCB1cmwucHJvdG9jb2xJcygiYmxvYiIpKTsKKyAgICByZXR1cm4g dXJsLmlzVmFsaWQoKSAmJiAodXJsLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSB8fCB1cmwucHJv dG9jb2xJc0Jsb2IoKSk7CiB9CiAKIC8vIHVyaSBoYW5kbGVyIGludGVyZmFjZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvd29y a2Vycy9Xb3JrZXIuY3BwCmluZGV4IDhjYzE1MmVjMmUzMDA2MTU4OTI4M2Q2Mjg0ODIzOTkyNDlk MzYxNWYuLmE0NzZiZmQwM2E0MmZiODc2YzAxOGQzZWVmOTRlMzEwNGEyM2U1ZjAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS93b3JrZXJzL1dvcmtlci5jcHAKQEAgLTE1OCw3ICsxNTgsNyBAQCB2b2lkIFdvcmtlcjo6bm90 aWZ5TmV0d29ya1N0YXRlQ2hhbmdlKGJvb2wgaXNPbkxpbmUpCiB2b2lkIFdvcmtlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UpCiB7CiAgICAgY29uc3QgVVJMJiByZXNwb25zZVVSTCA9IHJlc3BvbnNl LnVybCgpOwotICAgIGlmICghcmVzcG9uc2VVUkwucHJvdG9jb2xJcygiYmxvYiIpICYmICFyZXNw b25zZVVSTC5wcm90b2NvbElzKCJmaWxlIikgJiYgIVNlY3VyaXR5T3JpZ2luOjpjcmVhdGUocmVz cG9uc2VVUkwpLT5pc1VuaXF1ZSgpKQorICAgIGlmICghcmVzcG9uc2VVUkwucHJvdG9jb2xJc0Js b2IoKSAmJiAhcmVzcG9uc2VVUkwucHJvdG9jb2xJcygiZmlsZSIpICYmICFTZWN1cml0eU9yaWdp bjo6Y3JlYXRlKHJlc3BvbnNlVVJMKS0+aXNVbmlxdWUoKSkKICAgICAgICAgbV9jb250ZW50U2Vj dXJpdHlQb2xpY3lSZXNwb25zZUhlYWRlcnMgPSBDb250ZW50U2VjdXJpdHlQb2xpY3lSZXNwb25z ZUhlYWRlcnMocmVzcG9uc2UpOwogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVj ZWl2ZVNjcmlwdFJlc3BvbnNlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgaWRlbnRpZmllcik7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIv U291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCA3YmEzMzVjODQ1OGRh MzkxYmRkMzZlMDFhOTI1Y2NmNGJmOTg2NWY0Li4wMDQxNDNlZmU5MDlkMTBlZjk2OWUyMmVjNTVh ZmRlMWJjYTU0MTZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTcw OSw3ICs3MDksNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpzZW5kQnl0ZXNEYXRhKGNvbnN0IHZv aWQqIGRhdGEsIHNpemVfdCBsZW5ndGgsIEV4Y2VwdGlvbkNvZAogdm9pZCBYTUxIdHRwUmVxdWVz dDo6Y3JlYXRlUmVxdWVzdChFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICAvLyBPbmx5IEdFVCBy ZXF1ZXN0IGlzIHN1cHBvcnRlZCBmb3IgYmxvYiBVUkwuCi0gICAgaWYgKG1fdXJsLnByb3RvY29s SXMoImJsb2IiKSAmJiBtX21ldGhvZCAhPSAiR0VUIikgeworICAgIGlmIChtX3VybC5wcm90b2Nv bElzQmxvYigpICYmIG1fbWV0aG9kICE9ICJHRVQiKSB7CiAgICAgICAgIGVjID0gTkVUV09SS19F UlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9OZXR3b3JrTG9hZC5jcHAKaW5kZXggYzFhMzk1ZjEwZTYyZWVmZTRmZmE4MDIxYmEwNGI4 NjNkNWRjMjQzMC4uNjA4Yzk3YjUzZDg4NWE3YjhlNDkzYTY0NGRmYmM1YTM4MDFmZDJiYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcApAQCAtNDks NyArNDksNyBAQCBOZXR3b3JrTG9hZDo6TmV0d29ya0xvYWQoTmV0d29ya0xvYWRDbGllbnQmIGNs aWVudCwgY29uc3QgTmV0d29ya0xvYWRQYXJhbWV0ZXJzJgogICAgICwgbV9jdXJyZW50UmVxdWVz dChwYXJhbWV0ZXJzLnJlcXVlc3QpCiB7CiAjaWYgVVNFKE5FVFdPUktfU0VTU0lPTikKLSAgICBp ZiAocGFyYW1ldGVycy5yZXF1ZXN0LnVybCgpLnByb3RvY29sSXMoImJsb2IiKSkgeworICAgIGlm IChwYXJhbWV0ZXJzLnJlcXVlc3QudXJsKCkucHJvdG9jb2xJc0Jsb2IoKSkgewogICAgICAgICBt X2hhbmRsZSA9IFJlc291cmNlSGFuZGxlOjpjcmVhdGUobnVsbHB0ciwgcGFyYW1ldGVycy5yZXF1 ZXN0LCB0aGlzLCBwYXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcsIHBhcmFtZXRlcnMuY29udGVudFNu aWZmaW5nUG9saWN5ID09IFNuaWZmQ29udGVudCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VM b2FkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNl TG9hZGVyLmNwcAppbmRleCBlOWM5ZTYwNTdkNDI5OTg0ZGFmMzJmNDQ0MTcyY2QxZDVjMTNlMTdi Li40Nzg1MzdlNzZiZDNhNDNkMWViYWExMmE4YTc2ZDc4ZjUxM2E1MzRjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAKQEAgLTkxLDcgKzkxLDcgQEAgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpOZXR3b3JrUmVzb3Vy Y2VMb2FkZXIoY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMKICAgICAgICAgfQog ICAgIH0KIAotICAgIGlmIChvcmlnaW5hbFJlcXVlc3QoKS51cmwoKS5wcm90b2NvbElzKCJibG9i IikpIHsKKyAgICBpZiAob3JpZ2luYWxSZXF1ZXN0KCkudXJsKCkucHJvdG9jb2xJc0Jsb2IoKSkg ewogICAgICAgICBBU1NFUlQoIW1fcGFyYW1ldGVycy5yZXNvdXJjZVNhbmRib3hFeHRlbnNpb24p OwogICAgICAgICBtX2ZpbGVSZWZlcmVuY2VzLmFwcGVuZFZlY3RvcihOZXR3b3JrQmxvYlJlZ2lz dHJ5OjpzaW5nbGV0b24oKS5maWxlc0luQmxvYihjb25uZWN0aW9uLCBvcmlnaW5hbFJlcXVlc3Qo KS51cmwoKSkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAppbmRleCAyNDljZDM1ZGRjZjRjYTg3NWE0MGZhZTRmNjY1Y2RmZGVmYTQyYTc2 Li5hMTkzZDk4MjE5NWU3ZWZlZmQwNTVmYWUwMDNhOGU1NDJiMzRmNjU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC00MjM1LDcgKzQyMzUs NyBAQCBib29sIFdlYlBhZ2U6OmNhbkhhbmRsZVJlcXVlc3QoY29uc3QgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0KQogICAgIGlmIChTY2hlbWVSZWdpc3RyeTo6c2hvdWxkTG9hZFVS TFNjaGVtZUFzRW1wdHlEb2N1bWVudChyZXF1ZXN0LnVybCgpLnByb3RvY29sKCkpKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKIAotICAgIGlmIChyZXF1ZXN0LnVybCgpLnByb3RvY29sSXMoImJsb2Ii KSkKKyAgICBpZiAocmVxdWVzdC51cmwoKS5wcm90b2NvbElzQmxvYigpKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKIAogICAgIHJldHVybiBwbGF0Zm9ybUNhbkhhbmRsZVJlcXVlc3QocmVxdWVzdCk7 Cg==