122396 2013-10-05 16:55:57 -0700 CTTE: Pass DocumentWriter around as a reference 2013-10-05 16:58:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue d-r eric.carlson esprehn+autocc fmalita glenn gyuyoung.kim japhet jer.noble kangil.han pdr schenney oldest_to_newest 936669 0 sam 2013-10-05 16:55:57 -0700 CTTE: Pass DocumentWriter around as a reference 936670 1 213476 sam 2013-10-05 16:56:23 -0700 Created attachment 213476 Patch 936671 2 213476 kling 2013-10-05 16:57:49 -0700 Comment on attachment 213476 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=213476&action=review r=me! > Source/WebCore/loader/DocumentLoader.h:99 > - DocumentWriter* writer() const { return &m_writer; } > + DocumentWriter& writer() const { return m_writer; } Duh. 936672 3 sam 2013-10-05 16:58:29 -0700 Committed r156978: <http://trac.webkit.org/changeset/156978> 213476 2013-10-05 16:56:23 -0700 2013-10-05 16:57:49 -0700 Patch bug-122396-20131005165622.patch text/plain 15226 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Njk3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDEzLTEwLTA1ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ1RURTogUGFzcyBEb2N1bWVudFdyaXRl ciBhcm91bmQgYXMgYSByZWZlcmVuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyMjM5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpleGVjdXRlSWZKYXZhU2NyaXB0VVJMKToK KyAgICAgICAgKiBkb20vRGVjb2RlZERhdGFEb2N1bWVudFBhcnNlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpEZWNvZGVkRGF0YURvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRlcyk6CisgICAgICAg IChXZWJDb3JlOjpEZWNvZGVkRGF0YURvY3VtZW50UGFyc2VyOjpmbHVzaCk6CisgICAgICAgICog ZG9tL0RlY29kZWREYXRhRG9jdW1lbnRQYXJzZXIuaDoKKyAgICAgICAgKiBkb20vRG9jdW1lbnRQ YXJzZXIuaDoKKyAgICAgICAgKiBkb20vUmF3RGF0YURvY3VtZW50UGFyc2VyLmg6CisgICAgICAg IChXZWJDb3JlOjpSYXdEYXRhRG9jdW1lbnRQYXJzZXI6OmZsdXNoKToKKyAgICAgICAgKiBodG1s L0ltYWdlRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudFBhcnNl cjo6YXBwZW5kQnl0ZXMpOgorICAgICAgICAqIGh0bWwvTWVkaWFEb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYURvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRlcyk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYURvY3VtZW50OjpyZXBsYWNlTWVkaWFFbGVtZW50VGltZXJGaXJlZCk6 CisgICAgICAgICogaHRtbC9QbHVnaW5Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQ bHVnaW5Eb2N1bWVudFBhcnNlcjo6Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUpOgorICAgICAgICAo V2ViQ29yZTo6UGx1Z2luRG9jdW1lbnRQYXJzZXI6OmFwcGVuZEJ5dGVzKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JPdmVybGF5OjpvdmVybGF5UGFnZSk6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6d3JpdGVyKToKKyAgICAgICAg KiBsb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRX cml0ZXI6OmFkZERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRXcml0ZXI6OmVuZCk6 CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lTG9hZGVyOjp0cmFuc2l0aW9uVG9Db21taXR0ZWQpOgorICAgICAgICAqIGxvYWRlci9TaW5r RG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2lua0RvY3VtZW50UGFyc2VyOjphcHBl bmRCeXRlcyk6CisgICAgICAgICogc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNWR0ltYWdlOjpkYXRhQ2hhbmdlZCk6CisKIDIwMTMtMTAtMDUgIEFuZHJlYXMg S2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIEZyYW1lVmlldzogUmVtb3ZlIGNv ZGUgZm9yIGRpc2FibGluZyByZXBhaW50cy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiAxNTY5NzMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTU2LDcgKzU1Niw3IEBAIGJvb2wgU2NyaXB0Q29udHJvbGxlcjo6ZXhlY3V0ZUlmSmF2 YVNjcmkKICAgICAgICAgLy8gRG9jdW1lbnRXcml0ZXI6OnJlcGxhY2VEb2N1bWVudCBjYW4gY2F1 c2UgdGhlIERvY3VtZW50TG9hZGVyIHRvIGdldCBkZXJlZidlZCBhbmQgcG9zc2libGUgZGVzdHJv eWVkLAogICAgICAgICAvLyBzbyBwcm90ZWN0IGl0IHdpdGggYSBSZWZQdHIuCiAgICAgICAgIGlm IChSZWZQdHI8RG9jdW1lbnRMb2FkZXI+IGxvYWRlciA9IG1fZnJhbWUuZG9jdW1lbnQoKS0+bG9h ZGVyKCkpCi0gICAgICAgICAgICBsb2FkZXItPndyaXRlcigpLT5yZXBsYWNlRG9jdW1lbnQoc2Ny aXB0UmVzdWx0LCBvd25lckRvY3VtZW50LmdldCgpKTsKKyAgICAgICAgICAgIGxvYWRlci0+d3Jp dGVyKCkucmVwbGFjZURvY3VtZW50KHNjcmlwdFJlc3VsdCwgb3duZXJEb2N1bWVudC5nZXQoKSk7 CiAgICAgfQogICAgIHJldHVybiB0cnVlOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0Rl Y29kZWREYXRhRG9jdW1lbnRQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2RvbS9EZWNvZGVkRGF0YURvY3VtZW50UGFyc2VyLmNwcAkocmV2aXNpb24gMTU2OTczKQorKysg U291cmNlL1dlYkNvcmUvZG9tL0RlY29kZWREYXRhRG9jdW1lbnRQYXJzZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0zNywyNiArMzcsMjYgQEAgRGVjb2RlZERhdGFEb2N1bWVudFBhcnNlcjo6RGVj b2RlZERhdGFEbwogewogfQogCi12b2lkIERlY29kZWREYXRhRG9jdW1lbnRQYXJzZXI6OmFwcGVu ZEJ5dGVzKERvY3VtZW50V3JpdGVyKiB3cml0ZXIsIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBs ZW5ndGgpCit2b2lkIERlY29kZWREYXRhRG9jdW1lbnRQYXJzZXI6OmFwcGVuZEJ5dGVzKERvY3Vt ZW50V3JpdGVyJiB3cml0ZXIsIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBsZW5ndGgpCiB7CiAg ICAgaWYgKCFsZW5ndGgpCiAgICAgICAgIHJldHVybjsKIAotICAgIFN0cmluZyBkZWNvZGVkID0g d3JpdGVyLT5jcmVhdGVEZWNvZGVySWZOZWVkZWQoKS0+ZGVjb2RlKGRhdGEsIGxlbmd0aCk7Cisg ICAgU3RyaW5nIGRlY29kZWQgPSB3cml0ZXIuY3JlYXRlRGVjb2RlcklmTmVlZGVkKCktPmRlY29k ZShkYXRhLCBsZW5ndGgpOwogICAgIGlmIChkZWNvZGVkLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgd3JpdGVyLT5yZXBvcnREYXRhUmVjZWl2ZWQoKTsKKyAgICB3cml0ZXIucmVw b3J0RGF0YVJlY2VpdmVkKCk7CiAgICAgYXBwZW5kKGRlY29kZWQucmVsZWFzZUltcGwoKSk7CiB9 CiAKLXZvaWQgRGVjb2RlZERhdGFEb2N1bWVudFBhcnNlcjo6Zmx1c2goRG9jdW1lbnRXcml0ZXIq IHdyaXRlcikKK3ZvaWQgRGVjb2RlZERhdGFEb2N1bWVudFBhcnNlcjo6Zmx1c2goRG9jdW1lbnRX cml0ZXImIHdyaXRlcikKIHsKLSAgICBTdHJpbmcgcmVtYWluaW5nRGF0YSA9IHdyaXRlci0+Y3Jl YXRlRGVjb2RlcklmTmVlZGVkKCktPmZsdXNoKCk7CisgICAgU3RyaW5nIHJlbWFpbmluZ0RhdGEg PSB3cml0ZXIuY3JlYXRlRGVjb2RlcklmTmVlZGVkKCktPmZsdXNoKCk7CiAgICAgaWYgKHJlbWFp bmluZ0RhdGEuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICB3cml0ZXItPnJlcG9y dERhdGFSZWNlaXZlZCgpOworICAgIHdyaXRlci5yZXBvcnREYXRhUmVjZWl2ZWQoKTsKICAgICBh cHBlbmQocmVtYWluaW5nRGF0YS5yZWxlYXNlSW1wbCgpKTsKIH0KIApJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0RlY29kZWREYXRhRG9jdW1lbnRQYXJzZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9kb20vRGVjb2RlZERhdGFEb2N1bWVudFBhcnNlci5oCShyZXZpc2lvbiAxNTY5 NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRGVjb2RlZERhdGFEb2N1bWVudFBhcnNlci5oCSh3 b3JraW5nIGNvcHkpCkBAIC00NCw4ICs0NCw4IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IGFwcGVuZChQYXNzUmVmUHRyPFN0cmluZ0ltcGw+KSA9IDA7CiAKICAgICAvLyBhcHBlbmRCeXRl cyBhbmQgZmx1c2ggYXJlIHVzZWQgYnkgRG9jdW1lbnRXcml0ZXIgKHRoZSBsb2FkZXIpLgotICAg IHZpcnR1YWwgdm9pZCBhcHBlbmRCeXRlcyhEb2N1bWVudFdyaXRlciosIGNvbnN0IGNoYXIqIGJ5 dGVzLCBzaXplX3QgbGVuZ3RoKTsKLSAgICB2aXJ0dWFsIHZvaWQgZmx1c2goRG9jdW1lbnRXcml0 ZXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kQnl0ZXMoRG9jdW1lbnRXcml0ZXImLCBjb25z dCBjaGFyKiBieXRlcywgc2l6ZV90IGxlbmd0aCk7CisgICAgdmlydHVhbCB2b2lkIGZsdXNoKERv Y3VtZW50V3JpdGVyJik7CiB9OwogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnRQYXJzZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRQYXJz ZXIuaAkocmV2aXNpb24gMTU2OTczKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50UGFy c2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDggKzQ3LDggQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBpbnNlcnQoY29uc3QgU2VnbWVudGVkU3RyaW5nJikgPSAwOwogCiAgICAgLy8gYXBw ZW5kQnl0ZXMgYW5kIGZsdXNoIGFyZSB1c2VkIGJ5IERvY3VtZW50V3JpdGVyICh0aGUgbG9hZGVy KS4KLSAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kQnl0ZXMoRG9jdW1lbnRXcml0ZXIqLCBjb25zdCBj aGFyKiBieXRlcywgc2l6ZV90IGxlbmd0aCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBmbHVzaChE b2N1bWVudFdyaXRlciopID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kQnl0ZXMoRG9jdW1l bnRXcml0ZXImLCBjb25zdCBjaGFyKiBieXRlcywgc2l6ZV90IGxlbmd0aCkgPSAwOworICAgIHZp cnR1YWwgdm9pZCBmbHVzaChEb2N1bWVudFdyaXRlciYpID0gMDsKIAogICAgIHZpcnR1YWwgdm9p ZCBwaW5Ub01haW5UaHJlYWQoKSB7IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1Jhd0Rh dGFEb2N1bWVudFBhcnNlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9SYXdE YXRhRG9jdW1lbnRQYXJzZXIuaAkocmV2aXNpb24gMTU2OTczKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL1Jhd0RhdGFEb2N1bWVudFBhcnNlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw3ICs0NCw3 IEBAIHByb3RlY3RlZDoKICAgICB9CiAKIHByaXZhdGU6Ci0gICAgdmlydHVhbCB2b2lkIGZsdXNo KERvY3VtZW50V3JpdGVyKiB3cml0ZXIpCisgICAgdmlydHVhbCB2b2lkIGZsdXNoKERvY3VtZW50 V3JpdGVyJiB3cml0ZXIpCiAgICAgewogICAgICAgICAvLyBNYWtlIHN1cmUgYXBwZW5kQnl0ZXMg aXMgY2FsbGVkIGF0IGxlYXN0IG9uY2UuCiAgICAgICAgIGFwcGVuZEJ5dGVzKHdyaXRlciwgMCwg MCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlRG9jdW1lbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5jcHAJKHJldmlzaW9uIDE1 Njk3MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSW1hZ2VEb2N1bWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTk0LDcgKzk0LDcgQEAgcHJpdmF0ZToKICAgICB7CiAgICAgfQogCi0gICAgdmly dHVhbCB2b2lkIGFwcGVuZEJ5dGVzKERvY3VtZW50V3JpdGVyKiwgY29uc3QgY2hhciosIHNpemVf dCk7CisgICAgdmlydHVhbCB2b2lkIGFwcGVuZEJ5dGVzKERvY3VtZW50V3JpdGVyJiwgY29uc3Qg Y2hhciosIHNpemVfdCk7CiAgICAgdmlydHVhbCB2b2lkIGZpbmlzaCgpOwogfTsKIApAQCAtMTI4 LDcgKzEyOCw3IEBAIHN0YXRpYyBmbG9hdCBwYWdlWm9vbUZhY3Rvcihjb25zdCBEb2N1bWUKICAg ICByZXR1cm4gZnJhbWUgPyBmcmFtZS0+cGFnZVpvb21GYWN0b3IoKSA6IDE7CiB9CiAKLXZvaWQg SW1hZ2VEb2N1bWVudFBhcnNlcjo6YXBwZW5kQnl0ZXMoRG9jdW1lbnRXcml0ZXIqLCBjb25zdCBj aGFyKiwgc2l6ZV90KQordm9pZCBJbWFnZURvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRlcyhEb2N1 bWVudFdyaXRlciYsIGNvbnN0IGNoYXIqLCBzaXplX3QpCiB7CiAgICAgRnJhbWUqIGZyYW1lID0g ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lLT5sb2FkZXIoKS5jbGllbnQoKS5h bGxvd0ltYWdlKGZyYW1lLT5zZXR0aW5ncygpLmFyZUltYWdlc0VuYWJsZWQoKSwgZG9jdW1lbnQo KS0+dXJsKCkpKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYURvY3VtZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRG9jdW1lbnQuY3BwCShyZXZp c2lvbiAxNTY5NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRG9jdW1lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02NCw3ICs2NCw3IEBAIHByaXZhdGU6CiAgICAgewogICAgIH0KIAot ICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRCeXRlcyhEb2N1bWVudFdyaXRlciosIGNvbnN0IGNoYXIq LCBzaXplX3QpOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRCeXRlcyhEb2N1bWVudFdyaXRlciYs IGNvbnN0IGNoYXIqLCBzaXplX3QpOwogCiAgICAgdm9pZCBjcmVhdGVEb2N1bWVudFN0cnVjdHVy ZSgpOwogCkBAIC0xMDksNyArMTA5LDcgQEAgdm9pZCBNZWRpYURvY3VtZW50UGFyc2VyOjpjcmVh dGVEb2N1bWVudAogICAgIGZyYW1lLT5sb2FkZXIoKS5hY3RpdmVEb2N1bWVudExvYWRlcigpLT5z ZXRNYWluUmVzb3VyY2VEYXRhQnVmZmVyaW5nUG9saWN5KERvTm90QnVmZmVyRGF0YSk7CiB9CiAK LXZvaWQgTWVkaWFEb2N1bWVudFBhcnNlcjo6YXBwZW5kQnl0ZXMoRG9jdW1lbnRXcml0ZXIqLCBj b25zdCBjaGFyKiwgc2l6ZV90KQordm9pZCBNZWRpYURvY3VtZW50UGFyc2VyOjphcHBlbmRCeXRl cyhEb2N1bWVudFdyaXRlciYsIGNvbnN0IGNoYXIqLCBzaXplX3QpCiB7CiAgICAgaWYgKG1fbWVk aWFFbGVtZW50KQogICAgICAgICByZXR1cm47CkBAIC0yMzAsNyArMjMwLDcgQEAgdm9pZCBNZWRp YURvY3VtZW50OjpyZXBsYWNlTWVkaWFFbGVtZW50VAogICAgICAgICBEb2N1bWVudExvYWRlciog ZG9jdW1lbnRMb2FkZXIgPSBsb2FkZXIoKTsKICAgICAgICAgQVNTRVJUKGRvY3VtZW50TG9hZGVy KTsKICAgICAgICAgaWYgKGRvY3VtZW50TG9hZGVyKQotICAgICAgICAgICAgZW1iZWRFbGVtZW50 LT5zZXRBdHRyaWJ1dGUodHlwZUF0dHIsIGRvY3VtZW50TG9hZGVyLT53cml0ZXIoKS0+bWltZVR5 cGUoKSk7CisgICAgICAgICAgICBlbWJlZEVsZW1lbnQtPnNldEF0dHJpYnV0ZSh0eXBlQXR0ciwg ZG9jdW1lbnRMb2FkZXItPndyaXRlcigpLm1pbWVUeXBlKCkpOwogCiAgICAgICAgIHZpZGVvRWxl bWVudC0+cGFyZW50Tm9kZSgpLT5yZXBsYWNlQ2hpbGQoZW1iZWRFbGVtZW50LCB2aWRlb0VsZW1l bnQsIElHTk9SRV9FWENFUFRJT04pOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv UGx1Z2luRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvUGx1 Z2luRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAxNTY5NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L1BsdWdpbkRvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNyBAQCBwcml2 YXRlOgogICAgIHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kQnl0ZXMoRG9jdW1l bnRXcml0ZXIqLCBjb25zdCBjaGFyKiwgc2l6ZV90KTsKKyAgICB2aXJ0dWFsIHZvaWQgYXBwZW5k Qnl0ZXMoRG9jdW1lbnRXcml0ZXImLCBjb25zdCBjaGFyKiwgc2l6ZV90KTsKIAogICAgIHZvaWQg Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUoKTsKIApAQCAtOTMsMTQgKzkzLDE0IEBAIHZvaWQgUGx1 Z2luRG9jdW1lbnRQYXJzZXI6OmNyZWF0ZURvY3VtZW4KICAgICBEb2N1bWVudExvYWRlciogbG9h ZGVyID0gZG9jdW1lbnQoKS0+bG9hZGVyKCk7CiAgICAgQVNTRVJUKGxvYWRlcik7CiAgICAgaWYg KGxvYWRlcikKLSAgICAgICAgbV9lbWJlZEVsZW1lbnQtPnNldEF0dHJpYnV0ZSh0eXBlQXR0ciwg bG9hZGVyLT53cml0ZXIoKS0+bWltZVR5cGUoKSk7CisgICAgICAgIG1fZW1iZWRFbGVtZW50LT5z ZXRBdHRyaWJ1dGUodHlwZUF0dHIsIGxvYWRlci0+d3JpdGVyKCkubWltZVR5cGUoKSk7CiAKICAg ICB0b1BsdWdpbkRvY3VtZW50KGRvY3VtZW50KCkpLT5zZXRQbHVnaW5FbGVtZW50KG1fZW1iZWRF bGVtZW50KTsKIAogICAgIGJvZHktPmFwcGVuZENoaWxkKGVtYmVkRWxlbWVudCwgSUdOT1JFX0VY Q0VQVElPTik7CiB9CiAKLXZvaWQgUGx1Z2luRG9jdW1lbnRQYXJzZXI6OmFwcGVuZEJ5dGVzKERv Y3VtZW50V3JpdGVyKiwgY29uc3QgY2hhciosIHNpemVfdCkKK3ZvaWQgUGx1Z2luRG9jdW1lbnRQ YXJzZXI6OmFwcGVuZEJ5dGVzKERvY3VtZW50V3JpdGVyJiwgY29uc3QgY2hhciosIHNpemVfdCkK IHsKICAgICBpZiAobV9lbWJlZEVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAJKHJldmlzaW9uIDE1 Njk3MykKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTQ2LDEwICs1NDYsMTAgQEAgUGFnZSogSW5zcGVjdG9yT3Zlcmxh eTo6b3ZlcmxheVBhZ2UoKQogICAgIGZyYW1lLnZpZXcoKS0+c2V0Q2FuSGF2ZVNjcm9sbGJhcnMo ZmFsc2UpOwogICAgIGZyYW1lLnZpZXcoKS0+c2V0VHJhbnNwYXJlbnQodHJ1ZSk7CiAgICAgQVNT RVJUKGxvYWRlci5hY3RpdmVEb2N1bWVudExvYWRlcigpKTsKLSAgICBsb2FkZXIuYWN0aXZlRG9j dW1lbnRMb2FkZXIoKS0+d3JpdGVyKCktPnNldE1JTUVUeXBlKCJ0ZXh0L2h0bWwiKTsKLSAgICBs b2FkZXIuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+d3JpdGVyKCktPmJlZ2luKCk7Ci0gICAgbG9h ZGVyLmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPndyaXRlcigpLT5hZGREYXRhKHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgY2hhcio+KEluc3BlY3Rvck92ZXJsYXlQYWdlX2h0bWwpLCBzaXplb2YoSW5z cGVjdG9yT3ZlcmxheVBhZ2VfaHRtbCkpOwotICAgIGxvYWRlci5hY3RpdmVEb2N1bWVudExvYWRl cigpLT53cml0ZXIoKS0+ZW5kKCk7CisgICAgbG9hZGVyLmFjdGl2ZURvY3VtZW50TG9hZGVyKCkt PndyaXRlcigpLnNldE1JTUVUeXBlKCJ0ZXh0L2h0bWwiKTsKKyAgICBsb2FkZXIuYWN0aXZlRG9j dW1lbnRMb2FkZXIoKS0+d3JpdGVyKCkuYmVnaW4oKTsKKyAgICBsb2FkZXIuYWN0aXZlRG9jdW1l bnRMb2FkZXIoKS0+d3JpdGVyKCkuYWRkRGF0YShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIq PihJbnNwZWN0b3JPdmVybGF5UGFnZV9odG1sKSwgc2l6ZW9mKEluc3BlY3Rvck92ZXJsYXlQYWdl X2h0bWwpKTsKKyAgICBsb2FkZXIuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+d3JpdGVyKCkuZW5k KCk7CiAKICNpZiBPUyhXSU5ET1dTKQogICAgIGV2YWx1YXRlSW5PdmVybGF5KCJzZXRQbGF0Zm9y bSIsICJ3aW5kb3dzIik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIu aAkocmV2aXNpb24gMTU2OTczKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTk2LDcgKzk2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBSZXNvdXJjZUxvYWRlciogbWFpblJlc291cmNlTG9hZGVyKCkgY29uc3Q7CiAg ICAgICAgIFBhc3NSZWZQdHI8UmVzb3VyY2VCdWZmZXI+IG1haW5SZXNvdXJjZURhdGEoKSBjb25z dDsKICAgICAgICAgCi0gICAgICAgIERvY3VtZW50V3JpdGVyKiB3cml0ZXIoKSBjb25zdCB7IHJl dHVybiAmbV93cml0ZXI7IH0KKyAgICAgICAgRG9jdW1lbnRXcml0ZXImIHdyaXRlcigpIGNvbnN0 IHsgcmV0dXJuIG1fd3JpdGVyOyB9CiAKICAgICAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBv cmlnaW5hbFJlcXVlc3QoKSBjb25zdDsKICAgICAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBv cmlnaW5hbFJlcXVlc3RDb3B5KCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIv RG9jdW1lbnRXcml0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudFdyaXRlci5jcHAJKHJldmlzaW9uIDE1Njk3MykKKysrIFNvdXJjZS9XZWJDb3JlL2xv YWRlci9Eb2N1bWVudFdyaXRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxOSw3ICsyMTksNyBA QCB2b2lkIERvY3VtZW50V3JpdGVyOjphZGREYXRhKGNvbnN0IGNoYXIqCiAgICAgICAgIENSQVNI KCk7CiAKICAgICBBU1NFUlQobV9wYXJzZXIpOwotICAgIG1fcGFyc2VyLT5hcHBlbmRCeXRlcyh0 aGlzLCBieXRlcywgbGVuZ3RoKTsKKyAgICBtX3BhcnNlci0+YXBwZW5kQnl0ZXMoKnRoaXMsIGJ5 dGVzLCBsZW5ndGgpOwogfQogCiB2b2lkIERvY3VtZW50V3JpdGVyOjplbmQoKQpAQCAtMjM5LDcg KzIzOSw3IEBAIHZvaWQgRG9jdW1lbnRXcml0ZXI6OmVuZCgpCiAgICAgaWYgKCFtX3BhcnNlcikK ICAgICAgICAgcmV0dXJuOwogICAgIC8vIEZJWE1FOiBtX3BhcnNlci0+ZmluaXNoKCkgc2hvdWxk IGltcGx5IG1fcGFyc2VyLT5mbHVzaCgpLgotICAgIG1fcGFyc2VyLT5mbHVzaCh0aGlzKTsKKyAg ICBtX3BhcnNlci0+Zmx1c2goKnRoaXMpOwogICAgIGlmICghbV9wYXJzZXIpCiAgICAgICAgIHJl dHVybjsKICAgICBtX3BhcnNlci0+ZmluaXNoKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDE1Njk3MykKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4OTIsNyArMTg5Miw3IEBAIHZv aWQgRnJhbWVMb2FkZXI6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZCgKICAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAotICAgIG1fZG9jdW1lbnRMb2FkZXItPndyaXRlcigp LT5zZXRNSU1FVHlwZShkbC0+cmVzcG9uc2VNSU1FVHlwZSgpKTsKKyAgICBtX2RvY3VtZW50TG9h ZGVyLT53cml0ZXIoKS5zZXRNSU1FVHlwZShkbC0+cmVzcG9uc2VNSU1FVHlwZSgpKTsKIAogICAg IC8vIFRlbGwgdGhlIGNsaWVudCB3ZSd2ZSBjb21taXR0ZWQgdGhpcyBVUkwuCiAgICAgQVNTRVJU KG1fZnJhbWUudmlldygpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TaW5rRG9jdW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9TaW5rRG9jdW1lbnQu Y3BwCShyZXZpc2lvbiAxNTY5NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvU2lua0RvY3Vt ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsOSBAQCBwcml2YXRlOgogICAgIH0K IAogICAgIC8vIElnbm9yZSBhbGwgZGF0YS4KLSAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kQnl0ZXMo RG9jdW1lbnRXcml0ZXIqLCBjb25zdCBjaGFyKiwgc2l6ZV90KSB7IH0KKyAgICB2aXJ0dWFsIHZv aWQgYXBwZW5kQnl0ZXMoRG9jdW1lbnRXcml0ZXImLCBjb25zdCBjaGFyKiwgc2l6ZV90KQorICAg IHsKKyAgICB9CiB9OwogCiBTaW5rRG9jdW1lbnQ6OlNpbmtEb2N1bWVudChGcmFtZSogZnJhbWUs IGNvbnN0IFVSTCYgdXJsKQpJbmRleDogU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0lt YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1h Z2UuY3BwCShyZXZpc2lvbiAxNTY5NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3Mv U1ZHSW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzAsMTAgKzM3MCwxMCBAQCBib29sIFNW R0ltYWdlOjpkYXRhQ2hhbmdlZChib29sIGFsbERhdGFSCiAgICAgICAgIGZyYW1lLnZpZXcoKS0+ c2V0VHJhbnNwYXJlbnQodHJ1ZSk7IC8vIFNWRyBJbWFnZXMgYXJlIHRyYW5zcGFyZW50LgogCiAg ICAgICAgIEFTU0VSVChsb2FkZXIuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKSk7IC8vIERvY3VtZW50 TG9hZGVyIHNob3VsZCBoYXZlIGJlZW4gY3JlYXRlZCBieSBmcmFtZS0+aW5pdCgpLgotICAgICAg ICBsb2FkZXIuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+d3JpdGVyKCktPnNldE1JTUVUeXBlKCJp bWFnZS9zdmcreG1sIik7Ci0gICAgICAgIGxvYWRlci5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53 cml0ZXIoKS0+YmVnaW4oVVJMKCkpOyAvLyBjcmVhdGUgdGhlIGVtcHR5IGRvY3VtZW50Ci0gICAg ICAgIGxvYWRlci5hY3RpdmVEb2N1bWVudExvYWRlcigpLT53cml0ZXIoKS0+YWRkRGF0YShkYXRh KCktPmRhdGEoKSwgZGF0YSgpLT5zaXplKCkpOwotICAgICAgICBsb2FkZXIuYWN0aXZlRG9jdW1l bnRMb2FkZXIoKS0+d3JpdGVyKCktPmVuZCgpOworICAgICAgICBsb2FkZXIuYWN0aXZlRG9jdW1l bnRMb2FkZXIoKS0+d3JpdGVyKCkuc2V0TUlNRVR5cGUoImltYWdlL3N2Zyt4bWwiKTsKKyAgICAg ICAgbG9hZGVyLmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPndyaXRlcigpLmJlZ2luKFVSTCgpKTsg Ly8gY3JlYXRlIHRoZSBlbXB0eSBkb2N1bWVudAorICAgICAgICBsb2FkZXIuYWN0aXZlRG9jdW1l bnRMb2FkZXIoKS0+d3JpdGVyKCkuYWRkRGF0YShkYXRhKCktPmRhdGEoKSwgZGF0YSgpLT5zaXpl KCkpOworICAgICAgICBsb2FkZXIuYWN0aXZlRG9jdW1lbnRMb2FkZXIoKS0+d3JpdGVyKCkuZW5k KCk7CiAKICAgICAgICAgLy8gU2V0IHRoZSBpbnRyaW5zaWMgc2l6ZSBiZWZvcmUgYSBjb250YWlu ZXIgc2l6ZSBpcyBhdmFpbGFibGUuCiAgICAgICAgIG1faW50cmluc2ljU2l6ZSA9IGNvbnRhaW5l clNpemUoKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1Njk3NykKKysrIFNvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisy MDEzLTEwLTA1ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ1RURTog UGFzcyBEb2N1bWVudFdyaXRlciBhcm91bmQgYXMgYSByZWZlcmVuY2UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjM5NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToK KyAgICAgICAgKC1bV2ViRnJhbWUgX2NhblByb3ZpZGVEb2N1bWVudFNvdXJjZV0pOgorCiAyMDEz LTEwLTA0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIERv bid0IHByZWZsaWdodCBzcGVsbCBjaGVja2VyIHdoZW4gY2FsbGluZyAtc2V0Q29udGludW91c1Nw ZWxsQ2hlY2tpbmdFbmFibGVkIHJlcGVhdGVkbHkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViRnJhbWUubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmll dy9XZWJGcmFtZS5tbQkocmV2aXNpb24gMTU2OTczKQorKysgU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJGcmFtZS5tbQkod29ya2luZyBjb3B5KQpAQCAtODAzLDcgKzgwMyw3IEBAIC0gKHZv aWQpX2RyYWdTb3VyY2VFbmRlZEF0OihOU1BvaW50KXdpbmQKIC0gKEJPT0wpX2NhblByb3ZpZGVE b2N1bWVudFNvdXJjZQogewogICAgIEZyYW1lKiBmcmFtZSA9IF9wcml2YXRlLT5jb3JlRnJhbWU7 Ci0gICAgU3RyaW5nIG1pbWVUeXBlID0gZnJhbWUtPmRvY3VtZW50KCktPmxvYWRlcigpLT53cml0 ZXIoKS0+bWltZVR5cGUoKTsKKyAgICBTdHJpbmcgbWltZVR5cGUgPSBmcmFtZS0+ZG9jdW1lbnQo KS0+bG9hZGVyKCktPndyaXRlcigpLm1pbWVUeXBlKCk7CiAgICAgUGx1Z2luRGF0YSogcGx1Z2lu RGF0YSA9IGZyYW1lLT5wYWdlKCkgPyAmZnJhbWUtPnBhZ2UoKS0+cGx1Z2luRGF0YSgpIDogMDsK IAogICAgIGlmIChXZWJDb3JlOjpET01JbXBsZW1lbnRhdGlvbjo6aXNUZXh0TUlNRVR5cGUobWlt ZVR5cGUpCg==