109434 2013-02-11 07:19:30 -0800 Web Inspector: Colorpicker not saving values 2013-02-13 07:26:44 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 briangrinstead kaznacheev apavlov kaznacheev keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 829662 0 briangrinstead 2013-02-11 07:19:30 -0800 When working on another case (https://bugs.webkit.org/show_bug.cgi?id=108852) I noticed that the colorpicker is no longer saving values. If you click on the color swatch and open up the colorpicker, it will let you change the color in the popup, but the value never gets saved. This is caused by the following line: Source/WebCore/inspector/front-end/StylesSidebarPane.js - var scrollerElement = hasSpectrum ? self._parentPane._computedStylePane.element.parentElement : null; This fixes it: + var scrollerElement = hasSpectrum ? self._parentPane._computedStylePane.bodyElement : null; I'm working on a patch for this. 829679 1 187572 briangrinstead 2013-02-11 07:43:17 -0800 Created attachment 187572 Patch to fix colorpicker save issue Sorry if this is not in the correct format, trying to follow the guide for creating a patch and may not have done it right. 829700 2 apavlov 2013-02-11 08:01:48 -0800 @Vlad: I believe the issue is related to your recent changes to the sidebar structure. Could you see if anything else is broken in the StylesSidebarPane and MetricsSidebarPane (by plain looking at the code that may use the changed DOM elements)? The solution suggested by Brian does not fix the broken behavior when the spectrum popup should follow the swatch when the sidebar pane stack is scrolled. Could you advise on the right solution? 829703 3 187572 apavlov 2013-02-11 08:03:12 -0800 Comment on attachment 187572 Patch to fix colorpicker save issue Does the spectrum follow the swatch when the sidebar is scrolled? 829706 4 briangrinstead 2013-02-11 08:06:06 -0800 You are right, the popup does not follow the swatch while the sidebar is scrolled with the proposed patch. (In reply to comment #3) > (From update of attachment 187572 [details]) > Does the spectrum follow the swatch when the sidebar is scrolled? 829906 5 briangrinstead 2013-02-11 11:17:21 -0800 Not saying that we *should* do this, but this code does cause everything to work: var scrollerElement = hasSpectrum ? self._parentPane._parentView._parentView.element.parentNode : null; The scroll event seems to now be happening on the div[class=split-view-contents split-view-contents-vertical split-view-sidebar-right]. Surely there is a better way to get that element from the stylessidebarpane than the way above, though. (In reply to comment #3) > (From update of attachment 187572 [details]) > Does the spectrum follow the swatch when the sidebar is scrolled? 829989 6 apavlov 2013-02-11 12:36:17 -0800 (In reply to comment #5) > Not saying that we *should* do this, but this code does cause everything to work: > > var scrollerElement = hasSpectrum ? self._parentPane._parentView._parentView.element.parentNode : null; > > The scroll event seems to now be happening on the div[class=split-view-contents split-view-contents-vertical split-view-sidebar-right]. Surely there is a better way to get that element from the stylessidebarpane than the way above, though. Correct. That's why I was asking Vlad for advice. The new structure must have better accessors than ugly constructs like this one :) 831791 7 188050 kaznacheev 2013-02-13 04:12:21 -0800 Created attachment 188050 Patch 831798 8 188050 apavlov 2013-02-13 04:16:36 -0800 Comment on attachment 188050 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188050&action=review > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1786 > + var scrollerElement = self._parentPane.container().scrollTarget(); Can the scrollerElement change while the color picker is active? (E.g. if the user resizes the web inspector window, which can alter the sidebar pane representation) > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1788 > + console.log("detached scroll listener from ", scrollerElement); Please remove debug logging > Source/WebCore/inspector/front-end/StylesSidebarPane.js:1822 > + console.log("attached scroll listener to ", scrollerElement); Ditto 831800 9 188052 kaznacheev 2013-02-13 04:20:35 -0800 Created attachment 188052 Patch 831820 10 188059 kaznacheev 2013-02-13 04:59:44 -0800 Created attachment 188059 Patch 831824 11 188059 apavlov 2013-02-13 05:04:43 -0800 Comment on attachment 188059 Patch r=me 831834 12 188059 webkit.review.bot 2013-02-13 05:28:01 -0800 Comment on attachment 188059 Patch Rejecting attachment 188059 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 188059, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: rce/WebKit/chromium/webkit/media/crypto/ppapi/cdm --revision 173055 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 56>At revision 173055. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/16514150 831861 13 188071 kaznacheev 2013-02-13 06:20:58 -0800 Created attachment 188071 Patch 831892 14 188071 webkit.review.bot 2013-02-13 07:26:39 -0800 Comment on attachment 188071 Patch Clearing flags on attachment: 188071 Committed r142745: <http://trac.webkit.org/changeset/142745> 831893 15 webkit.review.bot 2013-02-13 07:26:44 -0800 All reviewed patches have been landed. Closing bug. 187572 2013-02-11 07:43:17 -0800 2013-02-13 04:12:17 -0800 Patch to fix colorpicker save issue 109434.patch text/plain 1331 briangrinstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMmM2NzQxLi5mMzNhNjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTMtMDItMTEgIEJyaWFuIEdyaW5zdGVhZCAgPGJyaWFuZ3JpbnN0ZWFkQGdtYWlsLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb2xvcnBpY2tlciBub3Qgc2F2aW5nIHZhbHVl cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvcG9zdF9idWcuY2dpLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKwogMjAxMy0wMi0xMSAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bQ2xhbmddIEJ1aWxkIGVy cm9ycyBpbiBMb2NhbGl6ZWRTdHJpbmdzR3RrLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKaW5kZXggY2U5MDI2 ZC4uZWE5ODIyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TdHlsZXNTaWRlYmFyUGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCkBAIC0xNzcxLDcgKzE3NzEsNyBAQCBXZWJJbnNw ZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICBjb2xvclN3YXRjaC5zZXRDb2xvclN0cmluZyh0ZXh0KTsKICAgICAgICAgICAgICAgICBj b2xvclN3YXRjaC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgc3dhdGNoQ2xpY2ss IGZhbHNlKTsKIAotICAgICAgICAgICAgICAgIHZhciBzY3JvbGxlckVsZW1lbnQgPSBoYXNTcGVj dHJ1bSA/IHNlbGYuX3BhcmVudFBhbmUuX2NvbXB1dGVkU3R5bGVQYW5lLmVsZW1lbnQucGFyZW50 RWxlbWVudCA6IG51bGw7CisgICAgICAgICAgICAgICAgdmFyIHNjcm9sbGVyRWxlbWVudCA9IGhh c1NwZWN0cnVtID8gc2VsZi5fcGFyZW50UGFuZS5fY29tcHV0ZWRTdHlsZVBhbmUuYm9keUVsZW1l bnQgOiBudWxsOwogCiAgICAgICAgICAgICAgICAgZnVuY3Rpb24gc3BlY3RydW1DaGFuZ2VkKGUp CiAgICAgICAgICAgICAgICAgewo= 188050 2013-02-13 04:12:21 -0800 2013-02-13 04:20:31 -0800 Patch bug-109434-20130213160850.patch text/plain 6555 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY5YzM0NWE4OTA5YWY3 ZTk4ZTY5ZWFiOTI4N2FiNzYyZDJiYTMzNC4uOGYzYjMyNDE1YjI3OTQ5NjVlMTY4ZWU2Y2NlMWEz ZTZhMDU4NjMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAyLTEzICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEZpeGVkIGNvbG9ycGlja2VyIGVkaXRpbmcgYW5kIHNjcm9sbGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQzNC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29sb3Ig cGlja2VyIHNjcm9sbGluZyBsb2dpYyByZWxpZWQgb24gdGhlIGZpeGVkIERPTSBzdHJ1Y3R1cmUg d2hpY2ggY2hhbmdlZCB3aXRoIHRoZSBpbnRyb2R1Y3Rpb24gb2YKKyAgICAgICAgU2lkZWJhclBh bmVTdGFjayAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODE4Myku IEFkZGVkIGEgbWV0aG9kIHRvIGdldCB0aGUgY29ycmVjdCBzY3JvbGwKKyAgICAgICAgZXZlbnQg dGFyZ2V0IGZyb20gYSBTaWRlYmFyUGFuZSBpbnN0YW5jZS4KKworICAgICAgICBObyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJQYW5lLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lLnByb3RvdHlwZS5vbkNvbnRlbnRSZWFkeSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUucHJvdG90eXBlLmNvbnRhaW5lcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUucHJvdG90eXBlLl9zZXRDb250YWlu ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBlLmFk ZFBhbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBl Ll9vblBhbmVFeHBhbmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmVTdGFj ay5wcm90b3R5cGUuc2Nyb2xsVGFyZ2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFy VGFiYmVkUGFuZS5wcm90b3R5cGUuYWRkUGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lk ZWJhclRhYmJlZFBhbmUucHJvdG90eXBlLl9vblBhbmVFeHBhbmRlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2lkZWJhclRhYmJlZFBhbmUucHJvdG90eXBlLnNjcm9sbFRhcmdldCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnVwZGF0ZVRp dGxlLik6CisKIDIwMTMtMDItMTIgIFRhbWFzIEN6ZW5lICA8dGN6ZW5lQGluZi51LXN6ZWdlZC5o dT4KIAogICAgICAgICBBZGQgZXJyb3IgY2hlY2tpbmcgaW50byBPcGVuQ0wgdmVyc2lvbiBvZiBT VkcgZmlsdGVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Np ZGViYXJQYW5lLmpzCmluZGV4IDc4NGMwZTM3MDJhYWY0MTJhYzJmMTBhYzY0Zjc5ZWZmNzY5MWNj MDQuLjU1NjgzNzJiMzI4NTk4MTc2YjllNzUyYTY5NDYzOWM0NzNiMDA2NDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclBhbmUuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyUGFuZS5qcwpAQCAtNzks MTYgKzc5LDIxIEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAKICAg ICBvbkNvbnRlbnRSZWFkeTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2V4 cGFuZENhbGxiYWNrKQotICAgICAgICAgICAgdGhpcy5fZXhwYW5kQ2FsbGJhY2soKTsKKyAgICAg ICAgaWYgKHRoaXMuX2NvbnRhaW5lcikKKyAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5fb25Q YW5lRXhwYW5kZWQodGhpcyk7CisgICAgfSwKKworICAgIGNvbnRhaW5lcjogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRhaW5lcjsKICAgICB9LAogCiAgICAgLyoq Ci0gICAgICogQHBhcmFtIHtmdW5jdGlvbigpfSBjYWxsYmFjaworICAgICAqIEBwYXJhbSB7T2Jq ZWN0fSBjb250YWluZXIKICAgICAgKi8KLSAgICBfc2V0RXhwYW5kQ2FsbGJhY2s6IGZ1bmN0aW9u KGNhbGxiYWNrKQorICAgIF9zZXRDb250YWluZXI6IGZ1bmN0aW9uKGNvbnRhaW5lcikKICAgICB7 Ci0gICAgICAgIHRoaXMuX2V4cGFuZENhbGxiYWNrID0gY2FsbGJhY2s7CisgICAgICAgIHRoaXMu X2NvbnRhaW5lciA9IGNvbnRhaW5lcjsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xNDEsNyArMTQ2 LDcgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBlID0gewogICAgICAg ICBwYW5lLnRpdGxlRWxlbWVudC5yZW1vdmVTZWxmKCk7CiAgICAgICAgIHRpdGxlLmFwcGVuZENo aWxkKHBhbmUudGl0bGVFbGVtZW50KTsKIAotICAgICAgICBwYW5lLl9zZXRFeHBhbmRDYWxsYmFj ayh0aGlzLl9vblBhbmVFeHBhbmRlZC5iaW5kKHRoaXMsIGluZGV4KSk7CisgICAgICAgIHBhbmUu X3NldENvbnRhaW5lcih0aGlzKTsKICAgICAgICAgdGhpcy5fc2V0RXhwYW5kZWQoaW5kZXgsIHBh bmUuZXhwYW5kZWQoKSk7CiAgICAgfSwKIApAQCAtMTgwLDEyICsxODUsMTIgQEAgV2ViSW5zcGVj dG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXgKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5T aWRlYmFyUGFuZX0gcGFuZQogICAgICAqLwotICAgIF9vblBhbmVFeHBhbmRlZDogZnVuY3Rpb24o aW5kZXgpCisgICAgX29uUGFuZUV4cGFuZGVkOiBmdW5jdGlvbihwYW5lKQogICAgIHsKKyAgICAg ICAgdmFyIGluZGV4ID0gdGhpcy5fcGFuZXMuaW5kZXhPZihwYW5lKTsKICAgICAgICAgdGhpcy5f YWN0aXZlUGFuZUluZGV4ID0gaW5kZXg7Ci0gICAgICAgIHZhciBwYW5lID0gdGhpcy5fcGFuZXNb aW5kZXhdOwogICAgICAgICB2YXIgdGl0bGUgPSB0aGlzLl90aXRsZXNbaW5kZXhdOwogICAgICAg ICB0aXRsZS5hZGRTdHlsZUNsYXNzKCJleHBhbmRlZCIpOwogICAgICAgICBwYW5lLnNob3codGhp cy5lbGVtZW50LCB0aXRsZS5uZXh0U2libGluZyk7CkBAIC0yMjQsNiArMjI5LDExIEBAIFdlYklu c3BlY3Rvci5TaWRlYmFyUGFuZVN0YWNrLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMu X3RvZ2dsZVBhbmUoaW5kZXgpOwogICAgIH0sCiAKKyAgICBzY3JvbGxUYXJnZXQ6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLmVsZW1lbnQuZW5jbG9zaW5nTm9kZU9yU2Vs ZldpdGhDbGFzcygic3BsaXQtdmlldy1jb250ZW50cyIpOworICAgIH0sCisKICAgICBfX3Byb3Rv X186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQogfQogCkBAIC0yNTIsNyArMjYyLDIxIEBA IFdlYkluc3BlY3Rvci5TaWRlYmFyVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHBh bmUudGl0bGVFbGVtZW50LnJlbW92ZVNlbGYoKTsKICAgICAgICAgcGFuZS5lbGVtZW50LmFwcGVu ZENoaWxkKHBhbmUudGl0bGVFbGVtZW50KTsKIAotICAgICAgICBwYW5lLl9zZXRFeHBhbmRDYWxs YmFjayh0aGlzLnNldEFjdGl2ZVBhbmVJZC5iaW5kKHRoaXMsIGluZGV4KSk7CisgICAgICAgIHBh bmUuX3NldENvbnRhaW5lcih0aGlzKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmV9IHBhbmUKKyAgICAgKi8KKyAgICBfb25QYW5lRXhw YW5kZWQ6IGZ1bmN0aW9uKHBhbmUpCisgICAgeworICAgICAgICB2YXIgaW5kZXggPSB0aGlzLl9w YW5lcy5pbmRleE9mKHBhbmUpOworICAgICAgICB0aGlzLnNldEFjdGl2ZVBhbmVJZChpbmRleCk7 CisgICAgfSwKKworICAgIHNjcm9sbFRhcmdldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRoaXMuZWxlbWVudC5xdWVyeVNlbGVjdG9yKCIudGFiYmVkLXBhbmUtY29udGVudCIp OwogICAgIH0sCiAKICAgICBhY3RpdmVQYW5lSWQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmlu ZGV4IGNlOTAyNmQ5OWU1NzllYTE5NWM5OWY2OWEyMjk3MDVjYzU4NDViNTMuLmIzYjRiZjJmYzVl NjNlYzUwMDIxOWIwMzYwZDQwODBiMmQ0OGFmY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtMTc3MSw4 ICsxNzcxLDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgY29sb3JTd2F0Y2guc2V0Q29sb3JTdHJpbmcodGV4dCk7 CiAgICAgICAgICAgICAgICAgY29sb3JTd2F0Y2guZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHN3YXRjaENsaWNrLCBmYWxzZSk7CiAKLSAgICAgICAgICAgICAgICB2YXIgc2Nyb2xs ZXJFbGVtZW50ID0gaGFzU3BlY3RydW0gPyBzZWxmLl9wYXJlbnRQYW5lLl9jb21wdXRlZFN0eWxl UGFuZS5lbGVtZW50LnBhcmVudEVsZW1lbnQgOiBudWxsOwotCiAgICAgICAgICAgICAgICAgZnVu Y3Rpb24gc3BlY3RydW1DaGFuZ2VkKGUpCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICAgICBjb2xvciA9IGUuZGF0YTsKQEAgLTE3ODUsNyArMTc4Myw5IEBAIFdlYkluc3BlY3Rv ci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICAg ICAgZnVuY3Rpb24gc3BlY3RydW1IaWRkZW4oZXZlbnQpCiAgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICB2YXIgc2Nyb2xsZXJFbGVtZW50ID0gc2VsZi5fcGFyZW50UGFuZS5j b250YWluZXIoKS5zY3JvbGxUYXJnZXQoKTsKICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZXJF bGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHJlcG9zaXRpb25TcGVjdHJ1bSwg ZmFsc2UpOworICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZygiZGV0YWNoZWQgc2Nyb2xs IGxpc3RlbmVyIGZyb20gIiwgc2Nyb2xsZXJFbGVtZW50KTsKICAgICAgICAgICAgICAgICAgICAg dmFyIGNvbW1pdEVkaXQgPSBldmVudC5kYXRhOwogICAgICAgICAgICAgICAgICAgICB2YXIgcHJv cGVydHlUZXh0ID0gIWNvbW1pdEVkaXQgJiYgc2VsZi5vcmlnaW5hbFByb3BlcnR5VGV4dCA/IHNl bGYub3JpZ2luYWxQcm9wZXJ0eVRleHQgOiAobmFtZUVsZW1lbnQudGV4dENvbnRlbnQgKyAiOiAi ICsgdmFsdWVFbGVtZW50LnRleHRDb250ZW50KTsKICAgICAgICAgICAgICAgICAgICAgc2VsZi5h cHBseVN0eWxlVGV4dChwcm9wZXJ0eVRleHQsIHRydWUsIHRydWUsIGZhbHNlKTsKQEAgLTE4MTcs NyArMTgxNyw5IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90 eXBlID0gewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNwZWN0cnVtLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLkV2ZW50cy5Db2xvckNoYW5nZWQsIHNwZWN0cnVt Q2hhbmdlZCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW1IZWxwZXIuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3BlY3RydW1Qb3B1cEhlbHBlci5FdmVudHMuSGlk ZGVuLCBzcGVjdHJ1bUhpZGRlbik7CiAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB2YXIg c2Nyb2xsZXJFbGVtZW50ID0gc2VsZi5fcGFyZW50UGFuZS5jb250YWluZXIoKS5zY3JvbGxUYXJn ZXQoKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigic2Nyb2xsIiwgcmVwb3NpdGlvblNwZWN0cnVtLCBmYWxzZSk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2coImF0dGFjaGVkIHNjcm9sbCBsaXN0ZW5l ciB0byAiLCBzY3JvbGxlckVsZW1lbnQpOwogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIGUuY29uc3VtZSh0cnVlKTsK 188052 2013-02-13 04:20:35 -0800 2013-02-13 04:59:39 -0800 Patch bug-109434-20130213161704.patch text/plain 6266 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY5YzM0NWE4OTA5YWY3 ZTk4ZTY5ZWFiOTI4N2FiNzYyZDJiYTMzNC4uOGYzYjMyNDE1YjI3OTQ5NjVlMTY4ZWU2Y2NlMWEz ZTZhMDU4NjMxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAyLTEzICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEZpeGVkIGNvbG9ycGlja2VyIGVkaXRpbmcgYW5kIHNjcm9sbGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQzNC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29sb3Ig cGlja2VyIHNjcm9sbGluZyBsb2dpYyByZWxpZWQgb24gdGhlIGZpeGVkIERPTSBzdHJ1Y3R1cmUg d2hpY2ggY2hhbmdlZCB3aXRoIHRoZSBpbnRyb2R1Y3Rpb24gb2YKKyAgICAgICAgU2lkZWJhclBh bmVTdGFjayAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODE4Myku IEFkZGVkIGEgbWV0aG9kIHRvIGdldCB0aGUgY29ycmVjdCBzY3JvbGwKKyAgICAgICAgZXZlbnQg dGFyZ2V0IGZyb20gYSBTaWRlYmFyUGFuZSBpbnN0YW5jZS4KKworICAgICAgICBObyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJQYW5lLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lLnByb3RvdHlwZS5vbkNvbnRlbnRSZWFkeSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUucHJvdG90eXBlLmNvbnRhaW5lcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUucHJvdG90eXBlLl9zZXRDb250YWlu ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBlLmFk ZFBhbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBl Ll9vblBhbmVFeHBhbmRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmVTdGFj ay5wcm90b3R5cGUuc2Nyb2xsVGFyZ2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFy VGFiYmVkUGFuZS5wcm90b3R5cGUuYWRkUGFuZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lk ZWJhclRhYmJlZFBhbmUucHJvdG90eXBlLl9vblBhbmVFeHBhbmRlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU2lkZWJhclRhYmJlZFBhbmUucHJvdG90eXBlLnNjcm9sbFRhcmdldCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlLnVwZGF0ZVRp dGxlLik6CisKIDIwMTMtMDItMTIgIFRhbWFzIEN6ZW5lICA8dGN6ZW5lQGluZi51LXN6ZWdlZC5o dT4KIAogICAgICAgICBBZGQgZXJyb3IgY2hlY2tpbmcgaW50byBPcGVuQ0wgdmVyc2lvbiBvZiBT VkcgZmlsdGVycy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Np ZGViYXJQYW5lLmpzCmluZGV4IDc4NGMwZTM3MDJhYWY0MTJhYzJmMTBhYzY0Zjc5ZWZmNzY5MWNj MDQuLjU1NjgzNzJiMzI4NTk4MTc2YjllNzUyYTY5NDYzOWM0NzNiMDA2NDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclBhbmUuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyUGFuZS5qcwpAQCAtNzks MTYgKzc5LDIxIEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAKICAg ICBvbkNvbnRlbnRSZWFkeTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2V4 cGFuZENhbGxiYWNrKQotICAgICAgICAgICAgdGhpcy5fZXhwYW5kQ2FsbGJhY2soKTsKKyAgICAg ICAgaWYgKHRoaXMuX2NvbnRhaW5lcikKKyAgICAgICAgICAgIHRoaXMuX2NvbnRhaW5lci5fb25Q YW5lRXhwYW5kZWQodGhpcyk7CisgICAgfSwKKworICAgIGNvbnRhaW5lcjogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRhaW5lcjsKICAgICB9LAogCiAgICAgLyoq Ci0gICAgICogQHBhcmFtIHtmdW5jdGlvbigpfSBjYWxsYmFjaworICAgICAqIEBwYXJhbSB7T2Jq ZWN0fSBjb250YWluZXIKICAgICAgKi8KLSAgICBfc2V0RXhwYW5kQ2FsbGJhY2s6IGZ1bmN0aW9u KGNhbGxiYWNrKQorICAgIF9zZXRDb250YWluZXI6IGZ1bmN0aW9uKGNvbnRhaW5lcikKICAgICB7 Ci0gICAgICAgIHRoaXMuX2V4cGFuZENhbGxiYWNrID0gY2FsbGJhY2s7CisgICAgICAgIHRoaXMu X2NvbnRhaW5lciA9IGNvbnRhaW5lcjsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xNDEsNyArMTQ2 LDcgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBlID0gewogICAgICAg ICBwYW5lLnRpdGxlRWxlbWVudC5yZW1vdmVTZWxmKCk7CiAgICAgICAgIHRpdGxlLmFwcGVuZENo aWxkKHBhbmUudGl0bGVFbGVtZW50KTsKIAotICAgICAgICBwYW5lLl9zZXRFeHBhbmRDYWxsYmFj ayh0aGlzLl9vblBhbmVFeHBhbmRlZC5iaW5kKHRoaXMsIGluZGV4KSk7CisgICAgICAgIHBhbmUu X3NldENvbnRhaW5lcih0aGlzKTsKICAgICAgICAgdGhpcy5fc2V0RXhwYW5kZWQoaW5kZXgsIHBh bmUuZXhwYW5kZWQoKSk7CiAgICAgfSwKIApAQCAtMTgwLDEyICsxODUsMTIgQEAgV2ViSW5zcGVj dG9yLlNpZGViYXJQYW5lU3RhY2sucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXgKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5T aWRlYmFyUGFuZX0gcGFuZQogICAgICAqLwotICAgIF9vblBhbmVFeHBhbmRlZDogZnVuY3Rpb24o aW5kZXgpCisgICAgX29uUGFuZUV4cGFuZGVkOiBmdW5jdGlvbihwYW5lKQogICAgIHsKKyAgICAg ICAgdmFyIGluZGV4ID0gdGhpcy5fcGFuZXMuaW5kZXhPZihwYW5lKTsKICAgICAgICAgdGhpcy5f YWN0aXZlUGFuZUluZGV4ID0gaW5kZXg7Ci0gICAgICAgIHZhciBwYW5lID0gdGhpcy5fcGFuZXNb aW5kZXhdOwogICAgICAgICB2YXIgdGl0bGUgPSB0aGlzLl90aXRsZXNbaW5kZXhdOwogICAgICAg ICB0aXRsZS5hZGRTdHlsZUNsYXNzKCJleHBhbmRlZCIpOwogICAgICAgICBwYW5lLnNob3codGhp cy5lbGVtZW50LCB0aXRsZS5uZXh0U2libGluZyk7CkBAIC0yMjQsNiArMjI5LDExIEBAIFdlYklu c3BlY3Rvci5TaWRlYmFyUGFuZVN0YWNrLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMu X3RvZ2dsZVBhbmUoaW5kZXgpOwogICAgIH0sCiAKKyAgICBzY3JvbGxUYXJnZXQ6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLmVsZW1lbnQuZW5jbG9zaW5nTm9kZU9yU2Vs ZldpdGhDbGFzcygic3BsaXQtdmlldy1jb250ZW50cyIpOworICAgIH0sCisKICAgICBfX3Byb3Rv X186IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZQogfQogCkBAIC0yNTIsNyArMjYyLDIxIEBA IFdlYkluc3BlY3Rvci5TaWRlYmFyVGFiYmVkUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHBh bmUudGl0bGVFbGVtZW50LnJlbW92ZVNlbGYoKTsKICAgICAgICAgcGFuZS5lbGVtZW50LmFwcGVu ZENoaWxkKHBhbmUudGl0bGVFbGVtZW50KTsKIAotICAgICAgICBwYW5lLl9zZXRFeHBhbmRDYWxs YmFjayh0aGlzLnNldEFjdGl2ZVBhbmVJZC5iaW5kKHRoaXMsIGluZGV4KSk7CisgICAgICAgIHBh bmUuX3NldENvbnRhaW5lcih0aGlzKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFt IHtXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmV9IHBhbmUKKyAgICAgKi8KKyAgICBfb25QYW5lRXhw YW5kZWQ6IGZ1bmN0aW9uKHBhbmUpCisgICAgeworICAgICAgICB2YXIgaW5kZXggPSB0aGlzLl9w YW5lcy5pbmRleE9mKHBhbmUpOworICAgICAgICB0aGlzLnNldEFjdGl2ZVBhbmVJZChpbmRleCk7 CisgICAgfSwKKworICAgIHNjcm9sbFRhcmdldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRoaXMuZWxlbWVudC5xdWVyeVNlbGVjdG9yKCIudGFiYmVkLXBhbmUtY29udGVudCIp OwogICAgIH0sCiAKICAgICBhY3RpdmVQYW5lSWQ6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmlu ZGV4IGNlOTAyNmQ5OWU1NzllYTE5NWM5OWY2OWEyMjk3MDVjYzU4NDViNTMuLjE1YTE1MWI1YWU1 MGZjNWJhNTNhZDkwYTE3OTNmMjViYzg1NjJkMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwpAQCAtMTc3MSw4 ICsxNzcxLDYgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAgICAgY29sb3JTd2F0Y2guc2V0Q29sb3JTdHJpbmcodGV4dCk7 CiAgICAgICAgICAgICAgICAgY29sb3JTd2F0Y2guZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHN3YXRjaENsaWNrLCBmYWxzZSk7CiAKLSAgICAgICAgICAgICAgICB2YXIgc2Nyb2xs ZXJFbGVtZW50ID0gaGFzU3BlY3RydW0gPyBzZWxmLl9wYXJlbnRQYW5lLl9jb21wdXRlZFN0eWxl UGFuZS5lbGVtZW50LnBhcmVudEVsZW1lbnQgOiBudWxsOwotCiAgICAgICAgICAgICAgICAgZnVu Y3Rpb24gc3BlY3RydW1DaGFuZ2VkKGUpCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICAgICBjb2xvciA9IGUuZGF0YTsKQEAgLTE3ODUsNiArMTc4Myw3IEBAIFdlYkluc3BlY3Rv ci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICAg ICAgZnVuY3Rpb24gc3BlY3RydW1IaWRkZW4oZXZlbnQpCiAgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICB2YXIgc2Nyb2xsZXJFbGVtZW50ID0gc2VsZi5fcGFyZW50UGFuZS5j b250YWluZXIoKS5zY3JvbGxUYXJnZXQoKTsKICAgICAgICAgICAgICAgICAgICAgc2Nyb2xsZXJF bGVtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHJlcG9zaXRpb25TcGVjdHJ1bSwg ZmFsc2UpOwogICAgICAgICAgICAgICAgICAgICB2YXIgY29tbWl0RWRpdCA9IGV2ZW50LmRhdGE7 CiAgICAgICAgICAgICAgICAgICAgIHZhciBwcm9wZXJ0eVRleHQgPSAhY29tbWl0RWRpdCAmJiBz ZWxmLm9yaWdpbmFsUHJvcGVydHlUZXh0ID8gc2VsZi5vcmlnaW5hbFByb3BlcnR5VGV4dCA6IChu YW1lRWxlbWVudC50ZXh0Q29udGVudCArICI6ICIgKyB2YWx1ZUVsZW1lbnQudGV4dENvbnRlbnQp OwpAQCAtMTgxNyw2ICsxODE2LDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0u YWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZlbnRzLkNvbG9yQ2hhbmdl ZCwgc3BlY3RydW1DaGFuZ2VkKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1 bUhlbHBlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bVBvcHVwSGVscGVy LkV2ZW50cy5IaWRkZW4sIHNwZWN0cnVtSGlkZGVuKTsKIAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHZhciBzY3JvbGxlckVsZW1lbnQgPSBzZWxmLl9wYXJlbnRQYW5lLmNvbnRhaW5lcigp LnNjcm9sbFRhcmdldCgpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGVyRWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCByZXBvc2l0aW9uU3BlY3RydW0sIGZhbHNl KTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQo= 188059 2013-02-13 04:59:44 -0800 2013-02-13 06:20:53 -0800 Patch bug-109434-20130213165612.patch text/plain 5221 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY5YzM0NWE4OTA5YWY3 ZTk4ZTY5ZWFiOTI4N2FiNzYyZDJiYTMzNC4uZjA1MDljNzRkOTRkMWZiMTIwYTU4Y2Q4YWMxODQ0 Zjk3NzczODVkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAyLTEzICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEZpeGVkIGNvbG9ycGlja2VyIGVkaXRpbmcgYW5kIHNjcm9sbGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQzNC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29sb3Ig cGlja2VyIHNjcm9sbGluZyBsb2dpYyByZWxpZWQgb24gdGhlIGZpeGVkIERPTSBzdHJ1Y3R1cmUg d2hpY2ggY2hhbmdlZCB3aXRoIHRoZSBpbnRyb2R1Y3Rpb24gb2YKKyAgICAgICAgU2lkZWJhclBh bmVTdGFjayAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODE4Myku CisgICAgICAgIEFkZGVkIGEgc3BlY2lhbCBDU1MgY2xhc3MgdG8gbWFyayB0aGUgc2Nyb2xsIHRh cmdldC4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NwbGl0Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS51cGRh dGVUaXRsZS4pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lKToKKwogMjAxMy0wMi0xMiAgVGFtYXMg Q3plbmUgIDx0Y3plbmVAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIEFkZCBlcnJvciBjaGVj a2luZyBpbnRvIE9wZW5DTCB2ZXJzaW9uIG9mIFNWRyBmaWx0ZXJzLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGxpdFZpZXcuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcwppbmRleCAxNjRkMTdlMTgwNzc4 YjdlN2M1YTBjNTY4YjI3NzNmN2M2YzAyZGJiLi4yYzZhZjQ1ZTc3ZDhhNTJmZTJmOWQ3YjJhYWVl ZTkyYWEyMjBmOTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NwbGl0Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NwbGl0Vmlldy5qcwpAQCAtNDIsOCArNDIsOCBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3ID0g ZnVuY3Rpb24oaXNWZXJ0aWNhbCwgc2lkZWJhclNpemVTZXR0aW5nTmFtZSwgZGVmYXVsdFNpZAog CiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3IjsKIAotICAgIHRoaXMu X2ZpcnN0RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZp ZXctY29udGVudHMiKTsKLSAgICB0aGlzLl9zZWNvbmRFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNy ZWF0ZUNoaWxkKCJkaXYiLCAic3BsaXQtdmlldy1jb250ZW50cyIpOworICAgIHRoaXMuX2ZpcnN0 RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXctY29u dGVudHMgc2Nyb2xsLXRhcmdldCIpOworICAgIHRoaXMuX3NlY29uZEVsZW1lbnQgPSB0aGlzLmVs ZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJzcGxpdC12aWV3LWNvbnRlbnRzIHNjcm9sbC10YXJn ZXQiKTsKIAogICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNo aWxkKCJkaXYiLCAic3BsaXQtdmlldy1yZXNpemVyIik7CiAgICAgdGhpcy5pbnN0YWxsUmVzaXpl cih0aGlzLl9yZXNpemVyRWxlbWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCBjZTkwMjZkOTllNTc5 ZWExOTVjOTlmNjlhMjI5NzA1Y2M1ODQ1YjUzLi4wMzcyYmEwN2E3Nzk0YWJlZmIzMmRjY2UyZTYy YmMxOWE0MTcyMGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTE3NzEsNyArMTc3MSwxMCBAQCBXZWJJ bnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgICAgICBjb2xvclN3YXRjaC5zZXRDb2xvclN0cmluZyh0ZXh0KTsKICAgICAgICAgICAgICAg ICBjb2xvclN3YXRjaC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgc3dhdGNoQ2xp Y2ssIGZhbHNlKTsKIAotICAgICAgICAgICAgICAgIHZhciBzY3JvbGxlckVsZW1lbnQgPSBoYXNT cGVjdHJ1bSA/IHNlbGYuX3BhcmVudFBhbmUuX2NvbXB1dGVkU3R5bGVQYW5lLmVsZW1lbnQucGFy ZW50RWxlbWVudCA6IG51bGw7CisgICAgICAgICAgICAgICAgZnVuY3Rpb24gc2Nyb2xsZXJFbGVt ZW50KCkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBzZWxm Ll9wYXJlbnRQYW5lLmVsZW1lbnQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygic2Nyb2xs LXRhcmdldCIpOworICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIGZ1bmN0aW9u IHNwZWN0cnVtQ2hhbmdlZChlKQogICAgICAgICAgICAgICAgIHsKQEAgLTE3ODUsNyArMTc4OCw3 IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog CiAgICAgICAgICAgICAgICAgZnVuY3Rpb24gc3BlY3RydW1IaWRkZW4oZXZlbnQpCiAgICAgICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQucmVtb3ZlRXZl bnRMaXN0ZW5lcigic2Nyb2xsIiwgcmVwb3NpdGlvblNwZWN0cnVtLCBmYWxzZSk7CisgICAgICAg ICAgICAgICAgICAgIHNjcm9sbGVyRWxlbWVudCgpLnJlbW92ZUV2ZW50TGlzdGVuZXIoInNjcm9s bCIsIHJlcG9zaXRpb25TcGVjdHJ1bSwgZmFsc2UpOwogICAgICAgICAgICAgICAgICAgICB2YXIg Y29tbWl0RWRpdCA9IGV2ZW50LmRhdGE7CiAgICAgICAgICAgICAgICAgICAgIHZhciBwcm9wZXJ0 eVRleHQgPSAhY29tbWl0RWRpdCAmJiBzZWxmLm9yaWdpbmFsUHJvcGVydHlUZXh0ID8gc2VsZi5v cmlnaW5hbFByb3BlcnR5VGV4dCA6IChuYW1lRWxlbWVudC50ZXh0Q29udGVudCArICI6ICIgKyB2 YWx1ZUVsZW1lbnQudGV4dENvbnRlbnQpOwogICAgICAgICAgICAgICAgICAgICBzZWxmLmFwcGx5 U3R5bGVUZXh0KHByb3BlcnR5VGV4dCwgdHJ1ZSwgdHJ1ZSwgZmFsc2UpOwpAQCAtMTgxNyw3ICsx ODIwLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0uYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZlbnRzLkNvbG9yQ2hhbmdlZCwgc3BlY3RydW1DaGFu Z2VkKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bUhlbHBlci5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bVBvcHVwSGVscGVyLkV2ZW50cy5IaWRkZW4s IHNwZWN0cnVtSGlkZGVuKTsKIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGVy RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCByZXBvc2l0aW9uU3BlY3RydW0sIGZh bHNlKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQoKS5hZGRF dmVudExpc3RlbmVyKCJzY3JvbGwiLCByZXBvc2l0aW9uU3BlY3RydW0sIGZhbHNlKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg ICAgICAgICBlLmNvbnN1bWUodHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMKaW5kZXggYThjNTBhYjkzNTQ3MjU0YTM0YTdhMDFjM2Rj MjA2ZTQ4ZmIxNmRhZS4uZTE3ZDcwMmFmZDE0OTg4NGRhNjczMzIwYmE3OTU4MDJiYTZkMGNhZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5l LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5q cwpAQCAtNDAsNyArNDAsNyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZSA9IGZ1bmN0aW9uKCkK ICAgICB0aGlzLl9oZWFkZXJFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYi LCAidGFiYmVkLXBhbmUtaGVhZGVyIik7CiAgICAgdGhpcy5faGVhZGVyQ29udGVudHNFbGVtZW50 ID0gdGhpcy5faGVhZGVyRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRhYmJlZC1wYW5lLWhl YWRlci1jb250ZW50cyIpOwogICAgIHRoaXMuX3RhYnNFbGVtZW50ID0gdGhpcy5faGVhZGVyQ29u dGVudHNFbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAidGFiYmVkLXBhbmUtaGVhZGVyLXRhYnMi KTsKLSAgICB0aGlzLl9jb250ZW50RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgi ZGl2IiwgInRhYmJlZC1wYW5lLWNvbnRlbnQiKTsKKyAgICB0aGlzLl9jb250ZW50RWxlbWVudCA9 IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRhYmJlZC1wYW5lLWNvbnRlbnQgc2Ny b2xsLXRhcmdldCIpOwogICAgIHRoaXMuX3RhYnMgPSBbXTsKICAgICB0aGlzLl90YWJzSGlzdG9y eSA9IFtdOwogICAgIHRoaXMuX3RhYnNCeUlkID0ge307Cg== 188071 2013-02-13 06:20:58 -0800 2013-02-13 07:26:39 -0800 Patch bug-109434-20130213181726.patch text/plain 5674 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmZhZDRmYzE5NTYzNWVj MTZjNjgwYmFkYzdiNGZjYzA5YzE3NGI3MS4uNTU5NTBiYzc5ZDVkY2Q3NWFjYjY2ODRhZjVjMzBh MmY0ZjczZTUwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTAyLTEzICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEZpeGVkIGNvbG9ycGlja2VyIGVkaXRpbmcgYW5kIHNjcm9sbGluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQzNC4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29sb3Ig cGlja2VyIHNjcm9sbGluZyBsb2dpYyByZWxpZWQgb24gdGhlIGZpeGVkIERPTSBzdHJ1Y3R1cmUg d2hpY2ggY2hhbmdlZCB3aXRoIHRoZSBpbnRyb2R1Y3Rpb24gb2YKKyAgICAgICAgU2lkZWJhclBh bmVTdGFjayAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODE4Myku CisgICAgICAgIEFkZGVkIGEgc3BlY2lhbCBDU1MgY2xhc3MgdG8gbWFyayB0aGUgc2Nyb2xsIHRh cmdldC4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NwbGl0Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS51cGRh dGVUaXRsZS4pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRQYW5lKToKKyAKKzIwMTMtMDItMTMgIFZsYWRp c2xhdiBLYXpuYWNoZWV2ICA8a2F6bmFjaGVldkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogU2ltcGxpZnkgU3BsaXRWaWV3IHRvIHJlbHkgbW9yZSBvbiBDU1MKICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQyNgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3BsaXRWaWV3LmpzCmluZGV4IGU3 YzJmZmNiNDYzNDdiNmE5MjM5YzlhYmViODNiZTA0NzE0OTJkMWYuLjM2NjI1Y2Q5ZjMwYTkzZGM0 MzQ5NmM5ZjZlMWUwM2Y0MTc2ZTgyNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU3BsaXRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3BsaXRWaWV3LmpzCkBAIC00MiwxMSArNDIsOCBAQCBXZWJJbnNwZWN0b3Iu U3BsaXRWaWV3ID0gZnVuY3Rpb24oaXNWZXJ0aWNhbCwgc2lkZWJhclNpemVTZXR0aW5nTmFtZSwg ZGVmYXVsdFNpZAogCiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3IjsK IAotICAgIHRoaXMuX2ZpcnN0RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2 IiwgInNwbGl0LXZpZXctY29udGVudHMiKTsKLSAgICB0aGlzLl9maXJzdEVsZW1lbnQuYWRkU3R5 bGVDbGFzcygic3BsaXQtdmlldy1jb250ZW50cy1maXJzdCIpOwotCi0gICAgdGhpcy5fc2Vjb25k RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXctY29u dGVudHMiKTsKLSAgICB0aGlzLl9zZWNvbmRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZp ZXctY29udGVudHMtc2Vjb25kIik7CisgICAgdGhpcy5fZmlyc3RFbGVtZW50ID0gdGhpcy5lbGVt ZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAic3BsaXQtdmlldy1jb250ZW50cyBzY3JvbGwtdGFyZ2V0 IHNwbGl0LXZpZXctY29udGVudHMtZmlyc3QiKTsKKyAgICB0aGlzLl9zZWNvbmRFbGVtZW50ID0g dGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAic3BsaXQtdmlldy1jb250ZW50cyBzY3Jv bGwtdGFyZ2V0IHNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kIik7CiAKICAgICB0aGlzLl9yZXNp emVyRWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXct cmVzaXplciIpOwogICAgIHRoaXMuaW5zdGFsbFJlc2l6ZXIodGhpcy5fcmVzaXplckVsZW1lbnQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNT aWRlYmFyUGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz U2lkZWJhclBhbmUuanMKaW5kZXggY2U5MDI2ZDk5ZTU3OWVhMTk1Yzk5ZjY5YTIyOTcwNWNjNTg0 NWI1My4uZDU0MTAyZGI0ZTUwYmUyNGJlNjZlZjNjMmUwYjA4ZWI3Y2IxY2U2NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzCkBAIC0xNzcxLDcgKzE3NzEsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjb2xvclN3YXRjaC5zZXRD b2xvclN0cmluZyh0ZXh0KTsKICAgICAgICAgICAgICAgICBjb2xvclN3YXRjaC5lbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgc3dhdGNoQ2xpY2ssIGZhbHNlKTsKIAotICAgICAgICAg ICAgICAgIHZhciBzY3JvbGxlckVsZW1lbnQgPSBoYXNTcGVjdHJ1bSA/IHNlbGYuX3BhcmVudFBh bmUuX2NvbXB1dGVkU3R5bGVQYW5lLmVsZW1lbnQucGFyZW50RWxlbWVudCA6IG51bGw7CisgICAg ICAgICAgICAgICAgdmFyIHNjcm9sbGVyRWxlbWVudDsKIAogICAgICAgICAgICAgICAgIGZ1bmN0 aW9uIHNwZWN0cnVtQ2hhbmdlZChlKQogICAgICAgICAgICAgICAgIHsKQEAgLTE3ODUsNyArMTc4 NSw4IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0g ewogCiAgICAgICAgICAgICAgICAgZnVuY3Rpb24gc3BlY3RydW1IaWRkZW4oZXZlbnQpCiAgICAg ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQucmVtb3Zl RXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgcmVwb3NpdGlvblNwZWN0cnVtLCBmYWxzZSk7CisgICAg ICAgICAgICAgICAgICAgIGlmIChzY3JvbGxlckVsZW1lbnQpCisgICAgICAgICAgICAgICAgICAg ICAgICBzY3JvbGxlckVsZW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgcmVwb3Np dGlvblNwZWN0cnVtLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgICAgIHZhciBjb21taXRFZGl0 ID0gZXZlbnQuZGF0YTsKICAgICAgICAgICAgICAgICAgICAgdmFyIHByb3BlcnR5VGV4dCA9ICFj b21taXRFZGl0ICYmIHNlbGYub3JpZ2luYWxQcm9wZXJ0eVRleHQgPyBzZWxmLm9yaWdpbmFsUHJv cGVydHlUZXh0IDogKG5hbWVFbGVtZW50LnRleHRDb250ZW50ICsgIjogIiArIHZhbHVlRWxlbWVu dC50ZXh0Q29udGVudCk7CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuYXBwbHlTdHlsZVRleHQo cHJvcGVydHlUZXh0LCB0cnVlLCB0cnVlLCBmYWxzZSk7CkBAIC0xODE3LDcgKzE4MTgsMTEgQEAg V2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuU3BlY3RydW0uRXZlbnRzLkNvbG9yQ2hhbmdlZCwgc3BlY3RydW1DaGFuZ2VkKTsKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bUhlbHBlci5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5TcGVjdHJ1bVBvcHVwSGVscGVyLkV2ZW50cy5IaWRkZW4sIHNwZWN0cnVt SGlkZGVuKTsKIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjcm9sbGVyRWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCByZXBvc2l0aW9uU3BlY3RydW0sIGZhbHNlKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQgPSBjb2xvclN3YXRjaC5l bGVtZW50LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoInNjcm9sbC10YXJnZXQiKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc2Nyb2xsZXJFbGVtZW50KQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi c2Nyb2xsIiwgcmVwb3NpdGlvblNwZWN0cnVtLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVy cm9yKCJVbmFibGUgdG8gaGFuZGxlIGNvbG9yIHBpY2tlciBzY3JvbGxpbmciKTsKICAgICAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICBlLmNvbnN1bWUodHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RhYmJlZFBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RhYmJlZFBhbmUuanMKaW5kZXggYThjNTBhYjkzNTQ3MjU0YTM0YTdhMDFjM2RjMjA2 ZTQ4ZmIxNmRhZS4uZTE3ZDcwMmFmZDE0OTg4NGRhNjczMzIwYmE3OTU4MDJiYTZkMGNhZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5lLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkUGFuZS5qcwpA QCAtNDAsNyArNDAsNyBAQCBXZWJJbnNwZWN0b3IuVGFiYmVkUGFuZSA9IGZ1bmN0aW9uKCkKICAg ICB0aGlzLl9oZWFkZXJFbGVtZW50ID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAi dGFiYmVkLXBhbmUtaGVhZGVyIik7CiAgICAgdGhpcy5faGVhZGVyQ29udGVudHNFbGVtZW50ID0g dGhpcy5faGVhZGVyRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRhYmJlZC1wYW5lLWhlYWRl ci1jb250ZW50cyIpOwogICAgIHRoaXMuX3RhYnNFbGVtZW50ID0gdGhpcy5faGVhZGVyQ29udGVu dHNFbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAidGFiYmVkLXBhbmUtaGVhZGVyLXRhYnMiKTsK LSAgICB0aGlzLl9jb250ZW50RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2 IiwgInRhYmJlZC1wYW5lLWNvbnRlbnQiKTsKKyAgICB0aGlzLl9jb250ZW50RWxlbWVudCA9IHRo aXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRhYmJlZC1wYW5lLWNvbnRlbnQgc2Nyb2xs LXRhcmdldCIpOwogICAgIHRoaXMuX3RhYnMgPSBbXTsKICAgICB0aGlzLl90YWJzSGlzdG9yeSA9 IFtdOwogICAgIHRoaXMuX3RhYnNCeUlkID0ge307Cg==