143525 2015-04-08 11:01:11 -0700 Add a WebApplicationCache::storage() and use it instead of the WebCore singleton 2015-04-08 12:29:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1083658 0 andersca 2015-04-08 11:01:11 -0700 Add a WebApplicationCache::storage() and use it instead of the WebCore singleton 1083659 1 250361 andersca 2015-04-08 11:01:43 -0700 Created attachment 250361 Patch 1083679 2 250365 andersca 2015-04-08 11:53:14 -0700 Created attachment 250365 Patch 1083690 3 andersca 2015-04-08 12:29:37 -0700 Committed r182559: <http://trac.webkit.org/changeset/182559> 250361 2015-04-08 11:01:43 -0700 2015-04-08 11:53:06 -0700 Patch bug-143525-20150408110054.patch text/plain 4917 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYThhMjU2NTU2 OWRhZjFiYmY1ODViMDIxZDhjOTZmNjk0ZTdhMzBhNC4uNTUyM2QxMjJiMTk2OTA1YWExMTIyZmMy Y2QyMDI5MmUzYzE3ZDBmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1 LTA0LTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg QWRkIGEgV2ViQXBwbGljYXRpb25DYWNoZTo6c3RvcmFnZSgpIGFuZCB1c2UgaXQgaW5zdGVhZCBv ZiB0aGUgV2ViQ29yZSBzaW5nbGV0b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0MzUyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViQXBwbGljYXRpb25DYWNoZS5jcHA6CisgICAgICAgIChXZWJB cHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKToKKyAgICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6 Om1heGltdW1TaXplKToKKyAgICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OnNldE1heGltdW1T aXplKToKKyAgICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlZmF1bHRPcmlnaW5RdW90YSk6 CisgICAgICAgIChXZWJBcHBsaWNhdGlvbkNhY2hlOjpzZXREZWZhdWx0T3JpZ2luUXVvdGEpOgor ICAgICAgICAoV2ViQXBwbGljYXRpb25DYWNoZTo6ZGlza1VzYWdlRm9yT3JpZ2luKToKKyAgICAg ICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUFsbEFwcGxpY2F0aW9uQ2FjaGVzKToKKyAg ICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUNhY2hlRm9yT3JpZ2luKToKKyAgICAg ICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6Om9yaWdpbnNXaXRoQ2FjaGUpOgorICAgICAgICAqIFdl YkFwcGxpY2F0aW9uQ2FjaGUuaDoKKwogMjAxNS0wNC0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggV2luZG93cyBidWlsZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2FjaGUuY3BwIGIvU291cmNlL1dl YktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5jcHAKaW5kZXggMGZiZGUxZTExMjk0MjQ3M2E2 MmIzN2UzOWEyY2FiYzU5MzUyOTcyYi4uNjZmZmNhZWZkMzlkNDA0YTU5MWQwMGU1YmEyOTM5NTY3 NTBlNWFhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNo ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5jcHAKQEAg LTU4LDYgKzU4LDExIEBAIFdlYkFwcGxpY2F0aW9uQ2FjaGUqIFdlYkFwcGxpY2F0aW9uQ2FjaGU6 OmNyZWF0ZUluc3RhbmNlKCkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKK1dlYkNvcmU6OkFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlJiBXZWJBcHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKCkKK3sK KyAgICByZXR1cm4gQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpOworfQorCiAv LyBJVW5rbm93biAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIEhSRVNVTFQgV2ViQXBwbGljYXRpb25DYWNoZTo6UXVl cnlJbnRlcmZhY2UoUkVGSUlEIHJpaWQsIHZvaWQqKiBwcHZPYmplY3QpCkBAIC05NSwxNSArMTAw LDE0IEBAIEhSRVNVTFQgV2ViQXBwbGljYXRpb25DYWNoZTo6bWF4aW11bVNpemUobG9uZyBsb25n KiBzaXplKQogICAgIGlmICghc2l6ZSkKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKIAotICAg ICpzaXplID0gV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLm1h eGltdW1TaXplKCk7CisgICAgKnNpemUgPSBzdG9yYWdlKCkubWF4aW11bVNpemUoKTsKICAgICBy ZXR1cm4gU19PSzsKIH0KIAogSFJFU1VMVCBXZWJBcHBsaWNhdGlvbkNhY2hlOjpzZXRNYXhpbXVt U2l6ZShsb25nIGxvbmcgc2l6ZSkKIHsKLSAgICBhdXRvJiBjYWNoZVN0b3JhZ2UgPSBXZWJDb3Jl OjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCk7Ci0gICAgY2FjaGVTdG9yYWdl LmRlbGV0ZUFsbEVudHJpZXMoKTsKLSAgICBjYWNoZVN0b3JhZ2Uuc2V0TWF4aW11bVNpemUoc2l6 ZSk7CisgICAgc3RvcmFnZSgpLmRlbGV0ZUFsbEVudHJpZXMoKTsKKyAgICBzdG9yYWdlKCkuc2V0 TWF4aW11bVNpemUoc2l6ZSk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKQEAgLTExMiwxMyArMTE2 LDEzIEBAIEhSRVNVTFQgV2ViQXBwbGljYXRpb25DYWNoZTo6ZGVmYXVsdE9yaWdpblF1b3RhKGxv bmcgbG9uZyogcXVvdGEpCiAgICAgaWYgKCFxdW90YSkKICAgICAgICAgcmV0dXJuIEVfUE9JTlRF UjsKIAotICAgICpxdW90YSA9IFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5n bGV0b24oKS5kZWZhdWx0T3JpZ2luUXVvdGEoKTsKKyAgICAqcXVvdGEgPSBzdG9yYWdlKCkuZGVm YXVsdE9yaWdpblF1b3RhKCk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKIEhSRVNVTFQgV2ViQXBw bGljYXRpb25DYWNoZTo6c2V0RGVmYXVsdE9yaWdpblF1b3RhKGxvbmcgbG9uZyBxdW90YSkKIHsK LSAgICBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCkuc2V0RGVm YXVsdE9yaWdpblF1b3RhKHF1b3RhKTsKKyAgICBzdG9yYWdlKCkuc2V0RGVmYXVsdE9yaWdpblF1 b3RhKHF1b3RhKTsKICAgICByZXR1cm4gU19PSzsKIH0KIApAQCAtMTMxLDEzICsxMzUsMTMgQEAg SFJFU1VMVCBXZWJBcHBsaWNhdGlvbkNhY2hlOjpkaXNrVXNhZ2VGb3JPcmlnaW4oSVdlYlNlY3Vy aXR5T3JpZ2luKiBvcmlnaW4sIGxvbmcKICAgICBpZiAoIXdlYlNlY3VyaXR5T3JpZ2luKQogICAg ICAgICByZXR1cm4gRV9GQUlMOwogCi0gICAgKnNpemUgPSBXZWJDb3JlOjpBcHBsaWNhdGlvbkNh Y2hlOjpkaXNrVXNhZ2VGb3JPcmlnaW4od2ViU2VjdXJpdHlPcmlnaW4tPnNlY3VyaXR5T3JpZ2lu KCkpOworICAgICpzaXplID0gc3RvcmFnZSgpLmRpc2tVc2FnZUZvck9yaWdpbigqd2ViU2VjdXJp dHlPcmlnaW4tPnNlY3VyaXR5T3JpZ2luKCkpOwogICAgIHJldHVybiBTX09LOwogfQogCiBIUkVT VUxUIFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUFsbEFwcGxpY2F0aW9uQ2FjaGVzKCkKIHsK LSAgICBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlOjpkZWxldGVBbGxDYWNoZXMoKTsKKyAgICBz dG9yYWdlKCkuZGVsZXRlQWxsQ2FjaGVzKCk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKQEAgLTE1 MSw3ICsxNTUsNyBAQCBIUkVTVUxUIFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUNhY2hlRm9y T3JpZ2luKElXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogICAgIGlmICghd2ViU2VjdXJpdHlP cmlnaW4pCiAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAKLSAgICBXZWJDb3JlOjpBcHBsaWNhdGlv bkNhY2hlOjpkZWxldGVDYWNoZUZvck9yaWdpbih3ZWJTZWN1cml0eU9yaWdpbi0+c2VjdXJpdHlP cmlnaW4oKSk7CisgICAgc3RvcmFnZSgpLmRlbGV0ZUNhY2hlRm9yT3JpZ2luKCp3ZWJTZWN1cml0 eU9yaWdpbi0+c2VjdXJpdHlPcmlnaW4oKSk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKQEAgLTE2 MSw3ICsxNjUsNyBAQCBIUkVTVUxUIFdlYkFwcGxpY2F0aW9uQ2FjaGU6Om9yaWdpbnNXaXRoQ2Fj aGUoSVByb3BlcnR5QmFnKiogb3JpZ2lucykKICAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKIAog ICAgIEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gY29yZU9yaWdpbnM7 Ci0gICAgV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigpLmdldE9y aWdpbnNXaXRoQ2FjaGUoY29yZU9yaWdpbnMpOworICAgIHN0b3JhZ2UoKS5nZXRPcmlnaW5zV2l0 aENhY2hlKGNvcmVPcmlnaW5zKTsKIAogICAgIFJldGFpblB0cjxDRk11dGFibGVBcnJheVJlZj4g YXJyYXlJdGVtID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZShrQ0ZBbGxvY2F0b3JEZWZh dWx0LCBjb3JlT3JpZ2lucy5zaXplKCksICZNYXJzaGFsbGluZ0hlbHBlcnM6OmtJVW5rbm93bkFy cmF5Q2FsbEJhY2tzKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxp Y2F0aW9uQ2FjaGUuaCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2FjaGUuaApp bmRleCBhZTgzYjRkNmQ4MTMzZjRjMjU0ODRhNTc4OTMzYjk3NDE4M2FlYTU5Li4yNzYzYjdmZmMz ZDlkNTNjODY3YjIyNGZmYzY0ZTgyZmE2NDNiYWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3dpbi9XZWJBcHBsaWNhdGlvbkNhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQXBw bGljYXRpb25DYWNoZS5oCkBAIC0yOCw5ICsyOCwxNiBAQAogCiAjaW5jbHVkZSAiV2ViS2l0Lmgi CiAKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOwor fQorCiBjbGFzcyBERUNMU1BFQ19VVUlEKCIxMTE5RTk3MC00QjEzLTRCOUEtQTA0OS00MTA5NjEw NEI2ODkiKSBXZWJBcHBsaWNhdGlvbkNhY2hlIDogcHVibGljIElXZWJBcHBsaWNhdGlvbkNhY2hl IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViQXBwbGljYXRpb25DYWNoZSogY3JlYXRlSW5zdGFu Y2UoKTsKKworICAgIFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlJiBzdG9yYWdlKCk7 CisKIHByb3RlY3RlZDoKICAgICBXZWJBcHBsaWNhdGlvbkNhY2hlKCk7CiAgICAgfldlYkFwcGxp Y2F0aW9uQ2FjaGUoKTsK 250365 2015-04-08 11:53:14 -0700 2015-04-08 12:28:38 -0700 Patch bug-143525-20150408115221.patch text/plain 4926 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYThhMjU2NTU2 OWRhZjFiYmY1ODViMDIxZDhjOTZmNjk0ZTdhMzBhNC4uNTUyM2QxMjJiMTk2OTA1YWExMTIyZmMy Y2QyMDI5MmUzYzE3ZDBmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1 LTA0LTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg QWRkIGEgV2ViQXBwbGljYXRpb25DYWNoZTo6c3RvcmFnZSgpIGFuZCB1c2UgaXQgaW5zdGVhZCBv ZiB0aGUgV2ViQ29yZSBzaW5nbGV0b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0MzUyNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogV2ViQXBwbGljYXRpb25DYWNoZS5jcHA6CisgICAgICAgIChXZWJB cHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKToKKyAgICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6 Om1heGltdW1TaXplKToKKyAgICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OnNldE1heGltdW1T aXplKToKKyAgICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlZmF1bHRPcmlnaW5RdW90YSk6 CisgICAgICAgIChXZWJBcHBsaWNhdGlvbkNhY2hlOjpzZXREZWZhdWx0T3JpZ2luUXVvdGEpOgor ICAgICAgICAoV2ViQXBwbGljYXRpb25DYWNoZTo6ZGlza1VzYWdlRm9yT3JpZ2luKToKKyAgICAg ICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUFsbEFwcGxpY2F0aW9uQ2FjaGVzKToKKyAg ICAgICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUNhY2hlRm9yT3JpZ2luKToKKyAgICAg ICAgKFdlYkFwcGxpY2F0aW9uQ2FjaGU6Om9yaWdpbnNXaXRoQ2FjaGUpOgorICAgICAgICAqIFdl YkFwcGxpY2F0aW9uQ2FjaGUuaDoKKwogMjAxNS0wNC0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggV2luZG93cyBidWlsZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9uQ2FjaGUuY3BwIGIvU291cmNlL1dl YktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5jcHAKaW5kZXggMGZiZGUxZTExMjk0MjQ3M2E2 MmIzN2UzOWEyY2FiYzU5MzUyOTcyYi4uMjk0Y2IxNDkzZDQxOWUxNDQ3OGJjZmFjZGMwNmU4YzEz NGYwNmU3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNo ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViQXBwbGljYXRpb25DYWNoZS5jcHAKQEAg LTU4LDYgKzU4LDExIEBAIFdlYkFwcGxpY2F0aW9uQ2FjaGUqIFdlYkFwcGxpY2F0aW9uQ2FjaGU6 OmNyZWF0ZUluc3RhbmNlKCkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKK1dlYkNvcmU6OkFw cGxpY2F0aW9uQ2FjaGVTdG9yYWdlJiBXZWJBcHBsaWNhdGlvbkNhY2hlOjpzdG9yYWdlKCkKK3sK KyAgICByZXR1cm4gV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigp OworfQorCiAvLyBJVW5rbm93biAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIEhSRVNVTFQgV2ViQXBwbGljYXRpb25D YWNoZTo6UXVlcnlJbnRlcmZhY2UoUkVGSUlEIHJpaWQsIHZvaWQqKiBwcHZPYmplY3QpCkBAIC05 NSwxNSArMTAwLDE0IEBAIEhSRVNVTFQgV2ViQXBwbGljYXRpb25DYWNoZTo6bWF4aW11bVNpemUo bG9uZyBsb25nKiBzaXplKQogICAgIGlmICghc2l6ZSkKICAgICAgICAgcmV0dXJuIEVfUE9JTlRF UjsKIAotICAgICpzaXplID0gV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmds ZXRvbigpLm1heGltdW1TaXplKCk7CisgICAgKnNpemUgPSBzdG9yYWdlKCkubWF4aW11bVNpemUo KTsKICAgICByZXR1cm4gU19PSzsKIH0KIAogSFJFU1VMVCBXZWJBcHBsaWNhdGlvbkNhY2hlOjpz ZXRNYXhpbXVtU2l6ZShsb25nIGxvbmcgc2l6ZSkKIHsKLSAgICBhdXRvJiBjYWNoZVN0b3JhZ2Ug PSBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9uKCk7Ci0gICAgY2Fj aGVTdG9yYWdlLmRlbGV0ZUFsbEVudHJpZXMoKTsKLSAgICBjYWNoZVN0b3JhZ2Uuc2V0TWF4aW11 bVNpemUoc2l6ZSk7CisgICAgc3RvcmFnZSgpLmRlbGV0ZUFsbEVudHJpZXMoKTsKKyAgICBzdG9y YWdlKCkuc2V0TWF4aW11bVNpemUoc2l6ZSk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKQEAgLTEx MiwxMyArMTE2LDEzIEBAIEhSRVNVTFQgV2ViQXBwbGljYXRpb25DYWNoZTo6ZGVmYXVsdE9yaWdp blF1b3RhKGxvbmcgbG9uZyogcXVvdGEpCiAgICAgaWYgKCFxdW90YSkKICAgICAgICAgcmV0dXJu IEVfUE9JTlRFUjsKIAotICAgICpxdW90YSA9IFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9y YWdlOjpzaW5nbGV0b24oKS5kZWZhdWx0T3JpZ2luUXVvdGEoKTsKKyAgICAqcXVvdGEgPSBzdG9y YWdlKCkuZGVmYXVsdE9yaWdpblF1b3RhKCk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKIEhSRVNV TFQgV2ViQXBwbGljYXRpb25DYWNoZTo6c2V0RGVmYXVsdE9yaWdpblF1b3RhKGxvbmcgbG9uZyBx dW90YSkKIHsKLSAgICBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6c2luZ2xldG9u KCkuc2V0RGVmYXVsdE9yaWdpblF1b3RhKHF1b3RhKTsKKyAgICBzdG9yYWdlKCkuc2V0RGVmYXVs dE9yaWdpblF1b3RhKHF1b3RhKTsKICAgICByZXR1cm4gU19PSzsKIH0KIApAQCAtMTMxLDEzICsx MzUsMTMgQEAgSFJFU1VMVCBXZWJBcHBsaWNhdGlvbkNhY2hlOjpkaXNrVXNhZ2VGb3JPcmlnaW4o SVdlYlNlY3VyaXR5T3JpZ2luKiBvcmlnaW4sIGxvbmcKICAgICBpZiAoIXdlYlNlY3VyaXR5T3Jp Z2luKQogICAgICAgICByZXR1cm4gRV9GQUlMOwogCi0gICAgKnNpemUgPSBXZWJDb3JlOjpBcHBs aWNhdGlvbkNhY2hlOjpkaXNrVXNhZ2VGb3JPcmlnaW4od2ViU2VjdXJpdHlPcmlnaW4tPnNlY3Vy aXR5T3JpZ2luKCkpOworICAgICpzaXplID0gc3RvcmFnZSgpLmRpc2tVc2FnZUZvck9yaWdpbigq d2ViU2VjdXJpdHlPcmlnaW4tPnNlY3VyaXR5T3JpZ2luKCkpOwogICAgIHJldHVybiBTX09LOwog fQogCiBIUkVTVUxUIFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0ZUFsbEFwcGxpY2F0aW9uQ2Fj aGVzKCkKIHsKLSAgICBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlOjpkZWxldGVBbGxDYWNoZXMo KTsKKyAgICBzdG9yYWdlKCkuZGVsZXRlQWxsQ2FjaGVzKCk7CiAgICAgcmV0dXJuIFNfT0s7CiB9 CiAKQEAgLTE1MSw3ICsxNTUsNyBAQCBIUkVTVUxUIFdlYkFwcGxpY2F0aW9uQ2FjaGU6OmRlbGV0 ZUNhY2hlRm9yT3JpZ2luKElXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogICAgIGlmICghd2Vi U2VjdXJpdHlPcmlnaW4pCiAgICAgICAgIHJldHVybiBFX0ZBSUw7CiAKLSAgICBXZWJDb3JlOjpB cHBsaWNhdGlvbkNhY2hlOjpkZWxldGVDYWNoZUZvck9yaWdpbih3ZWJTZWN1cml0eU9yaWdpbi0+ c2VjdXJpdHlPcmlnaW4oKSk7CisgICAgc3RvcmFnZSgpLmRlbGV0ZUNhY2hlRm9yT3JpZ2luKCp3 ZWJTZWN1cml0eU9yaWdpbi0+c2VjdXJpdHlPcmlnaW4oKSk7CiAgICAgcmV0dXJuIFNfT0s7CiB9 CiAKQEAgLTE2MSw3ICsxNjUsNyBAQCBIUkVTVUxUIFdlYkFwcGxpY2F0aW9uQ2FjaGU6Om9yaWdp bnNXaXRoQ2FjaGUoSVByb3BlcnR5QmFnKiogb3JpZ2lucykKICAgICAgICAgcmV0dXJuIEVfUE9J TlRFUjsKIAogICAgIEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gY29y ZU9yaWdpbnM7Ci0gICAgV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRv bigpLmdldE9yaWdpbnNXaXRoQ2FjaGUoY29yZU9yaWdpbnMpOworICAgIHN0b3JhZ2UoKS5nZXRP cmlnaW5zV2l0aENhY2hlKGNvcmVPcmlnaW5zKTsKIAogICAgIFJldGFpblB0cjxDRk11dGFibGVB cnJheVJlZj4gYXJyYXlJdGVtID0gYWRvcHRDRihDRkFycmF5Q3JlYXRlTXV0YWJsZShrQ0ZBbGxv Y2F0b3JEZWZhdWx0LCBjb3JlT3JpZ2lucy5zaXplKCksICZNYXJzaGFsbGluZ0hlbHBlcnM6OmtJ VW5rbm93bkFycmF5Q2FsbEJhY2tzKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2lu L1dlYkFwcGxpY2F0aW9uQ2FjaGUuaCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkFwcGxpY2F0aW9u Q2FjaGUuaAppbmRleCBhZTgzYjRkNmQ4MTMzZjRjMjU0ODRhNTc4OTMzYjk3NDE4M2FlYTU5Li4y NzYzYjdmZmMzZDlkNTNjODY3YjIyNGZmYzY0ZTgyZmE2NDNiYWNlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJBcHBsaWNhdGlvbkNhY2hlLmgKKysrIGIvU291cmNlL1dlYktpdC93 aW4vV2ViQXBwbGljYXRpb25DYWNoZS5oCkBAIC0yOCw5ICsyOCwxNiBAQAogCiAjaW5jbHVkZSAi V2ViS2l0LmgiCiAKK25hbWVzcGFjZSBXZWJDb3JlIHsKK2NsYXNzIEFwcGxpY2F0aW9uQ2FjaGVT dG9yYWdlOworfQorCiBjbGFzcyBERUNMU1BFQ19VVUlEKCIxMTE5RTk3MC00QjEzLTRCOUEtQTA0 OS00MTA5NjEwNEI2ODkiKSBXZWJBcHBsaWNhdGlvbkNhY2hlIDogcHVibGljIElXZWJBcHBsaWNh dGlvbkNhY2hlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViQXBwbGljYXRpb25DYWNoZSogY3Jl YXRlSW5zdGFuY2UoKTsKKworICAgIFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlJiBz dG9yYWdlKCk7CisKIHByb3RlY3RlZDoKICAgICBXZWJBcHBsaWNhdGlvbkNhY2hlKCk7CiAgICAg fldlYkFwcGxpY2F0aW9uQ2FjaGUoKTsK