102071 2012-11-13 05:05:09 -0800 Web Inspector: [Canvas] UI: make the Grid save scrolling position, show wait spinner icon 2014-12-01 14:29:23 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 1 aandrey aandrey apavlov burg keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 765484 0 aandrey 2012-11-13 05:05:09 -0800 1. save scroll position of the grid 2. show spinner icon on long operations Patch to follow. 765489 1 173871 aandrey 2012-11-13 05:11:04 -0800 Created attachment 173871 Patch 765505 2 173876 aandrey 2012-11-13 05:32:58 -0800 Created attachment 173876 Patch 765523 3 173871 webkit.review.bot 2012-11-13 06:06:03 -0800 Comment on attachment 173871 Patch Clearing flags on attachment: 173871 Committed r134405: <http://trac.webkit.org/changeset/134405> 765550 4 173876 webkit.review.bot 2012-11-13 06:57:28 -0800 Comment on attachment 173876 Patch Rejecting attachment 173876 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: rofileView.js Hunk #1 FAILED at 40. Hunk #2 FAILED at 57. Hunk #3 FAILED at 78. Hunk #4 FAILED at 231. 4 out of 4 hunks FAILED -- saving rejects to file Source/WebCore/inspector/front-end/CanvasProfileView.js.rej patching file Source/WebCore/inspector/front-end/canvasProfiler.css Hunk #1 succeeded at 63 with fuzz 2 (offset 9 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Pavel Feld..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/14824308 173871 2012-11-13 05:11:04 -0800 2012-11-13 06:06:03 -0800 Patch bug-102071-20121113170904.patch text/plain 9710 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0Mzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk5Y2M0MDg1YjNhZWM2 YjE4MjY2ZGU5ODI0Yzk4OTAxZTdlZTFmYi4uOWJlN2VhMWE5YmEwMjgwMzI0NjQzMzM5MzU0NmRk MWE4ZWJmZWFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTEzICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIFVJOiBtYWtlIHRoZSBHcmlkIHNhdmUgc2Nyb2xsaW5nIHBvc2l0aW9uLCBz aG93IHdhaXQgc3Bpbm5lciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDIwNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZS5kaXNwb3NlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUuZWxlbWVudHNUb1Jlc3Rv cmVTY3JvbGxQb3NpdGlvbnNGb3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2Zp bGVWaWV3LnByb3RvdHlwZS5fZW5hYmxlV2FpdEljb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZS5fcmVwbGF5VHJhY2VMb2cuZGlkUmVwbGF5VHJh Y2VMb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlw ZS5fcmVwbGF5VHJhY2VMb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVW aWV3LnByb3RvdHlwZS5fZGlkUmVjZWl2ZVRyYWNlTG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUuX2NyZWF0ZUNhbGxOb2RlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVyLmNzczoKKyAgICAgICAgKCNjYW52 YXMtcmVwbGF5LWltYWdlLndhaXQpOgorCiAyMDEyLTExLTEzICBLZW50YXJvIEhhcmEgIDxoYXJh a2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIE1ha2UgaXNWYWxpZERPTU9iamVjdCgp IHN0YXRpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D YW52YXNQcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q2FudmFzUHJvZmlsZVZpZXcuanMKaW5kZXggNjIxYzYwMjFjMGQyYjEwZGY5OTVjNTkyOGQwZmUx Mzc3YjJhYzE4NC4uZWYyZTU3YmMyMjIxOGM4M2JmZmQ5YWYzNGU3MDI2MWU4MTkyOTdjNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52YXNQcm9maWxl Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1By b2ZpbGVWaWV3LmpzCkBAIC00MCwxMSArNDAsMjQgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2Zp bGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB0aGlzLl90cmFjZUxvZ0lkID0gcHJvZmls ZS50cmFjZUxvZ0lkKCk7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNhbnZhcy1w cm9maWxlLXZpZXciKTsKIAorICAgIHRoaXMuX2xpbmtpZmllciA9IG5ldyBXZWJJbnNwZWN0b3Iu TGlua2lmaWVyKCk7CiAgICAgdGhpcy5fc3BsaXRWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5TcGxp dFZpZXcoZmFsc2UsICJjYW52YXNQcm9maWxlVmlld1NwbGl0TG9jYXRpb24iLCAzMDApOwogCi0g ICAgdGhpcy5fbGlua2lmaWVyID0gbmV3IFdlYkluc3BlY3Rvci5MaW5raWZpZXIoKTsKLSAgICB0 aGlzLl9sb2dHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5DYW52YXNMb2dHcmlkKHByb2ZpbGUudHJh Y2VMb2dJZCgpLCB0aGlzLl9saW5raWZpZXIpOworICAgIHZhciBjb2x1bW5zID0geyAwOiB7fSwg MToge30sIDI6IHt9IH07CisgICAgY29sdW1uc1swXS50aXRsZSA9ICIjIjsKKyAgICBjb2x1bW5z WzBdLnNvcnRhYmxlID0gdHJ1ZTsKKyAgICBjb2x1bW5zWzBdLndpZHRoID0gIjUlIjsKKyAgICBj b2x1bW5zWzFdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYWxsIik7CisgICAgY29s dW1uc1sxXS5zb3J0YWJsZSA9IHRydWU7CisgICAgY29sdW1uc1sxXS53aWR0aCA9ICI3NSUiOwor ICAgIGNvbHVtbnNbMl0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2F0aW9uIik7 CisgICAgY29sdW1uc1syXS5zb3J0YWJsZSA9IHRydWU7CisgICAgY29sdW1uc1syXS53aWR0aCA9 ICIyMCUiOworCisgICAgdGhpcy5fbG9nR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQo Y29sdW1ucyk7CisgICAgdGhpcy5fbG9nR3JpZC5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImZpbGwi KTsKICAgICB0aGlzLl9sb2dHcmlkLnNob3codGhpcy5fc3BsaXRWaWV3LnNlY29uZEVsZW1lbnQo KSk7CisgICAgdGhpcy5fbG9nR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5FdmVudHMuU2VsZWN0ZWROb2RlLCB0aGlzLl9yZXBsYXlUcmFjZUxvZy5iaW5kKHRoaXMp KTsKIAogICAgIHZhciByZXBsYXlJbWFnZUNvbnRhaW5lciA9IHRoaXMuX3NwbGl0Vmlldy5maXJz dEVsZW1lbnQoKTsKICAgICByZXBsYXlJbWFnZUNvbnRhaW5lci5pZCA9ICJjYW52YXMtcmVwbGF5 LWltYWdlLWNvbnRhaW5lciI7CkBAIC01NywxNCArNzAsMTYgQEAgV2ViSW5zcGVjdG9yLkNhbnZh c1Byb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICByZXBsYXlJbWFnZUNvbnRhaW5l ci5hcHBlbmRDaGlsZCh0aGlzLl9kZWJ1Z0luZm9FbGVtZW50KTsKIAogICAgIHRoaXMuX3NwbGl0 Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7Ci0gICAgdGhpcy5fbG9nR3JpZC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudHMuU2VsZWN0ZWROb2RlLCB0aGlzLl9vblNl bGVjdFRyYWNlTG9nLmJpbmQodGhpcykpOworCisgICAgdGhpcy5fZW5hYmxlV2FpdEljb24odHJ1 ZSk7CisgICAgQ2FudmFzQWdlbnQuZ2V0VHJhY2VMb2codGhpcy5fdHJhY2VMb2dJZCwgdGhpcy5f ZGlkUmVjZWl2ZVRyYWNlTG9nLmJpbmQodGhpcykpOwogfQogCiBXZWJJbnNwZWN0b3IuQ2FudmFz UHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX2xpbmtpZmllci5yZXNldCgpOwotICAgICAgICBDYW52YXNBZ2VudC5k cm9wVHJhY2VMb2codGhpcy5fcHJvZmlsZS50cmFjZUxvZ0lkKCkpOworICAgICAgICBDYW52YXNB Z2VudC5kcm9wVHJhY2VMb2codGhpcy5fdHJhY2VMb2dJZCk7CiAgICAgfSwKIAogICAgIGdldCBz dGF0dXNCYXJJdGVtcygpCkBAIC03OCwyOSArOTMsODUgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1By b2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuRXZlbnR9IGUKKyAgICAgKiBAb3ZlcnJpZGUKKyAgICAgKiBAcmV0dXJu IHtBcnJheS48RWxlbWVudD59CisgICAgICovCisgICAgZWxlbWVudHNUb1Jlc3RvcmVTY3JvbGxQ b3NpdGlvbnNGb3I6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbdGhpcy5fbG9n R3JpZC5zY3JvbGxDb250YWluZXJdOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e2Jvb2xlYW59IGVuYWJsZQogICAgICAqLwotICAgIF9vblNlbGVjdFRyYWNlTG9nOiBmdW5jdGlv bihlKQorICAgIF9lbmFibGVXYWl0SWNvbjogZnVuY3Rpb24oZW5hYmxlKQogICAgIHsKLSAgICAg ICAgdGhpcy5fcmVwbGF5VHJhY2VMb2codGhpcy5fbG9nR3JpZC5zZWxlY3RlZE5vZGUpOworICAg ICAgICB0aGlzLl9yZXBsYXlJbWFnZUVsZW1lbnQuY2xhc3NOYW1lID0gZW5hYmxlID8gIndhaXQi IDogIiI7CiAgICAgfSwKIAotICAgIF9yZXBsYXlUcmFjZUxvZzogZnVuY3Rpb24oY2FsbE5vZGUp CisgICAgX3JlcGxheVRyYWNlTG9nOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB2YXIgY2Fs bE5vZGUgPSB0aGlzLl9sb2dHcmlkLnNlbGVjdGVkTm9kZTsKICAgICAgICAgaWYgKCFjYWxsTm9k ZSkKICAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICB2YXIgdGltZSA9IERhdGUubm93KCk7 CiAgICAgICAgIGZ1bmN0aW9uIGRpZFJlcGxheVRyYWNlTG9nKGVycm9yLCBkYXRhVVJMKQogICAg ICAgICB7CisgICAgICAgICAgICB0aGlzLl9lbmFibGVXYWl0SWNvbihmYWxzZSk7CiAgICAgICAg ICAgICBpZiAoZXJyb3IpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgdGhp cy5fZGVidWdJbmZvRWxlbWVudC50ZXh0Q29udGVudCA9ICJSZXBsYXkgdGltZTogIiArIChEYXRl Lm5vdygpIC0gdGltZSkgKyAibXMiOwogICAgICAgICAgICAgdGhpcy5fcmVwbGF5SW1hZ2VFbGVt ZW50LnNyYyA9IGRhdGFVUkw7CiAgICAgICAgIH0KKyAgICAgICAgdGhpcy5fZW5hYmxlV2FpdElj b24odHJ1ZSk7CiAgICAgICAgIENhbnZhc0FnZW50LnJlcGxheVRyYWNlTG9nKHRoaXMuX3RyYWNl TG9nSWQsIGNhbGxOb2RlLmluZGV4LCBkaWRSZXBsYXlUcmFjZUxvZy5iaW5kKHRoaXMpKTsKICAg ICB9LAogCisgICAgX2RpZFJlY2VpdmVUcmFjZUxvZzogZnVuY3Rpb24oZXJyb3IsIHRyYWNlTG9n KQorICAgIHsKKyAgICAgICAgdGhpcy5fZW5hYmxlV2FpdEljb24oZmFsc2UpOworICAgICAgICB0 aGlzLl9sb2dHcmlkLnJvb3ROb2RlKCkucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgaWYgKGVy cm9yIHx8ICF0cmFjZUxvZykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdmFyIGNhbGxz ID0gdHJhY2VMb2cuY2FsbHM7CisgICAgICAgIGZvciAodmFyIGkgPSAwLCBuID0gY2FsbHMubGVu Z3RoOyBpIDwgbjsgKytpKQorICAgICAgICAgICAgdGhpcy5fbG9nR3JpZC5yb290Tm9kZSgpLmFw cGVuZENoaWxkKHRoaXMuX2NyZWF0ZUNhbGxOb2RlKGksIGNhbGxzW2ldKSk7CisgICAgICAgIHZh ciBsYXN0Tm9kZSA9IHRoaXMuX2xvZ0dyaWQucm9vdE5vZGUoKS5jaGlsZHJlbltjYWxscy5sZW5n dGggLSAxXTsKKyAgICAgICAgaWYgKGxhc3ROb2RlKSB7CisgICAgICAgICAgICBsYXN0Tm9kZS5y ZXZlYWwoKTsKKyAgICAgICAgICAgIGxhc3ROb2RlLnNlbGVjdCgpOworICAgICAgICB9CisgICAg fSwKKworICAgIF9jcmVhdGVDYWxsTm9kZTogZnVuY3Rpb24oaW5kZXgsIGNhbGwpCisgICAgewor ICAgICAgICB2YXIgdHJhY2VMb2dJdGVtID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CisgICAgICAgIHZhciBkYXRhID0ge307CisgICAgICAgIGRhdGFbMF0gPSBpbmRleCArIDE7Cisg ICAgICAgIGRhdGFbMV0gPSBjYWxsLmZ1bmN0aW9uTmFtZSB8fCAiY29udGV4dC4iICsgY2FsbC5w cm9wZXJ0eTsKKyAgICAgICAgZGF0YVsyXSA9ICIiOworICAgICAgICBpZiAoY2FsbC5zb3VyY2VV UkwpIHsKKyAgICAgICAgICAgIC8vIEZJWE1FKDYyNzI1KTogc3RhY2sgdHJhY2UgbGluZS9jb2x1 bW4gbnVtYmVycyBhcmUgb25lLWJhc2VkLgorICAgICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSBN YXRoLm1heCgwLCBjYWxsLmxpbmVOdW1iZXIgLSAxKSB8fCAwOworICAgICAgICAgICAgdmFyIGNv bHVtbk51bWJlciA9IE1hdGgubWF4KDAsIGNhbGwuY29sdW1uTnVtYmVyIC0gMSkgfHwgMDsKKyAg ICAgICAgICAgIGRhdGFbMl0gPSB0aGlzLl9saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKGNhbGwu c291cmNlVVJMLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpOworICAgICAgICB9CisKKyAgICAg ICAgaWYgKGNhbGwuYXJndW1lbnRzKQorICAgICAgICAgICAgZGF0YVsxXSArPSAiKCIgKyBjYWxs LmFyZ3VtZW50cy5qb2luKCIsICIpICsgIikiOworICAgICAgICBlbHNlCisgICAgICAgICAgICBk YXRhWzFdICs9ICIgPSAiICsgY2FsbC52YWx1ZTsKKworICAgICAgICBpZiAodHlwZW9mIGNhbGwu cmVzdWx0ICE9PSAidW5kZWZpbmVkIikKKyAgICAgICAgICAgIGRhdGFbMV0gKz0gIiA9PiAiICsg Y2FsbC5yZXN1bHQ7CisKKyAgICAgICAgdmFyIG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFH cmlkTm9kZShkYXRhKTsKKyAgICAgICAgbm9kZS5jYWxsID0gY2FsbDsKKyAgICAgICAgbm9kZS5p bmRleCA9IGluZGV4OworICAgICAgICBub2RlLnNlbGVjdGFibGUgPSB0cnVlOworICAgICAgICBy ZXR1cm4gbm9kZTsKKyAgICB9LAorCiAgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuVmlldy5w cm90b3R5cGUKIH0KIApAQCAtMjMxLDgwICszMDIsMyBAQCBXZWJJbnNwZWN0b3IuQ2FudmFzUHJv ZmlsZUhlYWRlci5wcm90b3R5cGUgPSB7CiAKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5Q cm9maWxlSGVhZGVyLnByb3RvdHlwZQogfQotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5EYXRhR3JpZH0KLSAqIEBwYXJhbSB7c3RyaW5nfSB0cmFjZUxv Z0lkCi0gKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5MaW5raWZpZXJ9IGxpbmtpZmllcgotICovCi1X ZWJJbnNwZWN0b3IuQ2FudmFzTG9nR3JpZCA9IGZ1bmN0aW9uKHRyYWNlTG9nSWQsIGxpbmtpZmll cikKLXsKLSAgICB0aGlzLl9saW5raWZpZXIgPSBsaW5raWZpZXI7Ci0gICAgdmFyIGNvbHVtbnMg PSB7IDA6IHt9LCAxOiB7fSwgMjoge30gfTsKLSAgICBjb2x1bW5zWzBdLnRpdGxlID0gIiMiOwot ICAgIGNvbHVtbnNbMF0uc29ydGFibGUgPSB0cnVlOwotICAgIGNvbHVtbnNbMF0ud2lkdGggPSAi MyUiOwotICAgIGNvbHVtbnNbMV0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGwi KTsKLSAgICBjb2x1bW5zWzFdLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICBjb2x1bW5zWzFdLndpZHRo ID0gIjc3JSI7Ci0gICAgY29sdW1uc1syXS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi TG9jYXRpb24iKTsKLSAgICBjb2x1bW5zWzJdLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICBjb2x1bW5z WzJdLndpZHRoID0gIjIwJSI7Ci0KLSAgICBXZWJJbnNwZWN0b3IuRGF0YUdyaWQuY2FsbCh0aGlz LCBjb2x1bW5zKTsKLSAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZmlsbCIpOwotCi0g ICAgdGhpcy5fdHJhY2VMb2dJZCA9IHRyYWNlTG9nSWQ7Ci0gICAgQ2FudmFzQWdlbnQuZ2V0VHJh Y2VMb2codHJhY2VMb2dJZCwgdGhpcy5fZGlkUmVjZWl2ZVRyYWNlTG9nLmJpbmQodGhpcykpOwot fQotCi1XZWJJbnNwZWN0b3IuQ2FudmFzTG9nR3JpZC5wcm90b3R5cGUgPSB7Ci0KLSAgICBfZGlk UmVjZWl2ZVRyYWNlTG9nOiBmdW5jdGlvbihlcnJvciwgdHJhY2VMb2cpCi0gICAgewotICAgICAg ICB0aGlzLnJvb3ROb2RlKCkucmVtb3ZlQ2hpbGRyZW4oKTsKLSAgICAgICAgaWYgKGVycm9yIHx8 ICF0cmFjZUxvZykKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB2YXIgY2FsbHMgPSB0 cmFjZUxvZy5jYWxsczsKLSAgICAgICAgZm9yICh2YXIgaSA9IDAsIG4gPSBjYWxscy5sZW5ndGg7 IGkgPCBuOyArK2kpCi0gICAgICAgICAgICB0aGlzLnJvb3ROb2RlKCkuYXBwZW5kQ2hpbGQodGhp cy5fY3JlYXRlQ2FsbE5vZGUoaSwgY2FsbHNbaV0pKTsKLSAgICAgICAgdmFyIGxhc3ROb2RlID0g dGhpcy5yb290Tm9kZSgpLmNoaWxkcmVuW2NhbGxzLmxlbmd0aCAtIDFdOwotICAgICAgICBpZiAo bGFzdE5vZGUpIHsKLSAgICAgICAgICAgIGxhc3ROb2RlLnJldmVhbCgpOwotICAgICAgICAgICAg bGFzdE5vZGUuc2VsZWN0KCk7Ci0gICAgICAgIH0KLSAgICB9LAotCi0gICAgX2NyZWF0ZUNhbGxO b2RlOiBmdW5jdGlvbihpbmRleCwgY2FsbCkKLSAgICB7Ci0gICAgICAgIHZhciB0cmFjZUxvZ0l0 ZW0gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgdmFyIGRhdGEgPSB7 fTsKLSAgICAgICAgZGF0YVswXSA9IGluZGV4ICsgMTsKLSAgICAgICAgZGF0YVsxXSA9IGNhbGwu ZnVuY3Rpb25OYW1lIHx8ICJjb250ZXh0LiIgKyBjYWxsLnByb3BlcnR5OwotICAgICAgICBkYXRh WzJdID0gIiI7Ci0gICAgICAgIGlmIChjYWxsLnNvdXJjZVVSTCkgewotICAgICAgICAgICAgLy8g RklYTUUoNjI3MjUpOiBzdGFjayB0cmFjZSBsaW5lL2NvbHVtbiBudW1iZXJzIGFyZSBvbmUtYmFz ZWQuCi0gICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IE1hdGgubWF4KDAsIGNhbGwubGluZU51 bWJlciAtIDEpIHx8IDA7Ci0gICAgICAgICAgICB2YXIgY29sdW1uTnVtYmVyID0gTWF0aC5tYXgo MCwgY2FsbC5jb2x1bW5OdW1iZXIgLSAxKSB8fCAwOwotICAgICAgICAgICAgZGF0YVsyXSA9IHRo aXMuX2xpbmtpZmllci5saW5raWZ5TG9jYXRpb24oY2FsbC5zb3VyY2VVUkwsIGxpbmVOdW1iZXIs IGNvbHVtbk51bWJlcik7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoY2FsbC5hcmd1bWVudHMp Ci0gICAgICAgICAgICBkYXRhWzFdICs9ICIoIiArIGNhbGwuYXJndW1lbnRzLmpvaW4oIiwgIikg KyAiKSI7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGRhdGFbMV0gKz0gIiA9ICIgKyBjYWxs LnZhbHVlOwotICAKLSAgICAgICAgaWYgKHR5cGVvZiBjYWxsLnJlc3VsdCAhPT0gInVuZGVmaW5l ZCIpCi0gICAgICAgICAgICBkYXRhWzFdICs9ICIgPT4gIiArIGNhbGwucmVzdWx0OwotCi0gICAg ICAgIHZhciBub2RlID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUoZGF0YSk7Ci0gICAg ICAgIG5vZGUuY2FsbCA9IGNhbGw7Ci0gICAgICAgIG5vZGUuaW5kZXggPSBpbmRleDsKLSAgICAg ICAgbm9kZS5zZWxlY3RhYmxlID0gdHJ1ZTsKLSAgICAgICAgcmV0dXJuIG5vZGU7Ci0gICAgfSwK LQotICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZQotfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9jYW52YXNQcm9maWxl ci5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVy LmNzcwppbmRleCA3Mzk4YTVmNjExMzkxOGY1OTc2MTg1YTBiNzE3NGM3ZTliYjRhM2I2Li5iOTAz ZGZhNTczMTdkNmJkZTA2MjIwMWFmNjI3Y2QxYWM1NGE4NWZlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVyLmNzcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVyLmNzcwpAQCAtNTQs MyArNTQsMTIgQEAKICAgICBtYXJnaW46IGF1dG87CiAgICAgZGlzcGxheTogYmxvY2s7CiB9CisK KyNjYW52YXMtcmVwbGF5LWltYWdlLndhaXQgeworICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvc3Bp bm5lckFjdGl2ZVNlbGVjdGVkLmdpZik7CisgICAgem9vbTogaW5oZXJpdDsKKyAgICBwb3NpdGlv bjogYWJzb2x1dGU7CisgICAgdG9wOiA1MCU7CisgICAgbGVmdDogNTAlOworICAgIG1hcmdpbjog LTE2cHggMCAwIC0xNnB4OworfQo= 173876 2012-11-13 05:32:58 -0800 2012-11-13 06:57:28 -0800 Patch bug-102071-20121113173058.patch text/plain 9760 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0Mzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk5Y2M0MDg1YjNhZWM2 YjE4MjY2ZGU5ODI0Yzk4OTAxZTdlZTFmYi4uOWJlN2VhMWE5YmEwMjgwMzI0NjQzMzM5MzU0NmRk MWE4ZWJmZWFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTEzICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIFVJOiBtYWtlIHRoZSBHcmlkIHNhdmUgc2Nyb2xsaW5nIHBvc2l0aW9uLCBz aG93IHdhaXQgc3Bpbm5lciBpY29uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDIwNzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZS5kaXNwb3NlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUuZWxlbWVudHNUb1Jlc3Rv cmVTY3JvbGxQb3NpdGlvbnNGb3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2Zp bGVWaWV3LnByb3RvdHlwZS5fZW5hYmxlV2FpdEljb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlwZS5fcmVwbGF5VHJhY2VMb2cuZGlkUmVwbGF5VHJh Y2VMb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVWaWV3LnByb3RvdHlw ZS5fcmVwbGF5VHJhY2VMb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVW aWV3LnByb3RvdHlwZS5fZGlkUmVjZWl2ZVRyYWNlTG9nKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUuX2NyZWF0ZUNhbGxOb2RlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVyLmNzczoKKyAgICAgICAgKCNjYW52 YXMtcmVwbGF5LWltYWdlLndhaXQpOgorCiAyMDEyLTExLTEzICBLZW50YXJvIEhhcmEgIDxoYXJh a2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIE1ha2UgaXNWYWxpZERPTU9iamVjdCgp IHN0YXRpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D YW52YXNQcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q2FudmFzUHJvZmlsZVZpZXcuanMKaW5kZXggNjIxYzYwMjFjMGQyYjEwZGY5OTVjNTkyOGQwZmUx Mzc3YjJhYzE4NC4uNTlkN2U3NzliMmRlYjMxZGRjMjgwNGIwNmQxNmU0YjA4NDY5NWFiZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52YXNQcm9maWxl Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1By b2ZpbGVWaWV3LmpzCkBAIC00MCwxMSArNDAsMjQgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2Zp bGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICB0aGlzLl90cmFjZUxvZ0lkID0gcHJvZmls ZS50cmFjZUxvZ0lkKCk7CiAgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNhbnZhcy1w cm9maWxlLXZpZXciKTsKIAorICAgIHRoaXMuX2xpbmtpZmllciA9IG5ldyBXZWJJbnNwZWN0b3Iu TGlua2lmaWVyKCk7CiAgICAgdGhpcy5fc3BsaXRWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5TcGxp dFZpZXcoZmFsc2UsICJjYW52YXNQcm9maWxlVmlld1NwbGl0TG9jYXRpb24iLCAzMDApOwogCi0g ICAgdGhpcy5fbGlua2lmaWVyID0gbmV3IFdlYkluc3BlY3Rvci5MaW5raWZpZXIoKTsKLSAgICB0 aGlzLl9sb2dHcmlkID0gbmV3IFdlYkluc3BlY3Rvci5DYW52YXNMb2dHcmlkKHByb2ZpbGUudHJh Y2VMb2dJZCgpLCB0aGlzLl9saW5raWZpZXIpOworICAgIHZhciBjb2x1bW5zID0geyAwOiB7fSwg MToge30sIDI6IHt9IH07CisgICAgY29sdW1uc1swXS50aXRsZSA9ICIjIjsKKyAgICBjb2x1bW5z WzBdLnNvcnRhYmxlID0gdHJ1ZTsKKyAgICBjb2x1bW5zWzBdLndpZHRoID0gIjUlIjsKKyAgICBj b2x1bW5zWzFdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYWxsIik7CisgICAgY29s dW1uc1sxXS5zb3J0YWJsZSA9IHRydWU7CisgICAgY29sdW1uc1sxXS53aWR0aCA9ICI3NSUiOwor ICAgIGNvbHVtbnNbMl0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvY2F0aW9uIik7 CisgICAgY29sdW1uc1syXS5zb3J0YWJsZSA9IHRydWU7CisgICAgY29sdW1uc1syXS53aWR0aCA9 ICIyMCUiOworCisgICAgdGhpcy5fbG9nR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQo Y29sdW1ucyk7CisgICAgdGhpcy5fbG9nR3JpZC5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImZpbGwi KTsKICAgICB0aGlzLl9sb2dHcmlkLnNob3codGhpcy5fc3BsaXRWaWV3LnNlY29uZEVsZW1lbnQo KSk7CisgICAgdGhpcy5fbG9nR3JpZC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5EYXRh R3JpZC5FdmVudHMuU2VsZWN0ZWROb2RlLCB0aGlzLl9yZXBsYXlUcmFjZUxvZy5iaW5kKHRoaXMp KTsKIAogICAgIHZhciByZXBsYXlJbWFnZUNvbnRhaW5lciA9IHRoaXMuX3NwbGl0Vmlldy5maXJz dEVsZW1lbnQoKTsKICAgICByZXBsYXlJbWFnZUNvbnRhaW5lci5pZCA9ICJjYW52YXMtcmVwbGF5 LWltYWdlLWNvbnRhaW5lciI7CkBAIC01NywxNCArNzAsMTYgQEAgV2ViSW5zcGVjdG9yLkNhbnZh c1Byb2ZpbGVWaWV3ID0gZnVuY3Rpb24ocHJvZmlsZSkKICAgICByZXBsYXlJbWFnZUNvbnRhaW5l ci5hcHBlbmRDaGlsZCh0aGlzLl9kZWJ1Z0luZm9FbGVtZW50KTsKIAogICAgIHRoaXMuX3NwbGl0 Vmlldy5zaG93KHRoaXMuZWxlbWVudCk7Ci0gICAgdGhpcy5fbG9nR3JpZC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5FdmVudHMuU2VsZWN0ZWROb2RlLCB0aGlzLl9vblNl bGVjdFRyYWNlTG9nLmJpbmQodGhpcykpOworCisgICAgdGhpcy5fZW5hYmxlV2FpdEljb24odHJ1 ZSk7CisgICAgQ2FudmFzQWdlbnQuZ2V0VHJhY2VMb2codGhpcy5fdHJhY2VMb2dJZCwgdGhpcy5f ZGlkUmVjZWl2ZVRyYWNlTG9nLmJpbmQodGhpcykpOwogfQogCiBXZWJJbnNwZWN0b3IuQ2FudmFz UHJvZmlsZVZpZXcucHJvdG90eXBlID0gewogICAgIGRpc3Bvc2U6IGZ1bmN0aW9uKCkKICAgICB7 CiAgICAgICAgIHRoaXMuX2xpbmtpZmllci5yZXNldCgpOwotICAgICAgICBDYW52YXNBZ2VudC5k cm9wVHJhY2VMb2codGhpcy5fcHJvZmlsZS50cmFjZUxvZ0lkKCkpOworICAgICAgICBDYW52YXNB Z2VudC5kcm9wVHJhY2VMb2codGhpcy5fdHJhY2VMb2dJZCk7CiAgICAgfSwKIAogICAgIGdldCBz dGF0dXNCYXJJdGVtcygpCkBAIC03OCwyOSArOTMsODYgQEAgV2ViSW5zcGVjdG9yLkNhbnZhc1By b2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuRXZlbnR9IGUKKyAgICAgKiBAb3ZlcnJpZGUKKyAgICAgKiBAcmV0dXJu IHtBcnJheS48RWxlbWVudD59CisgICAgICovCisgICAgZWxlbWVudHNUb1Jlc3RvcmVTY3JvbGxQ b3NpdGlvbnNGb3I6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBbdGhpcy5fbG9n R3JpZC5zY3JvbGxDb250YWluZXJdOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0g e2Jvb2xlYW59IGVuYWJsZQogICAgICAqLwotICAgIF9vblNlbGVjdFRyYWNlTG9nOiBmdW5jdGlv bihlKQorICAgIF9lbmFibGVXYWl0SWNvbjogZnVuY3Rpb24oZW5hYmxlKQogICAgIHsKLSAgICAg ICAgdGhpcy5fcmVwbGF5VHJhY2VMb2codGhpcy5fbG9nR3JpZC5zZWxlY3RlZE5vZGUpOworICAg ICAgICB0aGlzLl9yZXBsYXlJbWFnZUVsZW1lbnQuY2xhc3NOYW1lID0gZW5hYmxlID8gIndhaXQi IDogIiI7CisgICAgICAgIHRoaXMuX2RlYnVnSW5mb0VsZW1lbnQudGV4dENvbnRlbnQgPSAiIjsK ICAgICB9LAogCi0gICAgX3JlcGxheVRyYWNlTG9nOiBmdW5jdGlvbihjYWxsTm9kZSkKKyAgICBf cmVwbGF5VHJhY2VMb2c6IGZ1bmN0aW9uKCkKICAgICB7CisgICAgICAgIHZhciBjYWxsTm9kZSA9 IHRoaXMuX2xvZ0dyaWQuc2VsZWN0ZWROb2RlOwogICAgICAgICBpZiAoIWNhbGxOb2RlKQogICAg ICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgIHZhciB0aW1lID0gRGF0ZS5ub3coKTsKICAgICAg ICAgZnVuY3Rpb24gZGlkUmVwbGF5VHJhY2VMb2coZXJyb3IsIGRhdGFVUkwpCiAgICAgICAgIHsK KyAgICAgICAgICAgIHRoaXMuX2VuYWJsZVdhaXRJY29uKGZhbHNlKTsKICAgICAgICAgICAgIGlm IChlcnJvcikKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB0aGlzLl9kZWJ1 Z0luZm9FbGVtZW50LnRleHRDb250ZW50ID0gIlJlcGxheSB0aW1lOiAiICsgKERhdGUubm93KCkg LSB0aW1lKSArICJtcyI7CiAgICAgICAgICAgICB0aGlzLl9yZXBsYXlJbWFnZUVsZW1lbnQuc3Jj ID0gZGF0YVVSTDsKICAgICAgICAgfQorICAgICAgICB0aGlzLl9lbmFibGVXYWl0SWNvbih0cnVl KTsKICAgICAgICAgQ2FudmFzQWdlbnQucmVwbGF5VHJhY2VMb2codGhpcy5fdHJhY2VMb2dJZCwg Y2FsbE5vZGUuaW5kZXgsIGRpZFJlcGxheVRyYWNlTG9nLmJpbmQodGhpcykpOwogICAgIH0sCiAK KyAgICBfZGlkUmVjZWl2ZVRyYWNlTG9nOiBmdW5jdGlvbihlcnJvciwgdHJhY2VMb2cpCisgICAg eworICAgICAgICB0aGlzLl9lbmFibGVXYWl0SWNvbihmYWxzZSk7CisgICAgICAgIHRoaXMuX2xv Z0dyaWQucm9vdE5vZGUoKS5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICBpZiAoZXJyb3IgfHwg IXRyYWNlTG9nKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB2YXIgY2FsbHMgPSB0cmFj ZUxvZy5jYWxsczsKKyAgICAgICAgZm9yICh2YXIgaSA9IDAsIG4gPSBjYWxscy5sZW5ndGg7IGkg PCBuOyArK2kpCisgICAgICAgICAgICB0aGlzLl9sb2dHcmlkLnJvb3ROb2RlKCkuYXBwZW5kQ2hp bGQodGhpcy5fY3JlYXRlQ2FsbE5vZGUoaSwgY2FsbHNbaV0pKTsKKyAgICAgICAgdmFyIGxhc3RO b2RlID0gdGhpcy5fbG9nR3JpZC5yb290Tm9kZSgpLmNoaWxkcmVuW2NhbGxzLmxlbmd0aCAtIDFd OworICAgICAgICBpZiAobGFzdE5vZGUpIHsKKyAgICAgICAgICAgIGxhc3ROb2RlLnJldmVhbCgp OworICAgICAgICAgICAgbGFzdE5vZGUuc2VsZWN0KCk7CisgICAgICAgIH0KKyAgICB9LAorCisg ICAgX2NyZWF0ZUNhbGxOb2RlOiBmdW5jdGlvbihpbmRleCwgY2FsbCkKKyAgICB7CisgICAgICAg IHZhciB0cmFjZUxvZ0l0ZW0gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAg ICAgdmFyIGRhdGEgPSB7fTsKKyAgICAgICAgZGF0YVswXSA9IGluZGV4ICsgMTsKKyAgICAgICAg ZGF0YVsxXSA9IGNhbGwuZnVuY3Rpb25OYW1lIHx8ICJjb250ZXh0LiIgKyBjYWxsLnByb3BlcnR5 OworICAgICAgICBkYXRhWzJdID0gIiI7CisgICAgICAgIGlmIChjYWxsLnNvdXJjZVVSTCkgewor ICAgICAgICAgICAgLy8gRklYTUUoNjI3MjUpOiBzdGFjayB0cmFjZSBsaW5lL2NvbHVtbiBudW1i ZXJzIGFyZSBvbmUtYmFzZWQuCisgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IE1hdGgubWF4 KDAsIGNhbGwubGluZU51bWJlciAtIDEpIHx8IDA7CisgICAgICAgICAgICB2YXIgY29sdW1uTnVt YmVyID0gTWF0aC5tYXgoMCwgY2FsbC5jb2x1bW5OdW1iZXIgLSAxKSB8fCAwOworICAgICAgICAg ICAgZGF0YVsyXSA9IHRoaXMuX2xpbmtpZmllci5saW5raWZ5TG9jYXRpb24oY2FsbC5zb3VyY2VV UkwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcik7CisgICAgICAgIH0KKworICAgICAgICBpZiAo Y2FsbC5hcmd1bWVudHMpCisgICAgICAgICAgICBkYXRhWzFdICs9ICIoIiArIGNhbGwuYXJndW1l bnRzLmpvaW4oIiwgIikgKyAiKSI7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRhdGFbMV0g Kz0gIiA9ICIgKyBjYWxsLnZhbHVlOworCisgICAgICAgIGlmICh0eXBlb2YgY2FsbC5yZXN1bHQg IT09ICJ1bmRlZmluZWQiKQorICAgICAgICAgICAgZGF0YVsxXSArPSAiID0+ICIgKyBjYWxsLnJl c3VsdDsKKworICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2Rl KGRhdGEpOworICAgICAgICBub2RlLmNhbGwgPSBjYWxsOworICAgICAgICBub2RlLmluZGV4ID0g aW5kZXg7CisgICAgICAgIG5vZGUuc2VsZWN0YWJsZSA9IHRydWU7CisgICAgICAgIHJldHVybiBu b2RlOworICAgIH0sCisKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlw ZQogfQogCkBAIC0yMzEsODAgKzMwMywzIEBAIFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlSGVh ZGVyLnByb3RvdHlwZSA9IHsKIAogICAgIF9fcHJvdG9fXzogV2ViSW5zcGVjdG9yLlByb2ZpbGVI ZWFkZXIucHJvdG90eXBlCiB9Ci0KLS8qKgotICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7 V2ViSW5zcGVjdG9yLkRhdGFHcmlkfQotICogQHBhcmFtIHtzdHJpbmd9IHRyYWNlTG9nSWQKLSAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLkxpbmtpZmllcn0gbGlua2lmaWVyCi0gKi8KLVdlYkluc3Bl Y3Rvci5DYW52YXNMb2dHcmlkID0gZnVuY3Rpb24odHJhY2VMb2dJZCwgbGlua2lmaWVyKQotewot ICAgIHRoaXMuX2xpbmtpZmllciA9IGxpbmtpZmllcjsKLSAgICB2YXIgY29sdW1ucyA9IHsgMDog e30sIDE6IHt9LCAyOiB7fSB9OwotICAgIGNvbHVtbnNbMF0udGl0bGUgPSAiIyI7Ci0gICAgY29s dW1uc1swXS5zb3J0YWJsZSA9IHRydWU7Ci0gICAgY29sdW1uc1swXS53aWR0aCA9ICIzJSI7Ci0g ICAgY29sdW1uc1sxXS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2FsbCIpOwotICAg IGNvbHVtbnNbMV0uc29ydGFibGUgPSB0cnVlOwotICAgIGNvbHVtbnNbMV0ud2lkdGggPSAiNzcl IjsKLSAgICBjb2x1bW5zWzJdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhdGlv biIpOwotICAgIGNvbHVtbnNbMl0uc29ydGFibGUgPSB0cnVlOwotICAgIGNvbHVtbnNbMl0ud2lk dGggPSAiMjAlIjsKLQotICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5jYWxsKHRoaXMsIGNvbHVt bnMpOwotICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJmaWxsIik7Ci0KLSAgICB0aGlz Ll90cmFjZUxvZ0lkID0gdHJhY2VMb2dJZDsKLSAgICBDYW52YXNBZ2VudC5nZXRUcmFjZUxvZyh0 cmFjZUxvZ0lkLCB0aGlzLl9kaWRSZWNlaXZlVHJhY2VMb2cuYmluZCh0aGlzKSk7Ci19Ci0KLVdl Ykluc3BlY3Rvci5DYW52YXNMb2dHcmlkLnByb3RvdHlwZSA9IHsKLQotICAgIF9kaWRSZWNlaXZl VHJhY2VMb2c6IGZ1bmN0aW9uKGVycm9yLCB0cmFjZUxvZykKLSAgICB7Ci0gICAgICAgIHRoaXMu cm9vdE5vZGUoKS5yZW1vdmVDaGlsZHJlbigpOwotICAgICAgICBpZiAoZXJyb3IgfHwgIXRyYWNl TG9nKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIHZhciBjYWxscyA9IHRyYWNlTG9n LmNhbGxzOwotICAgICAgICBmb3IgKHZhciBpID0gMCwgbiA9IGNhbGxzLmxlbmd0aDsgaSA8IG47 ICsraSkKLSAgICAgICAgICAgIHRoaXMucm9vdE5vZGUoKS5hcHBlbmRDaGlsZCh0aGlzLl9jcmVh dGVDYWxsTm9kZShpLCBjYWxsc1tpXSkpOwotICAgICAgICB2YXIgbGFzdE5vZGUgPSB0aGlzLnJv b3ROb2RlKCkuY2hpbGRyZW5bY2FsbHMubGVuZ3RoIC0gMV07Ci0gICAgICAgIGlmIChsYXN0Tm9k ZSkgewotICAgICAgICAgICAgbGFzdE5vZGUucmV2ZWFsKCk7Ci0gICAgICAgICAgICBsYXN0Tm9k ZS5zZWxlY3QoKTsKLSAgICAgICAgfQotICAgIH0sCi0KLSAgICBfY3JlYXRlQ2FsbE5vZGU6IGZ1 bmN0aW9uKGluZGV4LCBjYWxsKQotICAgIHsKLSAgICAgICAgdmFyIHRyYWNlTG9nSXRlbSA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgICAgICB2YXIgZGF0YSA9IHt9OwotICAg ICAgICBkYXRhWzBdID0gaW5kZXggKyAxOwotICAgICAgICBkYXRhWzFdID0gY2FsbC5mdW5jdGlv bk5hbWUgfHwgImNvbnRleHQuIiArIGNhbGwucHJvcGVydHk7Ci0gICAgICAgIGRhdGFbMl0gPSAi IjsKLSAgICAgICAgaWYgKGNhbGwuc291cmNlVVJMKSB7Ci0gICAgICAgICAgICAvLyBGSVhNRSg2 MjcyNSk6IHN0YWNrIHRyYWNlIGxpbmUvY29sdW1uIG51bWJlcnMgYXJlIG9uZS1iYXNlZC4KLSAg ICAgICAgICAgIHZhciBsaW5lTnVtYmVyID0gTWF0aC5tYXgoMCwgY2FsbC5saW5lTnVtYmVyIC0g MSkgfHwgMDsKLSAgICAgICAgICAgIHZhciBjb2x1bW5OdW1iZXIgPSBNYXRoLm1heCgwLCBjYWxs LmNvbHVtbk51bWJlciAtIDEpIHx8IDA7Ci0gICAgICAgICAgICBkYXRhWzJdID0gdGhpcy5fbGlu a2lmaWVyLmxpbmtpZnlMb2NhdGlvbihjYWxsLnNvdXJjZVVSTCwgbGluZU51bWJlciwgY29sdW1u TnVtYmVyKTsKLSAgICAgICAgfQotCi0gICAgICAgIGlmIChjYWxsLmFyZ3VtZW50cykKLSAgICAg ICAgICAgIGRhdGFbMV0gKz0gIigiICsgY2FsbC5hcmd1bWVudHMuam9pbigiLCAiKSArICIpIjsK LSAgICAgICAgZWxzZQotICAgICAgICAgICAgZGF0YVsxXSArPSAiID0gIiArIGNhbGwudmFsdWU7 Ci0gIAotICAgICAgICBpZiAodHlwZW9mIGNhbGwucmVzdWx0ICE9PSAidW5kZWZpbmVkIikKLSAg ICAgICAgICAgIGRhdGFbMV0gKz0gIiA9PiAiICsgY2FsbC5yZXN1bHQ7Ci0KLSAgICAgICAgdmFy IG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZShkYXRhKTsKLSAgICAgICAgbm9k ZS5jYWxsID0gY2FsbDsKLSAgICAgICAgbm9kZS5pbmRleCA9IGluZGV4OwotICAgICAgICBub2Rl LnNlbGVjdGFibGUgPSB0cnVlOwotICAgICAgICByZXR1cm4gbm9kZTsKLSAgICB9LAotCi0gICAg X19wcm90b19fOiBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlCi19CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2NhbnZhc1Byb2ZpbGVyLmNzcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvY2FudmFzUHJvZmlsZXIuY3NzCmlu ZGV4IDczOThhNWY2MTEzOTE4ZjU5NzYxODVhMGI3MTc0YzdlOWJiNGEzYjYuLmI5MDNkZmE1NzMx N2Q2YmRlMDYyMjAxYWY2MjdjZDFhYzU0YTg1ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvY2FudmFzUHJvZmlsZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvY2FudmFzUHJvZmlsZXIuY3NzCkBAIC01NCwzICs1NCwx MiBAQAogICAgIG1hcmdpbjogYXV0bzsKICAgICBkaXNwbGF5OiBibG9jazsKIH0KKworI2NhbnZh cy1yZXBsYXktaW1hZ2Uud2FpdCB7CisgICAgY29udGVudDogdXJsKEltYWdlcy9zcGlubmVyQWN0 aXZlU2VsZWN0ZWQuZ2lmKTsKKyAgICB6b29tOiBpbmhlcml0OworICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICB0b3A6IDUwJTsKKyAgICBsZWZ0OiA1MCU7CisgICAgbWFyZ2luOiAtMTZweCAw IDAgLTE2cHg7Cit9Cg==