102855 2012-11-20 18:24:25 -0800 Remove the concept of initiatorDocument from CachedResourceRequest 2012-11-21 16:19:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simonjam simonjam cmarcelo japhet jochen macpherson marja menard ojan webkit.review.bot oldest_to_newest 772361 0 simonjam 2012-11-20 18:24:25 -0800 Remove the concept of initiatorDocument from CachedResourceRequest 772363 1 175318 simonjam 2012-11-20 18:27:49 -0800 Created attachment 175318 Patch 772365 2 simonjam 2012-11-20 18:28:33 -0800 I also wanted to double check that you're not planning to use it either. 773390 3 175318 webkit.review.bot 2012-11-21 16:19:16 -0800 Comment on attachment 175318 Patch Clearing flags on attachment: 175318 Committed r135452: <http://trac.webkit.org/changeset/135452> 773391 4 webkit.review.bot 2012-11-21 16:19:20 -0800 All reviewed patches have been landed. Closing bug. 175318 2012-11-20 18:27:49 -0800 2012-11-21 16:19:16 -0800 Patch bug-102855-20121120182537.patch text/plain 12032 simonjam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY1NjgwMDcyZjhhZTE4 NjYwZWJkMTlhNjg1OTlkNjNjMzNlM2M2Zi4uOTM0ZDYzMTRiMjI3ZWNiNjEyZDUxNjlhY2VjNzYw MzE1Mjg1M2M3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTExLTIwICBKYW1l cyBTaW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgdGhl IGNvbmNlcHQgb2YgaW5pdGlhdG9yRG9jdW1lbnQgZnJvbSBDYWNoZWRSZXNvdXJjZVJlcXVlc3QK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjg1NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IHR1cm5z IG91dCB0aGlzIGlzbid0IG5lY2Vzc2FyeSBmb3IgdGhlIG5ldyBpbXBsZW1lbnRhdGlvbiBvZiBS ZXNvdXJjZSBUaW1pbmcuIEluc3RlYWQsCisgICAgICAgIHdlIGNhbiBnZXQgYXQgaXQgZnJvbSB0 aGUgQ2FjaGVkUmVzb3VyY2VMb2FkZXIuIEkgZG9uJ3QgdGhpbmsgYW55b25lIGVsc2UgbmVlZGVk IGl0IGVpdGhlci4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgd2FzIG5ldmVyIHVzZWQu CisKKyAgICAgICAgKiBjc3MvQ1NTRm9udEZhY2VTcmNWYWx1ZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDU1NGb250RmFjZVNyY1ZhbHVlOjpjYWNoZWRGb250KToKKyAgICAgICAgKiBjc3MvQ1NT SW1hZ2VTZXRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NJbWFnZVNldFZhbHVlOjpj YWNoZWRJbWFnZVNldCk6CisgICAgICAgICogY3NzL0NTU0ltYWdlVmFsdWUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTSW1hZ2VWYWx1ZTo6Y2FjaGVkSW1hZ2UpOgorICAgICAgICAqIGNzcy9T dHlsZVJ1bGVJbXBvcnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSdWxlSW1wb3J0Ojpy ZXF1ZXN0U3R5bGVTaGVldCk6CisgICAgICAgICogY3NzL1dlYktpdENTU1NWR0RvY3VtZW50VmFs dWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViS2l0Q1NTU1ZHRG9jdW1lbnRWYWx1ZTo6bG9h ZCk6CisgICAgICAgICogY3NzL1dlYktpdENTU1NoYWRlclZhbHVlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OldlYktpdENTU1NoYWRlclZhbHVlOjpjYWNoZWRTaGFkZXIpOgorICAgICAgICAqIGh0 bWwvcGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1By ZWxvYWRTY2FubmVyOjplbWl0UnVsZSk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFByZWxv YWRTY2FubmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlByZWxvYWRUYXNrOjpwcmVsb2FkKToK KyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0SW5pdGlhdG9yKToKKyAgICAg ICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChDYWNo ZWRSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAqIGxvYWRlci9pY29uL0ljb25Mb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SWNvbkxvYWRlcjo6c3RhcnRMb2FkaW5nKToKKwogMjAxMi0x MS0xOSAgQWxwaGEgTGFtICA8aGNsYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZp ZXdlZC4gQnVpbGQgZml4IGZvciBDaHJvbWl1bS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NGb250RmFjZVNyY1ZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250 RmFjZVNyY1ZhbHVlLmNwcAppbmRleCAwNzc4MmFjMjE5ZDI2MTU0MzQ2NmI1OTNiOGE2OWY3NjI2 NTkyZDNkLi4wZDFmYTEwOGJkNTlmMDZkMGU0YmRkNTUxMTY2ZjBiMzQyYjI2YzQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTcmNWYWx1ZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU3JjVmFsdWUuY3BwCkBAIC05OCw3ICs5OCw3IEBA IENhY2hlZEZvbnQqIENTU0ZvbnRGYWNlU3JjVmFsdWU6OmNhY2hlZEZvbnQoRG9jdW1lbnQqIGRv Y3VtZW50KQogewogICAgIGlmICghbV9jYWNoZWRGb250KSB7CiAgICAgICAgIENhY2hlZFJlc291 cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChkb2N1bWVudC0+Y29tcGxldGVVUkwo bV9yZXNvdXJjZSkpKTsKLSAgICAgICAgcmVxdWVzdC5zZXRJbml0aWF0b3IoY2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0SW5pdGlhdG9ycygpLmNzcywgZG9jdW1lbnQpOworICAgICAgICByZXF1ZXN0LnNl dEluaXRpYXRvcihjYWNoZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCkuY3NzKTsKICAgICAg ICAgbV9jYWNoZWRGb250ID0gZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVyKCktPnJlcXVl c3RGb250KHJlcXVlc3QpOwogICAgIH0KICAgICByZXR1cm4gbV9jYWNoZWRGb250LmdldCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlU2V0VmFsdWUuY3BwCmluZGV4IGViYzc0YzcxN2RkNGMy NDJhMzMyMzViYzE0ZmU1YWE5OGM1OTNhN2MuLjA1MGYyMDFjM2RkNDZlZjJhNTlhMjQ2NzljNWJm ZjRiMGY2ZDQ5MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NJbWFnZVNldFZh bHVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VTZXRWYWx1ZS5jcHAKQEAg LTExMCw4ICsxMTAsOCBAQCBTdHlsZUNhY2hlZEltYWdlU2V0KiBDU1NJbWFnZVNldFZhbHVlOjpj YWNoZWRJbWFnZVNldChDYWNoZWRSZXNvdXJjZUxvYWRlciogbG9hZAogICAgICAgICAvLyBBbGwg Zm9ybXMgb2Ygc2NhbGUgc2hvdWxkIGJlIGluY2x1ZGVkOiBQYWdlOjpwYWdlU2NhbGVGYWN0b3Io KSwgRnJhbWU6OnBhZ2Vab29tRmFjdG9yKCksCiAgICAgICAgIC8vIGFuZCBhbnkgQ1NTIHRyYW5z Zm9ybXMuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTY5OAogICAg ICAgICBJbWFnZVdpdGhTY2FsZSBpbWFnZSA9IGJlc3RJbWFnZUZvclNjYWxlRmFjdG9yKCk7Ci0g ICAgICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChsb2Fk ZXItPmRvY3VtZW50KCktPmNvbXBsZXRlVVJMKGltYWdlLmltYWdlVVJMKSkpOwotICAgICAgICBy ZXF1ZXN0LnNldEluaXRpYXRvcihjYWNoZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCkuY3Nz LCBkb2N1bWVudCk7CisgICAgICAgIENhY2hlZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291 cmNlUmVxdWVzdChkb2N1bWVudC0+Y29tcGxldGVVUkwoaW1hZ2UuaW1hZ2VVUkwpKSk7CisgICAg ICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMo KS5jc3MpOwogICAgICAgICBpZiAoQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+IGNh Y2hlZEltYWdlID0gbG9hZGVyLT5yZXF1ZXN0SW1hZ2UocmVxdWVzdCkpIHsKICAgICAgICAgICAg IG1faW1hZ2VTZXQgPSBTdHlsZUNhY2hlZEltYWdlU2V0OjpjcmVhdGUoY2FjaGVkSW1hZ2UuZ2V0 KCksIGltYWdlLnNjYWxlRmFjdG9yLCB0aGlzKTsKICAgICAgICAgICAgIG1fYWNjZXNzZWRCZXN0 Rml0SW1hZ2UgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdl VmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ltYWdlVmFsdWUuY3BwCmluZGV4IDk1 N2EyMjEzY2RkMWQyZjEzM2NjMDdjYzQzMjkwMWJiZWE2ZTNhNWUuLmMzZjRmNjNlOThkYjdjZTdh NTRjMmUxY2U2MGM5ZmFhNDA5YjUxYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NJbWFnZVZhbHVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTSW1hZ2VWYWx1ZS5j cHAKQEAgLTg5LDcgKzg5LDcgQEAgU3R5bGVDYWNoZWRJbWFnZSogQ1NTSW1hZ2VWYWx1ZTo6Y2Fj aGVkSW1hZ2UoQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgY29uc3QKICAgICAgICAgaWYg KGluaXRpYXRvckVsZW1lbnQpCiAgICAgICAgICAgICByZXF1ZXN0LnNldEluaXRpYXRvcihpbml0 aWF0b3JFbGVtZW50KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVxdWVzdC5zZXRJbml0 aWF0b3IoY2FjaGVkUmVzb3VyY2VSZXF1ZXN0SW5pdGlhdG9ycygpLmNzcywgbG9hZGVyLT5kb2N1 bWVudCgpKTsKKyAgICAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNl UmVxdWVzdEluaXRpYXRvcnMoKS5jc3MpOwogICAgICAgICBpZiAoQ2FjaGVkUmVzb3VyY2VIYW5k bGU8Q2FjaGVkSW1hZ2U+IGNhY2hlZEltYWdlID0gbG9hZGVyLT5yZXF1ZXN0SW1hZ2UocmVxdWVz dCkpCiAgICAgICAgICAgICBtX2ltYWdlID0gU3R5bGVDYWNoZWRJbWFnZTo6Y3JlYXRlKGNhY2hl ZEltYWdlLmdldCgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVSdWxlSW1wb3J0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuY3Bw CmluZGV4IDMxNDZlYzNjZDBhNDBkOWRhN2E3YWZkY2VhMjFiNzUzZTZiMWU3NjQuLmNkNmExOTcw YmRiYjQwOWU0YjRkZmFkMTY4YTU5MTExNDAwODBlZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVJ1bGVJbXBvcnQuY3BwCkBAIC0xMTgsNyArMTE4LDcgQEAgdm9pZCBTdHlsZVJ1bGVJbXBvcnQ6 OnJlcXVlc3RTdHlsZVNoZWV0KCkKICAgICB9CiAKICAgICBDYWNoZWRSZXNvdXJjZVJlcXVlc3Qg cmVxdWVzdChSZXNvdXJjZVJlcXVlc3QoYWJzVVJMKSwgbV9wYXJlbnRTdHlsZVNoZWV0LT5jaGFy c2V0KCkpOwotICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNlUmVxdWVzdElu aXRpYXRvcnMoKS5jc3MsIGRvY3VtZW50KTsKKyAgICByZXF1ZXN0LnNldEluaXRpYXRvcihjYWNo ZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCkuY3NzKTsKICAgICBpZiAobV9wYXJlbnRTdHls ZVNoZWV0LT5pc1VzZXJTdHlsZVNoZWV0KCkpCiAgICAgICAgIG1fY2FjaGVkU2hlZXQgPSBjYWNo ZWRSZXNvdXJjZUxvYWRlci0+cmVxdWVzdFVzZXJDU1NTdHlsZVNoZWV0KHJlcXVlc3QpOwogICAg IGVsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NTVkdEb2N1bWVu dFZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NTVkdEb2N1bWVudFZhbHVl LmNwcAppbmRleCA2ZmU5NDhkNGE3ZTUxNmMwMzYwODM3ZDQzNGE2ZTI3YWIwNDY0OTVmLi5iNDM0 ZWVjZmQyYWQ2NDc2YTRhM2FkOGViOGIyMzI2NzM3ZmFkMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvV2ViS2l0Q1NTU1ZHRG9jdW1lbnRWYWx1ZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL1dlYktpdENTU1NWR0RvY3VtZW50VmFsdWUuY3BwCkBAIC01NSw3ICs1NSw3IEBA IENhY2hlZFNWR0RvY3VtZW50KiBXZWJLaXRDU1NTVkdEb2N1bWVudFZhbHVlOjpsb2FkKENhY2hl ZFJlc291cmNlTG9hZGVyKiBsb2FkZXIpCiAgICAgICAgIG1fbG9hZFJlcXVlc3RlZCA9IHRydWU7 CiAKICAgICAgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0 KGxvYWRlci0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwobV91cmwpKSk7Ci0gICAgICAgIHJlcXVl c3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5jc3MsIGxv YWRlci0+ZG9jdW1lbnQoKSk7CisgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJl c291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5jc3MpOwogICAgICAgICBtX2RvY3VtZW50ID0gbG9h ZGVyLT5yZXF1ZXN0U1ZHRG9jdW1lbnQocmVxdWVzdCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jc3MvV2ViS2l0Q1NTU2hhZGVyVmFsdWUuY3BwIGIvU291cmNlL1dlYkNv cmUvY3NzL1dlYktpdENTU1NoYWRlclZhbHVlLmNwcAppbmRleCAzNTE4N2Y4MjA0MGUxNjAzMzY5 ZDZhMmRiMmNlNWU4ODYxYzM5YzM2Li45MWJkZGUyOTg3Y2E5NjQ2NzUyNDhlNzViMjBmODljZmQy MWQyMTBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvV2ViS2l0Q1NTU2hhZGVyVmFs dWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NTaGFkZXJWYWx1ZS5jcHAK QEAgLTYyLDcgKzYyLDcgQEAgU3R5bGVDYWNoZWRTaGFkZXIqIFdlYktpdENTU1NoYWRlclZhbHVl OjpjYWNoZWRTaGFkZXIoQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGxvYWQKICAgICAgICAgbV9hY2Nl c3NlZFNoYWRlciA9IHRydWU7CiAKICAgICAgICAgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QoUmVzb3VyY2VSZXF1ZXN0KGxvYWRlci0+ZG9jdW1lbnQoKS0+Y29tcGxldGVVUkwobV91cmwp KSk7Ci0gICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291cmNlUmVxdWVzdElu aXRpYXRvcnMoKS5jc3MsIGxvYWRlci0+ZG9jdW1lbnQoKSk7CisgICAgICAgIHJlcXVlc3Quc2V0 SW5pdGlhdG9yKGNhY2hlZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5jc3MpOwogICAgICAg ICBpZiAoQ2FjaGVkUmVzb3VyY2VIYW5kbGU8Q2FjaGVkU2hhZGVyPiBjYWNoZWRTaGFkZXIgPSBs b2FkZXItPnJlcXVlc3RTaGFkZXIocmVxdWVzdCkpCiAgICAgICAgICAgICBtX3NoYWRlciA9IFN0 eWxlQ2FjaGVkU2hhZGVyOjpjcmVhdGUoY2FjaGVkU2hhZGVyLmdldCgpKTsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9DU1NQcmVsb2FkU2Nhbm5lci5jcHAKaW5kZXgg MTUwY2U4YTEwYWZiOTJlOTY4M2NhMWVlMTAzNTkxNDJjYjRjZDZmZC4uYzIwMTRmZWVkZmU2ZWNk MmFjZTU4N2RkOWY4NWUxYTg3ZGE5NTJkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvQ1NTUHJlbG9hZFNjYW5uZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0NTU1ByZWxvYWRTY2FubmVyLmNwcApAQCAtMTk5LDcgKzE5OSw3IEBAIHZvaWQgQ1NT UHJlbG9hZFNjYW5uZXI6OmVtaXRSdWxlKCkKICAgICAgICAgU3RyaW5nIHZhbHVlID0gcGFyc2VD U1NTdHJpbmdPclVSTChtX3J1bGVWYWx1ZS5jaGFyYWN0ZXJzKCksIG1fcnVsZVZhbHVlLmxlbmd0 aCgpKTsKICAgICAgICAgaWYgKCF2YWx1ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIENhY2hl ZFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KFJlc291cmNlUmVxdWVzdChtX2RvY3VtZW50LT5jb21w bGV0ZVVSTCh2YWx1ZSkpKTsKLSAgICAgICAgICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hl ZFJlc291cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5jc3MsIG1fZG9jdW1lbnQpOworICAgICAgICAg ICAgcmVxdWVzdC5zZXRJbml0aWF0b3IoY2FjaGVkUmVzb3VyY2VSZXF1ZXN0SW5pdGlhdG9ycygp LmNzcyk7CiAgICAgICAgICAgICBtX2RvY3VtZW50LT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLT5w cmVsb2FkKENhY2hlZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0LCByZXF1ZXN0LCBTdHJpbmcoKSwg bV9zY2FubmluZ0JvZHkpOwogICAgICAgICB9CiAgICAgICAgIG1fc3RhdGUgPSBJbml0aWFsOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQcmVsb2FkU2Nhbm5lci5jcHAK aW5kZXggNjhkZDkzMjFiZGRmNjMyYzg3MWIxZGQ3NWNmODFmMWI5NmU3MzQxMi4uNWE0NjM0YWRi OTU3YjhmYWMxZDRkN2NlMzYzYjkwZjQzNTAyZmUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFByZWxvYWRTY2FubmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuY3BwCkBAIC0xMzAsNyArMTMwLDcgQEAg cHVibGljOgogCiAgICAgICAgIENhY2hlZFJlc291cmNlTG9hZGVyKiBjYWNoZWRSZXNvdXJjZUxv YWRlciA9IGRvY3VtZW50LT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpOwogICAgICAgICBDYWNoZWRS ZXNvdXJjZVJlcXVlc3QgcmVxdWVzdChSZXNvdXJjZVJlcXVlc3QoZG9jdW1lbnQtPmNvbXBsZXRl VVJMKG1fdXJsVG9Mb2FkLCBiYXNlVVJMKSkpOwotICAgICAgICByZXF1ZXN0LnNldEluaXRpYXRv cih0YWdOYW1lKCksIGRvY3VtZW50KTsKKyAgICAgICAgcmVxdWVzdC5zZXRJbml0aWF0b3IodGFn TmFtZSgpKTsKICAgICAgICAgaWYgKG1fdGFnTmFtZSA9PSBzY3JpcHRUYWcpIHsKICAgICAgICAg ICAgIHJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVxdWVzdCgpLnNldEFsbG93Q29va2llcyhjcm9z c09yaWdpbk1vZGVBbGxvd3NDb29raWVzKCkpOwogICAgICAgICAgICAgY2FjaGVkUmVzb3VyY2VM b2FkZXItPnByZWxvYWQoQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdCwgcmVxdWVzdCwgbV9jaGFyc2V0 LCBzY2FubmluZ0JvZHkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUv Q2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmNwcAppbmRleCA3YmU3MzQ5ZGI5NWZiNzUwMmYwMzZkNWZm MjVjYWE4M2YxZTVjZWM3Li5jOTJlM2E3ZWUyZjllYTk2ZTY5OWU5MTk2MTZlODIyODM3ODFjMzdh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VS ZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0LmNwcApAQCAtNjYsMTUgKzY2LDE0IEBAIENhY2hlZFJlc291cmNlUmVxdWVzdDo6 fkNhY2hlZFJlc291cmNlUmVxdWVzdCgpCiAKIHZvaWQgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojpz ZXRJbml0aWF0b3IoUGFzc1JlZlB0cjxFbGVtZW50PiBlbGVtZW50KQogewotICAgIEFTU0VSVCgh bV9pbml0aWF0b3JFbGVtZW50ICYmICFtX2luaXRpYXRvckRvY3VtZW50KTsKKyAgICBBU1NFUlQo IW1faW5pdGlhdG9yRWxlbWVudCAmJiBtX2luaXRpYXRvck5hbWUuaXNFbXB0eSgpKTsKICAgICBt X2luaXRpYXRvckVsZW1lbnQgPSBlbGVtZW50OwogfQogCi12b2lkIENhY2hlZFJlc291cmNlUmVx dWVzdDo6c2V0SW5pdGlhdG9yKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgUGFzc1JlZlB0cjxE b2N1bWVudD4gZG9jdW1lbnQpCit2b2lkIENhY2hlZFJlc291cmNlUmVxdWVzdDo6c2V0SW5pdGlh dG9yKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkKIHsKLSAgICBBU1NFUlQoIW1faW5pdGlhdG9y RWxlbWVudCAmJiAhbV9pbml0aWF0b3JEb2N1bWVudCk7CisgICAgQVNTRVJUKCFtX2luaXRpYXRv ckVsZW1lbnQgJiYgbV9pbml0aWF0b3JOYW1lLmlzRW1wdHkoKSk7CiAgICAgbV9pbml0aWF0b3JO YW1lID0gbmFtZTsKLSAgICBtX2luaXRpYXRvckRvY3VtZW50ID0gZG9jdW1lbnQ7CiB9CiAKIGNv bnN0IEF0b21pY1N0cmluZyYgQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0Ojppbml0aWF0b3JOYW1lKCkg Y29uc3QKQEAgLTg4LDEzICs4Nyw2IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgQ2FjaGVkUmVzb3Vy Y2VSZXF1ZXN0Ojppbml0aWF0b3JOYW1lKCkgY29uc3QKICAgICByZXR1cm4gZGVmYXVsdE5hbWU7 CiB9CiAKLVBhc3NSZWZQdHI8RG9jdW1lbnQ+IENhY2hlZFJlc291cmNlUmVxdWVzdDo6aW5pdGlh dG9yRG9jdW1lbnQoKQotewotICAgIGlmIChtX2luaXRpYXRvckVsZW1lbnQpCi0gICAgICAgIHJl dHVybiBtX2luaXRpYXRvckVsZW1lbnQtPmRvY3VtZW50KCk7Ci0gICAgcmV0dXJuIG1faW5pdGlh dG9yRG9jdW1lbnQ7Ci19Ci0KIFBhc3NSZWZQdHI8RWxlbWVudD4gQ2FjaGVkUmVzb3VyY2VSZXF1 ZXN0Ojppbml0aWF0b3JFbGVtZW50KCkKIHsKICAgICByZXR1cm4gbV9pbml0aWF0b3JFbGVtZW50 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNl UmVxdWVzdC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlUmVx dWVzdC5oCmluZGV4IDRhYTMwZDQ1MzEzMWYyNjI2NzA1NzdmZWJjZjcwNjQ5NGMyZTczYWMuLjlk NDA4ZTYyMTYyZmJiYjZkMjQwODYyMzk0NzVkMjZmYTVhYWFjMDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZVJlcXVlc3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VSZXF1ZXN0LmgKQEAgLTU3LDkg KzU3LDggQEAgcHVibGljOgogICAgIERlZmVyT3B0aW9uIGRlZmVyKCkgY29uc3QgeyByZXR1cm4g bV9kZWZlcjsgfQogICAgIHZvaWQgc2V0RGVmZXIoRGVmZXJPcHRpb24gZGVmZXIpIHsgbV9kZWZl ciA9IGRlZmVyOyB9CiAgICAgdm9pZCBzZXRJbml0aWF0b3IoUGFzc1JlZlB0cjxFbGVtZW50Pik7 Ci0gICAgdm9pZCBzZXRJbml0aWF0b3IoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBQYXNzUmVm UHRyPERvY3VtZW50Pik7CisgICAgdm9pZCBzZXRJbml0aWF0b3IoY29uc3QgQXRvbWljU3RyaW5n JiBuYW1lKTsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGluaXRpYXRvck5hbWUoKSBjb25zdDsK LSAgICBQYXNzUmVmUHRyPERvY3VtZW50PiBpbml0aWF0b3JEb2N1bWVudCgpOwogICAgIFBhc3NS ZWZQdHI8RWxlbWVudD4gaW5pdGlhdG9yRWxlbWVudCgpOwogCiBwcml2YXRlOgpAQCAtNzAsNyAr NjksNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9mb3JQcmVsb2FkOwogICAgIERlZmVyT3B0aW9u IG1fZGVmZXI7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IG1faW5pdGlhdG9yRWxlbWVudDsKLSAgICBS ZWZQdHI8RG9jdW1lbnQ+IG1faW5pdGlhdG9yRG9jdW1lbnQ7CiAgICAgQXRvbWljU3RyaW5nIG1f aW5pdGlhdG9yTmFtZTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9p Y29uL0ljb25Mb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRl ci5jcHAKaW5kZXggZTA3MTA4ZTRjZDJkZTRjZGY4YmU4MDg2ZmQxZGQ2MjA5Zjg0NDQyOC4uNTcx NDUxMzBiMDY0NGE3OTExYzA3NWViZTJhOTBmYTA3MjI2Zjg2ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2ljb24vSWNvbkxvYWRlci5jcHAKQEAgLTY3LDcgKzY3LDcgQEAgdm9pZCBJY29uTG9h ZGVyOjpzdGFydExvYWRpbmcoKQogICAgIHJlcXVlc3QubXV0YWJsZVJlc291cmNlUmVxdWVzdCgp LnNldFRhcmdldFR5cGUoUmVzb3VyY2VSZXF1ZXN0OjpUYXJnZXRJc0Zhdmljb24pOwogI2VuZGlm CiAgICAgcmVxdWVzdC5tdXRhYmxlUmVzb3VyY2VSZXF1ZXN0KCkuc2V0UHJpb3JpdHkoUmVzb3Vy Y2VMb2FkUHJpb3JpdHlMb3cpOwotICAgIHJlcXVlc3Quc2V0SW5pdGlhdG9yKGNhY2hlZFJlc291 cmNlUmVxdWVzdEluaXRpYXRvcnMoKS5pY29uLCBtX2ZyYW1lLT5kb2N1bWVudCgpKTsKKyAgICBy ZXF1ZXN0LnNldEluaXRpYXRvcihjYWNoZWRSZXNvdXJjZVJlcXVlc3RJbml0aWF0b3JzKCkuaWNv bik7CiAKICAgICBtX3Jlc291cmNlID0gbV9mcmFtZS0+ZG9jdW1lbnQoKS0+Y2FjaGVkUmVzb3Vy Y2VMb2FkZXIoKS0+cmVxdWVzdFJhd1Jlc291cmNlKHJlcXVlc3QpOwogICAgIGlmIChtX3Jlc291 cmNlKQo=