49163 2010-11-08 00:48:52 -0800 Rename CachedResourceLoader::m_doc to CachedResourceLoader::m_document 2010-11-08 00:59:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth oldest_to_newest 306045 0 abarth 2010-11-08 00:48:52 -0800 Rename CachedResourceLoader::m_doc to CachedResourceLoader::m_document 306046 1 73221 abarth 2010-11-08 00:50:00 -0800 Created attachment 73221 Patch 306048 2 abarth 2010-11-08 00:59:44 -0800 Committed r71503: <http://trac.webkit.org/changeset/71503> 73221 2010-11-08 00:50:00 -0800 2010-11-08 00:51:25 -0800 Patch bug-49163-20101108004958.patch text/plain 14521 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTUwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzkgQEAKKzIwMTAtMTEtMDggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6Om1fZG9jIHRvIENhY2hlZFJlc291cmNlTG9hZGVyOjpt X2RvY3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00OTE2MworCisgICAgICAgIFRoZSB1c3VhbCBjb252ZW50aW9uIGlzIHRvIHVzZWQgZG9jdW1l bnQsIG5vdCBkb2MgdG8gcmVmZXIgdG8gdGhlCisgICAgICAgIGRvY3VtZW50LgorCisgICAgICAg ICogY3NzL0NTU0N1cnNvckltYWdlVmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ3Vy c29ySW1hZ2VWYWx1ZTo6Y2FjaGVkSW1hZ2UpOgorICAgICAgICAqIGRvbS9YTUxEb2N1bWVudFBh cnNlckxpYnhtbDIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkQWxsb3dFeHRlcm5hbExv YWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6Q2FjaGVkUmVzb3VyY2VMb2Fk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmZyYW1lKToKKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0SW1hZ2UpOgorICAg ICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmNhblJlcXVlc3QpOgorICAgICAg ICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZSk6CisgICAg ICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cHJpbnRBY2Nlc3NEZW5pZWRNZXNz YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpwcmVsb2FkKToK KyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpjaGVja0ZvclBlbmRpbmdQ cmVsb2Fkcyk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVz dFByZWxvYWQpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5o OgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OmRvY3VtZW50KToKKyAg ICAgICAgKiBsb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TWVtb3J5Q2FjaGU6OnJlcXVlc3RSZXNvdXJjZSk6CisgICAgICAgICogbG9hZGVyL2xvYWRlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMb2FkZXI6OmxvYWQpOgorICAgICAgICAoV2ViQ29yZTo6 TG9hZGVyOjpIb3N0OjpzZXJ2ZVBlbmRpbmdSZXF1ZXN0cyk6CisgICAgICAgIChXZWJDb3JlOjpM b2FkZXI6Okhvc3Q6OmRpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6TG9hZGVy OjpIb3N0OjpkaWRGYWlsKToKKyAgICAgICAgKiB4bWwvWFNMVFByb2Nlc3NvckxpYnhzbHQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6ZG9jTG9hZGVyRnVuYyk6CisKIDIwMTAtMTEtMDcgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiAgUmVtb3Zl IHNvbWUgdW5uZWVkZWQgaW5jbHVkZXMuCkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NDdXJzb3JJbWFn ZVZhbHVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NDdXJzb3JJbWFnZVZhbHVl LmNwcAkocmV2aXNpb24gNzE1MDApCisrKyBXZWJDb3JlL2Nzcy9DU1NDdXJzb3JJbWFnZVZhbHVl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDggKzExNiw4IEBAIFN0eWxlQ2FjaGVkSW1hZ2Uq IENTU0N1cnNvckltYWdlVmFsdWU6OmMKICAgICBTdHJpbmcgdXJsID0gZ2V0U3RyaW5nVmFsdWUo KTsKIAogI2lmIEVOQUJMRShTVkcpIAotICAgIGlmIChpc1NWR0N1cnNvcklkZW50aWZpZXIodXJs KSAmJiBsb2FkZXIgJiYgbG9hZGVyLT5kb2MoKSkgewotICAgICAgICBpZiAoU1ZHQ3Vyc29yRWxl bWVudCogY3Vyc29yRWxlbWVudCA9IHJlc291cmNlUmVmZXJlbmNlZEJ5Q3Vyc29yRWxlbWVudCh1 cmwsIGxvYWRlci0+ZG9jKCkpKQorICAgIGlmIChpc1NWR0N1cnNvcklkZW50aWZpZXIodXJsKSAm JiBsb2FkZXIgJiYgbG9hZGVyLT5kb2N1bWVudCgpKSB7CisgICAgICAgIGlmIChTVkdDdXJzb3JF bGVtZW50KiBjdXJzb3JFbGVtZW50ID0gcmVzb3VyY2VSZWZlcmVuY2VkQnlDdXJzb3JFbGVtZW50 KHVybCwgbG9hZGVyLT5kb2N1bWVudCgpKSkKICAgICAgICAgICAgIHVybCA9IGN1cnNvckVsZW1l bnQtPmhyZWYoKTsKICAgICB9CiAjZW5kaWYKSW5kZXg6IFdlYkNvcmUvZG9tL1hNTERvY3VtZW50 UGFyc2VyTGlieG1sMi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQ YXJzZXJMaWJ4bWwyLmNwcAkocmV2aXNpb24gNzE1MDApCisrKyBXZWJDb3JlL2RvbS9YTUxEb2N1 bWVudFBhcnNlckxpYnhtbDIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDMsNyArNDAzLDcgQEAg c3RhdGljIGJvb2wgc2hvdWxkQWxsb3dFeHRlcm5hbExvYWQoY29ucwogICAgIC8vIHJldHJpZXZl ZCBjb250ZW50LiAgSWYgd2UgaGFkIG1vcmUgY29udGV4dCwgd2UgY291bGQgcG90ZW50aWFsbHkg YWxsb3cKICAgICAvLyB0aGUgcGFyc2VyIHRvIGxvYWQgYSBEVEQuICBBcyB0aGluZ3Mgc3RhbmQs IHdlIHRha2UgdGhlIGNvbnNlcnZhdGl2ZQogICAgIC8vIHJvdXRlIGFuZCBhbGxvdyBzYW1lLW9y aWdpbiByZXF1ZXN0cyBvbmx5LgotICAgIGlmICghWE1MRG9jdW1lbnRQYXJzZXJTY29wZTo6Y3Vy cmVudENhY2hlZFJlc291cmNlTG9hZGVyLT5kb2MoKS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuUmVx dWVzdCh1cmwpKSB7CisgICAgaWYgKCFYTUxEb2N1bWVudFBhcnNlclNjb3BlOjpjdXJyZW50Q2Fj aGVkUmVzb3VyY2VMb2FkZXItPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmNhblJlcXVl c3QodXJsKSkgewogICAgICAgICBYTUxEb2N1bWVudFBhcnNlclNjb3BlOjpjdXJyZW50Q2FjaGVk UmVzb3VyY2VMb2FkZXItPnByaW50QWNjZXNzRGVuaWVkTWVzc2FnZSh1cmwpOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQpJbmRleDogV2ViQ29yZS9sb2FkZXIvbG9hZGVyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9sb2FkZXIuY3BwCShyZXZpc2lvbiA3MTUwMCkKKysr IFdlYkNvcmUvbG9hZGVyL2xvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MSw3ICsxNTEs NyBAQCB2b2lkIExvYWRlcjo6bG9hZChDYWNoZWRSZXNvdXJjZUxvYWRlciogCiAgICAgICAgIGhv c3QtPnNlcnZlUGVuZGluZ1JlcXVlc3RzKHByaW9yaXR5KTsKICAgICB9IGVsc2UgewogICAgICAg ICAvLyBIYW5kbGUgYXN5bmNocm9ub3VzbHkgc28gZWFybHkgbG93IHByaW9yaXR5IHJlcXVlc3Rz IGRvbid0IGdldCBzY2hlZHVsZWQgYmVmb3JlIGxhdGVyIGhpZ2ggcHJpb3JpdHkgb25lcwotICAg ICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0 KGNhY2hlZFJlc291cmNlTG9hZGVyLT5kb2MoKSwgcmVzb3VyY2UtPnVybCgpKTsKKyAgICAgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRTY2hlZHVsZVJlc291cmNlUmVxdWVzdChjYWNo ZWRSZXNvdXJjZUxvYWRlci0+ZG9jdW1lbnQoKSwgcmVzb3VyY2UtPnVybCgpKTsKICAgICAgICAg c2NoZWR1bGVTZXJ2ZVBlbmRpbmdSZXF1ZXN0cygpOwogICAgIH0KIH0KQEAgLTMzNCw3ICszMzQs NyBAQCB2b2lkIExvYWRlcjo6SG9zdDo6c2VydmVQZW5kaW5nUmVxdWVzdHMoCiAgICAgICAgIC8v IEZvciBuYW1lZCBob3N0cyAtIHdoaWNoIGFyZSBvbmx5IGh0dHAocykgaG9zdHMgLSB3ZSBzaG91 bGQgYWx3YXlzIGVuZm9yY2UgdGhlIGNvbm5lY3Rpb24gbGltaXQuCiAgICAgICAgIC8vIEZvciBu b24tbmFtZWQgaG9zdHMgLSBldmVyeXRoaW5nIGJ1dCBodHRwKHMpIC0gd2Ugc2hvdWxkIG9ubHkg ZW5mb3JjZSB0aGUgbGltaXQgaWYgdGhlIGRvY3VtZW50IGlzbid0IGRvbmUgcGFyc2luZyAKICAg ICAgICAgLy8gYW5kIHdlIGRvbid0IGtub3cgYWxsIHN0eWxlc2hlZXRzIHlldC4KLSAgICAgICAg Ym9vbCBzaG91bGRMaW1pdFJlcXVlc3RzID0gIW1fbmFtZS5pc051bGwoKSB8fCBjYWNoZWRSZXNv dXJjZUxvYWRlci0+ZG9jKCktPnBhcnNpbmcoKSB8fCAhY2FjaGVkUmVzb3VyY2VMb2FkZXItPmRv YygpLT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKTsKKyAgICAgICAgYm9vbCBzaG91bGRMaW1pdFJl cXVlc3RzID0gIW1fbmFtZS5pc051bGwoKSB8fCBjYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jdW1l bnQoKS0+cGFyc2luZygpIHx8ICFjYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jdW1lbnQoKS0+aGF2 ZVN0eWxlc2hlZXRzTG9hZGVkKCk7CiAgICAgICAgIGlmIChzaG91bGRMaW1pdFJlcXVlc3RzICYm IG1fcmVxdWVzdHNMb2FkaW5nLnNpemUoKSArIG1fbm9uQ2FjaGVkUmVxdWVzdHNJbkZsaWdodCA+ PSBtX21heFJlcXVlc3RzSW5GbGlnaHQpIHsKICAgICAgICAgICAgIHNlcnZlTG93ZXJQcmlvcml0 eSA9IGZhbHNlOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzcxLDcgKzM3MSw3IEBAIHZvaWQg TG9hZGVyOjpIb3N0OjpzZXJ2ZVBlbmRpbmdSZXF1ZXN0cygKICAgICAgICAgICAgIHJlc291cmNl UmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQoIlB1cnBvc2UiLCAicHJlZmV0Y2giKTsKICNlbmRp ZgogCi0gICAgICAgIFJlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4gbG9hZGVyID0gU3VicmVzb3Vy Y2VMb2FkZXI6OmNyZWF0ZShjYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jKCktPmZyYW1lKCksCisg ICAgICAgIFJlZlB0cjxTdWJyZXNvdXJjZUxvYWRlcj4gbG9hZGVyID0gU3VicmVzb3VyY2VMb2Fk ZXI6OmNyZWF0ZShjYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSwKICAg ICAgICAgICAgIHRoaXMsIHJlc291cmNlUmVxdWVzdCwgcmVxdWVzdC0+c2hvdWxkRG9TZWN1cml0 eUNoZWNrKCksIHJlcXVlc3QtPnNlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MoKSk7CiAgICAgICAg IGlmIChsb2FkZXIpIHsKICAgICAgICAgICAgIG1fcmVxdWVzdHNMb2FkaW5nLmFkZChsb2FkZXIu cmVsZWFzZSgpLCByZXF1ZXN0KTsKQEAgLTQwNSw3ICs0MDUsNyBAQCB2b2lkIExvYWRlcjo6SG9z dDo6ZGlkRmluaXNoTG9hZGluZyhTdWJyCiAgICAgQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGNhY2hl ZFJlc291cmNlTG9hZGVyID0gcmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKTsKICAgICAv LyBQcmV2ZW50IHRoZSBkb2N1bWVudCBmcm9tIGJlaW5nIGRlc3Ryb3llZCBiZWZvcmUgd2UgYXJl IGRvbmUgd2l0aAogICAgIC8vIHRoZSBjYWNoZWRSZXNvdXJjZUxvYWRlciB0aGF0IGl0IHdpbGwg ZGVsZXRlIHdoZW4gdGhlIGRvY3VtZW50IGdldHMgZGVsZXRlZC4KLSAgICBSZWZQdHI8RG9jdW1l bnQ+IHByb3RlY3RvcihjYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jKCkpOworICAgIFJlZlB0cjxE b2N1bWVudD4gcHJvdGVjdG9yKGNhY2hlZFJlc291cmNlTG9hZGVyLT5kb2N1bWVudCgpKTsKICAg ICBpZiAoIXJlcXVlc3QtPmlzTXVsdGlwYXJ0KCkpCiAgICAgICAgIGNhY2hlZFJlc291cmNlTG9h ZGVyLT5kZWNyZW1lbnRSZXF1ZXN0Q291bnQocmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKSk7CiAK QEAgLTQ1MSw3ICs0NTEsNyBAQCB2b2lkIExvYWRlcjo6SG9zdDo6ZGlkRmFpbChTdWJyZXNvdXJj ZUxvCiAgICAgQ2FjaGVkUmVzb3VyY2VMb2FkZXIqIGNhY2hlZFJlc291cmNlTG9hZGVyID0gcmVx dWVzdC0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKTsKICAgICAvLyBQcmV2ZW50IHRoZSBkb2N1bWVu dCBmcm9tIGJlaW5nIGRlc3Ryb3llZCBiZWZvcmUgd2UgYXJlIGRvbmUgd2l0aAogICAgIC8vIHRo ZSBjYWNoZWRSZXNvdXJjZUxvYWRlciB0aGF0IGl0IHdpbGwgZGVsZXRlIHdoZW4gdGhlIGRvY3Vt ZW50IGdldHMgZGVsZXRlZC4KLSAgICBSZWZQdHI8RG9jdW1lbnQ+IHByb3RlY3RvcihjYWNoZWRS ZXNvdXJjZUxvYWRlci0+ZG9jKCkpOworICAgIFJlZlB0cjxEb2N1bWVudD4gcHJvdGVjdG9yKGNh Y2hlZFJlc291cmNlTG9hZGVyLT5kb2N1bWVudCgpKTsKICAgICBpZiAoIXJlcXVlc3QtPmlzTXVs dGlwYXJ0KCkpCiAgICAgICAgIGNhY2hlZFJlc291cmNlTG9hZGVyLT5kZWNyZW1lbnRSZXF1ZXN0 Q291bnQocmVxdWVzdC0+Y2FjaGVkUmVzb3VyY2UoKSk7CiAKSW5kZXg6IFdlYkNvcmUvbG9hZGVy L2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDcxNTAwKQorKysg V2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MCw5ICs1MCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotQ2FjaGVkUmVz b3VyY2VMb2FkZXI6OkNhY2hlZFJlc291cmNlTG9hZGVyKERvY3VtZW50KiBkb2MpCitDYWNoZWRS ZXNvdXJjZUxvYWRlcjo6Q2FjaGVkUmVzb3VyY2VMb2FkZXIoRG9jdW1lbnQqIGRvY3VtZW50KQog ICAgIDogbV9jYWNoZShjYWNoZSgpKQotICAgICwgbV9kb2MoZG9jKQorICAgICwgbV9kb2N1bWVu dChkb2N1bWVudCkKICAgICAsIG1fcmVxdWVzdENvdW50KDApCiAgICAgLCBtX2F1dG9Mb2FkSW1h Z2VzKHRydWUpCiAgICAgLCBtX2xvYWRJblByb2dyZXNzKGZhbHNlKQpAQCAtNzgsNyArNzgsNyBA QCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6fkNhY2hlZFJlc291cmNlTG9hCiAKIEZyYW1lKiBDYWNo ZWRSZXNvdXJjZUxvYWRlcjo6ZnJhbWUoKSBjb25zdAogewotICAgIHJldHVybiBtX2RvYy0+ZnJh bWUoKTsKKyAgICByZXR1cm4gbV9kb2N1bWVudC0+ZnJhbWUoKTsKIH0KIAogdm9pZCBDYWNoZWRS ZXNvdXJjZUxvYWRlcjo6Y2hlY2tGb3JSZWxvYWQoY29uc3QgS1VSTCYgZnVsbFVSTCkKQEAgLTEy OCw3ICsxMjgsNyBAQCBDYWNoZWRJbWFnZSogQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlCiAg ICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICBpZiAoZi0+bG9hZGVyKCktPnBhZ2VEaXNt aXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCgpKSB7Ci0gICAgICAgICAgICBLVVJMIGNvbXBsZXRl VVJMID0gbV9kb2MtPmNvbXBsZXRlVVJMKHVybCk7CisgICAgICAgICAgICBLVVJMIGNvbXBsZXRl VVJMID0gbV9kb2N1bWVudC0+Y29tcGxldGVVUkwodXJsKTsKICAgICAgICAgICAgIGlmIChjb21w bGV0ZVVSTC5pc1ZhbGlkKCkgJiYgY2FuUmVxdWVzdChDYWNoZWRSZXNvdXJjZTo6SW1hZ2VSZXNv dXJjZSwgY29tcGxldGVVUkwpKQogICAgICAgICAgICAgICAgIFBpbmdMb2FkZXI6OmxvYWRJbWFn ZShmLCBjb21wbGV0ZVVSTCk7CiAgICAgICAgICAgICByZXR1cm4gMDsKQEAgLTE5NSw3ICsxOTUs NyBAQCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KENhCiAgICAgICAgIGJy ZWFrOwogI2lmIEVOQUJMRShYU0xUKQogICAgIGNhc2UgQ2FjaGVkUmVzb3VyY2U6OlhTTFN0eWxl U2hlZXQ6Ci0gICAgICAgIGlmICghbV9kb2MtPnNlY3VyaXR5T3JpZ2luKCktPmNhblJlcXVlc3Qo dXJsKSkgeworICAgICAgICBpZiAoIW1fZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCktPmNhblJl cXVlc3QodXJsKSkgewogICAgICAgICAgICAgcHJpbnRBY2Nlc3NEZW5pZWRNZXNzYWdlKHVybCk7 CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KQEAgLTIyMCw3ICsyMjAsNyBA QCBib29sIENhY2hlZFJlc291cmNlTG9hZGVyOjpjYW5SZXF1ZXN0KENhCiAjZW5kaWYKICAgICAg ICAgLy8gVGhlc2UgcmVzb3VyY2UgY2FuIGluamVjdCBzY3JpcHQgaW50byB0aGUgY3VycmVudCBk b2N1bWVudC4KICAgICAgICAgaWYgKEZyYW1lKiBmID0gZnJhbWUoKSkKLSAgICAgICAgICAgIGYt PmxvYWRlcigpLT5jaGVja0lmUnVuSW5zZWN1cmVDb250ZW50KG1fZG9jLT5zZWN1cml0eU9yaWdp bigpLCB1cmwpOworICAgICAgICAgICAgZi0+bG9hZGVyKCktPmNoZWNrSWZSdW5JbnNlY3VyZUNv bnRlbnQobV9kb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSwgdXJsKTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6SW1hZ2VSZXNvdXJjZToKICAgICBjYXNlIENhY2hl ZFJlc291cmNlOjpDU1NTdHlsZVNoZWV0OgpAQCAtMjQ3LDcgKzI0Nyw3IEBAIGJvb2wgQ2FjaGVk UmVzb3VyY2VMb2FkZXI6OmNhblJlcXVlc3QoQ2EKIAogQ2FjaGVkUmVzb3VyY2UqIENhY2hlZFJl c291cmNlTG9hZGVyOjpyZXF1ZXN0UmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OlR5cGUgdHlwZSwg Y29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY2hhcnNldCwgYm9vbCBpc1ByZWxvYWQp CiB7Ci0gICAgS1VSTCBmdWxsVVJMID0gbV9kb2MtPmNvbXBsZXRlVVJMKHVybCk7CisgICAgS1VS TCBmdWxsVVJMID0gbV9kb2N1bWVudC0+Y29tcGxldGVVUkwodXJsKTsKIAogICAgIGlmICghZnVs bFVSTC5pc1ZhbGlkKCkgfHwgIWNhblJlcXVlc3QodHlwZSwgZnVsbFVSTCkpCiAgICAgICAgIHJl dHVybiAwOwpAQCAtMjg4LDkgKzI4OCw5IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnBy aW50QWNjZXNzRGUKICAgICBpZiAoIXNldHRpbmdzIHx8IHNldHRpbmdzLT5wcml2YXRlQnJvd3Np bmdFbmFibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFN0cmluZyBtZXNzYWdlID0gbV9k b2MtPnVybCgpLmlzTnVsbCgpID8KKyAgICBTdHJpbmcgbWVzc2FnZSA9IG1fZG9jdW1lbnQtPnVy bCgpLmlzTnVsbCgpID8KICAgICAgICAgbWFrZVN0cmluZygiVW5zYWZlIGF0dGVtcHQgdG8gbG9h ZCBVUkwgIiwgdXJsLnN0cmluZygpLCAnLicpIDoKLSAgICAgICAgbWFrZVN0cmluZygiVW5zYWZl IGF0dGVtcHQgdG8gbG9hZCBVUkwgIiwgdXJsLnN0cmluZygpLCAiIGZyb20gZnJhbWUgd2l0aCBV UkwgIiwgbV9kb2MtPnVybCgpLnN0cmluZygpLCAiLiBEb21haW5zLCBwcm90b2NvbHMgYW5kIHBv cnRzIG11c3QgbWF0Y2guXG4iKTsKKyAgICAgICAgbWFrZVN0cmluZygiVW5zYWZlIGF0dGVtcHQg dG8gbG9hZCBVUkwgIiwgdXJsLnN0cmluZygpLCAiIGZyb20gZnJhbWUgd2l0aCBVUkwgIiwgbV9k b2N1bWVudC0+dXJsKCkuc3RyaW5nKCksICIuIERvbWFpbnMsIHByb3RvY29scyBhbmQgcG9ydHMg bXVzdCBtYXRjaC5cbiIpOwogCiAgICAgLy8gRklYTUU6IHByb3ZpZGUgYSByZWFsIGxpbmUgbnVt YmVyIGFuZCBzb3VyY2UgVVJMLgogICAgIGZyYW1lKCktPmRvbVdpbmRvdygpLT5jb25zb2xlKCkt PmFkZE1lc3NhZ2UoT3RoZXJNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNz YWdlTGV2ZWwsIG1lc3NhZ2UsIDEsIFN0cmluZygpKTsKQEAgLTM3Niw3ICszNzYsNyBAQCBpbnQg Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RDb3VudCgpCiAgICAgCiB2b2lkIENhY2hlZFJl c291cmNlTG9hZGVyOjpwcmVsb2FkKENhY2hlZFJlc291cmNlOjpUeXBlIHR5cGUsIGNvbnN0IFN0 cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNoYXJzZXQsIGJvb2wgcmVmZXJlbmNlZEZyb21Cb2R5 KQogewotICAgIGJvb2wgaGFzUmVuZGVyaW5nID0gbV9kb2MtPmJvZHkoKSAmJiBtX2RvYy0+Ym9k eSgpLT5yZW5kZXJlcigpOworICAgIGJvb2wgaGFzUmVuZGVyaW5nID0gbV9kb2N1bWVudC0+Ym9k eSgpICYmIG1fZG9jdW1lbnQtPmJvZHkoKS0+cmVuZGVyZXIoKTsKICAgICBpZiAoIWhhc1JlbmRl cmluZyAmJiAocmVmZXJlbmNlZEZyb21Cb2R5IHx8IHR5cGUgPT0gQ2FjaGVkUmVzb3VyY2U6Oklt YWdlUmVzb3VyY2UpKSB7CiAgICAgICAgIC8vIERvbid0IHByZWxvYWQgaW1hZ2VzIG9yIGJvZHkg cmVzb3VyY2VzIGJlZm9yZSB3ZSBoYXZlIHNvbWV0aGluZyB0byBkcmF3LiBUaGlzIHByZXZlbnRz CiAgICAgICAgIC8vIHByZWxvYWRzIGZyb20gYm9keSBkZWxheWluZyBmaXJzdCBkaXNwbGF5IHdo ZW4gYmFuZHdpZHRoIGlzIGxpbWl0ZWQuCkBAIC0zOTAsMTIgKzM5MCwxMiBAQCB2b2lkIENhY2hl ZFJlc291cmNlTG9hZGVyOjpwcmVsb2FkKENhY2hlCiB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVy OjpjaGVja0ZvclBlbmRpbmdQcmVsb2FkcygpIAogewogICAgIHVuc2lnbmVkIGNvdW50ID0gbV9w ZW5kaW5nUHJlbG9hZHMuc2l6ZSgpOwotICAgIGlmICghY291bnQgfHwgIW1fZG9jLT5ib2R5KCkg fHwgIW1fZG9jLT5ib2R5KCktPnJlbmRlcmVyKCkpCisgICAgaWYgKCFjb3VudCB8fCAhbV9kb2N1 bWVudC0+Ym9keSgpIHx8ICFtX2RvY3VtZW50LT5ib2R5KCktPnJlbmRlcmVyKCkpCiAgICAgICAg IHJldHVybjsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewogICAg ICAgICBQZW5kaW5nUHJlbG9hZCYgcHJlbG9hZCA9IG1fcGVuZGluZ1ByZWxvYWRzW2ldOwogICAg ICAgICAvLyBEb24ndCByZXF1ZXN0IHByZWxvYWQgaWYgdGhlIHJlc291cmNlIGFscmVhZHkgbG9h ZGVkIG5vcm1hbGx5ICh0aGlzIHdpbGwgcmVzdWx0IGluIGRvdWJsZSBsb2FkIGlmIHRoZSBwYWdl IGlzIGJlaW5nIHJlbG9hZGVkIHdpdGggY2FjaGVkIHJlc3VsdHMgaWdub3JlZCkuCi0gICAgICAg IGlmICghY2FjaGVkUmVzb3VyY2UobV9kb2MtPmNvbXBsZXRlVVJMKHByZWxvYWQubV91cmwpKSkK KyAgICAgICAgaWYgKCFjYWNoZWRSZXNvdXJjZShtX2RvY3VtZW50LT5jb21wbGV0ZVVSTChwcmVs b2FkLm1fdXJsKSkpCiAgICAgICAgICAgICByZXF1ZXN0UHJlbG9hZChwcmVsb2FkLm1fdHlwZSwg cHJlbG9hZC5tX3VybCwgcHJlbG9hZC5tX2NoYXJzZXQpOwogICAgIH0KICAgICBtX3BlbmRpbmdQ cmVsb2Fkcy5jbGVhcigpOwpAQCAtNDA1LDcgKzQwNSw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VM b2FkZXI6OnJlcXVlc3RQcmVsb2EKIHsKICAgICBTdHJpbmcgZW5jb2Rpbmc7CiAgICAgaWYgKHR5 cGUgPT0gQ2FjaGVkUmVzb3VyY2U6OlNjcmlwdCB8fCB0eXBlID09IENhY2hlZFJlc291cmNlOjpD U1NTdHlsZVNoZWV0KQotICAgICAgICBlbmNvZGluZyA9IGNoYXJzZXQuaXNFbXB0eSgpID8gbV9k b2MtPmZyYW1lKCktPmxvYWRlcigpLT53cml0ZXIoKS0+ZW5jb2RpbmcoKSA6IGNoYXJzZXQ7Cisg ICAgICAgIGVuY29kaW5nID0gY2hhcnNldC5pc0VtcHR5KCkgPyBtX2RvY3VtZW50LT5mcmFtZSgp LT5sb2FkZXIoKS0+d3JpdGVyKCktPmVuY29kaW5nKCkgOiBjaGFyc2V0OwogCiAgICAgQ2FjaGVk UmVzb3VyY2UqIHJlc291cmNlID0gcmVxdWVzdFJlc291cmNlKHR5cGUsIHVybCwgZW5jb2Rpbmcs IHRydWUpOwogICAgIGlmICghcmVzb3VyY2UgfHwgKG1fcHJlbG9hZHMgJiYgbV9wcmVsb2Fkcy0+ Y29udGFpbnMocmVzb3VyY2UpKSkKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJl c291cmNlTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk UmVzb3VyY2VMb2FkZXIuaAkocmV2aXNpb24gNzE1MDApCisrKyBXZWJDb3JlL2xvYWRlci9jYWNo ZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw3ICs4Miw3IEBA IHB1YmxpYzoKICAgICBDYWNoZVBvbGljeSBjYWNoZVBvbGljeSgpIGNvbnN0OwogICAgIAogICAg IEZyYW1lKiBmcmFtZSgpIGNvbnN0OyAvLyBDYW4gYmUgTlVMTAotICAgIERvY3VtZW50KiBkb2Mo KSBjb25zdCB7IHJldHVybiBtX2RvYzsgfQorICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNvbnN0 IHsgcmV0dXJuIG1fZG9jdW1lbnQ7IH0KIAogICAgIHZvaWQgcmVtb3ZlQ2FjaGVkUmVzb3VyY2Uo Q2FjaGVkUmVzb3VyY2UqKSBjb25zdDsKIApAQCAtMTEyLDcgKzExMiw3IEBAIHByaXZhdGU6CiAg ICAgTWVtb3J5Q2FjaGUqIG1fY2FjaGU7CiAgICAgSGFzaFNldDxTdHJpbmc+IG1fcmVsb2FkZWRV UkxzOwogICAgIG11dGFibGUgRG9jdW1lbnRSZXNvdXJjZU1hcCBtX2RvY3VtZW50UmVzb3VyY2Vz OwotICAgIERvY3VtZW50KiBtX2RvYzsKKyAgICBEb2N1bWVudCogbV9kb2N1bWVudDsKICAgICAK ICAgICBpbnQgbV9yZXF1ZXN0Q291bnQ7CiAgICAgCkluZGV4OiBXZWJDb3JlL2xvYWRlci9jYWNo ZS9NZW1vcnlDYWNoZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVt b3J5Q2FjaGUuY3BwCShyZXZpc2lvbiA3MTUwMCkKKysrIFdlYkNvcmUvbG9hZGVyL2NhY2hlL01l bW9yeUNhY2hlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTExLDEwICsxMTEsMTAgQEAgQ2FjaGVk UmVzb3VyY2UqIE1lbW9yeUNhY2hlOjpyZXF1ZXN0UmVzbwogICAgICAgICByZXR1cm4gMDsKICAg ICB9CiAKLSAgICBpZiAoIWNhY2hlZFJlc291cmNlTG9hZGVyLT5kb2MoKS0+c2VjdXJpdHlPcmln aW4oKS0+Y2FuRGlzcGxheSh1cmwpKSB7CisgICAgaWYgKCFjYWNoZWRSZXNvdXJjZUxvYWRlci0+ ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuRGlzcGxheSh1cmwpKSB7CiAgICAgICAg IExPRyhSZXNvdXJjZUxvYWRpbmcsICIuLi5VUkwgd2FzIG5vdCBhbGxvd2VkIGJ5IFNlY3VyaXR5 T3JpZ2luIik7CiAgICAgICAgIGlmICghcmVxdWVzdElzUHJlbG9hZCkKLSAgICAgICAgICAgIEZy YW1lTG9hZGVyOjpyZXBvcnRMb2NhbExvYWRGYWlsZWQoY2FjaGVkUmVzb3VyY2VMb2FkZXItPmRv YygpLT5mcmFtZSgpLCB1cmwuc3RyaW5nKCkpOworICAgICAgICAgICAgRnJhbWVMb2FkZXI6OnJl cG9ydExvY2FsTG9hZEZhaWxlZChjYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jdW1lbnQoKS0+ZnJh bWUoKSwgdXJsLnN0cmluZygpKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogICAgIApJbmRl eDogV2ViQ29yZS94bWwvWFNMVFByb2Nlc3NvckxpYnhzbHQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUveG1sL1hTTFRQcm9jZXNzb3JMaWJ4c2x0LmNwcAkocmV2aXNpb24gNzE1MDApCisrKyBX ZWJDb3JlL3htbC9YU0xUUHJvY2Vzc29yTGlieHNsdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEx NywxMCArMTE3LDEwIEBAIHN0YXRpYyB4bWxEb2NQdHIgZG9jTG9hZGVyRnVuYyhjb25zdCB4bWwK IAogICAgICAgICBWZWN0b3I8Y2hhcj4gZGF0YTsKIAotICAgICAgICBib29sIHJlcXVlc3RBbGxv d2VkID0gZ2xvYmFsQ2FjaGVkUmVzb3VyY2VMb2FkZXItPmZyYW1lKCkgJiYgZ2xvYmFsQ2FjaGVk UmVzb3VyY2VMb2FkZXItPmRvYygpLT5zZWN1cml0eU9yaWdpbigpLT5jYW5SZXF1ZXN0KHVybCk7 CisgICAgICAgIGJvb2wgcmVxdWVzdEFsbG93ZWQgPSBnbG9iYWxDYWNoZWRSZXNvdXJjZUxvYWRl ci0+ZnJhbWUoKSAmJiBnbG9iYWxDYWNoZWRSZXNvdXJjZUxvYWRlci0+ZG9jdW1lbnQoKS0+c2Vj dXJpdHlPcmlnaW4oKS0+Y2FuUmVxdWVzdCh1cmwpOwogICAgICAgICBpZiAocmVxdWVzdEFsbG93 ZWQpIHsKICAgICAgICAgICAgIGdsb2JhbENhY2hlZFJlc291cmNlTG9hZGVyLT5mcmFtZSgpLT5s b2FkZXIoKS0+bG9hZFJlc291cmNlU3luY2hyb25vdXNseSh1cmwsIEFsbG93U3RvcmVkQ3JlZGVu dGlhbHMsIGVycm9yLCByZXNwb25zZSwgZGF0YSk7Ci0gICAgICAgICAgICByZXF1ZXN0QWxsb3dl ZCA9IGdsb2JhbENhY2hlZFJlc291cmNlTG9hZGVyLT5kb2MoKS0+c2VjdXJpdHlPcmlnaW4oKS0+ Y2FuUmVxdWVzdChyZXNwb25zZS51cmwoKSk7CisgICAgICAgICAgICByZXF1ZXN0QWxsb3dlZCA9 IGdsb2JhbENhY2hlZFJlc291cmNlTG9hZGVyLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigp LT5jYW5SZXF1ZXN0KHJlc3BvbnNlLnVybCgpKTsKICAgICAgICAgfQogICAgICAgICBpZiAoIXJl cXVlc3RBbGxvd2VkKSB7CiAgICAgICAgICAgICBkYXRhLmNsZWFyKCk7Cg==