146031 2015-06-16 15:27:28 -0700 Web Inspector: Make rule icon toggle all properties for that selector on and off 2015-06-19 11:51:49 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Enhancement --- 1 hi webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1102362 0 hi 2015-06-16 15:27:28 -0700 I think that it would be really useful to make the selector icon toggle all the properties in that rule on/off (using comments) when clicked. Basically, clicking on the icon will cause all the properties for that rule to be commented out and the icon will become slightly opaque. Clicking on the icon again will remove the comments on all properties and restore the icon to full visibility. In addition, this will preserve non-property comments. 1102363 1 webkit-bug-importer 2015-06-16 15:27:44 -0700 <rdar://problem/21410966> 1102368 2 254972 hi 2015-06-16 15:32:42 -0700 Created attachment 254972 Patch 1102974 3 254972 timothy 2015-06-18 11:12:19 -0700 Comment on attachment 254972 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254972&action=review > Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.css:72 > + cursor: pointer; This should be a normal cursor. We can use a hover darkening of the icon to indicate clicking behavior. > Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:234 > + function uncommentProperties(properties) { Two lines. 1103021 4 255129 hi 2015-06-18 13:41:07 -0700 Created attachment 255129 Patch 1103043 5 255129 commit-queue 2015-06-18 14:53:03 -0700 Comment on attachment 255129 Patch Rejecting attachment 255129 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 255129, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: imothy Hatcher']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Parsed 5 diffs from patch file(s). patching file Source/WebInspectorUI/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. Original content of Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js mismatches at /Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply line 280. Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Timothy Hatcher']" exit_code: 255 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5111003557658624 1103339 6 255206 hi 2015-06-19 11:44:39 -0700 Created attachment 255206 Patch 1103343 7 joepeck 2015-06-19 11:51:49 -0700 http://trac.webkit.org/changeset/185757 254972 2015-06-16 15:32:42 -0700 2015-06-18 13:41:03 -0700 Patch bug-146031-20150616153207.patch text/plain 7560 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBkODhjZTcwYzVhMzkzYmRiNmViZTYxNGIxYmNh ODY5ZTIxMDA0YTIuLjgwYmQzYTdmMjFjM2EyYzE5MWJmOThiMjllMTQ1OGVlMjFjNzk5ODUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA2LTE2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBN YWtlIHJ1bGUgaWNvbiB0b2dnbGUgYWxsIHByb3BlcnRpZXMgZm9yIHRoYXQgc2VsZWN0b3Igb24g YW5kIG9mZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzczoKKyAg ICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uID4gLmhlYWRlciA+IC5pY29uLnRvZ2ds ZS1hYmxlKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLnJ1bGUtZGlzYWJs ZWQgPiAuaGVhZGVyID4gLmljb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ1NT U3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVEZWNsYXJhdGlvblNlY3Rpb24pOiBBZGRlZCBldmVudCBsaXN0ZW5lciB0byBzZWxlY3RvciBp Y29uIHRvIHRvZ2dsZSBjb21tZW50aW5nIG9mIGFsbCBwcm9wZXJ0aWVzIGZvciB0aGF0IHJ1bGUu CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90 eXBlLl90b2dnbGVSdWxlT25PZmYpOiBBZGRzIG9yIHJlbW92ZXMgY29tbWVudHMgdG8gYWxsIHBy b3BlcnRpZXMgZm9yIHRoYXQgcnVsZS4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NT U1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS51bmNvbW1lbnRBbGxQcm9wZXJ0 aWVzLnVuY29tbWVudFByb3BlcnRpZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxl RGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS51bmNvbW1lbnRBbGxQcm9wZXJ0aWVzKTog VW5jb21tZW50cyBhbGwgcHJvcGVydGllcy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuY29tbWVudEFsbFByb3BlcnRpZXMpOiBD b21tZW50cyBvdXQgYWxsIHByb3BlcnRpZXMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5 bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl9wcm9wZXJ0eUNoZWNrYm94Q2hhbmdl ZCk6IE1vdmVkIGNvbW1lbnQgbG9naWMgdG8gaXRzIG93biBmdW5jdGlvbi4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuX3Byb3Bl cnR5Q29tbWVudENoZWNrYm94Q2hhbmdlZCk6IE1vdmVkIHVuY29tbWVudCBsb2dpYyB0byBpdHMg b3duIGZ1bmN0aW9uLgorCiAyMDE1LTA2LTE1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogU3R5bGl6ZSBOb2RlIFByZXZpZXdz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlv bnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBiYTlmMTYwNDgzNGY0OGFkOWI4 OGU1OTM5MDBjNWMxZDQwMzg0OThjLi4yYzUwODE2YzEzMTRkMTdhNjMwMDAwNjViNzgxOGQ1MzE5 ODcwNmQ0IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEyNQp6Y21acDwlRG16X15NP0k7 bFhMWXIqY0JLWThGQ25NQ2coa3VvYjNPY09WcFZtcENLMHJReUtDWU4qRUJiais9TXQKYXYyN0pp I3Z1KlhFRXgqYWdpRDN2PUd+N152SDx7SUp8KVdsCgpkZWx0YSAyMgplY21aMitvdz87SV5NP0k7 aSslT0NQRyl+OXcpeTlpXj10cnNzdFlPcgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFy YXRpb25TZWN0aW9uLmNzcwppbmRleCBlYmFjZmZhNTJkZTAyYmRhNzUyYjVmYzU4YWY3ZTNlNzU2 ZTI3MDQ1Li5lNzkyNTFmYjEwNjg0M2I2MjBkMDg2Y2Q4MWVjN2ViYTQyNTM3ODcwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC02OCw2ICs2OCwx NCBAQAogICAgIGhlaWdodDogMTZweDsKIH0KIAorLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24g PiAuaGVhZGVyID4gLmljb24udG9nZ2xlLWFibGUgeworICAgIGN1cnNvcjogcG9pbnRlcjsKK30K KworLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24ucnVsZS1kaXNhYmxlZCA+IC5oZWFkZXIgPiAu aWNvbiB7CisgICAgb3BhY2l0eTogMC41OworfQorCiAuc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlv biA+IC5oZWFkZXIgPiAuc2VsZWN0b3IgewogICAgIGZvbnQtZmFtaWx5OiBNZW5sbywgbW9ub3Nw YWNlOwogICAgIGNvbG9yOiByZ2IoMTI4LCAxMjgsIDEyOCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2Vj dGlvbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0 eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCmluZGV4IDExNzRlNWEwNDY3OTdiNWZmYWM2M2E4ZjY0 ODkzMDg2YWM0YTAwODcuLmViYjgxODUwNTljYzM5ZmM4YjkxNWQ2ZWQ3MWY1NWIwZWVjNTZlMTAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NT U1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzCkBAIC0zMiw2 ICszMiw3IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9IGZ1bmN0 aW9uKGRlbGVnYXRlLCBzdHlsZSkKIAogICAgIGNvbnNvbGUuYXNzZXJ0KHN0eWxlKTsKICAgICB0 aGlzLl9zdHlsZSA9IHN0eWxlIHx8IG51bGw7CisgICAgdGhpcy5fcnVsZURpc2FibGVkID0gZmFs c2U7CiAKICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgdGhpcy5fZWxlbWVudC5jbGFzc05hbWUgPSAic3R5bGUtZGVjbGFyYXRpb24tc2VjdGlv biI7CkBAIC04Nyw2ICs4OCwxMyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNl Y3Rpb24gPSBmdW5jdGlvbihkZWxlZ2F0ZSwgc3R5bGUpCiAgICAgICAgIGJyZWFrOwogICAgIH0K IAorICAgIC8vIE1hdGNoZXMgYWxsIHNpdHVhdGlvbnMgZXhjZXB0IGZvciBVc2VyIEFnZW50IHN0 eWxlcy4KKyAgICBpZiAoIShzdHlsZS5vd25lclJ1bGUgJiYgc3R5bGUub3duZXJSdWxlLnR5cGUg PT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlckFnZW50KSkgeworICAgICAgICB0aGlz Ll9pY29uRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0b2dnbGUtYWJsZSIpOworICAgICAgICB0aGlz Ll9pY29uRWxlbWVudC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29tbWVudCBBbGwg UHJvcGVydGllcyIpOworICAgICAgICB0aGlzLl9pY29uRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsIHRoaXMuX3RvZ2dsZVJ1bGVPbk9mZi5iaW5kKHRoaXMpKTsKKyAgICB9CisKICAg ICBjb25zb2xlLmFzc2VydChpY29uQ2xhc3NOYW1lKTsKICAgICB0aGlzLl9lbGVtZW50LmNsYXNz TGlzdC5hZGQoaWNvbkNsYXNzTmFtZSk7CiAKQEAgLTI5MCw2ICsyOTgsMTMgQEAgV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLnByb3RvdHlwZSA9IHsKIAogICAgIC8vIFBy aXZhdGUKIAorICAgIF90b2dnbGVSdWxlT25PZmY6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHRoaXMuX3J1bGVEaXNhYmxlZCA9IHRoaXMuX3J1bGVEaXNhYmxlZCA/ICF0aGlzLl9wcm9wZXJ0 aWVzVGV4dEVkaXRvci51bmNvbW1lbnRBbGxQcm9wZXJ0aWVzKCkgOiB0aGlzLl9wcm9wZXJ0aWVz VGV4dEVkaXRvci5jb21tZW50QWxsUHJvcGVydGllcygpOworICAgICAgICB0aGlzLl9pY29uRWxl bWVudC50aXRsZSA9IHRoaXMuX3J1bGVEaXNhYmxlZCA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygi VW5jb21tZW50IEFsbCBQcm9wZXJ0aWVzIikgOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbW1l bnQgQWxsIFByb3BlcnRpZXMiKTsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9n Z2xlKCJydWxlLWRpc2FibGVkIiwgdGhpcy5fcnVsZURpc2FibGVkKTsKKyAgICB9LAorCiAgICAg X2NvbW1pdFNlbGVjdG9yOiBmdW5jdGlvbihtdXRhdGlvbnMpCiAgICAgewogICAgICAgICBjb25z b2xlLmFzc2VydCh0aGlzLl9zdHlsZS5vd25lclJ1bGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRF ZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcwppbmRleCA1ZjY0NDUxOTE2MWQ5YjczNGNlYmEz ZjJlOTU5Yzg4MDhjMTg3MWUwLi5mMGY4MTk1MDhiMWRkODA2ZGRjMzM3ZjI5MzgwY2QzOWYyYzRi YzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5q cwpAQCAtMjI5LDYgKzIyOSwzOCBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRl eHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICB0 aGlzLl9jb2RlTWlycm9yLnNldEN1cnNvcih7bGluZTogMCwgY2g6IDB9KTsKICAgICB9CiAKKyAg ICB1bmNvbW1lbnRBbGxQcm9wZXJ0aWVzKCkKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIHVuY29t bWVudFByb3BlcnRpZXMocHJvcGVydGllcykgeworICAgICAgICAgICAgaWYgKCFwcm9wZXJ0aWVz Lmxlbmd0aCkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgICAgIGZv ciAodmFyIHByb3BlcnR5IG9mIHByb3BlcnRpZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAocHJv cGVydHkuX2NvbW1lbnRSYW5nZSkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl91bmNvbW1l bnRSYW5nZShwcm9wZXJ0eS5fY29tbWVudFJhbmdlKTsKKyAgICAgICAgICAgICAgICAgICAgcHJv cGVydHkuX2NvbW1lbnRSYW5nZSA9IG51bGw7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgfQorCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCisgICAgICAgIHJl dHVybiB1bmNvbW1lbnRQcm9wZXJ0aWVzLmNhbGwodGhpcywgdGhpcy5fc3R5bGUucGVuZGluZ1By b3BlcnRpZXMpIHx8IHVuY29tbWVudFByb3BlcnRpZXMuY2FsbCh0aGlzLCB0aGlzLl9zdHlsZS5w cm9wZXJ0aWVzKTsKKyAgICB9CisKKyAgICBjb21tZW50QWxsUHJvcGVydGllcygpCisgICAgewor ICAgICAgICBpZiAoIXRoaXMuX3N0eWxlLnByb3BlcnRpZXMubGVuZ3RoKQorICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgICAgIGZvciAodmFyIHByb3BlcnR5IG9mIHRoaXMuX3N0eWxl LnByb3BlcnRpZXMpIHsKKyAgICAgICAgICAgIGlmIChwcm9wZXJ0eS5fX3Byb3BlcnR5VGV4dE1h cmtlcikKKyAgICAgICAgICAgICAgICB0aGlzLl9jb21tZW50UHJvcGVydHkocHJvcGVydHkpOwor ICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgLy8gUHJvdGVj dGVkCiAKICAgICBkaWREaXNtaXNzUG9wb3Zlcihwb3BvdmVyKQpAQCAtNjIwLDYgKzY1MiwxMSBA QCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICBpZiAoIXByb3BlcnR5KQogICAgICAg ICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMuX2NvbW1lbnRQcm9wZXJ0eShwcm9wZXJ0eSk7 CisgICAgfQorCisgICAgX2NvbW1lbnRQcm9wZXJ0eShwcm9wZXJ0eSkKKyAgICB7CiAgICAgICAg IHZhciB0ZXh0TWFya2VyID0gcHJvcGVydHkuX19wcm9wZXJ0eVRleHRNYXJrZXI7CiAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHRleHRNYXJrZXIpOwogICAgICAgICBpZiAoIXRleHRNYXJrZXIpCkBA IC02MzEsNiArNjY4LDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRp dG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKICAgICAgICAgaWYgKCFy YW5nZSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBwcm9wZXJ0eS5fY29tbWVudFJh bmdlID0gcmFuZ2U7CisgICAgICAgIHByb3BlcnR5Ll9jb21tZW50UmFuZ2UudG8uY2ggKz0gNjsg Ly8gTnVtYmVyIG9mIGNoYXJhY3RlcnMgYWRkZWQgYnkgY29tbWVudHMuCisKICAgICAgICAgdmFy IHRleHQgPSB0aGlzLl9jb2RlTWlycm9yLmdldFJhbmdlKHJhbmdlLmZyb20sIHJhbmdlLnRvKTsK IAogICAgICAgICBmdW5jdGlvbiB1cGRhdGUoKQpAQCAtNjU4LDYgKzY5OCwxMSBAQCBXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xh cmF0aW9uVGV4dEVkaXRvcgogICAgICAgICBpZiAoIXJhbmdlKQogICAgICAgICAgICAgcmV0dXJu OwogCisgICAgICAgIHRoaXMuX3VuY29tbWVudFJhbmdlKHJhbmdlKTsKKyAgICB9CisKKyAgICBf dW5jb21tZW50UmFuZ2UocmFuZ2UpCisgICAgewogICAgICAgICB2YXIgdGV4dCA9IHRoaXMuX2Nv ZGVNaXJyb3IuZ2V0UmFuZ2UocmFuZ2UuZnJvbSwgcmFuZ2UudG8pOwogCiAgICAgICAgIC8vIFJl bW92ZSB0aGUgY29tbWVudCBwcmVmaXggYW5kIHN1ZmZpeC4K 255129 2015-06-18 13:41:07 -0700 2015-06-19 11:44:34 -0700 Patch bug-146031-20150618134029.patch text/plain 7613 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBkOGJjZGVkNjhhYzY5N2Q3N2QyM2QwZDU0NzM0 OWY1YzNmYjJjNGIuLmRkMmJjODQ4NWQwZmExOWRkYTU2MGY4NzNkMjViODgyMGIyYjg2NTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA2LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBN YWtlIHJ1bGUgaWNvbiB0b2dnbGUgYWxsIHByb3BlcnRpZXMgZm9yIHRoYXQgc2VsZWN0b3Igb24g YW5kIG9mZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzczoKKyAg ICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uID4gLmhlYWRlciA+IC5pY29uLnRvZ2ds ZS1hYmxlOmhvdmVyKToKKyAgICAgICAgKC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLnJ1bGUt ZGlzYWJsZWQgPiAuaGVhZGVyID4gLmljb24pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24pOiBBZGRlZCBldmVudCBsaXN0ZW5lciB0byBzZWxl Y3RvciBpY29uIHRvIHRvZ2dsZSBjb21tZW50aW5nIG9mIGFsbCBwcm9wZXJ0aWVzIGZvciB0aGF0 IHJ1bGUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24u cHJvdG90eXBlLl90b2dnbGVSdWxlT25PZmYpOiBBZGRzIG9yIHJlbW92ZXMgY29tbWVudHMgdG8g YWxsIHByb3BlcnRpZXMgZm9yIHRoYXQgcnVsZS4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS51bmNvbW1lbnRBbGxQ cm9wZXJ0aWVzLnVuY29tbWVudFByb3BlcnRpZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNT U1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS51bmNvbW1lbnRBbGxQcm9wZXJ0 aWVzKTogVW5jb21tZW50cyBhbGwgcHJvcGVydGllcy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5D U1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuY29tbWVudEFsbFByb3BlcnRp ZXMpOiBDb21tZW50cyBvdXQgYWxsIHByb3BlcnRpZXMuCisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl9wcm9wZXJ0eUNoZWNrYm94 Q2hhbmdlZCk6IE1vdmVkIGNvbW1lbnQgbG9naWMgdG8gaXRzIG93biBmdW5jdGlvbi4KKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUu X3Byb3BlcnR5Q29tbWVudENoZWNrYm94Q2hhbmdlZCk6IE1vdmVkIHVuY29tbWVudCBsb2dpYyB0 byBpdHMgb3duIGZ1bmN0aW9uLgorCiAyMDE1LTA2LTE4ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92ZSBhIGZldyBt b3JlIG5vZGUgcHJldmlldyB0eXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5k ZXggYmE5ZjE2MDQ4MzRmNDhhZDliODhlNTkzOTAwYzVjMWQ0MDM4NDk4Yy4uMmM1MDgxNmMxMzE0 ZDE3YTYzMDAwMDY1Yjc4MThkNTMxOTg3MDZkNCAxMDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0 YSAxMjUKemNtWnA8JURtel9eTT9JO2xYTFlyKmNCS1k4RkNuTUNnKGt1b2IzT2NPVnBWbXBDSzBy UXlLQ1lOKkVCYmorPU10CmF2MjdKaSN2dSpYRUV4KmFnaUQzdj1Hfjdedkg8e0lKfClXbAoKZGVs dGEgMjIKZWNtWjIrb3c/O0leTT9JO2krJU9DUEcpfjl3KXk5aV49dHJzc3RZT3IKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURl Y2xhcmF0aW9uU2VjdGlvbi5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5jc3MKaW5kZXggZWJhY2ZmYTUyZGUw MmJkYTc1MmI1ZmM1OGFmN2UzZTc1NmUyNzA0NS4uMjAxMzJkYjY1YWM0Mjk4ZjcwMGI4N2YyN2Qz OGIzY2FlZDMwZTQxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0 aW9uLmNzcwpAQCAtNjgsNiArNjgsMTQgQEAKICAgICBoZWlnaHQ6IDE2cHg7CiB9CiAKKy5zdHls ZS1kZWNsYXJhdGlvbi1zZWN0aW9uID4gLmhlYWRlciA+IC5pY29uLnRvZ2dsZS1hYmxlOmhvdmVy IHsKKyAgICAtd2Via2l0LWZpbHRlcjogYnJpZ2h0bmVzcygwLjkpOworfQorCisuc3R5bGUtZGVj bGFyYXRpb24tc2VjdGlvbi5ydWxlLWRpc2FibGVkID4gLmhlYWRlciA+IC5pY29uIHsKKyAgICBv cGFjaXR5OiAwLjU7Cit9CisKIC5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uID4gLmhlYWRlciA+ IC5zZWxlY3RvciB7CiAgICAgZm9udC1mYW1pbHk6IE1lbmxvLCBtb25vc3BhY2U7CiAgICAgY29s b3I6IHJnYigxMjgsIDEyOCwgMTI4KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlv blNlY3Rpb24uanMKaW5kZXggMTE3NGU1YTA0Njc5N2I1ZmZhYzYzYThmNjQ4OTMwODZhYzRhMDA4 Ny4uZWJiODE4NTA1OWNjMzlmYzhiOTE1ZDZlZDcxZjU1YjBlZWM1NmUxMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJh dGlvblNlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMKQEAgLTMyLDYgKzMyLDcgQEAgV2Vi SW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uID0gZnVuY3Rpb24oZGVsZWdhdGUs IHN0eWxlKQogCiAgICAgY29uc29sZS5hc3NlcnQoc3R5bGUpOwogICAgIHRoaXMuX3N0eWxlID0g c3R5bGUgfHwgbnVsbDsKKyAgICB0aGlzLl9ydWxlRGlzYWJsZWQgPSBmYWxzZTsKIAogICAgIHRo aXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9l bGVtZW50LmNsYXNzTmFtZSA9ICJzdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uIjsKQEAgLTg3LDYg Kzg4LDEzIEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbiA9IGZ1bmN0 aW9uKGRlbGVnYXRlLCBzdHlsZSkKICAgICAgICAgYnJlYWs7CiAgICAgfQogCisgICAgLy8gTWF0 Y2hlcyBhbGwgc2l0dWF0aW9ucyBleGNlcHQgZm9yIFVzZXIgQWdlbnQgc3R5bGVzLgorICAgIGlm ICghKHN0eWxlLm93bmVyUnVsZSAmJiBzdHlsZS5vd25lclJ1bGUudHlwZSA9PT0gV2ViSW5zcGVj dG9yLkNTU1J1bGUuVHlwZS5Vc2VyQWdlbnQpKSB7CisgICAgICAgIHRoaXMuX2ljb25FbGVtZW50 LmNsYXNzTGlzdC5hZGQoInRvZ2dsZS1hYmxlIik7CisgICAgICAgIHRoaXMuX2ljb25FbGVtZW50 LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb21tZW50IEFsbCBQcm9wZXJ0aWVzIik7 CisgICAgICAgIHRoaXMuX2ljb25FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhp cy5fdG9nZ2xlUnVsZU9uT2ZmLmJpbmQodGhpcykpOworICAgIH0KKwogICAgIGNvbnNvbGUuYXNz ZXJ0KGljb25DbGFzc05hbWUpOwogICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChpY29u Q2xhc3NOYW1lKTsKIApAQCAtMjkwLDYgKzI5OCwxMyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24ucHJvdG90eXBlID0gewogCiAgICAgLy8gUHJpdmF0ZQogCisgICAg X3RvZ2dsZVJ1bGVPbk9mZjogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcnVsZURp c2FibGVkID0gdGhpcy5fcnVsZURpc2FibGVkID8gIXRoaXMuX3Byb3BlcnRpZXNUZXh0RWRpdG9y LnVuY29tbWVudEFsbFByb3BlcnRpZXMoKSA6IHRoaXMuX3Byb3BlcnRpZXNUZXh0RWRpdG9yLmNv bW1lbnRBbGxQcm9wZXJ0aWVzKCk7CisgICAgICAgIHRoaXMuX2ljb25FbGVtZW50LnRpdGxlID0g dGhpcy5fcnVsZURpc2FibGVkID8gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVbmNvbW1lbnQgQWxs IFByb3BlcnRpZXMiKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29tbWVudCBBbGwgUHJvcGVy dGllcyIpOworICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoInJ1bGUtZGlz YWJsZWQiLCB0aGlzLl9ydWxlRGlzYWJsZWQpOworICAgIH0sCisKICAgICBfY29tbWl0U2VsZWN0 b3I6IGZ1bmN0aW9uKG11dGF0aW9ucykKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRo aXMuX3N0eWxlLm93bmVyUnVsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yLmpzCmluZGV4IDVmNjQ0NTE5MTYxZDliNzM0Y2ViYTNmMmU5NTljODgwOGMx ODcxZTAuLjk3NzZkY2U3ZmI0MTZkMmE5MDBmM2M4MmUwNDcyMDJiODc3ODk1M2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCkBAIC0yMjksNiAr MjI5LDM5IEBAIFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNs YXNzIENTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yCiAgICAgICAgIHRoaXMuX2NvZGVNaXJy b3Iuc2V0Q3Vyc29yKHtsaW5lOiAwLCBjaDogMH0pOwogICAgIH0KIAorICAgIHVuY29tbWVudEFs bFByb3BlcnRpZXMoKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gdW5jb21tZW50UHJvcGVydGll cyhwcm9wZXJ0aWVzKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXByb3BlcnRpZXMubGVu Z3RoKQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAgICAgZm9yICh2 YXIgcHJvcGVydHkgb2YgcHJvcGVydGllcykgeworICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0 eS5fY29tbWVudFJhbmdlKSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3VuY29tbWVudFJh bmdlKHByb3BlcnR5Ll9jb21tZW50UmFuZ2UpOworICAgICAgICAgICAgICAgICAgICBwcm9wZXJ0 eS5fY29tbWVudFJhbmdlID0gbnVsbDsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9 CisKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJu IHVuY29tbWVudFByb3BlcnRpZXMuY2FsbCh0aGlzLCB0aGlzLl9zdHlsZS5wZW5kaW5nUHJvcGVy dGllcykgfHwgdW5jb21tZW50UHJvcGVydGllcy5jYWxsKHRoaXMsIHRoaXMuX3N0eWxlLnByb3Bl cnRpZXMpOworICAgIH0KKworICAgIGNvbW1lbnRBbGxQcm9wZXJ0aWVzKCkKKyAgICB7CisgICAg ICAgIGlmICghdGhpcy5fc3R5bGUucHJvcGVydGllcy5sZW5ndGgpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICAgICAgZm9yICh2YXIgcHJvcGVydHkgb2YgdGhpcy5fc3R5bGUucHJv cGVydGllcykgeworICAgICAgICAgICAgaWYgKHByb3BlcnR5Ll9fcHJvcGVydHlUZXh0TWFya2Vy KQorICAgICAgICAgICAgICAgIHRoaXMuX2NvbW1lbnRQcm9wZXJ0eShwcm9wZXJ0eSk7CisgICAg ICAgIH0KKworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICAgICAvLyBQcm90ZWN0ZWQK IAogICAgIGRpZERpc21pc3NQb3BvdmVyKHBvcG92ZXIpCkBAIC02MjAsNiArNjUzLDExIEBAIFdl Ykluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxl RGVjbGFyYXRpb25UZXh0RWRpdG9yCiAgICAgICAgIGlmICghcHJvcGVydHkpCiAgICAgICAgICAg ICByZXR1cm47CiAKKyAgICAgICAgdGhpcy5fY29tbWVudFByb3BlcnR5KHByb3BlcnR5KTsKKyAg ICB9CisKKyAgICBfY29tbWVudFByb3BlcnR5KHByb3BlcnR5KQorICAgIHsKICAgICAgICAgdmFy IHRleHRNYXJrZXIgPSBwcm9wZXJ0eS5fX3Byb3BlcnR5VGV4dE1hcmtlcjsKICAgICAgICAgY29u c29sZS5hc3NlcnQodGV4dE1hcmtlcik7CiAgICAgICAgIGlmICghdGV4dE1hcmtlcikKQEAgLTYz MSw2ICs2NjksOSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Ig PSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICBpZiAoIXJhbmdl KQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIHByb3BlcnR5Ll9jb21tZW50UmFuZ2Ug PSByYW5nZTsKKyAgICAgICAgcHJvcGVydHkuX2NvbW1lbnRSYW5nZS50by5jaCArPSA2OyAvLyBO dW1iZXIgb2YgY2hhcmFjdGVycyBhZGRlZCBieSBjb21tZW50cy4KKwogICAgICAgICB2YXIgdGV4 dCA9IHRoaXMuX2NvZGVNaXJyb3IuZ2V0UmFuZ2UocmFuZ2UuZnJvbSwgcmFuZ2UudG8pOwogCiAg ICAgICAgIGZ1bmN0aW9uIHVwZGF0ZSgpCkBAIC02NTgsNiArNjk5LDExIEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yCiAgICAgICAgIGlmICghcmFuZ2UpCiAgICAgICAgICAgICByZXR1cm47CiAK KyAgICAgICAgdGhpcy5fdW5jb21tZW50UmFuZ2UocmFuZ2UpOworICAgIH0KKworICAgIF91bmNv bW1lbnRSYW5nZShyYW5nZSkKKyAgICB7CiAgICAgICAgIHZhciB0ZXh0ID0gdGhpcy5fY29kZU1p cnJvci5nZXRSYW5nZShyYW5nZS5mcm9tLCByYW5nZS50byk7CiAKICAgICAgICAgLy8gUmVtb3Zl IHRoZSBjb21tZW50IHByZWZpeCBhbmQgc3VmZml4Lgo= 255206 2015-06-19 11:44:39 -0700 2015-06-19 11:50:38 -0700 Patch bug-146031-20150619114401.patch text/plain 7638 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNiNTUwOWYzNzYyMmZiYTU0ZjMyNWYxZmNhNjUw OGU5NmFmNzU1MWMuLmFiZGRiZWJjZTFkMmE1OTQ2OWFhMGQ4NmE3Y2YzMGRhM2IyOGZmZDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA2LTE5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBN YWtlIHJ1bGUgaWNvbiB0b2dnbGUgYWxsIHByb3BlcnRpZXMgZm9yIHRoYXQgc2VsZWN0b3Igb24g YW5kIG9mZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2MDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5jc3M6Cisg ICAgICAgICguc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbiA+IC5oZWFkZXIgPiAuaWNvbi50b2dn bGUtYWJsZTpob3Zlcik6CisgICAgICAgICguc3R5bGUtZGVjbGFyYXRpb24tc2VjdGlvbi5ydWxl LWRpc2FibGVkID4gLmhlYWRlciA+IC5pY29uKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uKTogQWRkZWQgZXZlbnQgbGlzdGVuZXIgdG8gc2Vs ZWN0b3IgaWNvbiB0byB0b2dnbGUgY29tbWVudGluZyBvZiBhbGwgcHJvcGVydGllcyBmb3IgdGhh dCBydWxlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9u LnByb3RvdHlwZS5fdG9nZ2xlUnVsZU9uT2ZmKTogQWRkcyBvciByZW1vdmVzIGNvbW1lbnRzIHRv IGFsbCBwcm9wZXJ0aWVzIGZvciB0aGF0IHJ1bGUuCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUudW5jb21tZW50QWxs UHJvcGVydGllcy51bmNvbW1lbnRQcm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5D U1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUudW5jb21tZW50QWxsUHJvcGVy dGllcyk6IFVuY29tbWVudHMgYWxsIHByb3BlcnRpZXMuCisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLmNvbW1lbnRBbGxQcm9wZXJ0 aWVzKTogQ29tbWVudHMgb3V0IGFsbCBwcm9wZXJ0aWVzLgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5fcHJvcGVydHlDaGVja2Jv eENoYW5nZWQpOiBNb3ZlZCBjb21tZW50IGxvZ2ljIHRvIGl0cyBvd24gZnVuY3Rpb24uCisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBl Ll9wcm9wZXJ0eUNvbW1lbnRDaGVja2JveENoYW5nZWQpOiBNb3ZlZCB1bmNvbW1lbnQgbG9naWMg dG8gaXRzIG93biBmdW5jdGlvbi4KKwogMjAxNS0wNi0xOSAgSm9uIExlZSAgPGpvbmxlZUBhcHBs ZS5jb20+CiAKICAgICAgICAgVXBkYXRlIGZvbnQgYW5kIGZvbnQtZmFtaWx5IGtleXdvcmQgY29t cGxldGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25z L2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDg2MjIzNjJhNTZk NzE3NWNiNzRhNjU5MTQxOTQ4MTZiMTE4NzM5ZGIuLmQwYWNjNjM4ZTBmZWZjYTgzZDk0ZDdlM2Ew NGIwMmZkZGFiZmUwYTMgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgMTI1CnpjbWRtWW8l enZDPF8tSnhDZzx2THVxIVkpR1VQRGlPZkduI0ViN2RWJnlXaipzU0o0eEJANzR8JDtxcU5ZSFol QQpaPWRldlE4SFc7TyR4eHNzVChTQFl6Q0puMDFefGFgQ2tYJW0KCmRlbHRhIDE5CmJjbWFFS2xY PjVEPF8tSnhIdjgmWlpRQ3NTPj9qKW1XKGYoRAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNz cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVj bGFyYXRpb25TZWN0aW9uLmNzcwppbmRleCBlYmFjZmZhNTJkZTAyYmRhNzUyYjVmYzU4YWY3ZTNl NzU2ZTI3MDQ1Li4yMDEzMmRiNjVhYzQyOThmNzAwYjg3ZjI3ZDM4YjNjYWVkMzBlNDFjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHls ZURlY2xhcmF0aW9uU2VjdGlvbi5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC02OCw2ICs2 OCwxNCBAQAogICAgIGhlaWdodDogMTZweDsKIH0KIAorLnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rp b24gPiAuaGVhZGVyID4gLmljb24udG9nZ2xlLWFibGU6aG92ZXIgeworICAgIC13ZWJraXQtZmls dGVyOiBicmlnaHRuZXNzKDAuOSk7Cit9CisKKy5zdHlsZS1kZWNsYXJhdGlvbi1zZWN0aW9uLnJ1 bGUtZGlzYWJsZWQgPiAuaGVhZGVyID4gLmljb24geworICAgIG9wYWNpdHk6IDAuNTsKK30KKwog LnN0eWxlLWRlY2xhcmF0aW9uLXNlY3Rpb24gPiAuaGVhZGVyID4gLnNlbGVjdG9yIHsKICAgICBm b250LWZhbWlseTogTWVubG8sIG1vbm9zcGFjZTsKICAgICBjb2xvcjogcmdiKDEyOCwgMTI4LCAx MjgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcwppbmRleCAw ZTliM2FlOWYzYmYyZWJiY2ZmZDRhYWNlNzAzODI1MTc0NjkyYTdhLi40ZmIwZDAxZTVjZWM5Mjg1 MGM3ZmUyOGIxNWJkYzc2MTM1Yzc4OTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uU2VjdGlvbi5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xh cmF0aW9uU2VjdGlvbi5qcwpAQCAtMzMsNiArMzMsNyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblNlY3Rpb24gPSBmdW5jdGlvbihkZWxlZ2F0ZSwgc3R5bGUpCiAgICAgY29uc29s ZS5hc3NlcnQoc3R5bGUpOwogICAgIHRoaXMuX3N0eWxlID0gc3R5bGUgfHwgbnVsbDsKICAgICB0 aGlzLl9zZWxlY3RvckVsZW1lbnRzID0gW107CisgICAgdGhpcy5fcnVsZURpc2FibGVkID0gZmFs c2U7CiAKICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgdGhpcy5fZWxlbWVudC5jbGFzc05hbWUgPSAic3R5bGUtZGVjbGFyYXRpb24tc2VjdGlv biI7CkBAIC04OCw2ICs4OSwxMyBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblNl Y3Rpb24gPSBmdW5jdGlvbihkZWxlZ2F0ZSwgc3R5bGUpCiAgICAgICAgIGJyZWFrOwogICAgIH0K IAorICAgIC8vIE1hdGNoZXMgYWxsIHNpdHVhdGlvbnMgZXhjZXB0IGZvciBVc2VyIEFnZW50IHN0 eWxlcy4KKyAgICBpZiAoIShzdHlsZS5vd25lclJ1bGUgJiYgc3R5bGUub3duZXJSdWxlLnR5cGUg PT09IFdlYkluc3BlY3Rvci5DU1NSdWxlLlR5cGUuVXNlckFnZW50KSkgeworICAgICAgICB0aGlz Ll9pY29uRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0b2dnbGUtYWJsZSIpOworICAgICAgICB0aGlz Ll9pY29uRWxlbWVudC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29tbWVudCBBbGwg UHJvcGVydGllcyIpOworICAgICAgICB0aGlzLl9pY29uRWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJjbGljayIsIHRoaXMuX3RvZ2dsZVJ1bGVPbk9mZi5iaW5kKHRoaXMpKTsKKyAgICB9CisKICAg ICBjb25zb2xlLmFzc2VydChpY29uQ2xhc3NOYW1lKTsKICAgICB0aGlzLl9lbGVtZW50LmNsYXNz TGlzdC5hZGQoaWNvbkNsYXNzTmFtZSk7CiAKQEAgLTM3Niw2ICszODQsMTMgQEAgV2ViSW5zcGVj dG9yLkNTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHN0eWxlVGV4dDsKICAgICB9LAogCisgICAgX3RvZ2dsZVJ1bGVPbk9mZjogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgdGhpcy5fcnVsZURpc2FibGVkID0gdGhpcy5fcnVsZURpc2FibGVk ID8gIXRoaXMuX3Byb3BlcnRpZXNUZXh0RWRpdG9yLnVuY29tbWVudEFsbFByb3BlcnRpZXMoKSA6 IHRoaXMuX3Byb3BlcnRpZXNUZXh0RWRpdG9yLmNvbW1lbnRBbGxQcm9wZXJ0aWVzKCk7CisgICAg ICAgIHRoaXMuX2ljb25FbGVtZW50LnRpdGxlID0gdGhpcy5fcnVsZURpc2FibGVkID8gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJVbmNvbW1lbnQgQWxsIFByb3BlcnRpZXMiKSA6IFdlYkluc3BlY3Rv ci5VSVN0cmluZygiQ29tbWVudCBBbGwgUHJvcGVydGllcyIpOworICAgICAgICB0aGlzLl9lbGVt ZW50LmNsYXNzTGlzdC50b2dnbGUoInJ1bGUtZGlzYWJsZWQiLCB0aGlzLl9ydWxlRGlzYWJsZWQp OworICAgIH0sCisKICAgICBfY29tbWl0U2VsZWN0b3I6IGZ1bmN0aW9uKG11dGF0aW9ucykKICAg ICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3N0eWxlLm93bmVyUnVsZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHls ZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCmluZGV4IGVkMmU4 MTZkOWU5ZWY3MjJlNDIzOTljYmZkOGRkOWMyNmMzY2YxNDUuLmUzMjJiODFhY2YxMGY1NTk3ODM0 MjQ1ZGViODQ1Yjk1NGE3MmU5MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yLmpzCkBAIC0zMDIsNiArMzAyLDM5IEBAIFdlYkluc3BlY3Rvci5DU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRpb25UZXh0 RWRpdG9yCiAgICAgICAgIHJldHVybiBtYXRjaGluZ1Byb3BlcnR5TmFtZXMubGVuZ3RoID4gMDsK ICAgICB9CiAKKyAgICB1bmNvbW1lbnRBbGxQcm9wZXJ0aWVzKCkKKyAgICB7CisgICAgICAgIGZ1 bmN0aW9uIHVuY29tbWVudFByb3BlcnRpZXMocHJvcGVydGllcykKKyAgICAgICAgeworICAgICAg ICAgICAgaWYgKCFwcm9wZXJ0aWVzLmxlbmd0aCkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICAgICAgICAgIGZvciAodmFyIHByb3BlcnR5IG9mIHByb3BlcnRpZXMpIHsKKyAg ICAgICAgICAgICAgICBpZiAocHJvcGVydHkuX2NvbW1lbnRSYW5nZSkgeworICAgICAgICAgICAg ICAgICAgICB0aGlzLl91bmNvbW1lbnRSYW5nZShwcm9wZXJ0eS5fY29tbWVudFJhbmdlKTsKKyAg ICAgICAgICAgICAgICAgICAgcHJvcGVydHkuX2NvbW1lbnRSYW5nZSA9IG51bGw7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgfQorCisgICAgICAgIHJldHVybiB1bmNvbW1lbnRQcm9wZXJ0aWVzLmNhbGwodGhpcywg dGhpcy5fc3R5bGUucGVuZGluZ1Byb3BlcnRpZXMpIHx8IHVuY29tbWVudFByb3BlcnRpZXMuY2Fs bCh0aGlzLCB0aGlzLl9zdHlsZS5wcm9wZXJ0aWVzKTsKKyAgICB9CisKKyAgICBjb21tZW50QWxs UHJvcGVydGllcygpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX3N0eWxlLnByb3BlcnRpZXMu bGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGZvciAodmFyIHBy b3BlcnR5IG9mIHRoaXMuX3N0eWxlLnByb3BlcnRpZXMpIHsKKyAgICAgICAgICAgIGlmIChwcm9w ZXJ0eS5fX3Byb3BlcnR5VGV4dE1hcmtlcikKKyAgICAgICAgICAgICAgICB0aGlzLl9jb21tZW50 UHJvcGVydHkocHJvcGVydHkpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICBkaWREaXNtaXNzUG9wb3Zlcihwb3BvdmVy KQpAQCAtNzEyLDYgKzc0NSwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRl eHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICBp ZiAoIXByb3BlcnR5KQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMuX2NvbW1l bnRQcm9wZXJ0eShwcm9wZXJ0eSk7CisgICAgfQorCisgICAgX2NvbW1lbnRQcm9wZXJ0eShwcm9w ZXJ0eSkKKyAgICB7CiAgICAgICAgIHZhciB0ZXh0TWFya2VyID0gcHJvcGVydHkuX19wcm9wZXJ0 eVRleHRNYXJrZXI7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRleHRNYXJrZXIpOwogICAgICAg ICBpZiAoIXRleHRNYXJrZXIpCkBAIC03MjMsNiArNzYxLDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0 eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRF ZGl0b3IKICAgICAgICAgaWYgKCFyYW5nZSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAg ICBwcm9wZXJ0eS5fY29tbWVudFJhbmdlID0gcmFuZ2U7CisgICAgICAgIHByb3BlcnR5Ll9jb21t ZW50UmFuZ2UudG8uY2ggKz0gNjsgLy8gTnVtYmVyIG9mIGNoYXJhY3RlcnMgYWRkZWQgYnkgY29t bWVudHMuCisKICAgICAgICAgdmFyIHRleHQgPSB0aGlzLl9jb2RlTWlycm9yLmdldFJhbmdlKHJh bmdlLmZyb20sIHJhbmdlLnRvKTsKIAogICAgICAgICBmdW5jdGlvbiB1cGRhdGUoKQpAQCAtNzUw LDYgKzc5MSwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3Ig PSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICBpZiAoIXJhbmdl KQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIHRoaXMuX3VuY29tbWVudFJhbmdlKHJh bmdlKTsKKyAgICB9CisKKyAgICBfdW5jb21tZW50UmFuZ2UocmFuZ2UpCisgICAgewogICAgICAg ICB2YXIgdGV4dCA9IHRoaXMuX2NvZGVNaXJyb3IuZ2V0UmFuZ2UocmFuZ2UuZnJvbSwgcmFuZ2Uu dG8pOwogCiAgICAgICAgIC8vIFJlbW92ZSB0aGUgY29tbWVudCBwcmVmaXggYW5kIHN1ZmZpeC4K