47577 2010-10-13 01:33:26 -0700 [Chromium] Clean up WebPageSerializerImpl::serialize 2010-10-13 11:13:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth eric fishd rniwa oldest_to_newest 293306 0 abarth 2010-10-13 01:33:26 -0700 [Chromium] Clean up WebPageSerializerImpl::serialize 293307 1 70588 abarth 2010-10-13 01:34:40 -0700 Created attachment 70588 Patch 293312 2 70589 abarth 2010-10-13 01:41:46 -0700 Created attachment 70589 Patch 293315 3 70589 rniwa 2010-10-13 01:48:34 -0700 Comment on attachment 70589 Patch LGTM. 293541 4 70589 abarth 2010-10-13 11:12:56 -0700 Comment on attachment 70589 Patch Clearing flags on attachment: 70589 Committed r69675: <http://trac.webkit.org/changeset/69675> 293542 5 abarth 2010-10-13 11:13:02 -0700 All reviewed patches have been landed. Closing bug. 70588 2010-10-13 01:34:40 -0700 2010-10-13 01:41:38 -0700 Patch bug-47577-20101013013438.patch text/plain 6892 abarth ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDE4MGUzMzBhNzgyOWExOTRiZWU0ZTIzN2RmY2Q3MmRjNzU3Yjg4NzEu LjIzNzE3ZjI3NTRhNzViNGI3ZjFlMDJlNGFiZmJkNWE3NzRjNTc2M2UgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE5IEBACisyMDEwLTEwLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBDbGVhbiB1cCBXZWJQYWdlU2VyaWFsaXplckltcGw6OnNlcmlhbGl6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1NzcKKworICAgICAg ICBUaGlzIHBhdGNoIHNob3VsZG4ndCBoYXZlIGFueSBiZWhhdmlvciBjaGFuZ2UuICBJJ20ganVz dCB0cnlpbmcgdG8KKyAgICAgICAgdW5kZXJzdGFuZCB3aGF0IHRoaXMgY29kZSBkb2VzLgorCisg ICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6c2F2ZUhUTUxDb250ZW50VG9CdWZmZXIpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuY29kZUFuZEZsdXNoQnVmZmVyKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpzZXJpYWxpemUpOgorICAg ICAgICAqIHNyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuaDoKKwogMjAxMC0xMC0xMiAgS2VubmV0 aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4ZXMg Zm9yIGFsbCBXZWJHTCBjb250ZW50IGNhdXNpbmcgYXNzZXJ0aW9uIGZhaWx1cmVzCmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHAgYi9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHAKaW5kZXggNGIwOWYwY2Uy ZjQzMmE0YzdhNDFjYmRkOWVhNmM0Mzk0NDU0YzdmYy4uMThhZDQ0MmQyNzIzYTk2NmMyOWMxOGM2 YWRlZTFkYzNiOTI0YzAxMSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdl U2VyaWFsaXplckltcGwuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlh bGl6ZXJJbXBsLmNwcApAQCAtMjY5LDE2ICsyNjksMTYgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXpl ckltcGw6OnNhdmVIVE1MQ29udGVudFRvQnVmZmVyKAogICAgIG1fZGF0YUJ1ZmZlci5hcHBlbmQo cmVzdWx0KTsKICAgICBlbmNvZGVBbmRGbHVzaEJ1ZmZlcihXZWJQYWdlU2VyaWFsaXplckNsaWVu dDo6Q3VycmVudEZyYW1lSXNOb3RGaW5pc2hlZCwKICAgICAgICAgICAgICAgICAgICAgICAgICBw YXJhbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICBEb05vdEZvcmNlRmx1c2gpOwogfQogCiB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6 ZW5jb2RlQW5kRmx1c2hCdWZmZXIoCiAgICAgV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQ6OlBhZ2VT ZXJpYWxpemF0aW9uU3RhdHVzIHN0YXR1cywKICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0s Ci0gICAgYm9vbCBmb3JjZSkKKyAgICBGbHVzaE9wdGlvbiBmbHVzaE9wdGlvbikKIHsKICAgICAv LyBEYXRhIGJ1ZmZlciBpcyBub3QgZnVsbCBub3IgZG8gd2Ugd2FudCB0byBmb3JjZSBmbHVzaC4K LSAgICBpZiAoIWZvcmNlICYmIG1fZGF0YUJ1ZmZlci5zaXplKCkgPD0gZGF0YUJ1ZmZlckNhcGFj aXR5KQorICAgIGlmIChmbHVzaE9wdGlvbiAhPSBGb3JjZUZsdXNoICYmIG1fZGF0YUJ1ZmZlci5z aXplKCkgPD0gZGF0YUJ1ZmZlckNhcGFjaXR5KQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJp bmcgY29udGVudCA9IG1fZGF0YUJ1ZmZlci50b1N0cmluZygpOwpAQCAtNDg5LDU1ICs0ODksMzcg QEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmNvbGxlY3RUYXJnZXRGcmFtZXMoKQogCiBi b29sIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6c2VyaWFsaXplKCkKIHsKLSAgICAvLyBDb2xsZWN0 IHRhcmdldCBmcmFtZXMuCiAgICAgaWYgKCFtX2ZyYW1lc0NvbGxlY3RlZCkKICAgICAgICAgY29s bGVjdFRhcmdldEZyYW1lcygpOworCiAgICAgYm9vbCBkaWRTZXJpYWxpemF0aW9uID0gZmFsc2U7 Ci0gICAgLy8gR2V0IEtVUkwgZm9yIG1haW4gZnJhbWUuCi0gICAgS1VSTCBtYWluUGFnZVVSTCA9 IG1fc3BlY2lmaWVkV2ViRnJhbWVJbXBsLT5mcmFtZSgpLT5sb2FkZXIoKS0+dXJsKCk7CisgICAg S1VSTCBtYWluVVJMID0gbV9zcGVjaWZpZWRXZWJGcmFtZUltcGwtPmZyYW1lKCktPmRvY3VtZW50 KCktPnVybCgpOwogCi0gICAgLy8gR28gdGhyb3VnaCBhbGwgZnJhbWVzIGZvciBzZXJpYWxpemlu ZyBET00gZm9yIHdob2xlIHBhZ2UsIGluY2x1ZGUKLSAgICAvLyBzdWItZnJhbWVzLgotICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgc3RhdGljX2Nhc3Q8aW50PihtX2ZyYW1lcy5zaXplKCkpOyArK2kp IHsKLSAgICAgICAgLy8gR2V0IGN1cnJlbnQgc2VyaWFsaXppbmcgZnJhbWUuCi0gICAgICAgIFdl YkZyYW1lSW1wbCogY3VycmVudEZyYW1lID0gbV9mcmFtZXNbaV07Ci0gICAgICAgIC8vIEdldCBj dXJyZW50IHVzaW5nIGRvY3VtZW50LgotICAgICAgICBEb2N1bWVudCogY3VycmVudERvYyA9IGN1 cnJlbnRGcmFtZS0+ZnJhbWUoKS0+ZG9jdW1lbnQoKTsKLSAgICAgICAgLy8gR2V0IGN1cnJlbnQg ZnJhbWUncyBVUkwuCi0gICAgICAgIGNvbnN0IEtVUkwmIGN1cnJlbnRGcmFtZVVSTCA9IGN1cnJl bnRGcmFtZS0+ZnJhbWUoKS0+bG9hZGVyKCktPnVybCgpOwotCi0gICAgICAgIC8vIENoZWNrIHdo ZXRoZXIgd2UgaGF2ZSBkb25lIHRoaXMgZG9jdW1lbnQuCi0gICAgICAgIGlmIChjdXJyZW50RnJh bWVVUkwuaXNWYWxpZCgpICYmIG1fbG9jYWxMaW5rcy5jb250YWlucyhjdXJyZW50RnJhbWVVUkwu c3RyaW5nKCkpKSB7Ci0gICAgICAgICAgICAvLyBBIG5ldyBkb2N1bWVudCwgd2Ugd2lsbCBzZXJp YWxpemUgaXQuCi0gICAgICAgICAgICBkaWRTZXJpYWxpemF0aW9uID0gdHJ1ZTsKLSAgICAgICAg ICAgIC8vIEdldCB0YXJnZXQgZW5jb2RpbmcgZm9yIGN1cnJlbnQgZG9jdW1lbnQuCi0gICAgICAg ICAgICBTdHJpbmcgZW5jb2RpbmcgPSBjdXJyZW50RnJhbWUtPmZyYW1lKCktPmxvYWRlcigpLT53 cml0ZXIoKS0+ZW5jb2RpbmcoKTsKLSAgICAgICAgICAgIC8vIENyZWF0ZSB0aGUgdGV4dCBlbmNv ZGluZyBvYmplY3Qgd2l0aCB0YXJnZXQgZW5jb2RpbmcuCi0gICAgICAgICAgICBUZXh0RW5jb2Rp bmcgdGV4dEVuY29kaW5nKGVuY29kaW5nKTsKLSAgICAgICAgICAgIC8vIENvbnN0cnVjdCBzZXJp YWxpemUgcGFyYW1ldGVyIGZvciBsYXRlIHByb2Nlc3NpbmcgZG9jdW1lbnQuCi0gICAgICAgICAg ICBTZXJpYWxpemVEb21QYXJhbSBwYXJhbShjdXJyZW50RnJhbWVVUkwsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBlbmNvZGluZy5sZW5ndGgoKSA/IHRleHRFbmNvZGluZyA6 IFVURjhFbmNvZGluZygpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vy cmVudERvYywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRGcmFt ZVVSTCA9PSBtYWluUGFnZVVSTCA/IG1fbG9jYWxEaXJlY3RvcnlOYW1lIDogIiIpOwotCi0gICAg ICAgICAgICAvLyBQcm9jZXNzIGN1cnJlbnQgZG9jdW1lbnQuCi0gICAgICAgICAgICBFbGVtZW50 KiByb290RWxlbWVudCA9IGN1cnJlbnREb2MtPmRvY3VtZW50RWxlbWVudCgpOwotICAgICAgICAg ICAgaWYgKHJvb3RFbGVtZW50KQotICAgICAgICAgICAgICAgIGJ1aWxkQ29udGVudEZvck5vZGUo cm9vdEVsZW1lbnQsICZwYXJhbSk7Ci0KLSAgICAgICAgICAgIC8vIEZsdXNoIHRoZSByZW1haW5k ZXIgZGF0YSBhbmQgZmluaXNoIHNlcmlhbGl6aW5nIGN1cnJlbnQgZnJhbWUuCi0gICAgICAgICAg ICBlbmNvZGVBbmRGbHVzaEJ1ZmZlcihXZWJQYWdlU2VyaWFsaXplckNsaWVudDo6Q3VycmVudEZy YW1lSXNGaW5pc2hlZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwYXJhbSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEpOwotICAgICAgICB9CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZnJhbWVzLnNpemUoKTsgKytpKSB7CisgICAgICAgIFdl YkZyYW1lSW1wbCogd2ViRnJhbWUgPSBtX2ZyYW1lc1tpXTsKKyAgICAgICAgRG9jdW1lbnQqIGRv Y3VtZW50ID0gd2ViRnJhbWUtPmZyYW1lKCktPmRvY3VtZW50KCk7CisgICAgICAgIGNvbnN0IEtV UkwmIHVybCA9IGRvY3VtZW50LT51cmwoKTsKKworICAgICAgICBpZiAoIXVybC5pc1ZhbGlkKCkg fHwgIW1fbG9jYWxMaW5rcy5jb250YWlucyh1cmwuc3RyaW5nKCkpKQorICAgICAgICAgICAgY29u dGludWU7CisKKyAgICAgICAgZGlkU2VyaWFsaXphdGlvbiA9IHRydWU7CisKKyAgICAgICAgU3Ry aW5nIGVuY29kaW5nID0gd2ViRnJhbWUtPmZyYW1lKCktPmxvYWRlcigpLT53cml0ZXIoKS0+ZW5j b2RpbmcoKTsKKyAgICAgICAgY29uc3QgVGV4dEVuY29kaW5nJiB0ZXh0RW5jb2RpbmcgPSBlbmNv ZGluZy5pc0VtcHR5KCkgPyBVVEY4RW5jb2RpbmcoKSA6IFRleHRFbmNvZGluZyhlbmNvZGluZyk7 CisgICAgICAgIFN0cmluZyBkaXJlY3RvcnlOYW1lID0gdXJsID09IG1haW5VUkwgPyBtX2xvY2Fs RGlyZWN0b3J5TmFtZSA6ICIiOworCisgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtIHBhcmFtKHVy bCwgdGV4dEVuY29kaW5nLCBkb2N1bWVudCwgZGlyZWN0b3J5TmFtZSk7CisKKyAgICAgICAgRWxl bWVudCogZG9jdW1lbnRlRWxlbWVudCA9IGRvY3VtZW50LT5kb2N1bWVudEVsZW1lbnQoKTsKKyAg ICAgICAgaWYgKGRvY3VtZW50ZUVsZW1lbnQpCisgICAgICAgICAgICBidWlsZENvbnRlbnRGb3JO b2RlKGRvY3VtZW50ZUVsZW1lbnQsICZwYXJhbSk7CisKKyAgICAgICAgZW5jb2RlQW5kRmx1c2hC dWZmZXIoV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQ6OkN1cnJlbnRGcmFtZUlzRmluaXNoZWQsICZw YXJhbSwgRm9yY2VGbHVzaCk7CiAgICAgfQogCi0gICAgLy8gV2UgaGF2ZSBkb25lIGNhbGwgZnJh bWVzLCBzbyB3ZSBzZW5kIG1lc3NhZ2UgdG8gZW1iZWRkZXIgdG8gdGVsbCBpdCB0aGF0Ci0gICAg Ly8gZnJhbWVzIGFyZSBmaW5pc2hlZCBzZXJpYWxpemluZy4KICAgICBBU1NFUlQobV9kYXRhQnVm ZmVyLmlzRW1wdHkoKSk7Ci0gICAgbV9jbGllbnQtPmRpZFNlcmlhbGl6ZURhdGFGb3JGcmFtZShL VVJMKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJDU3RyaW5n KCIiLCAwKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYlBhZ2VT ZXJpYWxpemVyQ2xpZW50OjpBbGxGcmFtZXNBcmVGaW5pc2hlZCk7CisgICAgbV9jbGllbnQtPmRp ZFNlcmlhbGl6ZURhdGFGb3JGcmFtZShLVVJMKCksIFdlYkNTdHJpbmcoIiIsIDApLCBXZWJQYWdl U2VyaWFsaXplckNsaWVudDo6QWxsRnJhbWVzQXJlRmluaXNoZWQpOwogICAgIHJldHVybiBkaWRT ZXJpYWxpemF0aW9uOwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBh Z2VTZXJpYWxpemVySW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXpl ckltcGwuaAppbmRleCAzYzY2ZTNhZTY5YWRiMWI0YjBmZmE4NTc2OTU0OGZmZDYwZDIxMDMxLi40 NWI3MjdhMTU0YWI5NDU3YzUwZjk5ZWVjMmFjODJkNTUwNWRiYTA2IDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5oCisrKyBiL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmgKQEAgLTE3NywxMiArMTc3LDE4IEBAIHBy aXZhdGU6CiAgICAgLy8gU2F2ZSBnZW5lcmF0ZWQgaHRtbCBjb250ZW50IHRvIGRhdGEgYnVmZmVy LgogICAgIHZvaWQgc2F2ZUhUTUxDb250ZW50VG9CdWZmZXIoY29uc3QgV1RGOjpTdHJpbmcmIGNv bnRlbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21QYXJh bSogcGFyYW0pOworCisgICAgZW51bSBGbHVzaE9wdGlvbiB7CisgICAgICAgIEZvcmNlRmx1c2gs CisgICAgICAgIERvTm90Rm9yY2VGbHVzaCwKKyAgICB9OworCiAgICAgLy8gRmx1c2hlcyB0aGUg Y29udGVudCBidWZmZXIgYnkgZW5jb2RpbmcgYW5kIHNlbmRpbmcgdGhlIGNvbnRlbnQgdG8gdGhl CiAgICAgLy8gV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQuIENvbnRlbnQgaXMgbm90IGZsdXNoZWQg aWYgdGhlIGJ1ZmZlciBpcyBub3QgZnVsbAogICAgIC8vIHVubGVzcyBmb3JjZSBpcyAxLgogICAg IHZvaWQgZW5jb2RlQW5kRmx1c2hCdWZmZXIoV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQ6OlBhZ2VT ZXJpYWxpemF0aW9uU3RhdHVzIHN0YXR1cywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGJvb2wgZm9yY2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmx1c2hPcHRpb24p OwogICAgIC8vIFNlcmlhbGl6ZSBvcGVuIHRhZyBvZiBhbiBzcGVjaWZpZWQgZWxlbWVudC4KICAg ICB2b2lkIG9wZW5UYWdUb1N0cmluZyhjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50LAog ICAgICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSk7Cg== 70589 2010-10-13 01:41:46 -0700 2010-10-13 11:12:56 -0700 Patch bug-47577-20101013014145.patch text/plain 6889 abarth ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDE4MGUzMzBhNzgyOWExOTRiZWU0ZTIzN2RmY2Q3MmRjNzU3Yjg4NzEu LjIzNzE3ZjI3NTRhNzViNGI3ZjFlMDJlNGFiZmJkNWE3NzRjNTc2M2UgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE5IEBACisyMDEwLTEwLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0No cm9taXVtXSBDbGVhbiB1cCBXZWJQYWdlU2VyaWFsaXplckltcGw6OnNlcmlhbGl6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1NzcKKworICAgICAg ICBUaGlzIHBhdGNoIHNob3VsZG4ndCBoYXZlIGFueSBiZWhhdmlvciBjaGFuZ2UuICBJJ20ganVz dCB0cnlpbmcgdG8KKyAgICAgICAgdW5kZXJzdGFuZCB3aGF0IHRoaXMgY29kZSBkb2VzLgorCisg ICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6c2F2ZUhUTUxDb250ZW50VG9CdWZmZXIpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuY29kZUFuZEZsdXNoQnVmZmVyKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpzZXJpYWxpemUpOgorICAg ICAgICAqIHNyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuaDoKKwogMjAxMC0xMC0xMiAgS2VubmV0 aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4ZXMg Zm9yIGFsbCBXZWJHTCBjb250ZW50IGNhdXNpbmcgYXNzZXJ0aW9uIGZhaWx1cmVzCmRpZmYgLS1n aXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHAgYi9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5jcHAKaW5kZXggNGIwOWYwY2Uy ZjQzMmE0YzdhNDFjYmRkOWVhNmM0Mzk0NDU0YzdmYy4uZDA5OWVjYmJkNGFlYjYzMDQzNjkzYmVi YTRjMDg0NDUyYmYzOTU0YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdl U2VyaWFsaXplckltcGwuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlh bGl6ZXJJbXBsLmNwcApAQCAtMjY5LDE2ICsyNjksMTYgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXpl ckltcGw6OnNhdmVIVE1MQ29udGVudFRvQnVmZmVyKAogICAgIG1fZGF0YUJ1ZmZlci5hcHBlbmQo cmVzdWx0KTsKICAgICBlbmNvZGVBbmRGbHVzaEJ1ZmZlcihXZWJQYWdlU2VyaWFsaXplckNsaWVu dDo6Q3VycmVudEZyYW1lSXNOb3RGaW5pc2hlZCwKICAgICAgICAgICAgICAgICAgICAgICAgICBw YXJhbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAwKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICBEb05vdEZvcmNlRmx1c2gpOwogfQogCiB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6 ZW5jb2RlQW5kRmx1c2hCdWZmZXIoCiAgICAgV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQ6OlBhZ2VT ZXJpYWxpemF0aW9uU3RhdHVzIHN0YXR1cywKICAgICBTZXJpYWxpemVEb21QYXJhbSogcGFyYW0s Ci0gICAgYm9vbCBmb3JjZSkKKyAgICBGbHVzaE9wdGlvbiBmbHVzaE9wdGlvbikKIHsKICAgICAv LyBEYXRhIGJ1ZmZlciBpcyBub3QgZnVsbCBub3IgZG8gd2Ugd2FudCB0byBmb3JjZSBmbHVzaC4K LSAgICBpZiAoIWZvcmNlICYmIG1fZGF0YUJ1ZmZlci5zaXplKCkgPD0gZGF0YUJ1ZmZlckNhcGFj aXR5KQorICAgIGlmIChmbHVzaE9wdGlvbiAhPSBGb3JjZUZsdXNoICYmIG1fZGF0YUJ1ZmZlci5z aXplKCkgPD0gZGF0YUJ1ZmZlckNhcGFjaXR5KQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJp bmcgY29udGVudCA9IG1fZGF0YUJ1ZmZlci50b1N0cmluZygpOwpAQCAtNDg5LDU1ICs0ODksMzcg QEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmNvbGxlY3RUYXJnZXRGcmFtZXMoKQogCiBi b29sIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6c2VyaWFsaXplKCkKIHsKLSAgICAvLyBDb2xsZWN0 IHRhcmdldCBmcmFtZXMuCiAgICAgaWYgKCFtX2ZyYW1lc0NvbGxlY3RlZCkKICAgICAgICAgY29s bGVjdFRhcmdldEZyYW1lcygpOworCiAgICAgYm9vbCBkaWRTZXJpYWxpemF0aW9uID0gZmFsc2U7 Ci0gICAgLy8gR2V0IEtVUkwgZm9yIG1haW4gZnJhbWUuCi0gICAgS1VSTCBtYWluUGFnZVVSTCA9 IG1fc3BlY2lmaWVkV2ViRnJhbWVJbXBsLT5mcmFtZSgpLT5sb2FkZXIoKS0+dXJsKCk7CisgICAg S1VSTCBtYWluVVJMID0gbV9zcGVjaWZpZWRXZWJGcmFtZUltcGwtPmZyYW1lKCktPmRvY3VtZW50 KCktPnVybCgpOwogCi0gICAgLy8gR28gdGhyb3VnaCBhbGwgZnJhbWVzIGZvciBzZXJpYWxpemlu ZyBET00gZm9yIHdob2xlIHBhZ2UsIGluY2x1ZGUKLSAgICAvLyBzdWItZnJhbWVzLgotICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgc3RhdGljX2Nhc3Q8aW50PihtX2ZyYW1lcy5zaXplKCkpOyArK2kp IHsKLSAgICAgICAgLy8gR2V0IGN1cnJlbnQgc2VyaWFsaXppbmcgZnJhbWUuCi0gICAgICAgIFdl YkZyYW1lSW1wbCogY3VycmVudEZyYW1lID0gbV9mcmFtZXNbaV07Ci0gICAgICAgIC8vIEdldCBj dXJyZW50IHVzaW5nIGRvY3VtZW50LgotICAgICAgICBEb2N1bWVudCogY3VycmVudERvYyA9IGN1 cnJlbnRGcmFtZS0+ZnJhbWUoKS0+ZG9jdW1lbnQoKTsKLSAgICAgICAgLy8gR2V0IGN1cnJlbnQg ZnJhbWUncyBVUkwuCi0gICAgICAgIGNvbnN0IEtVUkwmIGN1cnJlbnRGcmFtZVVSTCA9IGN1cnJl bnRGcmFtZS0+ZnJhbWUoKS0+bG9hZGVyKCktPnVybCgpOwotCi0gICAgICAgIC8vIENoZWNrIHdo ZXRoZXIgd2UgaGF2ZSBkb25lIHRoaXMgZG9jdW1lbnQuCi0gICAgICAgIGlmIChjdXJyZW50RnJh bWVVUkwuaXNWYWxpZCgpICYmIG1fbG9jYWxMaW5rcy5jb250YWlucyhjdXJyZW50RnJhbWVVUkwu c3RyaW5nKCkpKSB7Ci0gICAgICAgICAgICAvLyBBIG5ldyBkb2N1bWVudCwgd2Ugd2lsbCBzZXJp YWxpemUgaXQuCi0gICAgICAgICAgICBkaWRTZXJpYWxpemF0aW9uID0gdHJ1ZTsKLSAgICAgICAg ICAgIC8vIEdldCB0YXJnZXQgZW5jb2RpbmcgZm9yIGN1cnJlbnQgZG9jdW1lbnQuCi0gICAgICAg ICAgICBTdHJpbmcgZW5jb2RpbmcgPSBjdXJyZW50RnJhbWUtPmZyYW1lKCktPmxvYWRlcigpLT53 cml0ZXIoKS0+ZW5jb2RpbmcoKTsKLSAgICAgICAgICAgIC8vIENyZWF0ZSB0aGUgdGV4dCBlbmNv ZGluZyBvYmplY3Qgd2l0aCB0YXJnZXQgZW5jb2RpbmcuCi0gICAgICAgICAgICBUZXh0RW5jb2Rp bmcgdGV4dEVuY29kaW5nKGVuY29kaW5nKTsKLSAgICAgICAgICAgIC8vIENvbnN0cnVjdCBzZXJp YWxpemUgcGFyYW1ldGVyIGZvciBsYXRlIHByb2Nlc3NpbmcgZG9jdW1lbnQuCi0gICAgICAgICAg ICBTZXJpYWxpemVEb21QYXJhbSBwYXJhbShjdXJyZW50RnJhbWVVUkwsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBlbmNvZGluZy5sZW5ndGgoKSA/IHRleHRFbmNvZGluZyA6 IFVURjhFbmNvZGluZygpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vy cmVudERvYywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRGcmFt ZVVSTCA9PSBtYWluUGFnZVVSTCA/IG1fbG9jYWxEaXJlY3RvcnlOYW1lIDogIiIpOwotCi0gICAg ICAgICAgICAvLyBQcm9jZXNzIGN1cnJlbnQgZG9jdW1lbnQuCi0gICAgICAgICAgICBFbGVtZW50 KiByb290RWxlbWVudCA9IGN1cnJlbnREb2MtPmRvY3VtZW50RWxlbWVudCgpOwotICAgICAgICAg ICAgaWYgKHJvb3RFbGVtZW50KQotICAgICAgICAgICAgICAgIGJ1aWxkQ29udGVudEZvck5vZGUo cm9vdEVsZW1lbnQsICZwYXJhbSk7Ci0KLSAgICAgICAgICAgIC8vIEZsdXNoIHRoZSByZW1haW5k ZXIgZGF0YSBhbmQgZmluaXNoIHNlcmlhbGl6aW5nIGN1cnJlbnQgZnJhbWUuCi0gICAgICAgICAg ICBlbmNvZGVBbmRGbHVzaEJ1ZmZlcihXZWJQYWdlU2VyaWFsaXplckNsaWVudDo6Q3VycmVudEZy YW1lSXNGaW5pc2hlZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZwYXJhbSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEpOwotICAgICAgICB9CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZnJhbWVzLnNpemUoKTsgKytpKSB7CisgICAgICAgIFdl YkZyYW1lSW1wbCogd2ViRnJhbWUgPSBtX2ZyYW1lc1tpXTsKKyAgICAgICAgRG9jdW1lbnQqIGRv Y3VtZW50ID0gd2ViRnJhbWUtPmZyYW1lKCktPmRvY3VtZW50KCk7CisgICAgICAgIGNvbnN0IEtV UkwmIHVybCA9IGRvY3VtZW50LT51cmwoKTsKKworICAgICAgICBpZiAoIXVybC5pc1ZhbGlkKCkg fHwgIW1fbG9jYWxMaW5rcy5jb250YWlucyh1cmwuc3RyaW5nKCkpKQorICAgICAgICAgICAgY29u dGludWU7CisKKyAgICAgICAgZGlkU2VyaWFsaXphdGlvbiA9IHRydWU7CisKKyAgICAgICAgU3Ry aW5nIGVuY29kaW5nID0gd2ViRnJhbWUtPmZyYW1lKCktPmxvYWRlcigpLT53cml0ZXIoKS0+ZW5j b2RpbmcoKTsKKyAgICAgICAgY29uc3QgVGV4dEVuY29kaW5nJiB0ZXh0RW5jb2RpbmcgPSBlbmNv ZGluZy5pc0VtcHR5KCkgPyBVVEY4RW5jb2RpbmcoKSA6IFRleHRFbmNvZGluZyhlbmNvZGluZyk7 CisgICAgICAgIFN0cmluZyBkaXJlY3RvcnlOYW1lID0gdXJsID09IG1haW5VUkwgPyBtX2xvY2Fs RGlyZWN0b3J5TmFtZSA6ICIiOworCisgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtIHBhcmFtKHVy bCwgdGV4dEVuY29kaW5nLCBkb2N1bWVudCwgZGlyZWN0b3J5TmFtZSk7CisKKyAgICAgICAgRWxl bWVudCogZG9jdW1lbnRFbGVtZW50ID0gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgpOworICAg ICAgICBpZiAoZG9jdW1lbnRFbGVtZW50KQorICAgICAgICAgICAgYnVpbGRDb250ZW50Rm9yTm9k ZShkb2N1bWVudEVsZW1lbnQsICZwYXJhbSk7CisKKyAgICAgICAgZW5jb2RlQW5kRmx1c2hCdWZm ZXIoV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQ6OkN1cnJlbnRGcmFtZUlzRmluaXNoZWQsICZwYXJh bSwgRm9yY2VGbHVzaCk7CiAgICAgfQogCi0gICAgLy8gV2UgaGF2ZSBkb25lIGNhbGwgZnJhbWVz LCBzbyB3ZSBzZW5kIG1lc3NhZ2UgdG8gZW1iZWRkZXIgdG8gdGVsbCBpdCB0aGF0Ci0gICAgLy8g ZnJhbWVzIGFyZSBmaW5pc2hlZCBzZXJpYWxpemluZy4KICAgICBBU1NFUlQobV9kYXRhQnVmZmVy LmlzRW1wdHkoKSk7Ci0gICAgbV9jbGllbnQtPmRpZFNlcmlhbGl6ZURhdGFGb3JGcmFtZShLVVJM KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJDU3RyaW5nKCIi LCAwKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYlBhZ2VTZXJp YWxpemVyQ2xpZW50OjpBbGxGcmFtZXNBcmVGaW5pc2hlZCk7CisgICAgbV9jbGllbnQtPmRpZFNl cmlhbGl6ZURhdGFGb3JGcmFtZShLVVJMKCksIFdlYkNTdHJpbmcoIiIsIDApLCBXZWJQYWdlU2Vy aWFsaXplckNsaWVudDo6QWxsRnJhbWVzQXJlRmluaXNoZWQpOwogICAgIHJldHVybiBkaWRTZXJp YWxpemF0aW9uOwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VT ZXJpYWxpemVySW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplcklt cGwuaAppbmRleCAzYzY2ZTNhZTY5YWRiMWI0YjBmZmE4NTc2OTU0OGZmZDYwZDIxMDMxLi40NWI3 MjdhMTU0YWI5NDU3YzUwZjk5ZWVjMmFjODJkNTUwNWRiYTA2IDEwMDY0NAotLS0gYS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1wbC5oCisrKyBiL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmgKQEAgLTE3NywxMiArMTc3LDE4IEBAIHByaXZh dGU6CiAgICAgLy8gU2F2ZSBnZW5lcmF0ZWQgaHRtbCBjb250ZW50IHRvIGRhdGEgYnVmZmVyLgog ICAgIHZvaWQgc2F2ZUhUTUxDb250ZW50VG9CdWZmZXIoY29uc3QgV1RGOjpTdHJpbmcmIGNvbnRl bnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTZXJpYWxpemVEb21QYXJhbSog cGFyYW0pOworCisgICAgZW51bSBGbHVzaE9wdGlvbiB7CisgICAgICAgIEZvcmNlRmx1c2gsCisg ICAgICAgIERvTm90Rm9yY2VGbHVzaCwKKyAgICB9OworCiAgICAgLy8gRmx1c2hlcyB0aGUgY29u dGVudCBidWZmZXIgYnkgZW5jb2RpbmcgYW5kIHNlbmRpbmcgdGhlIGNvbnRlbnQgdG8gdGhlCiAg ICAgLy8gV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQuIENvbnRlbnQgaXMgbm90IGZsdXNoZWQgaWYg dGhlIGJ1ZmZlciBpcyBub3QgZnVsbAogICAgIC8vIHVubGVzcyBmb3JjZSBpcyAxLgogICAgIHZv aWQgZW5jb2RlQW5kRmx1c2hCdWZmZXIoV2ViUGFnZVNlcmlhbGl6ZXJDbGllbnQ6OlBhZ2VTZXJp YWxpemF0aW9uU3RhdHVzIHN0YXR1cywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNl cmlhbGl6ZURvbVBhcmFtKiBwYXJhbSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJv b2wgZm9yY2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmx1c2hPcHRpb24pOwog ICAgIC8vIFNlcmlhbGl6ZSBvcGVuIHRhZyBvZiBhbiBzcGVjaWZpZWQgZWxlbWVudC4KICAgICB2 b2lkIG9wZW5UYWdUb1N0cmluZyhjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBlbGVtZW50LAogICAg ICAgICAgICAgICAgICAgICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKiBwYXJhbSk7Cg==