32523 2009-12-14 09:46:57 -0800 Web Inspector: Extract WebInspector.Section from WebInspector.PropertiesSection 2009-12-15 03:29:24 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 apavlov webkit-unassigned bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy webkit.review.bot oldest_to_newest 171447 0 apavlov 2009-12-14 09:46:57 -0800 A more generic section than WebInspector.PropertiesSection (not containing a list) is necessary, to enable the Audits panel to show audit results. This is the second bit of the Audits panel submission. 171456 1 44806 apavlov 2009-12-14 10:00:37 -0800 Created attachment 44806 patch 171519 2 44806 timothy 2009-12-14 13:01:30 -0800 Comment on attachment 44806 patch This might conflict with Pavel's recent changes for keyboard focus. 171591 3 44806 commit-queue 2009-12-14 14:38:40 -0800 Comment on attachment 44806 patch Rejecting patch 44806 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Timothy Hatcher', '--force']" exit_code: 1 Last 500 characters of output: e.gypi Hunk #1 succeeded at 3700 (offset 5 lines). patching file WebCore/WebCore.vcproj/WebCore.vcproj Hunk #1 succeeded at 42620 (offset 14 lines). patching file WebCore/inspector/front-end/PropertiesSection.js Hunk #2 FAILED at 29. 1 out of 2 hunks FAILED -- saving rejects to file WebCore/inspector/front-end/PropertiesSection.js.rej patching file WebCore/inspector/front-end/Section.js patching file WebCore/inspector/front-end/WebKit.qrc patching file WebCore/inspector/front-end/inspector.html 171592 4 pfeldman 2009-12-14 14:41:11 -0800 I'll land manually or let Alexander update the patch. 171792 5 44860 apavlov 2009-12-15 03:11:04 -0800 Created attachment 44860 patch (merged) 171794 6 webkit.review.bot 2009-12-15 03:11:57 -0800 style-queue ran check-webkit-style on attachment 44860 without any errors. 171796 7 44860 commit-queue 2009-12-15 03:29:19 -0800 Comment on attachment 44860 patch (merged) Clearing flags on attachment: 44860 Committed r52149: <http://trac.webkit.org/changeset/52149> 171797 8 commit-queue 2009-12-15 03:29:24 -0800 All reviewed patches have been landed. Closing bug. 44806 2009-12-14 10:00:37 -0800 2009-12-15 03:11:04 -0800 patch section.patch text/plain 11553 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTA0NDk4Yi4uNDNiZjk4YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0xMi0xNCAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4dHJhY3QgV2ViSW5zcGVjdG9yLlNlY3Rpb24gZnJvbSBX ZWJJbnNwZWN0b3IuUHJvcGVydGllc1NlY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjUyMworCisgICAgICAgICogV2ViQ29yZS5neXBpOgor ICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvcGVydGllc1NlY3Rpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2Vj dGlvbi5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuZ2V0IHRpdGxlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TZWN0aW9uLnByb3RvdHlwZS5zZXQgdGl0bGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNlY3Rpb24ucHJvdG90eXBlLmdldCBzdWJ0aXRsZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHN1YnRpdGxlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWN0aW9uLnByb3RvdHlwZS5nZXQgZXhwYW5kZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNlY3Rpb24ucHJvdG90eXBlLnNldCBleHBhbmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2VjdGlvbi5wcm90b3R5cGUuZ2V0IHBvcHVsYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHBvcHVsYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2VjdGlvbi5wcm90b3R5cGUuZXhwYW5kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWN0 aW9uLnByb3RvdHlwZS5jb2xsYXBzZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbi5w cm90b3R5cGUudG9nZ2xlRXhwYW5kZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv V2ViS2l0LnFyYzoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1s OgorCiAyMDA5LTEyLTAzICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAgPHplY2tlQHNlbGZp c2gub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBhYmQw ZGUwLi43NDg5MGE1IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQorKysgYi9XZWJD b3JlL1dlYkNvcmUuZ3lwaQpAQCAtMzY5NSw2ICszNjk1LDcgQEAKICAgICAgICAgICAgICdpbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250 LWVuZC9TY3JpcHRzUGFuZWwuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0Vmlldy5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9TZWN0aW9u LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJQYW5lLmpzJywK ICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJUcmVlRWxlbWVudC5qcycs CiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcycsCmRpZmYg LS1naXQgYS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qIGIvV2ViQ29yZS9X ZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagppbmRleCA0NTI2NTZhLi45MDdjNmRjIDEwMDY0 NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qCisrKyBiL1dlYkNv cmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKQEAgLTQyNjA2LDYgKzQyNjA2LDEwIEBA CiAJCQkJCT4NCiAJCQkJPC9GaWxlPg0KIAkJCQk8RmlsZQ0KKwkJCQkJUmVsYXRpdmVQYXRoPSIu LlxpbnNwZWN0b3JcZnJvbnQtZW5kXFNlY3Rpb24uanMiDQorCQkJCQk+DQorCQkJCTwvRmlsZT4N CisJCQkJPEZpbGUNCiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxT aWRlYmFyUGFuZS5qcyINCiAJCQkJCT4NCiAJCQkJPC9GaWxlPg0KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2VjdGlvbi5qcyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2VjdGlvbi5qcwppbmRleCBhNGIyZmJhLi5kMTZh Njk1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1Nl Y3Rpb24uanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTZWN0 aW9uLmpzCkBAIC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNyBBcHBsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC0yOCwxMTggKzI5LDE0IEBACiAKIFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbiA9 IGZ1bmN0aW9uKHRpdGxlLCBzdWJ0aXRsZSkKIHsKLSAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInNl Y3Rpb24iOwotCi0gICAgdGhpcy5oZWFkZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5oZWFkZXJFbGVtZW50LmNsYXNzTmFtZSA9ICJoZWFkZXIiOwot Ci0gICAgdGhpcy50aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsK LSAgICB0aGlzLnRpdGxlRWxlbWVudC5jbGFzc05hbWUgPSAidGl0bGUiOwotCi0gICAgdGhpcy5z dWJ0aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlz LnN1YnRpdGxlRWxlbWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOwotCi0gICAgdGhpcy5oZWFk ZXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuc3VidGl0bGVFbGVtZW50KTsKLSAgICB0aGlzLmhl YWRlckVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy50aXRsZUVsZW1lbnQpOwotCi0gICAgdGhpcy5o ZWFkZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dnbGVFeHBhbmRl ZC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgV2ViSW5zcGVjdG9yLlNlY3Rpb24uY2FsbCh0aGlz LCB0aXRsZSwgc3VidGl0bGUpOwogCiAgICAgdGhpcy5wcm9wZXJ0aWVzRWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgdGhpcy5wcm9wZXJ0aWVzRWxlbWVudC5jbGFz c05hbWUgPSAicHJvcGVydGllcyI7CiAgICAgdGhpcy5wcm9wZXJ0aWVzVHJlZU91dGxpbmUgPSBu ZXcgVHJlZU91dGxpbmUodGhpcy5wcm9wZXJ0aWVzRWxlbWVudCk7CiAgICAgdGhpcy5wcm9wZXJ0 aWVzVHJlZU91dGxpbmUuc2VjdGlvbiA9IHRoaXM7CiAKLSAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5oZWFkZXJFbGVtZW50KTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5wcm9wZXJ0aWVzRWxlbWVudCk7Ci0KLSAgICB0aGlzLnRpdGxlID0gdGl0bGU7Ci0gICAg dGhpcy5zdWJ0aXRsZSA9IHN1YnRpdGxlOwotICAgIHRoaXMuX2V4cGFuZGVkID0gZmFsc2U7CiB9 CiAKLVdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUgPSB7Ci0gICAgZ2V0 IHRpdGxlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl90aXRsZTsKLSAgICB9LAotCi0g ICAgc2V0IHRpdGxlKHgpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fdGl0bGUgPT09IHgpCi0g ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX3RpdGxlID0geDsKLQotICAgICAgICBp ZiAoeCBpbnN0YW5jZW9mIE5vZGUpIHsKLSAgICAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LnJl bW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC5hcHBlbmRDaGls ZCh4KTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgdGhpcy50aXRsZUVsZW1lbnQudGV4dENv bnRlbnQgPSB4OwotICAgIH0sCi0KLSAgICBnZXQgc3VidGl0bGUoKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX3N1YnRpdGxlOwotICAgIH0sCi0KLSAgICBzZXQgc3VidGl0bGUoeCkKLSAg ICB7Ci0gICAgICAgIGlmICh0aGlzLl9zdWJ0aXRsZSA9PT0geCkKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgdGhpcy5fc3VidGl0bGUgPSB4OwotICAgICAgICB0aGlzLnN1YnRpdGxlRWxl bWVudC5pbm5lckhUTUwgPSB4OwotICAgIH0sCi0KLSAgICBnZXQgZXhwYW5kZWQoKQotICAgIHsK LSAgICAgICAgcmV0dXJuIHRoaXMuX2V4cGFuZGVkOwotICAgIH0sCi0KLSAgICBzZXQgZXhwYW5k ZWQoeCkKLSAgICB7Ci0gICAgICAgIGlmICh4KQotICAgICAgICAgICAgdGhpcy5leHBhbmQoKTsK LSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGhpcy5jb2xsYXBzZSgpOwotICAgIH0sCi0KLSAg ICBnZXQgcG9wdWxhdGVkKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9wb3B1bGF0ZWQ7 Ci0gICAgfSwKLQotICAgIHNldCBwb3B1bGF0ZWQoeCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3Bv cHVsYXRlZCA9IHg7Ci0gICAgICAgIGlmICgheCAmJiB0aGlzLm9ucG9wdWxhdGUgJiYgdGhpcy5f ZXhwYW5kZWQpIHsKLSAgICAgICAgICAgIHRoaXMub25wb3B1bGF0ZSh0aGlzKTsKLSAgICAgICAg ICAgIHRoaXMuX3BvcHVsYXRlZCA9IHRydWU7Ci0gICAgICAgIH0KLSAgICB9LAotCi0gICAgZXhw YW5kOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fZXhwYW5kZWQpCi0gICAg ICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX2V4cGFuZGVkID0gdHJ1ZTsKLSAgICAgICAg dGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImV4cGFuZGVkIik7Ci0KLSAgICAgICAgaWYgKCF0 aGlzLl9wb3B1bGF0ZWQgJiYgdGhpcy5vbnBvcHVsYXRlKSB7Ci0gICAgICAgICAgICB0aGlzLm9u cG9wdWxhdGUodGhpcyk7Ci0gICAgICAgICAgICB0aGlzLl9wb3B1bGF0ZWQgPSB0cnVlOwotICAg ICAgICB9Ci0gICAgfSwKLQotICAgIGNvbGxhcHNlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAg ICBpZiAoIXRoaXMuX2V4cGFuZGVkKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB0aGlz Ll9leHBhbmRlZCA9IGZhbHNlOwotICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFz cygiZXhwYW5kZWQiKTsKLSAgICB9LAotCi0gICAgdG9nZ2xlRXhwYW5kZWQ6IGZ1bmN0aW9uKCkK LSAgICB7Ci0gICAgICAgIHRoaXMuZXhwYW5kZWQgPSAhdGhpcy5leHBhbmRlZDsKLSAgICB9Ci19 CitXZWJJbnNwZWN0b3IuUHJvcGVydGllc1NlY3Rpb24ucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5TZWN0aW9uLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZWN0aW9uLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nl Y3Rpb24uanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzk0Zjg2ZAotLS0g L2Rldi9udWxsCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZWN0aW9uLmpzCkBA IC0wLDAgKzEsMTM5IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDA3IEFwcGxlIEluYy4gIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFy ZSBtZXQ6CisgKgorICogMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKiAzLiAgTmVpdGhlciB0aGUg bmFtZSBvZiBBcHBsZSBDb21wdXRlciwgSW5jLiAoIkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgor ICogICAgIGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3Rl IHByb2R1Y3RzIGRlcml2ZWQKKyAqICAgICBmcm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKKyAq IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgVEhFIElNUExJRUQKKyAqIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyAqIERJU0NMQUlNRUQuIElOIE5P IEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkK KyAqIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1Ig Q09OU0VRVUVOVElBTCBEQU1BR0VTCisgKiAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s IFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CisgKiBMT1NTIE9G IFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQKKyAqIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyAq IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9yLlNlY3Rpb24gPSBmdW5jdGlvbih0aXRsZSwg c3VidGl0bGUpCit7CisgICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7CisgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJzZWN0aW9uIjsKKworICAgIHRo aXMuaGVhZGVyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHRo aXMuaGVhZGVyRWxlbWVudC5jbGFzc05hbWUgPSAiaGVhZGVyIjsKKworICAgIHRoaXMudGl0bGVF bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy50aXRsZUVs ZW1lbnQuY2xhc3NOYW1lID0gInRpdGxlIjsKKworICAgIHRoaXMuc3VidGl0bGVFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5zdWJ0aXRsZUVsZW1lbnQu Y2xhc3NOYW1lID0gInN1YnRpdGxlIjsKKworICAgIHRoaXMuaGVhZGVyRWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLnN1YnRpdGxlRWxlbWVudCk7CisgICAgdGhpcy5oZWFkZXJFbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMudGl0bGVFbGVtZW50KTsKKworICAgIHRoaXMuaGVhZGVyRWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMudG9nZ2xlRXhwYW5kZWQuYmluZCh0aGlzKSwgZmFs c2UpOworICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmhlYWRlckVsZW1lbnQpOwor CisgICAgdGhpcy50aXRsZSA9IHRpdGxlOworICAgIHRoaXMuc3VidGl0bGUgPSBzdWJ0aXRsZTsK KyAgICB0aGlzLl9leHBhbmRlZCA9IGZhbHNlOworfQorCitXZWJJbnNwZWN0b3IuU2VjdGlvbi5w cm90b3R5cGUgPSB7CisgICAgZ2V0IHRpdGxlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll90aXRsZTsKKyAgICB9LAorCisgICAgc2V0IHRpdGxlKHgpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fdGl0bGUgPT09IHgpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX3Rp dGxlID0geDsKKworICAgICAgICBpZiAoeCBpbnN0YW5jZW9mIE5vZGUpIHsKKyAgICAgICAgICAg IHRoaXMudGl0bGVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAgICAgICAgICB0aGlzLnRp dGxlRWxlbWVudC5hcHBlbmRDaGlsZCh4KTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgdGhp cy50aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB4OworICAgIH0sCisKKyAgICBnZXQgc3VidGl0 bGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3N1YnRpdGxlOworICAgIH0sCisKKyAg ICBzZXQgc3VidGl0bGUoeCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9zdWJ0aXRsZSA9PT0g eCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fc3VidGl0bGUgPSB4OworICAg ICAgICB0aGlzLnN1YnRpdGxlRWxlbWVudC5pbm5lckhUTUwgPSB4OworICAgIH0sCisKKyAgICBn ZXQgZXhwYW5kZWQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2V4cGFuZGVkOworICAg IH0sCisKKyAgICBzZXQgZXhwYW5kZWQoeCkKKyAgICB7CisgICAgICAgIGlmICh4KQorICAgICAg ICAgICAgdGhpcy5leHBhbmQoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5jb2xs YXBzZSgpOworICAgIH0sCisKKyAgICBnZXQgcG9wdWxhdGVkKCkKKyAgICB7CisgICAgICAgIHJl dHVybiB0aGlzLl9wb3B1bGF0ZWQ7CisgICAgfSwKKworICAgIHNldCBwb3B1bGF0ZWQoeCkKKyAg ICB7CisgICAgICAgIHRoaXMuX3BvcHVsYXRlZCA9IHg7CisgICAgICAgIGlmICgheCAmJiB0aGlz Lm9ucG9wdWxhdGUgJiYgdGhpcy5fZXhwYW5kZWQpIHsKKyAgICAgICAgICAgIHRoaXMub25wb3B1 bGF0ZSh0aGlzKTsKKyAgICAgICAgICAgIHRoaXMuX3BvcHVsYXRlZCA9IHRydWU7CisgICAgICAg IH0KKyAgICB9LAorCisgICAgZXhwYW5kOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fZXhwYW5kZWQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2V4cGFu ZGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImV4cGFuZGVk Iik7CisKKyAgICAgICAgaWYgKCF0aGlzLl9wb3B1bGF0ZWQgJiYgdGhpcy5vbnBvcHVsYXRlKSB7 CisgICAgICAgICAgICB0aGlzLm9ucG9wdWxhdGUodGhpcyk7CisgICAgICAgICAgICB0aGlzLl9w b3B1bGF0ZWQgPSB0cnVlOworICAgICAgICB9CisgICAgfSwKKworICAgIGNvbGxhcHNlOiBmdW5j dGlvbigpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2V4cGFuZGVkKQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl9leHBhbmRlZCA9IGZhbHNlOworICAgICAgICB0aGlzLmVs ZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiZXhwYW5kZWQiKTsKKyAgICB9LAorCisgICAgdG9nZ2xl RXhwYW5kZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuZXhwYW5kZWQgPSAhdGhp cy5leHBhbmRlZDsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvV2ViS2l0LnFyYyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJj CmluZGV4IGViMjk5ZmMuLjFiYjI4OTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJL aXQucXJjCkBAIC01Myw2ICs1Myw3IEBACiAgICAgPGZpbGU+U2NyaXB0LmpzPC9maWxlPgogICAg IDxmaWxlPlNjcmlwdHNQYW5lbC5qczwvZmlsZT4KICAgICA8ZmlsZT5TY3JpcHRWaWV3LmpzPC9m aWxlPgorICAgIDxmaWxlPlNlY3Rpb24uanM8L2ZpbGU+CiAgICAgPGZpbGU+U2lkZWJhclBhbmUu anM8L2ZpbGU+CiAgICAgPGZpbGU+U2lkZWJhclRyZWVFbGVtZW50LmpzPC9maWxlPgogICAgIDxm aWxlPlNvdXJjZUZyYW1lLmpzPC9maWxlPgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCmluZGV4IDc3Yzc3NjAuLmU4NjFiMDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAgLTYyLDYgKzYyLDcgQEAgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAg ICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTaWRlYmFyUGFuZS5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRWxlbWVudHNU cmVlT3V0bGluZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iU2lkZWJhclRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTZWN0aW9uLmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJQcm9wZXJ0aWVzU2VjdGlvbi5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iT2JqZWN0UHJv eHkuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9 Ik9iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIj48L3NjcmlwdD4K 44860 2009-12-15 03:11:04 -0800 2009-12-15 03:29:19 -0800 patch (merged) section.patch text/plain 11615 apavlov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzlmZWEzYS4uNTExMTZhMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0xMi0xNCAgQWxleGFuZGVyIFBh dmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4dHJhY3QgV2ViSW5zcGVjdG9yLlNlY3Rpb24gZnJvbSBX ZWJJbnNwZWN0b3IuUHJvcGVydGllc1NlY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjUyMworCisgICAgICAgICogV2ViQ29yZS5neXBpOgor ICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUHJvcGVydGllc1NlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUHJvcGVydGllc1NlY3Rpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2Vj dGlvbi5qczogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbik6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuZ2V0IHRpdGxlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TZWN0aW9uLnByb3RvdHlwZS5zZXQgdGl0bGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNlY3Rpb24ucHJvdG90eXBlLmdldCBzdWJ0aXRsZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHN1YnRpdGxlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TZWN0aW9uLnByb3RvdHlwZS5nZXQgZXhwYW5kZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNlY3Rpb24ucHJvdG90eXBlLnNldCBleHBhbmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2VjdGlvbi5wcm90b3R5cGUuZ2V0IHBvcHVsYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2VjdGlvbi5wcm90b3R5cGUuc2V0IHBvcHVsYXRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2VjdGlvbi5wcm90b3R5cGUuZXhwYW5kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWN0 aW9uLnByb3RvdHlwZS5jb2xsYXBzZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VjdGlvbi5w cm90b3R5cGUudG9nZ2xlRXhwYW5kZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv V2ViS2l0LnFyYzoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1s OgorCiAyMDA5LTEyLTE1ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAg ICBObyByZXZpZXcsIHJvbGxpbmcgb3V0IHI1MjE0MC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2Vi Q29yZS5neXBpIGIvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggMjY4MGU2NS4uNmJjZmZmOCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmd5 cGkKQEAgLTM3MDAsNiArMzcwMCw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHQuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdFZpZXcuanMn LAorICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU2VjdGlvbi5qcycsCiAgICAgICAg ICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyUGFuZS5qcycsCiAgICAgICAgICAgICAn aW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVHJlZUVsZW1lbnQuanMnLAogICAgICAgICAgICAg J2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMnLApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvaiBiL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ov V2ViQ29yZS52Y3Byb2oKaW5kZXggNzFkODA1Mi4uZjdhM2Q3ZCAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9XZWJDb3JlL1dlYkNvcmUudmNw cm9qL1dlYkNvcmUudmNwcm9qCkBAIC00MjYyMCw2ICs0MjYyMCwxMCBAQAogCQkJCQk+DQogCQkJ CTwvRmlsZT4NCiAJCQkJPEZpbGUNCisJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZy b250LWVuZFxTZWN0aW9uLmpzIg0KKwkJCQkJPg0KKwkJCQk8L0ZpbGU+DQorCQkJCTxGaWxlDQog CQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcU2lkZWJhclBhbmUuanMi DQogCQkJCQk+DQogCQkJCTwvRmlsZT4NCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUHJvcGVydGllc1NlY3Rpb24uanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvcGVydGllc1NlY3Rpb24uanMKaW5kZXggN2RiNDk2Yi4uYmMyZWI0YyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTZWN0aW9uLmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9wZXJ0aWVzU2VjdGlvbi5qcwpAQCAtMSw1 ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjgsMjIgKzI5 LDcgQEAKIAogV2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24odGl0bGUs IHN1YnRpdGxlKQogewotICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAic2VjdGlvbiI7Ci0KLSAgICB0 aGlzLmhlYWRlckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0 aGlzLmhlYWRlckVsZW1lbnQuY2xhc3NOYW1lID0gImhlYWRlciI7Ci0KLSAgICB0aGlzLnRpdGxl RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMudGl0bGVF bGVtZW50LmNsYXNzTmFtZSA9ICJ0aXRsZSI7Ci0KLSAgICB0aGlzLnN1YnRpdGxlRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuc3VidGl0bGVFbGVtZW50 LmNsYXNzTmFtZSA9ICJzdWJ0aXRsZSI7Ci0KLSAgICB0aGlzLmhlYWRlckVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5zdWJ0aXRsZUVsZW1lbnQpOwotICAgIHRoaXMuaGVhZGVyRWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLnRpdGxlRWxlbWVudCk7Ci0KLSAgICB0aGlzLmhlYWRlckVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLnRvZ2dsZUV4cGFuZGVkLmJpbmQodGhpcyksIGZh bHNlKTsKKyAgICBXZWJJbnNwZWN0b3IuU2VjdGlvbi5jYWxsKHRoaXMsIHRpdGxlLCBzdWJ0aXRs ZSk7CiAKICAgICB0aGlzLnByb3BlcnRpZXNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgib2wiKTsKICAgICB0aGlzLnByb3BlcnRpZXNFbGVtZW50LmNsYXNzTmFtZSA9ICJwcm9wZXJ0 aWVzIjsKQEAgLTUxLDk2ICszNyw3IEBAIFdlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbiA9 IGZ1bmN0aW9uKHRpdGxlLCBzdWJ0aXRsZSkKICAgICB0aGlzLnByb3BlcnRpZXNUcmVlT3V0bGlu ZSA9IG5ldyBUcmVlT3V0bGluZSh0aGlzLnByb3BlcnRpZXNFbGVtZW50KTsKICAgICB0aGlzLnBy b3BlcnRpZXNUcmVlT3V0bGluZS5zZWN0aW9uID0gdGhpczsKIAotICAgIHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLmhlYWRlckVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLnByb3BlcnRpZXNFbGVtZW50KTsKLQotICAgIHRoaXMudGl0bGUgPSB0aXRsZTsK LSAgICB0aGlzLnN1YnRpdGxlID0gc3VidGl0bGU7Ci0gICAgdGhpcy5fZXhwYW5kZWQgPSBmYWxz ZTsKIH0KIAotV2ViSW5zcGVjdG9yLlByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKLSAg ICBnZXQgdGl0bGUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RpdGxlOwotICAgIH0s Ci0KLSAgICBzZXQgdGl0bGUoeCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl90aXRsZSA9PT0g eCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fdGl0bGUgPSB4OwotCi0gICAg ICAgIGlmICh4IGluc3RhbmNlb2YgTm9kZSkgewotICAgICAgICAgICAgdGhpcy50aXRsZUVsZW1l bnQucmVtb3ZlQ2hpbGRyZW4oKTsKLSAgICAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LmFwcGVu ZENoaWxkKHgpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICB0aGlzLnRpdGxlRWxlbWVudC50 ZXh0Q29udGVudCA9IHg7Ci0gICAgfSwKLQotICAgIGdldCBzdWJ0aXRsZSgpCi0gICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fc3VidGl0bGU7Ci0gICAgfSwKLQotICAgIHNldCBzdWJ0aXRsZSh4 KQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3N1YnRpdGxlID09PSB4KQotICAgICAgICAgICAg cmV0dXJuOwotICAgICAgICB0aGlzLl9zdWJ0aXRsZSA9IHg7Ci0gICAgICAgIHRoaXMuc3VidGl0 bGVFbGVtZW50LmlubmVySFRNTCA9IHg7Ci0gICAgfSwKLQotICAgIGdldCBleHBhbmRlZCgpCi0g ICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZXhwYW5kZWQ7Ci0gICAgfSwKLQotICAgIHNldCBl eHBhbmRlZCh4KQotICAgIHsKLSAgICAgICAgaWYgKHgpCi0gICAgICAgICAgICB0aGlzLmV4cGFu ZCgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLmNvbGxhcHNlKCk7Ci0gICAgfSwK LQotICAgIGdldCBwb3B1bGF0ZWQoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3BvcHVs YXRlZDsKLSAgICB9LAotCi0gICAgc2V0IHBvcHVsYXRlZCh4KQotICAgIHsKLSAgICAgICAgdGhp cy5fcG9wdWxhdGVkID0geDsKLSAgICAgICAgaWYgKCF4ICYmIHRoaXMub25wb3B1bGF0ZSAmJiB0 aGlzLl9leHBhbmRlZCkgewotICAgICAgICAgICAgdGhpcy5vbnBvcHVsYXRlKHRoaXMpOwotICAg ICAgICAgICAgdGhpcy5fcG9wdWxhdGVkID0gdHJ1ZTsKLSAgICAgICAgfQotICAgIH0sCi0KLSAg ICBleHBhbmQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9leHBhbmRlZCkK LSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSB0cnVlOwotICAg ICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZXhwYW5kZWQiKTsKLQotICAgICAgICBp ZiAoIXRoaXMuX3BvcHVsYXRlZCAmJiB0aGlzLm9ucG9wdWxhdGUpIHsKLSAgICAgICAgICAgIHRo aXMub25wb3B1bGF0ZSh0aGlzKTsKLSAgICAgICAgICAgIHRoaXMuX3BvcHVsYXRlZCA9IHRydWU7 Ci0gICAgICAgIH0KLSAgICB9LAotCi0gICAgY29sbGFwc2U6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIGlmICghdGhpcy5fZXhwYW5kZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IHRoaXMuX2V4cGFuZGVkID0gZmFsc2U7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVTdHls ZUNsYXNzKCJleHBhbmRlZCIpOwotICAgIH0sCi0KLSAgICB0b2dnbGVFeHBhbmRlZDogZnVuY3Rp b24oKQotICAgIHsKLSAgICAgICAgdGhpcy5leHBhbmRlZCA9ICF0aGlzLmV4cGFuZGVkOwotICAg IH0KLX0KK1dlYkluc3BlY3Rvci5Qcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5cGUuX19wcm90b19f ID0gV2ViSW5zcGVjdG9yLlNlY3Rpb24ucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24uanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2VjdGlvbi5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zOTRmODZk Ci0tLSAvZGV2L251bGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NlY3Rpb24u anMKQEAgLTAsMCArMSwxMzkgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcgQXBwbGUgSW5j LiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5j LiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlv biwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwor ICogYXJlIG1ldDoKKyAqCisgKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiAgUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqIDMuICBOZWl0aGVy IHRoZSBuYW1lIG9mIEFwcGxlIENvbXB1dGVyLCBJbmMuICgiQXBwbGUiKSBub3IgdGhlIG5hbWVz IG9mCisgKiAgICAgaXRzIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHBy b21vdGUgcHJvZHVjdHMgZGVyaXZlZAorICogICAgIGZyb20gdGhpcyBzb2Z0d2FyZSB3aXRob3V0 IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5EIEFO WQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorICogRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWQorICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRF RCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsKKyAqIExP U1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIg SU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCitXZWJJbnNwZWN0b3IuU2VjdGlvbiA9IGZ1bmN0aW9uKHRp dGxlLCBzdWJ0aXRsZSkKK3sKKyAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKKyAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInNlY3Rpb24iOworCisg ICAgdGhpcy5oZWFkZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Cisg ICAgdGhpcy5oZWFkZXJFbGVtZW50LmNsYXNzTmFtZSA9ICJoZWFkZXIiOworCisgICAgdGhpcy50 aXRsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLnRp dGxlRWxlbWVudC5jbGFzc05hbWUgPSAidGl0bGUiOworCisgICAgdGhpcy5zdWJ0aXRsZUVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLnN1YnRpdGxlRWxl bWVudC5jbGFzc05hbWUgPSAic3VidGl0bGUiOworCisgICAgdGhpcy5oZWFkZXJFbGVtZW50LmFw cGVuZENoaWxkKHRoaXMuc3VidGl0bGVFbGVtZW50KTsKKyAgICB0aGlzLmhlYWRlckVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy50aXRsZUVsZW1lbnQpOworCisgICAgdGhpcy5oZWFkZXJFbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy50b2dnbGVFeHBhbmRlZC5iaW5kKHRoaXMp LCBmYWxzZSk7CisgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuaGVhZGVyRWxlbWVu dCk7CisKKyAgICB0aGlzLnRpdGxlID0gdGl0bGU7CisgICAgdGhpcy5zdWJ0aXRsZSA9IHN1YnRp dGxlOworICAgIHRoaXMuX2V4cGFuZGVkID0gZmFsc2U7Cit9CisKK1dlYkluc3BlY3Rvci5TZWN0 aW9uLnByb3RvdHlwZSA9IHsKKyAgICBnZXQgdGl0bGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJu IHRoaXMuX3RpdGxlOworICAgIH0sCisKKyAgICBzZXQgdGl0bGUoeCkKKyAgICB7CisgICAgICAg IGlmICh0aGlzLl90aXRsZSA9PT0geCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhp cy5fdGl0bGUgPSB4OworCisgICAgICAgIGlmICh4IGluc3RhbmNlb2YgTm9kZSkgeworICAgICAg ICAgICAgdGhpcy50aXRsZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgICAgIHRo aXMudGl0bGVFbGVtZW50LmFwcGVuZENoaWxkKHgpOworICAgICAgICB9IGVsc2UKKyAgICAgICAg ICB0aGlzLnRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHg7CisgICAgfSwKKworICAgIGdldCBz dWJ0aXRsZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc3VidGl0bGU7CisgICAgfSwK KworICAgIHNldCBzdWJ0aXRsZSh4KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3N1YnRpdGxl ID09PSB4KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl9zdWJ0aXRsZSA9IHg7 CisgICAgICAgIHRoaXMuc3VidGl0bGVFbGVtZW50LmlubmVySFRNTCA9IHg7CisgICAgfSwKKwor ICAgIGdldCBleHBhbmRlZCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZXhwYW5kZWQ7 CisgICAgfSwKKworICAgIHNldCBleHBhbmRlZCh4KQorICAgIHsKKyAgICAgICAgaWYgKHgpCisg ICAgICAgICAgICB0aGlzLmV4cGFuZCgpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlz LmNvbGxhcHNlKCk7CisgICAgfSwKKworICAgIGdldCBwb3B1bGF0ZWQoKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3BvcHVsYXRlZDsKKyAgICB9LAorCisgICAgc2V0IHBvcHVsYXRlZCh4 KQorICAgIHsKKyAgICAgICAgdGhpcy5fcG9wdWxhdGVkID0geDsKKyAgICAgICAgaWYgKCF4ICYm IHRoaXMub25wb3B1bGF0ZSAmJiB0aGlzLl9leHBhbmRlZCkgeworICAgICAgICAgICAgdGhpcy5v bnBvcHVsYXRlKHRoaXMpOworICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVkID0gdHJ1ZTsKKyAg ICAgICAgfQorICAgIH0sCisKKyAgICBleHBhbmQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IGlmICh0aGlzLl9leHBhbmRlZCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5f ZXhwYW5kZWQgPSB0cnVlOworICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZXhw YW5kZWQiKTsKKworICAgICAgICBpZiAoIXRoaXMuX3BvcHVsYXRlZCAmJiB0aGlzLm9ucG9wdWxh dGUpIHsKKyAgICAgICAgICAgIHRoaXMub25wb3B1bGF0ZSh0aGlzKTsKKyAgICAgICAgICAgIHRo aXMuX3BvcHVsYXRlZCA9IHRydWU7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgY29sbGFwc2U6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZXhwYW5kZWQpCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2V4cGFuZGVkID0gZmFsc2U7CisgICAgICAgIHRo aXMuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJleHBhbmRlZCIpOworICAgIH0sCisKKyAgICB0 b2dnbGVFeHBhbmRlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5leHBhbmRlZCA9 ICF0aGlzLmV4cGFuZGVkOworICAgIH0KK30KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9XZWJLaXQucXJjIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktp dC5xcmMKaW5kZXggZWIyOTlmYy4uMWJiMjg5NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1dlYktpdC5xcmMKQEAgLTUzLDYgKzUzLDcgQEAKICAgICA8ZmlsZT5TY3JpcHQuanM8L2ZpbGU+ CiAgICAgPGZpbGU+U2NyaXB0c1BhbmVsLmpzPC9maWxlPgogICAgIDxmaWxlPlNjcmlwdFZpZXcu anM8L2ZpbGU+CisgICAgPGZpbGU+U2VjdGlvbi5qczwvZmlsZT4KICAgICA8ZmlsZT5TaWRlYmFy UGFuZS5qczwvZmlsZT4KICAgICA8ZmlsZT5TaWRlYmFyVHJlZUVsZW1lbnQuanM8L2ZpbGU+CiAg ICAgPGZpbGU+U291cmNlRnJhbWUuanM8L2ZpbGU+CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmh0bWwKaW5kZXggYzIwNzBlMi4uY2U2MmNkMiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCisrKyBiL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtNjIsNiArNjIsNyBAQCBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNpZGViYXJQYW5lLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJFbGVt ZW50c1RyZWVPdXRsaW5lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCIgc3JjPSJTaWRlYmFyVHJlZUVsZW1lbnQuanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNlY3Rpb24uanMiPjwvc2NyaXB0PgogICAg IDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlByb3BlcnRpZXNTZWN0aW9uLmpz Ij48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJPYmpl Y3RQcm94eS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMiPjwvc2NyaXB0Pgo=