109426 2013-02-11 06:51:11 -0800 Web Inspector: Simplify SplitView to rely more on CSS 2013-02-14 08:16:33 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kaznacheev kaznacheev aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 829634 0 kaznacheev 2013-02-11 06:51:11 -0800 Currently WebInspector.SplitView code performs quite a few element.style manipulations. Most of these can replaced with simple CSS rules. 829636 1 187561 kaznacheev 2013-02-11 06:54:35 -0800 Created attachment 187561 Patch 829644 2 187561 apavlov 2013-02-11 07:05:04 -0800 Comment on attachment 187561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187561&action=review Not really familiar with the code, but there's one style nit there. > Source/WebCore/inspector/front-end/SplitView.js:181 > + this._firstElement.style.cssText = ''; Web Inspector uses double quotes (") for enclosing string literals. 830798 3 187561 vsevik 2013-02-12 05:14:12 -0800 Comment on attachment 187561 Patch I would revert the change in SplitView._removeAllLayoutProperties (what if split view elements have styles set externally?), other than that looks good. 830820 4 187561 kaznacheev 2013-02-12 05:34:04 -0800 Comment on attachment 187561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187561&action=review >> Source/WebCore/inspector/front-end/SplitView.js:181 >> + this._firstElement.style.cssText = ''; > > Web Inspector uses double quotes (") for enclosing string literals. Vsevik convinced me to roll back the change to this function, so the problem is no longer there. 830822 5 187842 kaznacheev 2013-02-12 05:34:55 -0800 Created attachment 187842 Patch 830845 6 187842 webkit.review.bot 2013-02-12 05:52:19 -0800 Comment on attachment 187842 Patch Rejecting attachment 187842 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', 'validate-changelog', '--non-interactive', 187842, '--port=chromium-xvfb']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/16519216 831793 7 188051 kaznacheev 2013-02-13 04:14:37 -0800 Created attachment 188051 Patch 831828 8 188051 webkit.review.bot 2013-02-13 05:17:04 -0800 Comment on attachment 188051 Patch Clearing flags on attachment: 188051 Committed r142738: <http://trac.webkit.org/changeset/142738> 831829 9 webkit.review.bot 2013-02-13 05:17:09 -0800 All reviewed patches have been landed. Closing bug. 833059 10 aandrey 2013-02-14 07:29:02 -0800 This patch broke SplitView in Canvas profiler. I requested a rollout, but sheriffbot failed. @Vladislav: Would you manually roll out this patch please, or plz fix the problem. A SplitView in CanvasProfileView.js no longer works. 833075 11 188351 kaznacheev 2013-02-14 07:52:57 -0800 Created attachment 188351 Patch 833077 12 188351 pfeldman 2013-02-14 07:53:52 -0800 Comment on attachment 188351 Patch There is a bug-per patch policy that you should follow. 833090 13 aandrey 2013-02-14 08:16:33 -0800 Regression addressed at https://bugs.webkit.org/show_bug.cgi?id=109835 187561 2013-02-11 06:54:35 -0800 2013-02-12 05:34:50 -0800 Patch bug-109426-20130211185106.patch text/plain 16735 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBmZmFkZDEyOWM1ZTgx YWU0M2JkNDA2NjRkNjg3M2M0MDZlNDAxOC4uYmZmNjUyMDIxZmE5OTg0ZDNmODQ1YzI0MmY4Mzky MDNkYTI5MjI2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUzIEBACiAyMDEzLTAyLTExICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFNpbXBsaWZ5IFNwbGl0VmlldyB0byByZWx5IG1vcmUgb24gQ1NTCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk0MjYKKworICAg ICAgICBTaW1wbGlmaWVkIEphdmFzY3JpcHQgY29kZSBieSBtb3ZpbmcgbW9zdCBvZiB0aGUgbGF5 b3V0IGxvZ2ljIGludG8gQ1NTIHJ1bGVzLiBUaGUgcGF0Y2ggaXMgbGFyZ2VyIHRoYW4gaXQKKyAg ICAgICAgc2hvdWxkIGJlIGJlY2F1c2Ugb25lIG9mIHRoZSBjbGllbnRzIChUaW1lbGluZVBhbmVs KSBpcyBicmVha2luZyBTcGxpdFZpZXcgaW5jYXBzdWxhdGlvbiBieSByZXBhcmVudGluZyBpdHMK KyAgICAgICAgcmVzaXplci4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlNpZGViYXJWaWV3KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuX2lubmVyU2V0VmVydGljYWwpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuc2V0U2Vjb25kSXNTaWRlYmFyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl9zaG93T25seSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5fcmVtb3ZlQWxsTGF5b3V0UHJvcGVy dGllcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvY3NzTmFtZWRGbG93cy5jc3M6CisgICAgICAg ICguY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyKToK KyAgICAgICAgKC5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5zcGxpdC12aWV3LXNp ZGViYXIgLnNpZGViYXItY29udGVudCk6CisgICAgICAgICguY3NzLW5hbWVkLWZsb3ctY29sbGVj dGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyIC5zZWxlY3Rpb24pOgorICAgICAgICAoLmNz cy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhciAubmFtZWQt Zmxvdy1vdmVyZmxvdzo6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAu cmVnaW9uLWVtcHR5OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnJl Z2lvbi1maXQ6OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnJlZ2lv bi1vdmVyc2V0OjpiZWZvcmUpOgorICAgICAgICAoLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25z LXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhciAubmFtZWQtZmxvdy1vdmVyZmxvdzo6YmVmb3JlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3M6CisgICAgICAgICgu c3BsaXQtdmlldy1jb250ZW50cy5tYXhpbWl6ZWQpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVy dGljYWwgLnNwbGl0LXZpZXctY29udGVudHMpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVydGlj YWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVy dGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkKToKKyAgICAgICAgKC5z cGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZCk6CisgICAgICAg ICguc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQubWF4aW1p emVkKToKKyAgICAgICAgKC5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVu dHMpOgorICAgICAgICAoLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1jb250ZW50 cy1maXJzdCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNv bnRlbnRzLWZpcnN0Lm1heGltaXplZCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFs IC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jp em9udGFsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZC5tYXhpbWl6ZWQpOgorICAgICAgICAo LnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRl bnRzLWZpcnN0Om5vdCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy12ZXJ0aWNh bCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4 aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LXNp ZGViYXIuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkpOgorICAgICAg ICAoLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXct Y29udGVudHMtc2Vjb25kOm5vdCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy12 ZXJ0aWNhbCAuc3BsaXQtdmlldy1yZXNpemVyKToKKyAgICAgICAgKC5zcGxpdC12aWV3LWhvcml6 b250YWwgLnNwbGl0LXZpZXctcmVzaXplcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC90aW1lbGluZVBhbmVsLmNzczoKKyAgICAgICAgKC50aW1lbGluZS5zcGxpdC12aWV3LXZlcnRp Y2FsIC5zcGxpdC12aWV3LXJlc2l6ZXIpOgorICAgICAgICAoI3RpbWVsaW5lLWNvbnRhaW5lciAu c3BsaXQtdmlldy1zaWRlYmFyKToKKworMjAxMy0wMi0xMSAgVmxhZGlzbGF2IEthem5hY2hlZXYg IDxrYXpuYWNoZWV2QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBbGxv dyBTcGxpdFZpZXcgdG8ga2VlcCB0aGUgc2lkZWJhciBzaXplIGFzIGEgZnJhY3Rpb24gb2YgdGhl IGNvbnRhaW5lciBzaXplCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDk0MTQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TaWRlYmFyVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2lkZWJhclZpZXcuanMKaW5kZXggODRlYjk1M2NiNWUwNjU5MDEwZDY0YzIzMmJlYTRkZDQ0 ZWQzZTBiMC4uZDU0ZTAyZjViZmM0NGM4Njk2NjRkODc0MzExODA1NjVhYWNmMjBjNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVmlldy5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJWaWV3LmpzCkBA IC00Niw3ICs0Niw2IEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldyA9IGZ1bmN0aW9uKHNpZGVi YXJQb3NpdGlvbiwgc2lkZWJhcldpZHRoU2V0dGluZ05hbWUsIGRlCiAKICAgICB0aGlzLl9zaWRl YmFyUG9zaXRpb24gPSBzaWRlYmFyUG9zaXRpb24gfHwgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3 LlNpZGViYXJQb3NpdGlvbi5TdGFydDsKICAgICB0aGlzLnNldFNlY29uZElzU2lkZWJhcih0aGlz Ll9zaWRlYmFyUG9zaXRpb24gPT09IFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9z aXRpb24uRW5kKTsKLSAgICB0aGlzLl91cGRhdGVTaWRlYmFyRWxlbWVudFN0eWxlKCk7CiB9CiAK IFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5FdmVudFR5cGVzID0gewpAQCAtNzgsMzggKzc3LDYg QEAgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IHRoaXMuaXNTaWRlYmFyU2Vjb25kKCkgPyB0aGlzLnNlY29uZEVsZW1lbnQoKSA6IHRoaXMuZmly c3RFbGVtZW50KCk7CiAgICAgfSwKIAotICAgIF91cGRhdGVTaWRlYmFyRWxlbWVudFN0eWxlOiBm dW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnJlbW92ZVN0eWxl Q2xhc3MoInNwbGl0LXZpZXctc2lkZWJhci1sZWZ0Iik7Ci0gICAgICAgIHRoaXMuc2lkZWJhckVs ZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyLXJpZ2h0Iik7Ci0gICAg ICAgIHRoaXMuc2lkZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRl YmFyLXRvcCIpOwotICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3Mo InNwbGl0LXZpZXctc2lkZWJhci1ib3R0b20iKTsKLQotICAgICAgICBpZiAodGhpcy5fc2lkZWJh clBvc2l0aW9uID09PSBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLlN0 YXJ0KSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5pc1ZlcnRpY2FsKCkpCi0gICAgICAgICAgICAg ICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXIt bGVmdCIpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhckVs ZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyLXRvcCIpOwotICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgaWYgKHRoaXMuaXNWZXJ0aWNhbCgpKQotICAgICAgICAgICAg ICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFy LXJpZ2h0Iik7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdGhpcy5zaWRlYmFy RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXItYm90dG9tIik7Ci0gICAg ICAgIH0KLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtib29sZWFufSBpc1ZlcnRp Y2FsCi0gICAgICovCi0gICAgc2V0VmVydGljYWw6IGZ1bmN0aW9uKGlzVmVydGljYWwpCi0gICAg ewotICAgICAgICBpZiAodGhpcy5pc1ZlcnRpY2FsKCkgPT09IGlzVmVydGljYWwpCi0gICAgICAg ICAgICByZXR1cm47Ci0KLSAgICAgICAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUu c2V0VmVydGljYWwuY2FsbCh0aGlzLCBpc1ZlcnRpY2FsKTsKLSAgICAgICAgdGhpcy5fdXBkYXRl U2lkZWJhckVsZW1lbnRTdHlsZSgpOwotICAgIH0sCi0KICAgICAvKioKICAgICAgKiBAcGFyYW0g e251bWJlcn0gd2lkdGgKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU3BsaXRWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TcGxpdFZpZXcuanMKaW5kZXggMTY0ZDE3ZTE4MDc3OGI3ZTdjNWEwYzU2OGIyNzcz ZjdjNmMwMmRiYi4uMzBkNTllYzhmZTllMjEzNjllN2Y1MTc0ZjM2MGNhODc5MmQ1OWZkMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGxpdFZpZXcuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGxpdFZpZXcuanMKQEAg LTQzLDcgKzQzLDEwIEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcgPSBmdW5jdGlvbihpc1ZlcnRp Y2FsLCBzaWRlYmFyU2l6ZVNldHRpbmdOYW1lLCBkZWZhdWx0U2lkCiAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3IjsKIAogICAgIHRoaXMuX2ZpcnN0RWxlbWVudCA9IHRo aXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXctY29udGVudHMiKTsKKyAg ICB0aGlzLl9maXJzdEVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1jb250ZW50cy1m aXJzdCIpOworCiAgICAgdGhpcy5fc2Vjb25kRWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVD aGlsZCgiZGl2IiwgInNwbGl0LXZpZXctY29udGVudHMiKTsKKyAgICB0aGlzLl9zZWNvbmRFbGVt ZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kIik7CiAKICAgICB0 aGlzLl9yZXNpemVyRWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNw bGl0LXZpZXctcmVzaXplciIpOwogICAgIHRoaXMuaW5zdGFsbFJlc2l6ZXIodGhpcy5fcmVzaXpl ckVsZW1lbnQpOwpAQCAtOTEsMzMgKzk0LDkgQEAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2lubmVyU2V0VmVydGljYWw6IGZ1bmN0aW9uKGlzVmVy dGljYWwpCiAgICAgeworICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcyh0aGlz Ll9pc1ZlcnRpY2FsID8gInNwbGl0LXZpZXctdmVydGljYWwiIDogInNwbGl0LXZpZXctaG9yaXpv bnRhbCIpOwogICAgICAgICB0aGlzLl9pc1ZlcnRpY2FsID0gaXNWZXJ0aWNhbDsKLQotICAgICAg ICB0aGlzLl9yZW1vdmVBbGxMYXlvdXRQcm9wZXJ0aWVzKCk7Ci0KLSAgICAgICAgaWYgKGlzVmVy dGljYWwpIHsKLSAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5sZWZ0ID0gMDsK LSAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmlnaHQgPSAwOwotICAgICAg ICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ0b3AiKTsKLSAg ICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImJvdHRv bSIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0 eWxlLnRvcCA9IDA7Ci0gICAgICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmJvdHRv bSA9IDA7Ci0gICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVy dHkoImxlZnQiKTsKLSAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3Zl UHJvcGVydHkoInJpZ2h0Iik7Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgb2xkRGlyZWN0aW9u ID0gKGlzVmVydGljYWwgPyAiaG9yaXpvbnRhbCIgOiAidmVydGljYWwiKTsKLSAgICAgICAgdmFy IG5ld0RpcmVjdGlvbiA9IChpc1ZlcnRpY2FsID8gInZlcnRpY2FsIiA6ICJob3Jpem9udGFsIik7 Ci0KLSAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZp ZXctY29udGVudHMtIiArIG9sZERpcmVjdGlvbik7Ci0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBuZXdEaXJlY3Rpb24pOwot Ci0gICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmll dy1jb250ZW50cy0iICsgb2xkRGlyZWN0aW9uKTsKLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBuZXdEaXJlY3Rpb24pOwot Ci0gICAgICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZp ZXctcmVzaXplci0iICsgb2xkRGlyZWN0aW9uKTsKLSAgICAgICAgdGhpcy5fcmVzaXplckVsZW1l bnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1yZXNpemVyLSIgKyBuZXdEaXJlY3Rpb24pOwor ICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcyh0aGlzLl9pc1ZlcnRpY2FsID8gInNw bGl0LXZpZXctdmVydGljYWwiIDogInNwbGl0LXZpZXctaG9yaXpvbnRhbCIpOwogICAgIH0sCiAg IAogICAgIF91cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkKQEAgLTE1Nyw3ICsxMzYsOSBAQCBXZWJJ bnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBzZXRTZWNvbmRJ c1NpZGViYXI6IGZ1bmN0aW9uKHNlY29uZElzU2lkZWJhcikKICAgICB7CisgICAgICAgIHRoaXMu c2lkZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyIik7CiAg ICAgICAgIHRoaXMuX3NlY29uZElzU2lkZWJhciA9IHNlY29uZElzU2lkZWJhcjsKKyAgICAgICAg dGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXIiKTsK ICAgICB9LAogCiAgICAgLyoqCkBAIC0xOTAsMTYgKzE3MSw2IEBAIFdlYkluc3BlY3Rvci5TcGxp dFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBzaWRlQi5yZW1vdmVTdHlsZUNsYXNzKCJtYXhp bWl6ZWQiKTsKICAgICAgICAgdGhpcy5fcmVtb3ZlQWxsTGF5b3V0UHJvcGVydGllcygpOwogCi0g ICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5yaWdodCA9IDA7Ci0gICAgICAgIHRoaXMu X2ZpcnN0RWxlbWVudC5zdHlsZS5ib3R0b20gPSAwOwotICAgICAgICB0aGlzLl9maXJzdEVsZW1l bnQuc3R5bGUud2lkdGggPSAiMTAwJSI7Ci0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHls ZS5oZWlnaHQgPSAiMTAwJSI7Ci0KLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5s ZWZ0ID0gMDsKLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS50b3AgPSAwOwotICAg ICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLndpZHRoID0gIjEwMCUiOwotICAgICAgICB0 aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmhlaWdodCA9ICIxMDAlIjsKLQogICAgICAgICB0aGlz Ll9pc1Nob3dpbmdPbmUgPSB0cnVlOwogICAgICAgICB0aGlzLnNldFJlc2l6YWJsZShmYWxzZSk7 CiAgICAgICAgIHRoaXMuZG9SZXNpemUoKTsKQEAgLTIwNywyNSArMTc4LDkgQEAgV2ViSW5zcGVj dG9yLlNwbGl0Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfcmVtb3ZlQWxsTGF5b3V0UHJvcGVy dGllczogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxl LnJlbW92ZVByb3BlcnR5KCJyaWdodCIpOwotICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5 bGUucmVtb3ZlUHJvcGVydHkoImJvdHRvbSIpOwotICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQu c3R5bGUucmVtb3ZlUHJvcGVydHkoIndpZHRoIik7Ci0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVu dC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiaGVpZ2h0Iik7Ci0gIAotICAgICAgICB0aGlzLl9zZWNv bmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJsZWZ0Iik7Ci0gICAgICAgIHRoaXMuX3Nl Y29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInRvcCIpOwotICAgICAgICB0aGlzLl9z ZWNvbmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ3aWR0aCIpOwotICAgICAgICB0aGlz Ll9zZWNvbmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJoZWlnaHQiKTsKLQotICAgICAg ICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgibGVmdCIpOwotICAg ICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgicmlnaHQiKTsK LSAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInRvcCIp OwotICAgICAgICB0aGlzLl9yZXNpemVyRWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgiYm90 dG9tIik7Ci0KLSAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVy dHkoIm1hcmdpbi1sZWZ0Iik7Ci0gICAgICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50LnN0eWxlLnJl bW92ZVByb3BlcnR5KCJtYXJnaW4tcmlnaHQiKTsKLSAgICAgICAgdGhpcy5fcmVzaXplckVsZW1l bnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoIm1hcmdpbi10b3AiKTsKLSAgICAgICAgdGhpcy5fcmVz aXplckVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoIm1hcmdpbi1ib3R0b20iKTsKKyAgICAg ICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLmNzc1RleHQgPSAnJzsKKyAgICAgICAgdGhpcy5f c2Vjb25kRWxlbWVudC5zdHlsZS5jc3NUZXh0ID0gJyc7CisgICAgICAgIHRoaXMuX3Jlc2l6ZXJF bGVtZW50LnN0eWxlLmNzc1RleHQgPSAnJzsKICAgICB9LAogCiAgICAgc2hvd0JvdGg6IGZ1bmN0 aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGlt ZWxpbmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxp bmVQYW5lbC5qcwppbmRleCBhMzNiZWVlNDQ2NDZkYWJiOGM5NDM5MGFlYzcyOTgzZTc5MTRjZjBi Li45YzZjYzU1OTEyZTFmMDA5ZTRmMDMwZTMyYjg5ZmViYjEyN2FhYTc0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC01 OCw4ICs1OCwxMCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKICAg ICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250 ZXh0TWVudS5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LnRhYkluZGV4ID0g MDsKIAorICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXZlcnRpY2Fs Iik7CisKICAgICB0aGlzLl9zaWRlYmFyQmFja2dyb3VuZEVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9zaWRlYmFyQmFja2dyb3VuZEVsZW1lbnQuY2xh c3NOYW1lID0gInNpZGViYXIgc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgdGltZWxpbmUtc2lkZWJh ci1iYWNrZ3JvdW5kIjsKKyAgICB0aGlzLl9zaWRlYmFyQmFja2dyb3VuZEVsZW1lbnQuY2xhc3NO YW1lID0gInNpZGViYXIgc3BsaXQtdmlldy1zaWRlYmFyIHNwbGl0LXZpZXctY29udGVudHMtZmly c3QgdGltZWxpbmUtc2lkZWJhci1iYWNrZ3JvdW5kIjsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fc2lkZWJhckJhY2tncm91bmRFbGVtZW50KTsKIAogICAgIHRoaXMuY3JlYXRl U2lkZWJhclZpZXdXaXRoVHJlZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9jc3NOYW1lZEZsb3dzLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvY3NzTmFtZWRGbG93cy5jc3MKaW5kZXggZDA5MGIyZTk0OWY4NmE5YTIzMjA2 YTIwOTk5ZGNmY2Y4ODVlMzFlNS4uZjMzODdkNWZkMDExZmQ1ZDkzOTE5ZGNhMzdiMjBkY2UxMDBi NDliNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9jc3NO YW1lZEZsb3dzLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2Nz c05hbWVkRmxvd3MuY3NzCkBAIC0yNyw4ICsyNyw3IEBACiAgKiBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcg LnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IHsKLSAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCBy Z2IoMTYzLCAxNjMsIDE2Myk7CisuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3Bs aXQtdmlldy1zaWRlYmFyIHsKICAgICBvdmVyZmxvdy14OiBoaWRkZW47CiB9CiAKQEAgLTQ2LDcg KzQ1LDcgQEAKICAgICB3aWR0aDogMTAwJTsKIH0KIAotLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rp b25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IC5zaWRlYmFyLWNvbnRlbnQgeworLmNz cy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhciAuc2lkZWJh ci1jb250ZW50IHsKICAgICBib3R0b206IDBweDsKICAgICBsZWZ0OiAwcHg7CiAgICAgcGFkZGlu ZzogMHB4OwpAQCAtNTUsNyArNTQsNyBAQAogICAgIHRvcDogMjNweDsKIH0KIAotLmNzcy1uYW1l ZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IC5zZWxlY3Rp b24geworLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJh ciAuc2VsZWN0aW9uIHsKICAgICBtYXJnaW4tbGVmdDogLTEycHg7CiAgICAgei1pbmRleDogMDsK IH0KQEAgLTY0LDcgKzYzLDcgQEAKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiB9CiAKLS5jc3Mt bmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5zcGxpdC12aWV3LXNpZGViYXItbGVmdCAubmFt ZWQtZmxvdy1vdmVyZmxvdzo6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmll dyAucmVnaW9uLWVtcHR5OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcg LnJlZ2lvbi1maXQ6OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnJl Z2lvbi1vdmVyc2V0OjpiZWZvcmUgeworLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcg LnNwbGl0LXZpZXctc2lkZWJhciAubmFtZWQtZmxvdy1vdmVyZmxvdzo6YmVmb3JlLCAuY3NzLW5h bWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAucmVnaW9uLWVtcHR5OmJlZm9yZSwgLmNzcy1uYW1l ZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnJlZ2lvbi1maXQ6OmJlZm9yZSwgLmNzcy1uYW1lZC1m bG93LWNvbGxlY3Rpb25zLXZpZXcgLnJlZ2lvbi1vdmVyc2V0OjpiZWZvcmUgewogICAgIGN1cnNv cjogZGVmYXVsdDsKICAgICBmbG9hdDogbGVmdDsKICAgICBoZWlnaHQ6IDEwcHg7CkBAIC03NSw3 ICs3NCw3IEBACiAgICAgei1pbmRleDogMTsKIH0KIAotLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rp b25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IC5uYW1lZC1mbG93LW92ZXJmbG93Ojpi ZWZvcmUgeworLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lk ZWJhciAubmFtZWQtZmxvdy1vdmVyZmxvdzo6YmVmb3JlIHsKICAgICBjb250ZW50OiB1cmwoSW1h Z2VzL25hbWVkRmxvd092ZXJmbG93LnBuZyk7CiAgICAgbWFyZ2luOiAycHggM3B4IDBweCAtMTNw eDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc3Bs aXRWaWV3LmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc3BsaXRWaWV3 LmNzcwppbmRleCA3YjA4YTdlMDc2YTQwYjQ4ZmI2ZGIwZTk3MzkwZmNhNGU4MmVkYzkxLi4yMTk3 M2Y3YTZlMjI3NzIyZGVkYWVkYTI5MmZiNTIzYmI0ODgyNDg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3MKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3NzCkBAIC00MSw0OSArNDEsNzAg QEAKICAgICBjdXJzb3I6IGRlZmF1bHQ7CiB9CiAKLS5zcGxpdC12aWV3LWNvbnRlbnRzLnNwbGl0 LXZpZXctY29udGVudHMtdmVydGljYWwgeworLnNwbGl0LXZpZXctY29udGVudHMubWF4aW1pemVk IHsKKyAgICB3aWR0aDogMTAwJTsKKyAgICBoZWlnaHQ6IDEwMCU7Cit9CisKKy5zcGxpdC12aWV3 LXZlcnRpY2FsIC5zcGxpdC12aWV3LWNvbnRlbnRzIHsKICAgICB0b3A6IDA7CiAgICAgYm90dG9t OiAwOwogfQogCi0uc3BsaXQtdmlldy1jb250ZW50cy5zcGxpdC12aWV3LWNvbnRlbnRzLWhvcml6 b250YWwgeworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3Qg ewogICAgIGxlZnQ6IDA7Cit9CisKKy5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LWNv bnRlbnRzLWZpcnN0Lm1heGltaXplZCB7CiAgICAgcmlnaHQ6IDA7CiB9CiAKLS5zcGxpdC12aWV3 LXNpZGViYXItbGVmdCB7Ci0gICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgcmdiKDY0JSwgNjQl LCA2NCUpOworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25k IHsKKyAgICByaWdodDogMDsKIH0KIAotLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0Lm1heGltaXpl ZCB7Ci0gICAgYm9yZGVyLXJpZ2h0OiBub25lOworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0 LXZpZXctY29udGVudHMtc2Vjb25kLm1heGltaXplZCB7CisgICAgbGVmdDogMDsKIH0KIAotLnNw bGl0LXZpZXctc2lkZWJhci1yaWdodCB7Ci0gICAgYm9yZGVyLWxlZnQ6IDFweCBzb2xpZCByZ2Io NjQlLCA2NCUsIDY0JSk7Cisuc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNvbnRl bnRzIHsKKyAgICBsZWZ0OiAwOworICAgIHJpZ2h0OiAwOwogfQogCi0uc3BsaXQtdmlldy1zaWRl YmFyLXJpZ2h0Lm1heGltaXplZCB7Ci0gICAgYm9yZGVyLXJpZ2h0OiBub25lOworLnNwbGl0LXZp ZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdCB7CisgICAgdG9wOiAwOwog fQogCi0uc3BsaXQtdmlldy1zaWRlYmFyLXRvcCB7Ci0gICAgYm9yZGVyLWJvdHRvbTogMXB4IHNv bGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZp ZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkIHsKKyAgICBib3R0b206IDA7CiB9CiAKLS5zcGxp dC12aWV3LXNpZGViYXItdG9wLm1heGltaXplZCB7Ci0gICAgYm9yZGVyLWJvdHRvbTogbm9uZTsK Ky5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kIHsKKyAg ICBib3R0b206IDA7CiB9CiAKLS5zcGxpdC12aWV3LXNpZGViYXItYm90dG9tIHsKLSAgICBib3Jk ZXItdG9wOiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUpOworLnNwbGl0LXZpZXctaG9yaXpv bnRhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQubWF4aW1pemVkIHsKKyAgICB0b3A6IDA7 CiB9CiAKLS5zcGxpdC12aWV3LXNpZGViYXItYm90dG9tLm1heGltaXplZCB7Ci0gICAgYm9yZGVy LXRvcDogbm9uZTsKKy5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LXNpZGViYXIuc3Bs aXQtdmlldy1jb250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkgeworICAgIGJvcmRlci1yaWdo dDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKK30KKworLnNwbGl0LXZpZXctdmVydGlj YWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZDpub3QoLm1h eGltaXplZCkgeworICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUp OworfQorCisuc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQt dmlldy1jb250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkgeworICAgIGJvcmRlci1ib3R0b206 IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7Cit9CisKKy5zcGxpdC12aWV3LWhvcml6b250 YWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZDpub3QoLm1h eGltaXplZCkgeworICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7 CiB9CiAKLS5zcGxpdC12aWV3LXJlc2l6ZXIuc3BsaXQtdmlldy1yZXNpemVyLXZlcnRpY2FsIHsK Ky5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LXJlc2l6ZXIgewogICAgIHBvc2l0aW9u OiBhYnNvbHV0ZTsKICAgICB0b3A6IDA7CiAgICAgYm90dG9tOiAwOwpAQCAtOTIsNyArMTEzLDcg QEAKICAgICBjdXJzb3I6IGV3LXJlc2l6ZTsKIH0KIAotLnNwbGl0LXZpZXctcmVzaXplci5zcGxp dC12aWV3LXJlc2l6ZXItaG9yaXpvbnRhbCB7Cisuc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxp dC12aWV3LXJlc2l6ZXIgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBsZWZ0OiAwOwog ICAgIHJpZ2h0OiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC90aW1lbGluZVBhbmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvdGltZWxpbmVQYW5lbC5jc3MKaW5kZXggYTdhYmQ1MWU2ZjBmNzRmNWFhMmY4ZDg5NzQxZWIw YWQxMmY0NzQzZS4uYzVlN2IwYmFjNDQ1NTA3OGIxOWI4OTcwOGY4NjFmNDg2MDcxZTIwZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVs LmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFu ZWwuY3NzCkBAIC00NSw3ICs0NSw3IEBACiAgICAgYm90dG9tOiBhdXRvOwogfQogCi0udGltZWxp bmUgLnNwbGl0LXZpZXctcmVzaXplciB7CisudGltZWxpbmUuc3BsaXQtdmlldy12ZXJ0aWNhbCAu c3BsaXQtdmlldy1yZXNpemVyIHsKICAgICB0b3A6IDIwcHg7CiB9CiAKQEAgLTE2Niw3ICsxNjYs NyBAQAogICAgIG92ZXJmbG93LXg6IGhpZGRlbjsKIH0KIAotI3RpbWVsaW5lLWNvbnRhaW5lciAu c3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgeworI3RpbWVsaW5lLWNvbnRhaW5lciAuc3BsaXQtdmll dy1zaWRlYmFyIHsKICAgICB6LWluZGV4OiAxOwogfQogCg== 187842 2013-02-12 05:34:55 -0800 2013-02-13 04:14:32 -0800 Patch bug-109426-20130212173124.patch text/plain 15765 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY5YzM0NWE4OTA5YWY3 ZTk4ZTY5ZWFiOTI4N2FiNzYyZDJiYTMzNC4uYmJiOTkzZGQxZDI1MmYyMjFmZDcxMGJjN2VmMzE3 OGJkOWQxNzBjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDEzLTAyLTEyICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFNpbXBsaWZ5IFNwbGl0VmlldyB0byByZWx5IG1vcmUgb24gQ1NTCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk0MjYKKworICAg ICAgICBTaW1wbGlmaWVkIEphdmFzY3JpcHQgY29kZSBieSBtb3ZpbmcgbGFyZ2UgcGFydCBvZiB0 aGUgbGF5b3V0IGxvZ2ljIGludG8gQ1NTIHJ1bGVzLiBUaGUgcGF0Y2ggaXMgbGFyZ2VyIHRoYW4g aXQKKyAgICAgICAgc2hvdWxkIGJlIGJlY2F1c2Ugb25lIG9mIHRoZSBjbGllbnRzIChUaW1lbGlu ZVBhbmVsKSBpcyBicmVha2luZyBTcGxpdFZpZXcgaW5jYXBzdWxhdGlvbiBieSByZXBhcmVudGlu ZyBpdHMKKyAgICAgICAgcmVzaXplci4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNpZGViYXJWaWV3KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0 Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuX2lubmVyU2V0VmVydGljYWwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuc2V0U2Vjb25kSXNTaWRlYmFyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl9zaG93T25seSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5fcmVtb3ZlQWxsTGF5b3V0 UHJvcGVydGllcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVs LmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvY3NzTmFtZWRGbG93cy5jc3M6Cisg ICAgICAgICguY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRl YmFyKToKKyAgICAgICAgKC5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5zcGxpdC12 aWV3LXNpZGViYXIgLnNpZGViYXItY29udGVudCk6CisgICAgICAgICguY3NzLW5hbWVkLWZsb3ct Y29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyIC5zZWxlY3Rpb24pOgorICAgICAg ICAoLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhciAu bmFtZWQtZmxvdy1vdmVyZmxvdzo6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMt dmlldyAucmVnaW9uLWVtcHR5OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZp ZXcgLnJlZ2lvbi1maXQ6OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcg LnJlZ2lvbi1vdmVyc2V0OjpiZWZvcmUpOgorICAgICAgICAoLmNzcy1uYW1lZC1mbG93LWNvbGxl Y3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhciAubmFtZWQtZmxvdy1vdmVyZmxvdzo6YmVm b3JlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3M6CisgICAg ICAgICguc3BsaXQtdmlldy1jb250ZW50cy5tYXhpbWl6ZWQpOgorICAgICAgICAoLnNwbGl0LXZp ZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMpOgorICAgICAgICAoLnNwbGl0LXZpZXct dmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QpOgorICAgICAgICAoLnNwbGl0LXZp ZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkKToKKyAgICAg ICAgKC5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZCk6Cisg ICAgICAgICguc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQu bWF4aW1pemVkKToKKyAgICAgICAgKC5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXct Y29udGVudHMpOgorICAgICAgICAoLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1j b250ZW50cy1maXJzdCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12 aWV3LWNvbnRlbnRzLWZpcnN0Lm1heGltaXplZCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jp em9udGFsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZCk6CisgICAgICAgICguc3BsaXQtdmll dy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZC5tYXhpbWl6ZWQpOgorICAg ICAgICAoLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3 LWNvbnRlbnRzLWZpcnN0Om5vdCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy12 ZXJ0aWNhbCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5v dCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12 aWV3LXNpZGViYXIuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkpOgor ICAgICAgICAoLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0 LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQt dmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1yZXNpemVyKToKKyAgICAgICAgKC5zcGxpdC12aWV3 LWhvcml6b250YWwgLnNwbGl0LXZpZXctcmVzaXplcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zy b250LWVuZC90aW1lbGluZVBhbmVsLmNzczoKKyAgICAgICAgKC50aW1lbGluZS5zcGxpdC12aWV3 LXZlcnRpY2FsIC5zcGxpdC12aWV3LXJlc2l6ZXIpOgorICAgICAgICAoI3RpbWVsaW5lLWNvbnRh aW5lciAuc3BsaXQtdmlldy1zaWRlYmFyKToKKwogMjAxMy0wMi0xMiAgVGFtYXMgQ3plbmUgIDx0 Y3plbmVAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIEFkZCBlcnJvciBjaGVja2luZyBpbnRv IE9wZW5DTCB2ZXJzaW9uIG9mIFNWRyBmaWx0ZXJzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclZpZXcuanMKaW5kZXggODRlYjk1M2NiNWUwNjU5MDEw ZDY0YzIzMmJlYTRkZDQ0ZWQzZTBiMC4uZDU0ZTAyZjViZmM0NGM4Njk2NjRkODc0MzExODA1NjVh YWNmMjBjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T aWRlYmFyVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Np ZGViYXJWaWV3LmpzCkBAIC00Niw3ICs0Niw2IEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldyA9 IGZ1bmN0aW9uKHNpZGViYXJQb3NpdGlvbiwgc2lkZWJhcldpZHRoU2V0dGluZ05hbWUsIGRlCiAK ICAgICB0aGlzLl9zaWRlYmFyUG9zaXRpb24gPSBzaWRlYmFyUG9zaXRpb24gfHwgV2ViSW5zcGVj dG9yLlNpZGViYXJWaWV3LlNpZGViYXJQb3NpdGlvbi5TdGFydDsKICAgICB0aGlzLnNldFNlY29u ZElzU2lkZWJhcih0aGlzLl9zaWRlYmFyUG9zaXRpb24gPT09IFdlYkluc3BlY3Rvci5TaWRlYmFy Vmlldy5TaWRlYmFyUG9zaXRpb24uRW5kKTsKLSAgICB0aGlzLl91cGRhdGVTaWRlYmFyRWxlbWVu dFN0eWxlKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5FdmVudFR5cGVzID0gewpA QCAtNzgsMzggKzc3LDYgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgcmV0dXJuIHRoaXMuaXNTaWRlYmFyU2Vjb25kKCkgPyB0aGlzLnNlY29uZEVsZW1l bnQoKSA6IHRoaXMuZmlyc3RFbGVtZW50KCk7CiAgICAgfSwKIAotICAgIF91cGRhdGVTaWRlYmFy RWxlbWVudFN0eWxlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnNpZGViYXJFbGVt ZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZpZXctc2lkZWJhci1sZWZ0Iik7Ci0gICAgICAg IHRoaXMuc2lkZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFy LXJpZ2h0Iik7Ci0gICAgICAgIHRoaXMuc2lkZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygi c3BsaXQtdmlldy1zaWRlYmFyLXRvcCIpOwotICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnJl bW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZpZXctc2lkZWJhci1ib3R0b20iKTsKLQotICAgICAgICBp ZiAodGhpcy5fc2lkZWJhclBvc2l0aW9uID09PSBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lk ZWJhclBvc2l0aW9uLlN0YXJ0KSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5pc1ZlcnRpY2FsKCkp Ci0gICAgICAgICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxp dC12aWV3LXNpZGViYXItbGVmdCIpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg IHRoaXMuc2lkZWJhckVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyLXRv cCIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYgKHRoaXMuaXNWZXJ0aWNhbCgp KQotICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhckVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3Bs aXQtdmlldy1zaWRlYmFyLXJpZ2h0Iik7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXIt Ym90dG9tIik7Ci0gICAgICAgIH0KLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHti b29sZWFufSBpc1ZlcnRpY2FsCi0gICAgICovCi0gICAgc2V0VmVydGljYWw6IGZ1bmN0aW9uKGlz VmVydGljYWwpCi0gICAgewotICAgICAgICBpZiAodGhpcy5pc1ZlcnRpY2FsKCkgPT09IGlzVmVy dGljYWwpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgV2ViSW5zcGVjdG9yLlNwbGl0 Vmlldy5wcm90b3R5cGUuc2V0VmVydGljYWwuY2FsbCh0aGlzLCBpc1ZlcnRpY2FsKTsKLSAgICAg ICAgdGhpcy5fdXBkYXRlU2lkZWJhckVsZW1lbnRTdHlsZSgpOwotICAgIH0sCi0KICAgICAvKioK ICAgICAgKiBAcGFyYW0ge251bWJlcn0gd2lkdGgKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3BsaXRWaWV3LmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGxpdFZpZXcuanMKaW5kZXggMTY0ZDE3ZTE4MDc3OGI3 ZTdjNWEwYzU2OGIyNzczZjdjNmMwMmRiYi4uZTdjMmZmY2I0NjM0N2I2YTkyMzljOWFiZWI4M2Jl MDQ3MTQ5MmQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TcGxpdFZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T cGxpdFZpZXcuanMKQEAgLTQzLDcgKzQzLDEwIEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcgPSBm dW5jdGlvbihpc1ZlcnRpY2FsLCBzaWRlYmFyU2l6ZVNldHRpbmdOYW1lLCBkZWZhdWx0U2lkCiAg ICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJzcGxpdC12aWV3IjsKIAogICAgIHRoaXMuX2Zp cnN0RWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXct Y29udGVudHMiKTsKKyAgICB0aGlzLl9maXJzdEVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQt dmlldy1jb250ZW50cy1maXJzdCIpOworCiAgICAgdGhpcy5fc2Vjb25kRWxlbWVudCA9IHRoaXMu ZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXctY29udGVudHMiKTsKKyAgICB0 aGlzLl9zZWNvbmRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctY29udGVudHMtc2Vj b25kIik7CiAKICAgICB0aGlzLl9yZXNpemVyRWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVD aGlsZCgiZGl2IiwgInNwbGl0LXZpZXctcmVzaXplciIpOwogICAgIHRoaXMuaW5zdGFsbFJlc2l6 ZXIodGhpcy5fcmVzaXplckVsZW1lbnQpOwpAQCAtOTEsMzMgKzk0LDkgQEAgV2ViSW5zcGVjdG9y LlNwbGl0Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX2lubmVyU2V0VmVydGljYWw6 IGZ1bmN0aW9uKGlzVmVydGljYWwpCiAgICAgeworICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3Zl U3R5bGVDbGFzcyh0aGlzLl9pc1ZlcnRpY2FsID8gInNwbGl0LXZpZXctdmVydGljYWwiIDogInNw bGl0LXZpZXctaG9yaXpvbnRhbCIpOwogICAgICAgICB0aGlzLl9pc1ZlcnRpY2FsID0gaXNWZXJ0 aWNhbDsKLQotICAgICAgICB0aGlzLl9yZW1vdmVBbGxMYXlvdXRQcm9wZXJ0aWVzKCk7Ci0KLSAg ICAgICAgaWYgKGlzVmVydGljYWwpIHsKLSAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5z dHlsZS5sZWZ0ID0gMDsKLSAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmln aHQgPSAwOwotICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLnJlbW92ZVByb3Bl cnR5KCJ0b3AiKTsKLSAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3Zl UHJvcGVydHkoImJvdHRvbSIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5f Zmlyc3RFbGVtZW50LnN0eWxlLnRvcCA9IDA7Ci0gICAgICAgICAgICB0aGlzLl9zZWNvbmRFbGVt ZW50LnN0eWxlLmJvdHRvbSA9IDA7Ci0gICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5 bGUucmVtb3ZlUHJvcGVydHkoImxlZnQiKTsKLSAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1l bnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInJpZ2h0Iik7Ci0gICAgICAgIH0KLQotICAgICAgICB2 YXIgb2xkRGlyZWN0aW9uID0gKGlzVmVydGljYWwgPyAiaG9yaXpvbnRhbCIgOiAidmVydGljYWwi KTsKLSAgICAgICAgdmFyIG5ld0RpcmVjdGlvbiA9IChpc1ZlcnRpY2FsID8gInZlcnRpY2FsIiA6 ICJob3Jpem9udGFsIik7Ci0KLSAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnJlbW92ZVN0eWxl Q2xhc3MoInNwbGl0LXZpZXctY29udGVudHMtIiArIG9sZERpcmVjdGlvbik7Ci0gICAgICAgIHRo aXMuX2ZpcnN0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBu ZXdEaXJlY3Rpb24pOwotCi0gICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQucmVtb3ZlU3R5bGVD bGFzcygic3BsaXQtdmlldy1jb250ZW50cy0iICsgb2xkRGlyZWN0aW9uKTsKLSAgICAgICAgdGhp cy5fc2Vjb25kRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBu ZXdEaXJlY3Rpb24pOwotCi0gICAgICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50LnJlbW92ZVN0eWxl Q2xhc3MoInNwbGl0LXZpZXctcmVzaXplci0iICsgb2xkRGlyZWN0aW9uKTsKLSAgICAgICAgdGhp cy5fcmVzaXplckVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1yZXNpemVyLSIgKyBu ZXdEaXJlY3Rpb24pOworICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcyh0aGlzLl9p c1ZlcnRpY2FsID8gInNwbGl0LXZpZXctdmVydGljYWwiIDogInNwbGl0LXZpZXctaG9yaXpvbnRh bCIpOwogICAgIH0sCiAgIAogICAgIF91cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkKQEAgLTE1Nyw3 ICsxMzYsOSBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBzZXRTZWNvbmRJc1NpZGViYXI6IGZ1bmN0aW9uKHNlY29uZElzU2lkZWJhcikKICAgICB7 CisgICAgICAgIHRoaXMuc2lkZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmll dy1zaWRlYmFyIik7CiAgICAgICAgIHRoaXMuX3NlY29uZElzU2lkZWJhciA9IHNlY29uZElzU2lk ZWJhcjsKKyAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12 aWV3LXNpZGViYXIiKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xOTAsMTYgKzE3MSw2IEBAIFdl Ykluc3BlY3Rvci5TcGxpdFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBzaWRlQi5yZW1vdmVT dHlsZUNsYXNzKCJtYXhpbWl6ZWQiKTsKICAgICAgICAgdGhpcy5fcmVtb3ZlQWxsTGF5b3V0UHJv cGVydGllcygpOwogCi0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5yaWdodCA9IDA7 Ci0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5ib3R0b20gPSAwOwotICAgICAgICB0 aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUud2lkdGggPSAiMTAwJSI7Ci0gICAgICAgIHRoaXMuX2Zp cnN0RWxlbWVudC5zdHlsZS5oZWlnaHQgPSAiMTAwJSI7Ci0KLSAgICAgICAgdGhpcy5fc2Vjb25k RWxlbWVudC5zdHlsZS5sZWZ0ID0gMDsKLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHls ZS50b3AgPSAwOwotICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLndpZHRoID0gIjEw MCUiOwotICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmhlaWdodCA9ICIxMDAlIjsK LQogICAgICAgICB0aGlzLl9pc1Nob3dpbmdPbmUgPSB0cnVlOwogICAgICAgICB0aGlzLnNldFJl c2l6YWJsZShmYWxzZSk7CiAgICAgICAgIHRoaXMuZG9SZXNpemUoKTsKQEAgLTIxMSw3ICsxODIs NyBAQCBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5f Zmlyc3RFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJib3R0b20iKTsKICAgICAgICAgdGhp cy5fZmlyc3RFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ3aWR0aCIpOwogICAgICAgICB0 aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImhlaWdodCIpOwotICAKKwog ICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJsZWZ0Iik7 CiAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInRvcCIp OwogICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ3aWR0 aCIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1l bGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZVBhbmVsLmpzCmluZGV4IGYxYjMyZWFiYjg3ZmMzMGUzY2M1MDIxMzUxOTI5MTE4MmFhOWZlZjEu LjVmMGYyYzM1OWNlZDk5Njc4Y2EwNzg1NjY2NjY2NmZjODc4ZDc4MGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTU4 LDggKzU4LDEwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVuY3Rpb24oKQogICAg IHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2NvbnRl eHRNZW51LmJpbmQodGhpcyksIGZhbHNlKTsKICAgICB0aGlzLmVsZW1lbnQudGFiSW5kZXggPSAw OwogCisgICAgdGhpcy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctdmVydGljYWwi KTsKKwogICAgIHRoaXMuX3NpZGViYXJCYWNrZ3JvdW5kRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX3NpZGViYXJCYWNrZ3JvdW5kRWxlbWVudC5jbGFz c05hbWUgPSAic2lkZWJhciBzcGxpdC12aWV3LXNpZGViYXItbGVmdCB0aW1lbGluZS1zaWRlYmFy LWJhY2tncm91bmQiOworICAgIHRoaXMuX3NpZGViYXJCYWNrZ3JvdW5kRWxlbWVudC5jbGFzc05h bWUgPSAic2lkZWJhciBzcGxpdC12aWV3LXNpZGViYXIgc3BsaXQtdmlldy1jb250ZW50cy1maXJz dCB0aW1lbGluZS1zaWRlYmFyLWJhY2tncm91bmQiOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLl9zaWRlYmFyQmFja2dyb3VuZEVsZW1lbnQpOwogCiAgICAgdGhpcy5jcmVhdGVT aWRlYmFyVmlld1dpdGhUcmVlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2Nzc05hbWVkRmxvd3MuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9jc3NOYW1lZEZsb3dzLmNzcwppbmRleCBkMDkwYjJlOTQ5Zjg2YTlhMjMyMDZh MjA5OTlkY2ZjZjg4NWUzMWU1Li5mMzM4N2Q1ZmQwMTFmZDVkOTM5MTlkY2EzN2IyMGRjZTEwMGI0 OWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2Nzc05h bWVkRmxvd3MuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvY3Nz TmFtZWRGbG93cy5jc3MKQEAgLTI3LDggKzI3LDcgQEAKICAqIE9GIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KICAqLwogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAu c3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgewotICAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIHJn YigxNjMsIDE2MywgMTYzKTsKKy5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5zcGxp dC12aWV3LXNpZGViYXIgewogICAgIG92ZXJmbG93LXg6IGhpZGRlbjsKIH0KIApAQCAtNDYsNyAr NDUsNyBAQAogICAgIHdpZHRoOiAxMDAlOwogfQogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlv bnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgLnNpZGViYXItY29udGVudCB7CisuY3Nz LW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyIC5zaWRlYmFy LWNvbnRlbnQgewogICAgIGJvdHRvbTogMHB4OwogICAgIGxlZnQ6IDBweDsKICAgICBwYWRkaW5n OiAwcHg7CkBAIC01NSw3ICs1NCw3IEBACiAgICAgdG9wOiAyM3B4OwogfQogCi0uY3NzLW5hbWVk LWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgLnNlbGVjdGlv biB7CisuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFy IC5zZWxlY3Rpb24gewogICAgIG1hcmdpbi1sZWZ0OiAtMTJweDsKICAgICB6LWluZGV4OiAwOwog fQpAQCAtNjQsNyArNjMsNyBAQAogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKIH0KIAotLmNzcy1u YW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IC5uYW1l ZC1mbG93LW92ZXJmbG93OjpiZWZvcmUsIC5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3 IC5yZWdpb24tZW1wdHk6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAu cmVnaW9uLWZpdDo6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAucmVn aW9uLW92ZXJzZXQ6OmJlZm9yZSB7CisuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAu c3BsaXQtdmlldy1zaWRlYmFyIC5uYW1lZC1mbG93LW92ZXJmbG93OjpiZWZvcmUsIC5jc3MtbmFt ZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5yZWdpb24tZW1wdHk6YmVmb3JlLCAuY3NzLW5hbWVk LWZsb3ctY29sbGVjdGlvbnMtdmlldyAucmVnaW9uLWZpdDo6YmVmb3JlLCAuY3NzLW5hbWVkLWZs b3ctY29sbGVjdGlvbnMtdmlldyAucmVnaW9uLW92ZXJzZXQ6OmJlZm9yZSB7CiAgICAgY3Vyc29y OiBkZWZhdWx0OwogICAgIGZsb2F0OiBsZWZ0OwogICAgIGhlaWdodDogMTBweDsKQEAgLTc1LDcg Kzc0LDcgQEAKICAgICB6LWluZGV4OiAxOwogfQogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlv bnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgLm5hbWVkLWZsb3ctb3ZlcmZsb3c6OmJl Zm9yZSB7CisuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRl YmFyIC5uYW1lZC1mbG93LW92ZXJmbG93OjpiZWZvcmUgewogICAgIGNvbnRlbnQ6IHVybChJbWFn ZXMvbmFtZWRGbG93T3ZlcmZsb3cucG5nKTsKICAgICBtYXJnaW46IDJweCAzcHggMHB4IC0xM3B4 OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxp dFZpZXcuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcu Y3NzCmluZGV4IDdiMDhhN2UwNzZhNDBiNDhmYjZkYjBlOTczOTBmY2E0ZTgyZWRjOTEuLjIxOTcz ZjdhNmUyMjc3MjJkZWRhZWRhMjkyZmI1MjNiYjQ4ODI0ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc3BsaXRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3MKQEAgLTQxLDQ5ICs0MSw3MCBA QAogICAgIGN1cnNvcjogZGVmYXVsdDsKIH0KIAotLnNwbGl0LXZpZXctY29udGVudHMuc3BsaXQt dmlldy1jb250ZW50cy12ZXJ0aWNhbCB7Cisuc3BsaXQtdmlldy1jb250ZW50cy5tYXhpbWl6ZWQg eworICAgIHdpZHRoOiAxMDAlOworICAgIGhlaWdodDogMTAwJTsKK30KKworLnNwbGl0LXZpZXct dmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMgewogICAgIHRvcDogMDsKICAgICBib3R0b206 IDA7CiB9CiAKLS5zcGxpdC12aWV3LWNvbnRlbnRzLnNwbGl0LXZpZXctY29udGVudHMtaG9yaXpv bnRhbCB7Cisuc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdCB7 CiAgICAgbGVmdDogMDsKK30KKworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29u dGVudHMtZmlyc3QubWF4aW1pemVkIHsKICAgICByaWdodDogMDsKIH0KIAotLnNwbGl0LXZpZXct c2lkZWJhci1sZWZ0IHsKLSAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUs IDY0JSk7Cisuc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQg eworICAgIHJpZ2h0OiAwOwogfQogCi0uc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQubWF4aW1pemVk IHsKLSAgICBib3JkZXItcmlnaHQ6IG5vbmU7Cisuc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQt dmlldy1jb250ZW50cy1zZWNvbmQubWF4aW1pemVkIHsKKyAgICBsZWZ0OiAwOwogfQogCi0uc3Bs aXQtdmlldy1zaWRlYmFyLXJpZ2h0IHsKLSAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJnYig2 NCUsIDY0JSwgNjQlKTsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVu dHMgeworICAgIGxlZnQ6IDA7CisgICAgcmlnaHQ6IDA7CiB9CiAKLS5zcGxpdC12aWV3LXNpZGVi YXItcmlnaHQubWF4aW1pemVkIHsKLSAgICBib3JkZXItcmlnaHQ6IG5vbmU7Cisuc3BsaXQtdmll dy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0IHsKKyAgICB0b3A6IDA7CiB9 CiAKLS5zcGxpdC12aWV3LXNpZGViYXItdG9wIHsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29s aWQgcmdiKDY0JSwgNjQlLCA2NCUpOworLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmll dy1jb250ZW50cy1maXJzdC5tYXhpbWl6ZWQgeworICAgIGJvdHRvbTogMDsKIH0KIAotLnNwbGl0 LXZpZXctc2lkZWJhci10b3AubWF4aW1pemVkIHsKLSAgICBib3JkZXItYm90dG9tOiBub25lOwor LnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQgeworICAg IGJvdHRvbTogMDsKIH0KIAotLnNwbGl0LXZpZXctc2lkZWJhci1ib3R0b20gewotICAgIGJvcmRl ci10b3A6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7Cisuc3BsaXQtdmlldy1ob3Jpem9u dGFsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZC5tYXhpbWl6ZWQgeworICAgIHRvcDogMDsK IH0KIAotLnNwbGl0LXZpZXctc2lkZWJhci1ib3R0b20ubWF4aW1pemVkIHsKLSAgICBib3JkZXIt dG9wOiBub25lOworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxp dC12aWV3LWNvbnRlbnRzLWZpcnN0Om5vdCgubWF4aW1pemVkKSB7CisgICAgYm9yZGVyLXJpZ2h0 OiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUpOworfQorCisuc3BsaXQtdmlldy12ZXJ0aWNh bCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4 aW1pemVkKSB7CisgICAgYm9yZGVyLWxlZnQ6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7 Cit9CisKKy5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12 aWV3LWNvbnRlbnRzLWZpcnN0Om5vdCgubWF4aW1pemVkKSB7CisgICAgYm9yZGVyLWJvdHRvbTog MXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKK30KKworLnNwbGl0LXZpZXctaG9yaXpvbnRh bCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4 aW1pemVkKSB7CisgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsK IH0KIAotLnNwbGl0LXZpZXctcmVzaXplci5zcGxpdC12aWV3LXJlc2l6ZXItdmVydGljYWwgewor LnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctcmVzaXplciB7CiAgICAgcG9zaXRpb246 IGFic29sdXRlOwogICAgIHRvcDogMDsKICAgICBib3R0b206IDA7CkBAIC05Miw3ICsxMTMsNyBA QAogICAgIGN1cnNvcjogZXctcmVzaXplOwogfQogCi0uc3BsaXQtdmlldy1yZXNpemVyLnNwbGl0 LXZpZXctcmVzaXplci1ob3Jpem9udGFsIHsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0 LXZpZXctcmVzaXplciB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGxlZnQ6IDA7CiAg ICAgcmlnaHQ6IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL3RpbWVsaW5lUGFuZWwuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC90aW1lbGluZVBhbmVsLmNzcwppbmRleCBhN2FiZDUxZTZmMGY3NGY1YWEyZjhkODk3NDFlYjBh ZDEyZjQ3NDNlLi5jNWU3YjBiYWM0NDU1MDc4YjE5Yjg5NzA4Zjg2MWY0ODYwNzFlMjBlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwu Y3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5l bC5jc3MKQEAgLTQ1LDcgKzQ1LDcgQEAKICAgICBib3R0b206IGF1dG87CiB9CiAKLS50aW1lbGlu ZSAuc3BsaXQtdmlldy1yZXNpemVyIHsKKy50aW1lbGluZS5zcGxpdC12aWV3LXZlcnRpY2FsIC5z cGxpdC12aWV3LXJlc2l6ZXIgewogICAgIHRvcDogMjBweDsKIH0KIApAQCAtMTY2LDcgKzE2Niw3 IEBACiAgICAgb3ZlcmZsb3cteDogaGlkZGVuOwogfQogCi0jdGltZWxpbmUtY29udGFpbmVyIC5z cGxpdC12aWV3LXNpZGViYXItbGVmdCB7CisjdGltZWxpbmUtY29udGFpbmVyIC5zcGxpdC12aWV3 LXNpZGViYXIgewogICAgIHotaW5kZXg6IDE7CiB9CiAK 188051 2013-02-13 04:14:37 -0800 2013-02-14 07:52:52 -0800 Patch bug-109426-20130213161105.patch text/plain 15804 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGY5YzM0NWE4OTA5YWY3 ZTk4ZTY5ZWFiOTI4N2FiNzYyZDJiYTMzNC4uMzQ0OTUwZjA3NDM4MmM0MjZmNDQ3NDMxYWVmYTQ3 ZDgyZTA5NjFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUzIEBACisyMDEzLTAyLTEyICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IFNpbXBsaWZ5IFNwbGl0VmlldyB0byByZWx5IG1vcmUgb24gQ1NTCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk0MjYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmaWVkIEph dmFzY3JpcHQgY29kZSBieSBtb3ZpbmcgbGFyZ2UgcGFydCBvZiB0aGUgbGF5b3V0IGxvZ2ljIGlu dG8gQ1NTIHJ1bGVzLiBUaGUgcGF0Y2ggaXMgbGFyZ2VyIHRoYW4gaXQKKyAgICAgICAgc2hvdWxk IGJlIGJlY2F1c2Ugb25lIG9mIHRoZSBjbGllbnRzIChUaW1lbGluZVBhbmVsKSBpcyBicmVha2lu ZyBTcGxpdFZpZXcgaW5jYXBzdWxhdGlvbiBieSByZXBhcmVudGluZyBpdHMKKyAgICAgICAgcmVz aXplci4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1NpZGViYXJWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5TcGxpdFZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwbGl0Vmll dy5wcm90b3R5cGUuX2lubmVyU2V0VmVydGljYWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNw bGl0Vmlldy5wcm90b3R5cGUuc2V0U2Vjb25kSXNTaWRlYmFyKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5TcGxpdFZpZXcucHJvdG90eXBlLl9zaG93T25seSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU3BsaXRWaWV3LnByb3RvdHlwZS5fcmVtb3ZlQWxsTGF5b3V0UHJvcGVydGllcyk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvY3NzTmFtZWRGbG93cy5jc3M6CisgICAgICAgICguY3NzLW5hbWVk LWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyKToKKyAgICAgICAgKC5j c3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5zcGxpdC12aWV3LXNpZGViYXIgLnNpZGVi YXItY29udGVudCk6CisgICAgICAgICguY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAu c3BsaXQtdmlldy1zaWRlYmFyIC5zZWxlY3Rpb24pOgorICAgICAgICAoLmNzcy1uYW1lZC1mbG93 LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhciAubmFtZWQtZmxvdy1vdmVyZmxv dzo6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAucmVnaW9uLWVtcHR5 OmJlZm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnJlZ2lvbi1maXQ6OmJl Zm9yZSwgLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnJlZ2lvbi1vdmVyc2V0Ojpi ZWZvcmUpOgorICAgICAgICAoLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rpb25zLXZpZXcgLnNwbGl0 LXZpZXctc2lkZWJhciAubmFtZWQtZmxvdy1vdmVyZmxvdzo6YmVmb3JlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3M6CisgICAgICAgICguc3BsaXQtdmlldy1j b250ZW50cy5tYXhpbWl6ZWQpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0 LXZpZXctY29udGVudHMpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZp ZXctY29udGVudHMtZmlyc3QpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0 LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkKToKKyAgICAgICAgKC5zcGxpdC12aWV3LXZl cnRpY2FsIC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZCk6CisgICAgICAgICguc3BsaXQtdmll dy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQubWF4aW1pemVkKToKKyAgICAg ICAgKC5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVudHMpOgorICAgICAg ICAoLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdCk6Cisg ICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0 Lm1heGltaXplZCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3 LWNvbnRlbnRzLXNlY29uZCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxp dC12aWV3LWNvbnRlbnRzLXNlY29uZC5tYXhpbWl6ZWQpOgorICAgICAgICAoLnNwbGl0LXZpZXct dmVydGljYWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0Om5v dCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmll dy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4aW1pemVkKSk6Cisg ICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQt dmlldy1jb250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkpOgorICAgICAgICAoLnNwbGl0LXZp ZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vj b25kOm5vdCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3Bs aXQtdmlldy1yZXNpemVyKToKKyAgICAgICAgKC5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0 LXZpZXctcmVzaXplcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBh bmVsLmNzczoKKyAgICAgICAgKC50aW1lbGluZS5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12 aWV3LXJlc2l6ZXIpOgorICAgICAgICAoI3RpbWVsaW5lLWNvbnRhaW5lciAuc3BsaXQtdmlldy1z aWRlYmFyKToKKwogMjAxMy0wMi0xMiAgVGFtYXMgQ3plbmUgIDx0Y3plbmVAaW5mLnUtc3plZ2Vk Lmh1PgogCiAgICAgICAgIEFkZCBlcnJvciBjaGVja2luZyBpbnRvIE9wZW5DTCB2ZXJzaW9uIG9m IFNWRyBmaWx0ZXJzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TaWRlYmFyVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2lkZWJhclZpZXcuanMKaW5kZXggODRlYjk1M2NiNWUwNjU5MDEwZDY0YzIzMmJlYTRkZDQ0ZWQz ZTBiMC4uZDU0ZTAyZjViZmM0NGM4Njk2NjRkODc0MzExODA1NjVhYWNmMjBjNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRlYmFyVmlldy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJWaWV3LmpzCkBAIC00 Niw3ICs0Niw2IEBAIFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldyA9IGZ1bmN0aW9uKHNpZGViYXJQ b3NpdGlvbiwgc2lkZWJhcldpZHRoU2V0dGluZ05hbWUsIGRlCiAKICAgICB0aGlzLl9zaWRlYmFy UG9zaXRpb24gPSBzaWRlYmFyUG9zaXRpb24gfHwgV2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LlNp ZGViYXJQb3NpdGlvbi5TdGFydDsKICAgICB0aGlzLnNldFNlY29uZElzU2lkZWJhcih0aGlzLl9z aWRlYmFyUG9zaXRpb24gPT09IFdlYkluc3BlY3Rvci5TaWRlYmFyVmlldy5TaWRlYmFyUG9zaXRp b24uRW5kKTsKLSAgICB0aGlzLl91cGRhdGVTaWRlYmFyRWxlbWVudFN0eWxlKCk7CiB9CiAKIFdl Ykluc3BlY3Rvci5TaWRlYmFyVmlldy5FdmVudFR5cGVzID0gewpAQCAtNzgsMzggKzc3LDYgQEAg V2ViSW5zcGVjdG9yLlNpZGViYXJWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRo aXMuaXNTaWRlYmFyU2Vjb25kKCkgPyB0aGlzLnNlY29uZEVsZW1lbnQoKSA6IHRoaXMuZmlyc3RF bGVtZW50KCk7CiAgICAgfSwKIAotICAgIF91cGRhdGVTaWRlYmFyRWxlbWVudFN0eWxlOiBmdW5j dGlvbigpCi0gICAgewotICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnJlbW92ZVN0eWxlQ2xh c3MoInNwbGl0LXZpZXctc2lkZWJhci1sZWZ0Iik7Ci0gICAgICAgIHRoaXMuc2lkZWJhckVsZW1l bnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyLXJpZ2h0Iik7Ci0gICAgICAg IHRoaXMuc2lkZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFy LXRvcCIpOwotICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNw bGl0LXZpZXctc2lkZWJhci1ib3R0b20iKTsKLQotICAgICAgICBpZiAodGhpcy5fc2lkZWJhclBv c2l0aW9uID09PSBXZWJJbnNwZWN0b3IuU2lkZWJhclZpZXcuU2lkZWJhclBvc2l0aW9uLlN0YXJ0 KSB7Ci0gICAgICAgICAgICBpZiAodGhpcy5pc1ZlcnRpY2FsKCkpCi0gICAgICAgICAgICAgICAg dGhpcy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXItbGVm dCIpOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMuc2lkZWJhckVsZW1l bnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyLXRvcCIpOwotICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgaWYgKHRoaXMuaXNWZXJ0aWNhbCgpKQotICAgICAgICAgICAgICAg IHRoaXMuc2lkZWJhckVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyLXJp Z2h0Iik7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgdGhpcy5zaWRlYmFyRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXItYm90dG9tIik7Ci0gICAgICAg IH0KLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtib29sZWFufSBpc1ZlcnRpY2Fs Ci0gICAgICovCi0gICAgc2V0VmVydGljYWw6IGZ1bmN0aW9uKGlzVmVydGljYWwpCi0gICAgewot ICAgICAgICBpZiAodGhpcy5pc1ZlcnRpY2FsKCkgPT09IGlzVmVydGljYWwpCi0gICAgICAgICAg ICByZXR1cm47Ci0KLSAgICAgICAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5cGUuc2V0 VmVydGljYWwuY2FsbCh0aGlzLCBpc1ZlcnRpY2FsKTsKLSAgICAgICAgdGhpcy5fdXBkYXRlU2lk ZWJhckVsZW1lbnRTdHlsZSgpOwotICAgIH0sCi0KICAgICAvKioKICAgICAgKiBAcGFyYW0ge251 bWJlcn0gd2lkdGgKICAgICAgKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU3BsaXRWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9TcGxpdFZpZXcuanMKaW5kZXggMTY0ZDE3ZTE4MDc3OGI3ZTdjNWEwYzU2OGIyNzczZjdj NmMwMmRiYi4uZTdjMmZmY2I0NjM0N2I2YTkyMzljOWFiZWI4M2JlMDQ3MTQ5MmQxZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGxpdFZpZXcuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TcGxpdFZpZXcuanMKQEAgLTQz LDcgKzQzLDEwIEBAIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcgPSBmdW5jdGlvbihpc1ZlcnRpY2Fs LCBzaWRlYmFyU2l6ZVNldHRpbmdOYW1lLCBkZWZhdWx0U2lkCiAgICAgdGhpcy5lbGVtZW50LmNs YXNzTmFtZSA9ICJzcGxpdC12aWV3IjsKIAogICAgIHRoaXMuX2ZpcnN0RWxlbWVudCA9IHRoaXMu ZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0LXZpZXctY29udGVudHMiKTsKKyAgICB0 aGlzLl9maXJzdEVsZW1lbnQuYWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1jb250ZW50cy1maXJz dCIpOworCiAgICAgdGhpcy5fc2Vjb25kRWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGls ZCgiZGl2IiwgInNwbGl0LXZpZXctY29udGVudHMiKTsKKyAgICB0aGlzLl9zZWNvbmRFbGVtZW50 LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kIik7CiAKICAgICB0aGlz Ll9yZXNpemVyRWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNwbGl0 LXZpZXctcmVzaXplciIpOwogICAgIHRoaXMuaW5zdGFsbFJlc2l6ZXIodGhpcy5fcmVzaXplckVs ZW1lbnQpOwpAQCAtOTEsMzMgKzk0LDkgQEAgV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICovCiAgICAgX2lubmVyU2V0VmVydGljYWw6IGZ1bmN0aW9uKGlzVmVydGlj YWwpCiAgICAgeworICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcyh0aGlzLl9p c1ZlcnRpY2FsID8gInNwbGl0LXZpZXctdmVydGljYWwiIDogInNwbGl0LXZpZXctaG9yaXpvbnRh bCIpOwogICAgICAgICB0aGlzLl9pc1ZlcnRpY2FsID0gaXNWZXJ0aWNhbDsKLQotICAgICAgICB0 aGlzLl9yZW1vdmVBbGxMYXlvdXRQcm9wZXJ0aWVzKCk7Ci0KLSAgICAgICAgaWYgKGlzVmVydGlj YWwpIHsKLSAgICAgICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5sZWZ0ID0gMDsKLSAg ICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmlnaHQgPSAwOwotICAgICAgICAg ICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ0b3AiKTsKLSAgICAg ICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoImJvdHRvbSIp OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxl LnRvcCA9IDA7Ci0gICAgICAgICAgICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLmJvdHRvbSA9 IDA7Ci0gICAgICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHko ImxlZnQiKTsKLSAgICAgICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJv cGVydHkoInJpZ2h0Iik7Ci0gICAgICAgIH0KLQotICAgICAgICB2YXIgb2xkRGlyZWN0aW9uID0g KGlzVmVydGljYWwgPyAiaG9yaXpvbnRhbCIgOiAidmVydGljYWwiKTsKLSAgICAgICAgdmFyIG5l d0RpcmVjdGlvbiA9IChpc1ZlcnRpY2FsID8gInZlcnRpY2FsIiA6ICJob3Jpem9udGFsIik7Ci0K LSAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZpZXct Y29udGVudHMtIiArIG9sZERpcmVjdGlvbik7Ci0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBuZXdEaXJlY3Rpb24pOwotCi0g ICAgICAgIHRoaXMuX3NlY29uZEVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1j b250ZW50cy0iICsgb2xkRGlyZWN0aW9uKTsKLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LWNvbnRlbnRzLSIgKyBuZXdEaXJlY3Rpb24pOwotCi0g ICAgICAgIHRoaXMuX3Jlc2l6ZXJFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoInNwbGl0LXZpZXct cmVzaXplci0iICsgb2xkRGlyZWN0aW9uKTsKLSAgICAgICAgdGhpcy5fcmVzaXplckVsZW1lbnQu YWRkU3R5bGVDbGFzcygic3BsaXQtdmlldy1yZXNpemVyLSIgKyBuZXdEaXJlY3Rpb24pOworICAg ICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcyh0aGlzLl9pc1ZlcnRpY2FsID8gInNwbGl0 LXZpZXctdmVydGljYWwiIDogInNwbGl0LXZpZXctaG9yaXpvbnRhbCIpOwogICAgIH0sCiAgIAog ICAgIF91cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkKQEAgLTE1Nyw3ICsxMzYsOSBAQCBXZWJJbnNw ZWN0b3IuU3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBzZXRTZWNvbmRJc1Np ZGViYXI6IGZ1bmN0aW9uKHNlY29uZElzU2lkZWJhcikKICAgICB7CisgICAgICAgIHRoaXMuc2lk ZWJhckVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygic3BsaXQtdmlldy1zaWRlYmFyIik7CiAgICAg ICAgIHRoaXMuX3NlY29uZElzU2lkZWJhciA9IHNlY29uZElzU2lkZWJhcjsKKyAgICAgICAgdGhp cy5zaWRlYmFyRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzcGxpdC12aWV3LXNpZGViYXIiKTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC0xOTAsMTYgKzE3MSw2IEBAIFdlYkluc3BlY3Rvci5TcGxpdFZp ZXcucHJvdG90eXBlID0gewogICAgICAgICBzaWRlQi5yZW1vdmVTdHlsZUNsYXNzKCJtYXhpbWl6 ZWQiKTsKICAgICAgICAgdGhpcy5fcmVtb3ZlQWxsTGF5b3V0UHJvcGVydGllcygpOwogCi0gICAg ICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5yaWdodCA9IDA7Ci0gICAgICAgIHRoaXMuX2Zp cnN0RWxlbWVudC5zdHlsZS5ib3R0b20gPSAwOwotICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQu c3R5bGUud2lkdGggPSAiMTAwJSI7Ci0gICAgICAgIHRoaXMuX2ZpcnN0RWxlbWVudC5zdHlsZS5o ZWlnaHQgPSAiMTAwJSI7Ci0KLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS5sZWZ0 ID0gMDsKLSAgICAgICAgdGhpcy5fc2Vjb25kRWxlbWVudC5zdHlsZS50b3AgPSAwOwotICAgICAg ICB0aGlzLl9zZWNvbmRFbGVtZW50LnN0eWxlLndpZHRoID0gIjEwMCUiOwotICAgICAgICB0aGlz Ll9zZWNvbmRFbGVtZW50LnN0eWxlLmhlaWdodCA9ICIxMDAlIjsKLQogICAgICAgICB0aGlzLl9p c1Nob3dpbmdPbmUgPSB0cnVlOwogICAgICAgICB0aGlzLnNldFJlc2l6YWJsZShmYWxzZSk7CiAg ICAgICAgIHRoaXMuZG9SZXNpemUoKTsKQEAgLTIxMSw3ICsxODIsNyBAQCBXZWJJbnNwZWN0b3Iu U3BsaXRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0eWxl LnJlbW92ZVByb3BlcnR5KCJib3R0b20iKTsKICAgICAgICAgdGhpcy5fZmlyc3RFbGVtZW50LnN0 eWxlLnJlbW92ZVByb3BlcnR5KCJ3aWR0aCIpOwogICAgICAgICB0aGlzLl9maXJzdEVsZW1lbnQu c3R5bGUucmVtb3ZlUHJvcGVydHkoImhlaWdodCIpOwotICAKKwogICAgICAgICB0aGlzLl9zZWNv bmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJsZWZ0Iik7CiAgICAgICAgIHRoaXMuX3Nl Y29uZEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoInRvcCIpOwogICAgICAgICB0aGlzLl9z ZWNvbmRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5KCJ3aWR0aCIpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IGYx YjMyZWFiYjg3ZmMzMGUzY2M1MDIxMzUxOTI5MTE4MmFhOWZlZjEuLjVmMGYyYzM1OWNlZDk5Njc4 Y2EwNzg1NjY2NjY2NmZjODc4ZDc4MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTU4LDggKzU4LDEwIEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuZWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2NvbnRleHRNZW51LmJpbmQodGhpcyks IGZhbHNlKTsKICAgICB0aGlzLmVsZW1lbnQudGFiSW5kZXggPSAwOwogCisgICAgdGhpcy5lbGVt ZW50LmFkZFN0eWxlQ2xhc3MoInNwbGl0LXZpZXctdmVydGljYWwiKTsKKwogICAgIHRoaXMuX3Np ZGViYXJCYWNrZ3JvdW5kRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwot ICAgIHRoaXMuX3NpZGViYXJCYWNrZ3JvdW5kRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhciBz cGxpdC12aWV3LXNpZGViYXItbGVmdCB0aW1lbGluZS1zaWRlYmFyLWJhY2tncm91bmQiOworICAg IHRoaXMuX3NpZGViYXJCYWNrZ3JvdW5kRWxlbWVudC5jbGFzc05hbWUgPSAic2lkZWJhciBzcGxp dC12aWV3LXNpZGViYXIgc3BsaXQtdmlldy1jb250ZW50cy1maXJzdCB0aW1lbGluZS1zaWRlYmFy LWJhY2tncm91bmQiOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9zaWRlYmFy QmFja2dyb3VuZEVsZW1lbnQpOwogCiAgICAgdGhpcy5jcmVhdGVTaWRlYmFyVmlld1dpdGhUcmVl KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2Nzc05h bWVkRmxvd3MuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9jc3NOYW1l ZEZsb3dzLmNzcwppbmRleCBkMDkwYjJlOTQ5Zjg2YTlhMjMyMDZhMjA5OTlkY2ZjZjg4NWUzMWU1 Li5mMzM4N2Q1ZmQwMTFmZDVkOTM5MTlkY2EzN2IyMGRjZTEwMGI0OWI0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2Nzc05hbWVkRmxvd3MuY3NzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvY3NzTmFtZWRGbG93cy5jc3MKQEAg LTI3LDggKzI3LDcgQEAKICAqIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAq LwogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFy LWxlZnQgewotICAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIHJnYigxNjMsIDE2MywgMTYzKTsK Ky5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5zcGxpdC12aWV3LXNpZGViYXIgewog ICAgIG92ZXJmbG93LXg6IGhpZGRlbjsKIH0KIApAQCAtNDYsNyArNDUsNyBAQAogICAgIHdpZHRo OiAxMDAlOwogfQogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmll dy1zaWRlYmFyLWxlZnQgLnNpZGViYXItY29udGVudCB7CisuY3NzLW5hbWVkLWZsb3ctY29sbGVj dGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyIC5zaWRlYmFyLWNvbnRlbnQgewogICAgIGJv dHRvbTogMHB4OwogICAgIGxlZnQ6IDBweDsKICAgICBwYWRkaW5nOiAwcHg7CkBAIC01NSw3ICs1 NCw3IEBACiAgICAgdG9wOiAyM3B4OwogfQogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMt dmlldyAuc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQgLnNlbGVjdGlvbiB7CisuY3NzLW5hbWVkLWZs b3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyIC5zZWxlY3Rpb24gewogICAg IG1hcmdpbi1sZWZ0OiAtMTJweDsKICAgICB6LWluZGV4OiAwOwogfQpAQCAtNjQsNyArNjMsNyBA QAogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKIH0KIAotLmNzcy1uYW1lZC1mbG93LWNvbGxlY3Rp b25zLXZpZXcgLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IC5uYW1lZC1mbG93LW92ZXJmbG93Ojpi ZWZvcmUsIC5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9ucy12aWV3IC5yZWdpb24tZW1wdHk6YmVm b3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAucmVnaW9uLWZpdDo6YmVmb3Jl LCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAucmVnaW9uLW92ZXJzZXQ6OmJlZm9y ZSB7CisuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFy IC5uYW1lZC1mbG93LW92ZXJmbG93OjpiZWZvcmUsIC5jc3MtbmFtZWQtZmxvdy1jb2xsZWN0aW9u cy12aWV3IC5yZWdpb24tZW1wdHk6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMt dmlldyAucmVnaW9uLWZpdDo6YmVmb3JlLCAuY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmll dyAucmVnaW9uLW92ZXJzZXQ6OmJlZm9yZSB7CiAgICAgY3Vyc29yOiBkZWZhdWx0OwogICAgIGZs b2F0OiBsZWZ0OwogICAgIGhlaWdodDogMTBweDsKQEAgLTc1LDcgKzc0LDcgQEAKICAgICB6LWlu ZGV4OiAxOwogfQogCi0uY3NzLW5hbWVkLWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmll dy1zaWRlYmFyLWxlZnQgLm5hbWVkLWZsb3ctb3ZlcmZsb3c6OmJlZm9yZSB7CisuY3NzLW5hbWVk LWZsb3ctY29sbGVjdGlvbnMtdmlldyAuc3BsaXQtdmlldy1zaWRlYmFyIC5uYW1lZC1mbG93LW92 ZXJmbG93OjpiZWZvcmUgewogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvbmFtZWRGbG93T3ZlcmZs b3cucG5nKTsKICAgICBtYXJnaW46IDJweCAzcHggMHB4IC0xM3B4OwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3NzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3NzCmluZGV4IDdiMDhhN2Uw NzZhNDBiNDhmYjZkYjBlOTczOTBmY2E0ZTgyZWRjOTEuLjIxOTczZjdhNmUyMjc3MjJkZWRhZWRh MjkyZmI1MjNiYjQ4ODI0ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvc3BsaXRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL3NwbGl0Vmlldy5jc3MKQEAgLTQxLDQ5ICs0MSw3MCBAQAogICAgIGN1cnNvcjogZGVm YXVsdDsKIH0KIAotLnNwbGl0LXZpZXctY29udGVudHMuc3BsaXQtdmlldy1jb250ZW50cy12ZXJ0 aWNhbCB7Cisuc3BsaXQtdmlldy1jb250ZW50cy5tYXhpbWl6ZWQgeworICAgIHdpZHRoOiAxMDAl OworICAgIGhlaWdodDogMTAwJTsKK30KKworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZp ZXctY29udGVudHMgewogICAgIHRvcDogMDsKICAgICBib3R0b206IDA7CiB9CiAKLS5zcGxpdC12 aWV3LWNvbnRlbnRzLnNwbGl0LXZpZXctY29udGVudHMtaG9yaXpvbnRhbCB7Cisuc3BsaXQtdmll dy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdCB7CiAgICAgbGVmdDogMDsKK30K KworLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1p emVkIHsKICAgICByaWdodDogMDsKIH0KIAotLnNwbGl0LXZpZXctc2lkZWJhci1sZWZ0IHsKLSAg ICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7Cisuc3BsaXQtdmll dy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQgeworICAgIHJpZ2h0OiAwOwog fQogCi0uc3BsaXQtdmlldy1zaWRlYmFyLWxlZnQubWF4aW1pemVkIHsKLSAgICBib3JkZXItcmln aHQ6IG5vbmU7Cisuc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNv bmQubWF4aW1pemVkIHsKKyAgICBsZWZ0OiAwOwogfQogCi0uc3BsaXQtdmlldy1zaWRlYmFyLXJp Z2h0IHsKLSAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKKy5z cGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVudHMgeworICAgIGxlZnQ6IDA7 CisgICAgcmlnaHQ6IDA7CiB9CiAKLS5zcGxpdC12aWV3LXNpZGViYXItcmlnaHQubWF4aW1pemVk IHsKLSAgICBib3JkZXItcmlnaHQ6IG5vbmU7Cisuc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxp dC12aWV3LWNvbnRlbnRzLWZpcnN0IHsKKyAgICB0b3A6IDA7CiB9CiAKLS5zcGxpdC12aWV3LXNp ZGViYXItdG9wIHsKLSAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2 NCUpOworLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdC5t YXhpbWl6ZWQgeworICAgIGJvdHRvbTogMDsKIH0KIAotLnNwbGl0LXZpZXctc2lkZWJhci10b3Au bWF4aW1pemVkIHsKLSAgICBib3JkZXItYm90dG9tOiBub25lOworLnNwbGl0LXZpZXctaG9yaXpv bnRhbCAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQgeworICAgIGJvdHRvbTogMDsKIH0KIAot LnNwbGl0LXZpZXctc2lkZWJhci1ib3R0b20gewotICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBy Z2IoNjQlLCA2NCUsIDY0JSk7Cisuc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNv bnRlbnRzLXNlY29uZC5tYXhpbWl6ZWQgeworICAgIHRvcDogMDsKIH0KIAotLnNwbGl0LXZpZXct c2lkZWJhci1ib3R0b20ubWF4aW1pemVkIHsKLSAgICBib3JkZXItdG9wOiBub25lOworLnNwbGl0 LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLWZp cnN0Om5vdCgubWF4aW1pemVkKSB7CisgICAgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQgcmdiKDY0 JSwgNjQlLCA2NCUpOworfQorCisuc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1zaWRl YmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4aW1pemVkKSB7CisgICAgYm9y ZGVyLWxlZnQ6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7Cit9CisKKy5zcGxpdC12aWV3 LWhvcml6b250YWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0 Om5vdCgubWF4aW1pemVkKSB7CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHJnYig2NCUs IDY0JSwgNjQlKTsKK30KKworLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQtdmlldy1zaWRl YmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4aW1pemVkKSB7CisgICAgYm9y ZGVyLXRvcDogMXB4IHNvbGlkIHJnYig2NCUsIDY0JSwgNjQlKTsKIH0KIAotLnNwbGl0LXZpZXct cmVzaXplci5zcGxpdC12aWV3LXJlc2l6ZXItdmVydGljYWwgeworLnNwbGl0LXZpZXctdmVydGlj YWwgLnNwbGl0LXZpZXctcmVzaXplciB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHRv cDogMDsKICAgICBib3R0b206IDA7CkBAIC05Miw3ICsxMTMsNyBAQAogICAgIGN1cnNvcjogZXct cmVzaXplOwogfQogCi0uc3BsaXQtdmlldy1yZXNpemVyLnNwbGl0LXZpZXctcmVzaXplci1ob3Jp em9udGFsIHsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctcmVzaXplciB7CiAg ICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIGxlZnQ6IDA7CiAgICAgcmlnaHQ6IDA7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwu Y3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNz cwppbmRleCBhN2FiZDUxZTZmMGY3NGY1YWEyZjhkODk3NDFlYjBhZDEyZjQ3NDNlLi5jNWU3YjBi YWM0NDU1MDc4YjE5Yjg5NzA4Zjg2MWY0ODYwNzFlMjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MKQEAgLTQ1LDcgKzQ1 LDcgQEAKICAgICBib3R0b206IGF1dG87CiB9CiAKLS50aW1lbGluZSAuc3BsaXQtdmlldy1yZXNp emVyIHsKKy50aW1lbGluZS5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LXJlc2l6ZXIg ewogICAgIHRvcDogMjBweDsKIH0KIApAQCAtMTY2LDcgKzE2Niw3IEBACiAgICAgb3ZlcmZsb3ct eDogaGlkZGVuOwogfQogCi0jdGltZWxpbmUtY29udGFpbmVyIC5zcGxpdC12aWV3LXNpZGViYXIt bGVmdCB7CisjdGltZWxpbmUtY29udGFpbmVyIC5zcGxpdC12aWV3LXNpZGViYXIgewogICAgIHot aW5kZXg6IDE7CiB9CiAK 188351 2013-02-14 07:52:57 -0800 2013-02-14 07:53:52 -0800 Patch bug-109426-20130214194924.patch text/plain 4971 kaznacheev U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyODc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWNhNTE2ODNjZDczMzJj NmQyYTBhNzQ3ZTQ2ZWQ2OTJmZGRmNTdkOS4uN2E2YjhiOGMyZjk3OTY4OGEyN2RkNDhlNmZhN2Ux ZmJkYjUxODdkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDEzLTAyLTE0ICBWbGFk aXNsYXYgS2F6bmFjaGVldiAgPGthem5hY2hlZXZAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEZpeGVkIGEgbGF5b3V0IHJlZ3Jlc3Npb24gaW4gQ2FudmFzUHJvZmlsZVZp ZXcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk0 MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFu Z2VkIHNwbGl0Vmlldy5jc3MgdG8gc3VwcG9ydGVkIG5lc3RlZCBTcGxpdFZpZXcgaW5zdGFuY2Vz LgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3NzOgorICAgICAg ICAoLnNwbGl0LXZpZXctdmVydGljYWwgPiAuc3BsaXQtdmlldy1jb250ZW50cyk6CisgICAgICAg ICguc3BsaXQtdmlldy12ZXJ0aWNhbCA+IC5zcGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0KToKKyAg ICAgICAgKC5zcGxpdC12aWV3LXZlcnRpY2FsID4gLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3Qu bWF4aW1pemVkKToKKyAgICAgICAgKC5zcGxpdC12aWV3LXZlcnRpY2FsID4gLnNwbGl0LXZpZXct Y29udGVudHMtc2Vjb25kKToKKyAgICAgICAgKC5zcGxpdC12aWV3LXZlcnRpY2FsID4gLnNwbGl0 LXZpZXctY29udGVudHMtc2Vjb25kLm1heGltaXplZCk6CisgICAgICAgICguc3BsaXQtdmlldy1o b3Jpem9udGFsID4gLnNwbGl0LXZpZXctY29udGVudHMpOgorICAgICAgICAoLnNwbGl0LXZpZXct aG9yaXpvbnRhbCA+IC5zcGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0KToKKyAgICAgICAgKC5zcGxp dC12aWV3LWhvcml6b250YWwgPiAuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdC5tYXhpbWl6ZWQp OgorICAgICAgICAoLnNwbGl0LXZpZXctaG9yaXpvbnRhbCA+IC5zcGxpdC12aWV3LWNvbnRlbnRz LXNlY29uZCk6CisgICAgICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsID4gLnNwbGl0LXZpZXct Y29udGVudHMtc2Vjb25kLm1heGltaXplZCk6CisgICAgICAgICguc3BsaXQtdmlldy12ZXJ0aWNh bCA+IC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdDpub3QoLm1h eGltaXplZCkpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVydGljYWwgPiAuc3BsaXQtdmlldy1z aWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtc2Vjb25kOm5vdCgubWF4aW1pemVkKSk6CisgICAg ICAgICguc3BsaXQtdmlldy1ob3Jpem9udGFsID4gLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12 aWV3LWNvbnRlbnRzLWZpcnN0Om5vdCgubWF4aW1pemVkKSk6CisgICAgICAgICguc3BsaXQtdmll dy1ob3Jpem9udGFsID4gLnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLXNl Y29uZDpub3QoLm1heGltaXplZCkpOgorICAgICAgICAoLnNwbGl0LXZpZXctdmVydGljYWwgPiAu c3BsaXQtdmlldy1yZXNpemVyKToKKyAgICAgICAgKC5zcGxpdC12aWV3LWhvcml6b250YWwgPiAu c3BsaXQtdmlldy1yZXNpemVyKToKKworMjAxMy0wMi0xNCAgVmxhZGlzbGF2IEthem5hY2hlZXYg IDxrYXpuYWNoZWV2QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb2xv ciBwaWNrZXIgc2hvdWxkIG5vdCBiZSBhdmFpbGFibGUgaW4gQ29tcHV0ZWQgU3R5bGVzIHBhbmUu CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk2OTcK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZp ZXcuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3Nz CmluZGV4IDIxOTczZjdhNmUyMjc3MjJkZWRhZWRhMjkyZmI1MjNiYjQ4ODI0ODcuLjljNWFhOTIz MTgyNDdjMDk2MzU4MzY3YjBjY2Y1NjdiOTE5YzE3ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc3BsaXRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3MKQEAgLTQ2LDY1ICs0Niw2NSBAQAog ICAgIGhlaWdodDogMTAwJTsKIH0KIAotLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXct Y29udGVudHMgeworLnNwbGl0LXZpZXctdmVydGljYWwgPiAuc3BsaXQtdmlldy1jb250ZW50cyB7 CiAgICAgdG9wOiAwOwogICAgIGJvdHRvbTogMDsKIH0KIAotLnNwbGl0LXZpZXctdmVydGljYWwg LnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QgeworLnNwbGl0LXZpZXctdmVydGljYWwgPiAuc3Bs aXQtdmlldy1jb250ZW50cy1maXJzdCB7CiAgICAgbGVmdDogMDsKIH0KIAotLnNwbGl0LXZpZXct dmVydGljYWwgLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkIHsKKy5zcGxpdC12 aWV3LXZlcnRpY2FsID4gLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkIHsKICAg ICByaWdodDogMDsKIH0KIAotLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0LXZpZXctY29udGVu dHMtc2Vjb25kIHsKKy5zcGxpdC12aWV3LXZlcnRpY2FsID4gLnNwbGl0LXZpZXctY29udGVudHMt c2Vjb25kIHsKICAgICByaWdodDogMDsKIH0KIAotLnNwbGl0LXZpZXctdmVydGljYWwgLnNwbGl0 LXZpZXctY29udGVudHMtc2Vjb25kLm1heGltaXplZCB7Cisuc3BsaXQtdmlldy12ZXJ0aWNhbCA+ IC5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZC5tYXhpbWl6ZWQgewogICAgIGxlZnQ6IDA7CiB9 CiAKLS5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVudHMgeworLnNwbGl0 LXZpZXctaG9yaXpvbnRhbCA+IC5zcGxpdC12aWV3LWNvbnRlbnRzIHsKICAgICBsZWZ0OiAwOwog ICAgIHJpZ2h0OiAwOwogfQogCi0uc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LWNv bnRlbnRzLWZpcnN0IHsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgPiAuc3BsaXQtdmlldy1jb250 ZW50cy1maXJzdCB7CiAgICAgdG9wOiAwOwogfQogCi0uc3BsaXQtdmlldy1ob3Jpem9udGFsIC5z cGxpdC12aWV3LWNvbnRlbnRzLWZpcnN0Lm1heGltaXplZCB7Cisuc3BsaXQtdmlldy1ob3Jpem9u dGFsID4gLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3QubWF4aW1pemVkIHsKICAgICBib3R0b206 IDA7CiB9CiAKLS5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctY29udGVudHMtc2Vj b25kIHsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgPiAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNv bmQgewogICAgIGJvdHRvbTogMDsKIH0KIAotLnNwbGl0LXZpZXctaG9yaXpvbnRhbCAuc3BsaXQt dmlldy1jb250ZW50cy1zZWNvbmQubWF4aW1pemVkIHsKKy5zcGxpdC12aWV3LWhvcml6b250YWwg PiAuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQubWF4aW1pemVkIHsKICAgICB0b3A6IDA7CiB9 CiAKLS5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQtdmlldy1j b250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkgeworLnNwbGl0LXZpZXctdmVydGljYWwgPiAu c3BsaXQtdmlldy1zaWRlYmFyLnNwbGl0LXZpZXctY29udGVudHMtZmlyc3Q6bm90KC5tYXhpbWl6 ZWQpIHsKICAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0JSk7CiB9 CiAKLS5zcGxpdC12aWV3LXZlcnRpY2FsIC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQtdmlldy1j b250ZW50cy1zZWNvbmQ6bm90KC5tYXhpbWl6ZWQpIHsKKy5zcGxpdC12aWV3LXZlcnRpY2FsID4g LnNwbGl0LXZpZXctc2lkZWJhci5zcGxpdC12aWV3LWNvbnRlbnRzLXNlY29uZDpub3QoLm1heGlt aXplZCkgewogICAgIGJvcmRlci1sZWZ0OiAxcHggc29saWQgcmdiKDY0JSwgNjQlLCA2NCUpOwog fQogCi0uc3BsaXQtdmlldy1ob3Jpem9udGFsIC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQtdmll dy1jb250ZW50cy1maXJzdDpub3QoLm1heGltaXplZCkgeworLnNwbGl0LXZpZXctaG9yaXpvbnRh bCA+IC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQtdmlldy1jb250ZW50cy1maXJzdDpub3QoLm1h eGltaXplZCkgewogICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoNjQlLCA2NCUsIDY0 JSk7CiB9CiAKLS5zcGxpdC12aWV3LWhvcml6b250YWwgLnNwbGl0LXZpZXctc2lkZWJhci5zcGxp dC12aWV3LWNvbnRlbnRzLXNlY29uZDpub3QoLm1heGltaXplZCkgeworLnNwbGl0LXZpZXctaG9y aXpvbnRhbCA+IC5zcGxpdC12aWV3LXNpZGViYXIuc3BsaXQtdmlldy1jb250ZW50cy1zZWNvbmQ6 bm90KC5tYXhpbWl6ZWQpIHsKICAgICBib3JkZXItdG9wOiAxcHggc29saWQgcmdiKDY0JSwgNjQl LCA2NCUpOwogfQogCi0uc3BsaXQtdmlldy12ZXJ0aWNhbCAuc3BsaXQtdmlldy1yZXNpemVyIHsK Ky5zcGxpdC12aWV3LXZlcnRpY2FsID4gLnNwbGl0LXZpZXctcmVzaXplciB7CiAgICAgcG9zaXRp b246IGFic29sdXRlOwogICAgIHRvcDogMDsKICAgICBib3R0b206IDA7CkBAIC0xMTMsNyArMTEz LDcgQEAKICAgICBjdXJzb3I6IGV3LXJlc2l6ZTsKIH0KIAotLnNwbGl0LXZpZXctaG9yaXpvbnRh bCAuc3BsaXQtdmlldy1yZXNpemVyIHsKKy5zcGxpdC12aWV3LWhvcml6b250YWwgPiAuc3BsaXQt dmlldy1yZXNpemVyIHsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAgICAgbGVmdDogMDsKICAg ICByaWdodDogMDsK