90610 2012-07-05 07:00:00 -0700 Web Inspector: move search field to the bottom of the page. 2012-07-05 09:45:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 663534 0 pfeldman 2012-07-05 07:00:00 -0700 This is the first step in the Search/replace implementation. This change moves search field from the inspector toolbar to the inspector view footer that is visible upon Cmd/Ctrl+F. 663535 1 150936 pfeldman 2012-07-05 07:00:54 -0700 Created attachment 150936 [IMAGE] with patch applied 663567 2 150942 pfeldman 2012-07-05 08:09:58 -0700 Created attachment 150942 Patch 663589 3 150942 vsevik 2012-07-05 09:17:09 -0700 Comment on attachment 150942 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150942&action=review Please make label and input font size the same. > Source/WebCore/inspector/front-end/SearchController.js:-220 > - // If focus belongs here and text is empty - nothing to do, return unhandled. We need a close button on the footer as well. > Source/WebCore/inspector/front-end/inspector.css:300 > +.toolbar-search-navigation-hidden { Is this style used somewhere? > Source/WebCore/inspector/front-end/inspector.css:462 > .status-bar { Please revert this. 663592 4 pfeldman 2012-07-05 09:45:02 -0700 Committed r121911: <http://trac.webkit.org/changeset/121911> 150936 2012-07-05 07:00:54 -0700 2012-07-05 07:00:54 -0700 [IMAGE] with patch applied search.png image/png 6112 pfeldman iVBORw0KGgoAAAANSUhEUgAAAcgAAAB5CAIAAAAyIibZAAAAA3NCSVQICAjb4U/gAAAAGXRFWHRT b2Z0d2FyZQBnbm9tZS1zY3JlZW5zaG907wO/PgAAF3NJREFUeJzt3XtcE2e6B/BnQjCRtgG3BaNH kD1ewEoRBZUea1VQV6laUdsF0S1Va/G2RcBK6661nm1Xd1Vo1SNWq7Si0m21rvWCrlRErFjoCqiI WrcBqYaLQoKQSUjynj+CEc0F0EEUft/P/BFm3nnmTZj3x5CZTDjGGAEAgHBEbd0BAID2BsEKACAw BCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAI DMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAA AkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsA gMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEK ACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOw AgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQrAAAAkOwAgAIDMEKACAwBCsAgMAQ rAAAAkOwAgAITHzhwoW27gMAQLvC1dy+3dZ9uN/x779XKpVt3QtozwICAvr07dvWvYB2S8wYa+s+ 3K+8vFwulyNboZUMGTLEw8PjMdzzod0Q02O5eymVyrfeequtewHtU1VVFRE9nns+tA84eQUAIDCx 0djWXQBoC9jzofWIOQ7/EEFHhD0fWo+YUYfcvXiFgvf0dGnrbkDb6aB7PjwSj+NVAQJQJHp7J8cr 8iLl1pbyedHe4xTJin0jpY+6Y/DYaJ97PjweRBxx1ibttT0xY/rKu7h06dJzyIyEU2rrzVo2abNm eI0+1GQpAZ6WfHJSauJImwekvLKaF2Ar8PjJLCwvKK4mIr3BqDcYiWjPD8XKKiu/bssdz3+Qv/8g f/tzmpyau4rqVMzgMdtLmix4bfsEzy4untMOqu/MKT+0eMyAvl4DfIdMS8hVt7igvS69H5F4nn/w kYvJPImYVcU7Zy0+N+WbS1VVVTcyP3DbNn3WgWrrLVuIqDltGlOkRgXKpRzHcS7ekxPzGkZIdXbi ZD+XhrlJeTwRFa3ydgmMnOzJcZzfx9uiwqIzqokUq7ylfpFhgd7e3t5yz5HR+5SkTB437iuV6p+j 5COTFa07yuHR+qGw/NO9Fz/dd6W8mhc7iMQOolMXyr/IKEv8ttCysa0db9CgQaYfBw0aZKulLeZV zEWsqi7YOW/01O1XVE1XrP5x1+WArxWKb0JkDTP+tXhxzpSv8y/lZ65z2zQ/4VILC9rb1qWTBSW2 FrbkZQAmIsasTBqVSurm4SojxqTuIR+kbHzTnRGrzkqYOsTX19fXd/j8nZc1jDSXds0a7uvr69Wz p9eEFTkaxp+M8B0+dbiX3CvimIopj62Y4Ovl5eXlO2HFSRVjxIgv2zV/uK9XT7nX1IRzGkaaYxPk Q7YV37v1RqrToiL3eScrGGNV+8blxUcmK4hImTp5ZHx1ZEYVY1VpkxXR46KzeSLiVWcyPJNv3Phl X8Rv7pbQ5mfIE7OLiooUqYFpYeMS+ci0tN87O796XJkR6Sn00Ia29OwzErenHUtvimM25txUa0+d K//z9gK+jvX4TWcrrS12+59yc01L/P39/f39TY9/ys21PkYsJvMq5iI2WhYfTDjWZ/nWcHeJxSLl sfcahsyYxQdKNJcSIt7PLU9fMGF+VnVDG+fglEuZUX0ljKrLVCRxk9gryJ+M8BoSETFhzHBfryGz EjbNnzpmuK/XkPkHlZaDt3jX4tXnr+2KiNhW0pyRa5kGygMxY3x9fX29fMfEHFM280Vrr5OIEVmZ +r65dkr5fD/PIRNnL07cVeAcHPKCc3X6gvnpU77Oz8/Pz/yAVs/eXqLJTdqujT6an1+kyFyq2r7q FM+IykukS8/cKEoJZumxCw4FpOQVFeWlBKSv3HaZGJG2nA9JyS9SnHmnPHHFKZ5Jh209sz/c456t NyaVukjLMpKSUzOKKDBRwedFeRIpMxKz5VGJUX4uRC6BK9Ky0+K9Te+WekVHj5TLPT0ljUpIBqyI D3QhImlgdLx3UdI+hRBjGB5DXu7Of50T0F2iunFLv+DvJ/6y7UfOyI33kSyc3M+ysdU9P/dOtprk 5uZaHyAWk39AgHkVcxH/gABrjT3CP/88OthDYtEN5d45s7OCv84rKir6LvJK7Ozd0uitHwe4hW49 unGYc+OWfMGHY7385mQFRId62CvIiFRlkjdTjmZmrnU/lJgV8vnRzDNbfdJXpZdZDF638HVLfdzD U1LelDVj5FqmwaXdK48FpJzJz89LCeXTzyub97q110lkI3Jlwz4+8ssvJzZEBbuX7F0w1G/G3uLL e3Ov5a6cOGDAgAEvx6SrynOL2Utr/7FclrU94b0F72+/olbxPCNy7hvq78wYaYrTzzmHh/lIGZP6 LM888k5fxoicXwgP8mCMXH36SFUqnpHEzcPtvr+zjfds6cjkjO2T+dToUf26dHbxC0vK44mqFUqt i5+84cyTVO7n13B+X+Iit3xfVXr37L+L3IWqi/D+antlMDLnpzutjxnWtXPdr8qq27X82AHPLA7z MxiZZWNbBxs5uTmmBjm5Oc0/RLlvFXMR+6vcO0dzee8Vj6iwPlLGyD0kqs/lvQXVxJiVIhKfD45c vH56aXnMjO3FtgsyRuTcN6S/M2MSNzc3j6AXZIyYq4czqXiJlcFrqtCckauyTAPXYUHS7RNHTJu/ +lyfPy4Pcmvzg8Y2nUREnOVUdnDZgu1XSNoz4JXp0eu+OZHik5WYcYuoT9T+vPz8vPz8vDNnMjYO Vx2cGTgpKZd6Bke+E/WCjBrOO0mlpjo8mQvyZdfK+HuXElndNN178opXFFX7rUjLUzLNjdOr5Gnz wpIVpnzMUzbkI5+XFJ+YUW1ztPEKxZ2FijylVu7nIiVcDdA+MUZEPxWW3rxZpeNrdZqay79cL79V 6yCyekbU1u7H5eTm5uTm2mnQnFWaUcSyD2Tt8T3N+MvfHzynJuJI6hUS6nEl/RrfREHTiCMiIsnd ZmVWBu+dCs0aufengcvgv2YXHV0z/QXV3tiRQ2Nz+Ra8eu1vsn7ySubGn/pwwYfHijWMsepLx3ad l/o87zvep2x3UlY1Y6x4+7Shr2+/XLI3VxL+0UeRoUHuZemX1cQYY0QNNSTuIS+o9h68rGFMU7B6 0sTV5zSNljLTMGBMoyxWau7deuN9vzojatzIyFQFT1K5XO5CErmLlOTjokcok+OT86qJqrMTI6OT i6S2o1KbHx+/T8ETX5QUvUoxNHqyJxFJeWWRQolD1/bFwUF0Ou+XuDUHKqvUIYHd+3Z3LPi5cv7/ fn2zutayseDnK1rs/k5Ieof2KUnae1nDGCs+mHTFI8RHdnekNOAvb1q4YFuBhjHNpYO7S/qE9JbY LMgajbi7z5mIiHgrg7cTI+L5Zo3cTr0t0qDgw5dHbOP9Q6PWbFgeoLpSzAv1Mj2RxFZ3UGnAR/9Y u2zhwsAe5VoimU/o8q/WBnSVbtjy01sLA/tpiWTDPt4R2cd92Dt9Zr468JCbm5tPwEvu534qo6C7 RZyD16w/9dbrAzdrSdInfMOXAVLKstgSf2pu4LLQ7OxID+tDRR6ZmpodFuXdOVxLkp4jolJTw+RE FLkvTRkZFdhlnpacB/w+KSMxUEpFtoZb10B+hV/nUJXE69UVaWmRciJp5GTPUfP6BRadLUr0w9Fr u3Hk5Pklf9vDHJ8KHdHngwXjKm7VzFqWfKXUsODDnakJc9u6d03rOmXLhtyZrw/8hEjiFvLRl5Ee pMq9r43zKxu2nJr5B9OwCt36ZXjXB9qUxOcdi8EbHDBMGjcuUHo8e8364CZGrvMr96dBH9W7/jNf H7RZIiGpz9ItIc4P1K/2gquorGzrPtzvn/v2GY1GYe5upVjl7Z26QpEXZvWTAtC+lN1Ur978nVTi +HHs6waD0cFBVFlVs3BlyoSRvjNeHWZuZrq7lQE3C4BWY/2IFeBJ1PVZ2br3I0yPHRxERPRcl2dS E+a1aaegI2qnH2kFaAr2fGg9j+mNrgXjGV/Ex7d1J+Cx1L73fGhTYo7jmm71yPXq1avhNu8ArePx 3POhfXgcv0HA3d194MCBbd0LAIAHxJ0/f76t+wAA0K5wGr61rpK/+vPPvXr3fkKL/3erFX/E/vPz zx8ddXqUW3xJcvgPb7zxKLcI8Lhp3asCntziOLPxMHDCHTq4VrwqgDXcBQLF21LbZFx7efUAHkwr nrx6cg9X29MB16N/Lu3p1QN4MGKDobVKM8ZQvM21Sczhw6LQwYk5zvogGD9+fPOrHD582HImI2ar +MNrZvGLFy/++OOPRDRkyJB+/azc7fhhij8RGLXBESu+WRo6ODGzMQZadPm0rSK25q/5+xoiilsS Z54TMj7EsllQUFDjNs0sbjZn9pzr169zxBFR6lep3bt33/r5VvurNFlce3ruS6unpe8bKzPPUmWv jDs7bf285+3cuTDjjcGbIrK+Givjz8aF7oz4dk2Pb0IXST5Lfc216fqtw7GH2ycv3Y5LratrVnPO N9R90r+v/aW4WYn56NMc4LHSxFUBaUfSrM4f97txjX+0WoQZmZ3i33//PWPMnJscWc9xWxXsFyei 6eHT1Sp1T4+eprtkbdmypaSkJGJ6RMrOFDtrNVmccSKO4+5ZrP7PmcJfp9n9n/vuWqX/+o/b+N4S 1U8ndAHvPWe5jpX6D4dZu3l+qzLdj/IRbxTgsSLmmL0jU4O+We81Wi3CGLNV/N0l74o4UXp6Okdc XFwcER05csSymdFoNNp4u85OcSI6ceKEWqX+7W9/u2nTJlOFwYMHz507t6Sk5MzpM4GBgfafjp3i HCNt+TdLxn94trSCBkZ/8dnEwmWJhaXqt9/qlzzvRNgyGuhaUVpaqh04K0KS/V3h1VJt4Eepa0Yw IuO1TyYP/+7ir5XkGhTAV1bWyK4uGR5f8dbWiKzUsTLSnnhj8KZZOV9ISXtt5x/Hf3i1QisLXPrZ mmk9JOrsTYuW7byqJZIFRq//aFqPs3ODV2plFdkVAz9L/2yE/WNbOxnnKHtmUcRvuj/F1ZZWrTty u9Lg4DvCdbaXoyOxiqu31qfXVZKDf3DX2b1E9bX11yUckch3YvepiusfnDMQiYPD5D0zft2mtPjb QMzWn0mADqKJI9ZmHnpYP2K1feRiMBhiY2MZY+np6YyxuLi4+vr65myoOcWJ6NSpU0Q0Z84cvV5v mmM0Gt9+++1ly5ZlZ2cPHTr0gYszIm2Fbvw3OV94lG4ZPXr16Vk7VsUmv3YhYdvMHrknayolfzhw MIg7EuEXfWbj6YOfdj49f+jyjPKXuxKJvN47eDI8fuLGyd9t6pU2dVZF4oHZLv+awYlMx6eME3Ei jjEirVo3+bucMI9rX0ydsGj/y8muf1qSOXlPTpg7qb5/Z8yilKF7fUSVv3ZeeaZ4/DNaXtfEEam9 YJVwp1NLM9Xi4GndFnlp1uldF/XQLP9cecMgfnlat0Uv6FZrn53tWrP8s5pKJ6eYN5wcyXjxLO86 4qnnzqkrZU7BkrrNFS37vQN0EOImzuA28/yutWY8z9tZ3Wg0xsXGElF6ejoxZnq8Zu3a48ePm9uM GjXKNL+lxR1EIiK6rVY3bnNbrSYig8HQ5JOyV9zIZP2nDXet4+ue9u4t2aeuM+gMjIz12npmZLLe Y707abRaF1dX90FeEq1G0+W/ZHRbQ66MqLZOU1Z0pVOgq1F1JUvVY5JzHW80MiJGRiORkRiR0UhG Jntx/mjXOr7uuVdmuP/1H3kXn8srPZs3ZfBaIuJ0NVr+mvZ5Jus9ydextjkfmuNtN6orVeWqiUh/ ukAf1r+Th96x4mzFDQMR6XPP1s8c2MmrrlP1hcpKIqrTHC7VTyWqv6HKlTz3Ypea3P7P0IXyYmv/ z9Tr6nEdK3RwYvsZ08xT47aaNVHcYGCMcRzHiUSmlpxIxInuXlprnt/S4gMHDco8eTJl164Xh929 b3zKrl1E5O/v35wnZe8ZMUcHRkZiBiLiGloazYsaMpIZHclIZGBExBmJyKj8fNqy9XmVsvARayt+ reSOBk8c87fF5nW1Gm3DYwnTm+rrDYyIIxH1nvPNifd7ExGpKsodZY45X9zZ0EOpJ2rGvwl3/qk3 ZahBd/gyF+vr5OppzPzW5tqIVejgbF4V0PBduHaX3v2xhVcFmKxbuy7jeEZQcFBsXKzBYCCi2CWx S95dYm5gZEaD7QtK7RQfPWb05s2bS66VzJ49+7XXXyOi1N2pN2/dJKJefXo1eTmBneKMIyLGONbw CnCMSRmRVsuxu4s41vCVxdydr4LjiEQe8zctPBXTdeeesefnTTq6cP+K5x1VZ2Il17Kv6YKeV2fv KVQTxxhH6sIDZ2teGiqrOLGntP+rA7xl/cvfSzo+Z+VQWenu6ZN2T9j/dX9zHx6Kk+tTvSWai1qH Af3FxZd0Jfp618FPdbukvmEQBwx0rLiqu6TWuQQ6dStU3xBLX+4ppgtERDcKanQRz75YdStObfvV Q7RCxyYmm6eAOCJqYqmZrWa2zy+tW7s2IyMjKDg4NjbWoDeYChr0RsP9x2G2T4PYLm5kbO+3304J DS0vL9+4YeOdShwRzZ0z97MtW7p162azrP3ijIg4Ytzd1+fpQS9K/jRtjOPXH99ZxO4sYne+K5gR ka4s7zgb+Wdx1YVDV3qMfI7VaXSO/ebH9J/52tDvXHsMHNW/x23GESOJ5Nf1b874u1bN+a/aNuXZ p9naTa8veHfMi1oi2f+s3DbTg34y9+Gh1OvFU0Pljg4iUt5cV2hQUUVSN7f42c5ErPrqrXUF+jpD ZVIPt/jZMtLqr6vv/IVT12WqXQL+XaeyVxsnr6BD427auJ/05EmTiGjf/v12lppZbVZUWOj9/PNW V09Yty4jIyM4KGhxbMOx6qsTJ1o2Gzlq1OKYGKsV7BQ3c3R0TDt8OCcnh4gGDx48fvz4sLAwtUrF GEvavLlb9+62VrRX3EH6VKf6Wo2BiBwkThJDXZ1eJHFy6kT1tVquc8MikdRJYtBo6hlxnZw6M02d UfJ0p/rbOkcnkbaunpN07qTX8AYiIs5R2lniQMxo1JPIQVdXR9KnJHeORY06jdbAiHPoJJWKOSIi g65Oq2eN+tCkosLCDWea+ivSIk5PLw3rfHhnRYHW+vJBhj1vzpol5BYBnjRNXBUwyVreEZHo3o8P NC6SmJAQvXix5fzGOI4LCgpaHBNjPmtv9fMIpis6bfWtyVPPOp1u9JgxY3/3OyIyGo1anW737t0z IiKqqqrefvvtpKQkO9lqs7hec1t/5yFfqyciMvC1NaYzRHcWGTS1DdfdM21tLRGRpkZPRHrT19vz dRrzdnSaWt09G7hb39xGr6273TjF9JZtHhGnXl3/b1KngiM3bKUqAFCTwSpq3uevzEUSExJOnjz5 TnT0ffPvExMTQ0T1+rvxcODQIctmRoNBb+c91ma8x2gwGBq/S6vV6XakpMycMaOqqmr37t22Doeb WbwDqrtaFpnQdDO8etDB2bxt4IGDB5tfRafTEVFiYuLJzEyRSHS3po3iev39R1w6bcsPgR5o9Op0 uh07dny5Y8eMGTMsu/GQxQEAiEhstJEgfAuT7pPExKyTJ0UiERGZa9oqLogHLs7rdOHTp+vsfiSh VXve7uGIFTq4pj4g0DyffPJJVlaWyHwJqrlmq94/7iGKG5pcF3e+exgIVujYxCKRAPe6Xr58uUQi Mf9YWVlpeiBIcVue3OLtHr5ZGjo4sSBVampqampqBCkFAPCk40z3K4F27IcffnjEW2zRXdIB2h/u y0/fnRS+sK27AQDQfuCdRAAAgYlmLlq9f/eGtu4GAED70fCZ0R3rlxIR3hMAAHh4/w/Z51V0hFsU rAAAAABJRU5ErkJggg== 150942 2012-07-05 08:09:58 -0700 2012-07-05 09:17:30 -0700 Patch bug-90610-20120705190956.patch text/plain 19415 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxODk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWMzMDI0NWNmODc2MzEw ODJmMDFjNzg3ODg5MjQ3MTE0ZDgzZThkYy4uMzhhZTQ0MTU4YzQ4YjBhMTNkOGMxNTZmYjAxMzYy Y2E2NGRlYzY4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDEyLTA3LTA1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1vdmUgc2VhcmNoIGZpZWxkIHRvIHRoZSBib3R0b20gb2YgdGhlIHBhZ2UuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDYxMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgdGhlIGZpcnN0 IHN0ZXAgaW4gdGhlIFNlYXJjaC9yZXBsYWNlIGltcGxlbWVudGF0aW9uLiBUaGlzIGNoYW5nZSBt b3ZlcyBzZWFyY2gKKyAgICAgICAgZmllbGQgZnJvbSB0aGUgaW5zcGVjdG9yIHRvb2xiYXIgdG8g dGhlIGluc3BlY3RvciB2aWV3IGZvb3RlciB0aGF0IGlzIHZpc2libGUgdXBvbiBDbWQvQ3RybCtG LgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yVmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5JbnNwZWN0b3JWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5JbnNwZWN0b3JW aWV3LnByb3RvdHlwZS5fcHVzaFRvSGlzdG9yeSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSW5z cGVjdG9yVmlldy5wcm90b3R5cGUucGFuZWxzRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSW5zcGVjdG9yVmlldy5wcm90b3R5cGUuc2V0Rm9vdGVyRWxlbWVudCk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5l bC5wcm90b3R5cGUuc2hvdyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxl c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90eXBl Ll9yZXNldCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVy LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLnVwZGF0ZVNlYXJjaExhYmVs KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZS5jYW5j ZWxTZWFyY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90 eXBlLl91cGRhdGVTZWFyY2hOYXZpZ2F0aW9uQnV0dG9uU3RhdGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLmZvY3VzU2VhcmNoRmllbGQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLl9vbktleURvd24p OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlLl9vbk5l eHRCdXR0b25TZWFyY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaENvbnRyb2xsZXIu cHJvdG90eXBlLl9vblByZXZCdXR0b25TZWFyY2gpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNl YXJjaENvbnRyb2xsZXIucHJvdG90eXBlLl9wZXJmb3JtU2VhcmNoKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisgICAgICAgICgjc2VhcmNoKToKKyAgICAg ICAgKC50b29sYmFyLXNlYXJjaC1jb250YWluZXIpOgorICAgICAgICAoLnRvb2xiYXItc2VhcmNo LW5hdmlnYXRpb24pOgorICAgICAgICAoLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb246aG92ZXIp OgorICAgICAgICAoLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24udG9vbGJhci1zZWFyY2gtbmF2 aWdhdGlvbi1wcmV2KToKKyAgICAgICAgKC50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLnRvb2xi YXItc2VhcmNoLW5hdmlnYXRpb24tbmV4dCk6CisgICAgICAgICgudG9vbGJhci1zZWFyY2gtbmF2 aWdhdGlvbi1oaWRkZW4pOgorICAgICAgICAoLnN0YXR1cy1iYXIpOgorICAgICAgICAoLnNlYXJj aC1kcmF3ZXItaGVhZGVyIGlucHV0W3R5cGU9InNlYXJjaCJdLnNlYXJjaC1jb25maWctc2VhcmNo KToKKyAgICAgICAgKC5pbnNwZWN0b3ItZm9vdGVyKToKKyAgICAgICAgKC5pbnNwZWN0b3ItZm9v dGVyID4gZGl2KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1s OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLmdldCBfc2V0Q29tcGFjdE1vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LnBvc3REb2N1bWVudEtleURvd24pOgorCiAyMDEyLTA3LTA1ICBTYW0gRCAgPGRzYW0yOTEyQGdt YWlsLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBIYXZpbmcgYSAiU2Nyb2xsIGludG8g dmlldyIgZm9yIG5vZGVzIHRocm91Z2ggd2ViIGluc3BlY3Rvci4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJD b3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA3YjUyMjM0MjdlZmFm NDYyYTVmZjc5NGFhZjVlOTIyYjAxZDdjNWRlLi4xNThjODhjOTAxODRlMTI1ZjMzNGQ2ZWFhZjM5 NDk5MDc0NGUwMWY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCkBAIC03MTksMyArNzE5LDQgQEAgbG9jYWxpemVkU3RyaW5nc1siQ1BV IFRpbWUiXSA9ICJDUFUgVGltZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmNvZGVkIERhdGEgTGVu Z3RoIl0gPSAiRW5jb2RlZCBEYXRhIExlbmd0aCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyIlZCBCeXRl cyJdID0gIiVkIEJ5dGVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRpbWUgRW5kIl0gPSAiVGltZSBF bmQiOworbG9jYWxpemVkU3RyaW5nc1siU2VhcmNoOiJdID0gIlNlYXJjaDoiOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JWaWV3LmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JWaWV3LmpzCmluZGV4 IDc0ZDVhODRhYzcwMzhkZjZiZGU3YTNiOGMxYjYwMmQ1NjExMTc0ZDkuLmRlMzM0NTUwMTU5ZjY1 NTY3MjNjYzQ0NDIxYzM0NTc5MGZiMTZmN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvclZpZXcuanMKQEAgLTUxLDYgKzUxLDggQEAgV2Vi SW5zcGVjdG9yLkluc3BlY3RvclZpZXcgPSBmdW5jdGlvbigpCiAgICAgLy8gV2luZG93cyBhbmQg TWFjIGhhdmUgdHdvIGRpZmZlcmVudCBkZWZpbml0aW9ucyBvZiAnXScsIHNvIGFjY2VwdCBib3Ro LgogICAgIHRoaXMuX2Nsb3NlQnJhY2tldElkZW50aWZpZXJzID0gWyJVKzAwNUQiLCAiVSswMERE Il0ua2V5U2V0KCk7CiAgICAgdGhpcy5fY2xvc2VCcmFja2V0Q2hhckNvZGUgPSAiXSIuY2hhckNv ZGVBdCgwKTsKKyAgICB0aGlzLl9mb290ZXJFbGVtZW50Q29udGFpbmVyID0gdGhpcy5lbGVtZW50 LmNyZWF0ZUNoaWxkKCJkaXYiLCAiaW5zcGVjdG9yLWZvb3RlciBzdGF0dXMtYmFyIGhpZGRlbiIp OworICAgIHRoaXMuX3BhbmVsc0VsZW1lbnQgPSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoImRp diIsICJmaWxsIik7CiB9CiAKIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JWaWV3LkV2ZW50cyA9IHsK QEAgLTE5MCw2ICsxOTIsMjggQEAgV2ViSW5zcGVjdG9yLkluc3BlY3RvclZpZXcucHJvdG90eXBl ID0gewogICAgICAgICBpZiAoIXRoaXMuX2hpc3RvcnkubGVuZ3RoIHx8IHRoaXMuX2hpc3Rvcnlb dGhpcy5faGlzdG9yeS5sZW5ndGggLSAxXSAhPT0gcGFuZWxOYW1lKQogICAgICAgICAgICAgdGhp cy5faGlzdG9yeS5wdXNoKHBhbmVsTmFtZSk7CiAgICAgICAgIHRoaXMuX2hpc3RvcnlJdGVyYXRv ciA9IHRoaXMuX2hpc3RvcnkubGVuZ3RoIC0gMTsKKyAgICB9LAorCisgICAgcGFuZWxzRWxlbWVu dDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3BhbmVsc0VsZW1lbnQ7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7RWxlbWVudD99IGVsZW1lbnQKKyAg ICAgKi8KKyAgICBzZXRGb290ZXJFbGVtZW50OiBmdW5jdGlvbihlbGVtZW50KQorICAgIHsKKyAg ICAgICAgaWYgKGVsZW1lbnQpIHsKKyAgICAgICAgICAgIHRoaXMuX2Zvb3RlckVsZW1lbnRDb250 YWluZXIucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgICAgICAgICB0aGlzLl9mb290 ZXJFbGVtZW50Q29udGFpbmVyLmFwcGVuZENoaWxkKGVsZW1lbnQpOworICAgICAgICAgICAgdGhp cy5fcGFuZWxzRWxlbWVudC5zdHlsZS5ib3R0b20gPSB0aGlzLl9mb290ZXJFbGVtZW50Q29udGFp bmVyLm9mZnNldEhlaWdodCArICJweCI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICB0 aGlzLl9mb290ZXJFbGVtZW50Q29udGFpbmVyLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAg ICAgICAgICAgdGhpcy5fZm9vdGVyRWxlbWVudENvbnRhaW5lci5yZW1vdmVDaGlsZHJlbigpOwor ICAgICAgICAgICAgdGhpcy5fcGFuZWxzRWxlbWVudC5zdHlsZS5ib3R0b20gPSAwOworICAgICAg ICB9CisgICAgICAgIHRoaXMuZG9SZXNpemUoKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCmluZGV4IDU2NmYxMDVmNTVjNDI4N2I1Njc0 N2E0Nzg1MDE4NzcxYjUyZDU3N2IuLmVjZmIzZTg4OTlkOGI3YmU5NGUwZTNjMzc2MGRkMTlmNzQ1 NjhiMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFu ZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpA QCAtNjMsNyArNjMsNyBAQCBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlID0gewogCiAgICAg c2hvdzogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90 eXBlLnNob3cuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5lbGVtZW50KTsK KyAgICAgICAgV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBlLnNob3cuY2FsbCh0aGlzLCBXZWJJ bnNwZWN0b3IuaW5zcGVjdG9yVmlldy5wYW5lbHNFbGVtZW50KCkpOwogICAgIH0sCiAKICAgICB3 YXNTaG93bjogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCmluZGV4IDE4MTMxYzFjNDUzOWZlZTQzNjIyMzEyMDYx OGVlZjAzMDllZDk1NGQuLjdhZTI2ZWEwYzRlOGQzYWE0OWNmMTUyMTFhY2VmOWQwZjU0NzYxMGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQ YW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVz UGFuZWwuanMKQEAgLTM2MSw4ICszNjEsMTAgQEAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIGRlbGV0ZSB0aGlzLnZpc2libGVWaWV3 OwogCi0gICAgICAgIGRlbGV0ZSB0aGlzLmN1cnJlbnRRdWVyeTsKLSAgICAgICAgdGhpcy5zZWFy Y2hDYW5jZWxlZCgpOworICAgICAgICBpZiAodGhpcy5jdXJyZW50UXVlcnkpIHsKKyAgICAgICAg ICAgIGRlbGV0ZSB0aGlzLmN1cnJlbnRRdWVyeTsKKyAgICAgICAgICAgIHRoaXMuc2VhcmNoQ2Fu Y2VsZWQoKTsKKyAgICAgICAgfQogCiAgICAgICAgIGZvciAodmFyIGlkIGluIHRoaXMuX3Byb2Zp bGVUeXBlc0J5SWRNYXApIHsKICAgICAgICAgICAgIHZhciBwcm9maWxlVHlwZSA9IHRoaXMuX3By b2ZpbGVUeXBlc0J5SWRNYXBbaWRdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZWFyY2hDb250cm9sbGVyLmpzCmluZGV4IDZlZjEyNGZkOTU0N2E5YTU1 YjdhZWEyNzk3YTY1YjZhNzQzYjM1ZTMuLjUwNGZiZjQ3M2YzNGZiOTQ1YWRiZjc2ZDRhMTU0NTg4 MjY0YTEzNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2VhcmNoQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NlYXJjaENvbnRyb2xsZXIuanMKQEAgLTMxLDE5ICszMSwzMyBAQAogCiAvKioKICAqIEBj b25zdHJ1Y3RvcgorICogQHBhcmFtIHtFbGVtZW50fSBwYXJlbnRFbGVtZW50CiAgKi8KIFdlYklu c3BlY3Rvci5TZWFyY2hDb250cm9sbGVyID0gZnVuY3Rpb24oKQogewotICAgIHRoaXMuZWxlbWVu dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2giKTsKLSAgICB0aGlzLl9tYXRjaGVz RWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzZWFyY2gtcmVzdWx0cy1tYXRjaGVz Iik7Ci0gICAgdGhpcy5fc2VhcmNoSXRlbUVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgidG9vbGJhci1zZWFyY2gtaXRlbSIpOwotICAgIHRoaXMuX3NlYXJjaENvbnRyb2xCb3hFbGVt ZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24t Y29udHJvbCIpOwotCi0gICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNlYXJjaCIs IHRoaXMuX29uU2VhcmNoLmJpbmQodGhpcyksIGZhbHNlKTsgLy8gd2hlbiB0aGUgc2VhcmNoIGlz IGVtcHRpZWQKLSAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwg dGhpcy5fb25TZWFyY2hGaWVsZE1hbnVhbEZvY3VzLmJpbmQodGhpcyksIGZhbHNlKTsgLy8gd2hl biB0aGUgc2VhcmNoIGZpZWxkIGlzIG1hbnVhbGx5IHNlbGVjdGVkCi0gICAgdGhpcy5lbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9vbktleURvd24uYmluZCh0aGlzKSwg dHJ1ZSk7Ci0gICAKLSAgICB0aGlzLl9wb3B1bGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0b25zKCk7 CisgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAg IHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gInRvb2xiYXItc2VhcmNoLWNvbnRhaW5lciI7Cisg ICAgdGhpcy5fZWxlbWVudC50ZXh0Q29udGVudCA9ICJTZWFyY2g6IjsKKworICAgIHRoaXMuX3Nl YXJjaElucHV0RWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuY3JlYXRlQ2hpbGQoImlucHV0Iik7Cisg ICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LmlkID0gInNlYXJjaCI7CisgICAgdGhpcy5fc2Vh cmNoSW5wdXRFbGVtZW50LnR5cGUgPSAic2VhcmNoIjsKKyAgICB0aGlzLl9zZWFyY2hJbnB1dEVs ZW1lbnQuaW5jcmVtZW50YWwgPSB0cnVlOworICAgIHRoaXMuX3NlYXJjaElucHV0RWxlbWVudC5y ZXN1bHRzID0gMDsKKworICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0RWxlbWVudCA9IHRo aXMuX2VsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJ0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9u IHRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24tbmV4dCBoaWRkZW4iKTsKKyAgICB0aGlzLl9zZWFy Y2hOYXZpZ2F0aW9uTmV4dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhp cy5fb25OZXh0QnV0dG9uU2VhcmNoLmJpbmQodGhpcyksIGZhbHNlKTsgCisgICAgdGhpcy5fc2Vh cmNoTmF2aWdhdGlvbk5leHRFbGVtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT ZWFyY2ggTmV4dCIpOworCisgICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvblByZXZFbGVtZW50ID0g dGhpcy5fZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRvb2xiYXItc2VhcmNoLW5hdmlnYXRp b24gdG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbi1wcmV2IGhpZGRlbiIpOworICAgIHRoaXMuX3Nl YXJjaE5hdmlnYXRpb25QcmV2RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0 aGlzLl9vblByZXZCdXR0b25TZWFyY2guYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRoaXMuX3Nl YXJjaE5hdmlnYXRpb25QcmV2RWxlbWVudC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi U2VhcmNoIFByZXZpb3VzIik7CisKKyAgICB0aGlzLl9tYXRjaGVzRWxlbWVudCA9IHRoaXMuX2Vs ZW1lbnQuY3JlYXRlQ2hpbGQoInNwYW4iLCAic2VhcmNoLXJlc3VsdHMtbWF0Y2hlcyIpOworCisg ICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNlYXJjaCIsIHRo aXMuX29uU2VhcmNoLmJpbmQodGhpcyksIGZhbHNlKTsgLy8gd2hlbiB0aGUgc2VhcmNoIGlzIGVt cHRpZWQKKyAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2Vkb3duIiwgdGhpcy5fb25TZWFyY2hGaWVsZE1hbnVhbEZvY3VzLmJpbmQodGhpcyksIGZhbHNl KTsgLy8gd2hlbiB0aGUgc2VhcmNoIGZpZWxkIGlzIG1hbnVhbGx5IHNlbGVjdGVkCisgICAgdGhp cy5fc2VhcmNoSW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9v bktleURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7CiB9CiAKIFdlYkluc3BlY3Rvci5TZWFyY2hDb250 cm9sbGVyLnByb3RvdHlwZSA9IHsKQEAgLTcwLDEzICs4NCwxNCBAQCBXZWJJbnNwZWN0b3IuU2Vh cmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghcGFuZWxOYW1lKQogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB2YXIgbmV3TGFiZWwgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNlYXJjaCAlcyIsIHBhbmVsTmFtZSk7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5zZXRB dHRyaWJ1dGUoInBsYWNlaG9sZGVyIiwgbmV3TGFiZWwpOworICAgICAgICB0aGlzLl9zZWFyY2hJ bnB1dEVsZW1lbnQuc2V0QXR0cmlidXRlKCJwbGFjZWhvbGRlciIsIG5ld0xhYmVsKTsKICAgICB9 LAogCiAgICAgY2FuY2VsU2VhcmNoOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLmVs ZW1lbnQudmFsdWUgPSAiIjsKKyAgICAgICAgdGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LnZhbHVl ID0gIiI7CiAgICAgICAgIHRoaXMuX3BlcmZvcm1TZWFyY2goIiIpOworICAgICAgICBXZWJJbnNw ZWN0b3IuaW5zcGVjdG9yVmlldy5zZXRGb290ZXJFbGVtZW50KG51bGwpOwogICAgIH0sCiAKICAg ICBkaXNhYmxlU2VhcmNoVW50aWxFeHBsaWNpdEFjdGlvbjogZnVuY3Rpb24oZXZlbnQpCkBAIC0x NTYsMTIgKzE3MSwxNSBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUg PSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgX3VwZGF0ZVNlYXJjaE5hdmlnYXRpb25CdXR0 b25TdGF0ZTogZnVuY3Rpb24odmlzaWJsZSkKKyAgICBfdXBkYXRlU2VhcmNoTmF2aWdhdGlvbkJ1 dHRvblN0YXRlOiBmdW5jdGlvbihlbmFibGVkKQogICAgIHsKLSAgICAgICAgaWYgKHZpc2libGUp Ci0gICAgICAgICAgICB0aGlzLl9zZWFyY2hJdGVtRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJ3aXRo LW5hdmlnYXRpb24tYnV0dG9ucyIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLl9z ZWFyY2hJdGVtRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJ3aXRoLW5hdmlnYXRpb24tYnV0dG9u cyIpOworICAgICAgICBpZiAoZW5hYmxlZCkgeworICAgICAgICAgICAgdGhpcy5fc2VhcmNoTmF2 aWdhdGlvblByZXZFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAg ICAgdGhpcy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhp ZGRlbiIpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5fc2VhcmNoTmF2aWdh dGlvblByZXZFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhp cy5fc2VhcmNoTmF2aWdhdGlvbk5leHRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwor ICAgICAgICB9CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMjA0LDggKzIyMiw5IEBAIFdlYkluc3Bl Y3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogICAgIGZvY3VzU2VhcmNoRmll bGQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5mb2N1cygpOwotICAg ICAgICB0aGlzLmVsZW1lbnQuc2VsZWN0KCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0 b3JWaWV3LnNldEZvb3RlckVsZW1lbnQodGhpcy5fZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3Nl YXJjaElucHV0RWxlbWVudC5mb2N1cygpOworICAgICAgICB0aGlzLl9zZWFyY2hJbnB1dEVsZW1l bnQuc2VsZWN0KCk7CiAgICAgfSwKIAogICAgIF9vblNlYXJjaEZpZWxkTWFudWFsRm9jdXM6IGZ1 bmN0aW9uKGV2ZW50KQpAQCAtMjE3LDE0ICsyMzYsNyBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29u dHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICAvLyBFc2NhcGUgS2V5IHdpbGwg Y2xlYXIgdGhlIGZpZWxkIGFuZCBjbGVhciB0aGUgc2VhcmNoIHJlc3VsdHMKICAgICAgICAgaWYg KGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuRXNj LmNvZGUpIHsKLSAgICAgICAgICAgIC8vIElmIGZvY3VzIGJlbG9uZ3MgaGVyZSBhbmQgdGV4dCBp cyBlbXB0eSAtIG5vdGhpbmcgdG8gZG8sIHJldHVybiB1bmhhbmRsZWQuCi0gICAgICAgICAgICAv LyBXaGVuIHNlYXJjaCB3YXMgc2VsZWN0ZWQgbWFudWFsbHkgYW5kIGlzIGN1cnJlbnRseSBibGFu aywgd2UnZCBsaWtlIEVzYyBzdGF5IHVuaGFuZGxlZAotICAgICAgICAgICAgLy8gYW5kIGhpdCBj b25zb2xlIGRyYXdlciBoYW5kbGVyLgotICAgICAgICAgICAgaWYgKGV2ZW50LnRhcmdldC52YWx1 ZSA9PT0gIiIpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotCiAgICAgICAgICAgICBldmVudC5j b25zdW1lKHRydWUpOwotCiAgICAgICAgICAgICB0aGlzLmNhbmNlbFNlYXJjaCgpOwogICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLnNldEN1cnJlbnRGb2N1c0VsZW1lbnQoV2ViSW5zcGVjdG9yLnBy ZXZpb3VzRm9jdXNFbGVtZW50KCkpOwogICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5jdXJy ZW50Rm9jdXNFbGVtZW50KCkgPT09IGV2ZW50LnRhcmdldCkKQEAgLTI1NywxMyArMjY5LDEzIEBA IFdlYkluc3BlY3Rvci5TZWFyY2hDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKICAgICBfb25OZXh0 QnV0dG9uU2VhcmNoOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIC8vIFNpbXVsYXRl IG5leHQgc2VhcmNoIG9uIHNlYXJjaC1uYXZpZ2F0aW9uLWJ1dHRvbiBjbGljay4KLSAgICAgICAg dGhpcy5fcGVyZm9ybVNlYXJjaCh0aGlzLmVsZW1lbnQudmFsdWUsIHRydWUsIGZhbHNlLCBmYWxz ZSk7CisgICAgICAgIHRoaXMuX3BlcmZvcm1TZWFyY2godGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50 LnZhbHVlLCB0cnVlLCBmYWxzZSwgZmFsc2UpOwogICAgIH0sCiAKICAgICBfb25QcmV2QnV0dG9u U2VhcmNoOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIC8vIFNpbXVsYXRlIHByZXZp b3VzIHNlYXJjaCBvbiBzZWFyY2gtbmF2aWdhdGlvbi1idXR0b24gY2xpY2suCi0gICAgICAgIHRo aXMuX3BlcmZvcm1TZWFyY2godGhpcy5lbGVtZW50LnZhbHVlLCB0cnVlLCB0cnVlLCBmYWxzZSk7 CisgICAgICAgIHRoaXMuX3BlcmZvcm1TZWFyY2godGhpcy5fc2VhcmNoSW5wdXRFbGVtZW50LnZh bHVlLCB0cnVlLCB0cnVlLCBmYWxzZSk7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtMzI3LDQ0ICsz MzksNiBAQCBXZWJJbnNwZWN0b3IuU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAg ICAgICAgY3VycmVudFBhbmVsLmN1cnJlbnRRdWVyeSA9IHF1ZXJ5OwogICAgICAgICBjdXJyZW50 UGFuZWwucGVyZm9ybVNlYXJjaChxdWVyeSk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBw YXJhbSB7c3RyaW5nPX0gZGlyZWN0aW9uCi0gICAgICovIAotICAgIF9jcmVhdGVTZWFyY2hOYXZp Z2F0aW9uQnV0dG9uOiBmdW5jdGlvbihkaXJlY3Rpb24pIAotICAgIHsKLSAgICAgICAgdmFyIHNl YXJjaE5hdmlnYXRpb25Db250cm9sRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwotICAgICAgICB2YXIgc2VhcmNoTmF2aWdhdGlvbkljb25FbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgIAotICAgICAgICBzZWFyY2hOYXZpZ2F0aW9u Q29udHJvbEVsZW1lbnQuY2xhc3NOYW1lID0gInRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24tbGFi ZWwiOwotICAgICAgICAKLSAgICAgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsKLSAgICAgICAgY2Fz ZSAicHJldiI6Ci0gICAgICAgICAgICB2YXIgc2VhcmNoVGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIlNlYXJjaCBQcmV2aW91cyIpOwotICAgICAgICAgICAgc2VhcmNoTmF2aWdhdGlvbklj b25FbGVtZW50LmNsYXNzTmFtZSA9ICJ0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWljb24tcHJl diI7Ci0gICAgICAgICAgICB0aGlzLl9zZWFyY2hOYXZpZ2F0aW9uUHJldiA9IHNlYXJjaE5hdmln YXRpb25Db250cm9sRWxlbWVudDsKLSAgICAgICAgICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25Q cmV2LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX29uUHJldkJ1dHRvblNlYXJj aC5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAK LSAgICAgICAgY2FzZSAibmV4dCI6Ci0gICAgICAgICAgICB2YXIgc2VhcmNoVGl0bGUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlNlYXJjaCBOZXh0Iik7Ci0gICAgICAgICAgICBzZWFyY2hOYXZp Z2F0aW9uSWNvbkVsZW1lbnQuY2xhc3NOYW1lID0gInRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24t aWNvbi1uZXh0IjsKLSAgICAgICAgICAgIHRoaXMuX3NlYXJjaE5hdmlnYXRpb25OZXh0ID0gc2Vh cmNoTmF2aWdhdGlvbkNvbnRyb2xFbGVtZW50OwotICAgICAgICAgICAgdGhpcy5fc2VhcmNoTmF2 aWdhdGlvbk5leHQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5fb25OZXh0QnV0 dG9uU2VhcmNoLmJpbmQodGhpcyksIGZhbHNlKTsgCi0gICAgICAgICAgICBicmVhazsKLSAgICAg ICAgfQotCi0gICAgICAgIHNlYXJjaE5hdmlnYXRpb25Db250cm9sRWxlbWVudC5zZXRBdHRyaWJ1 dGUoInRpdGxlIiAsIHNlYXJjaFRpdGxlKTsKLSAgICAgICAgc2VhcmNoTmF2aWdhdGlvbkNvbnRy b2xFbGVtZW50LmFwcGVuZENoaWxkKHNlYXJjaE5hdmlnYXRpb25JY29uRWxlbWVudCk7ICAKLSAg ICAgICAgdGhpcy5fc2VhcmNoQ29udHJvbEJveEVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VhcmNoTmF2 aWdhdGlvbkNvbnRyb2xFbGVtZW50KTsKLSAgICB9LAotCi0gICAgX3BvcHVsYXRlU2VhcmNoTmF2 aWdhdGlvbkJ1dHRvbnM6IGZ1bmN0aW9uKCkgCi0gICAgewotICAgICAgICAvLyBMYXppbHkgYWRk aW5nIHNlYXJjaCBuYXZpZ2F0aW9uIGtleXMgdG8gZG9tLgotICAgICAgICB0aGlzLl9jcmVhdGVT ZWFyY2hOYXZpZ2F0aW9uQnV0dG9uKCJwcmV2Iik7Ci0gICAgICAgIHRoaXMuX2NyZWF0ZVNlYXJj aE5hdmlnYXRpb25CdXR0b24oIm5leHQiKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcwppbmRleCAwZTYzMzU5YTQ5Mzhl NWI3Y2FlMzhkZDcxZjNlODY5ZDg0NDFkZGE3Li5jMTA2NDAwMmM1YWNlYjA0ZDllMTVlYWViNzQ3 N2I0MDNlODNkYzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuY3NzCkBAIC0yNjMsNTYgKzI2Myw0NCBAQCBib2R5LmRldGFjaGVkLnBsYXRm b3JtLW1hYy1zbm93bGVvcGFyZCAjdG9vbGJhci1kcm9wZG93biB7CiAgICAgYm9yZGVyLXJhZGl1 czogNXB4OwogfQogCi0jdG9vbGJhci1zZWFyY2gtaXRlbSB7Ci0gICAgZGlzcGxheTogLXdlYmtp dC1ib3g7Ci0gICAgLXdlYmtpdC1ib3gtb3JpZW50OiBob3Jpem9udGFsOwotICAgIC13ZWJraXQt Ym94LWFsaWduOiBjZW50ZXI7Ci0gICAgLXdlYmtpdC1ib3gtcGFjazogZW5kOwotfQotCiAjc2Vh cmNoIHsKICAgICB3aWR0aDogMjA1cHg7Ci0gICAgZm9udC1zaXplOiAxNnB4OworICAgIG1hcmdp bi1sZWZ0OiA0cHg7CiB9CiAKLS53aXRoLW5hdmlnYXRpb24tYnV0dG9ucyAjc2VhcmNoIHsKLSAg ICB3aWR0aDogMTY1cHg7CisudG9vbGJhci1zZWFyY2gtY29udGFpbmVyIHsKKyAgICBwb3NpdGlv bjogcmVsYXRpdmU7CisgICAgdG9wOiAtMXB4OwogfQogCi0udG9vbGJhci1zZWFyY2gtbmF2aWdh dGlvbi1sYWJlbCB7Ci0gICAgZGlzcGxheTogbm9uZTsKLSAgICBib3JkZXI6IDFweCBzb2xpZCB0 cmFuc3BhcmVudDsKLSAgICBib3JkZXItcmFkaXVzOiAycHg7Ci0gICAgcGFkZGluZzogM3B4Owot ICAgIG1hcmdpbi1sZWZ0OiAycHg7CisudG9vbGJhci1zZWFyY2gtbmF2aWdhdGlvbiB7CiAgICAg d2lkdGg6IDE4cHg7CiAgICAgaGVpZ2h0OiAxOHB4OwotICAgIGZsb2F0OiByaWdodDsKLX0KLQot LndpdGgtbmF2aWdhdGlvbi1idXR0b25zIC50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWxhYmVs IHsKLSAgICBkaXNwbGF5OiBibG9jazsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgdG9w OiAzcHg7CisgICAgbWFyZ2luOiAwIDFweDsKKyAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVw ZWF0OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNrZ3JvdW5kLXBvc2l0aW9u OiAzcHggNnB4OworICAgIGJvcmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogfQogCi0udG9v bGJhci1zZWFyY2gtbmF2aWdhdGlvbi1sYWJlbDpob3ZlciB7CisudG9vbGJhci1zZWFyY2gtbmF2 aWdhdGlvbjpob3ZlciB7CiAgICAgYm9yZGVyOiAxcHggc29saWQgcmdiYSgxMjAsIDEyMCwgMTIw LCAwLjYpOyAgICAKIH0KIAotLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24taWNvbi1wcmV2ICwg LnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24taWNvbi1uZXh0IHsKLSAgICB3aWR0aDogOXB4Owot ICAgIG1hcmdpbi10b3A6IDJweDsKLSAgICBoZWlnaHQ6IDEwMCU7Ci0gICAgYmFja2dyb3VuZC1y ZXBlYXQ6IG5vLXJlcGVhdDsKLX0KLQotLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRpb24taWNvbi1w cmV2IHsKKy50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLnRvb2xiYXItc2VhcmNoLW5hdmlnYXRp b24tcHJldiB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9zZWFyY2hQcmV2LnBu Zyk7CiB9CiAKLS50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWljb24tbmV4dCB7CisudG9vbGJh ci1zZWFyY2gtbmF2aWdhdGlvbi50b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLW5leHQgewogICAg IGJhY2tncm91bmQtaW1hZ2U6IHVybChJbWFnZXMvc2VhcmNoTmV4dC5wbmcpOwogfQogCisudG9v bGJhci1zZWFyY2gtbmF2aWdhdGlvbi1oaWRkZW4geworICAgIGJhY2tncm91bmQ6IG5vbmU7Cit9 CisKIGJvZHkuY29tcGFjdCAjc2VhcmNoIHsKICAgICBmb250LXNpemU6IDExcHg7CiB9CkBAIC00 NzMsMTAgKzQ2MSw5IEBAIGJvZHkuZHJhd2VyLXZpc2libGUgI21haW4tcGFuZWxzIHsKIAogLnN0 YXR1cy1iYXIgewogICAgIGJhY2tncm91bmQtY29sb3I6IHJnYigyMzUsIDIzNSwgMjM1KTsKLSAg ICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoSW1hZ2VzL3N0YXR1c2JhckJhY2tncm91bmQucG5nKTsK ICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogcmVwZWF0LXg7CiAgICAgd2hpdGUtc3BhY2U6IG5vd3Jh cDsKLSAgICBoZWlnaHQ6IDIzcHg7CisgICAgaGVpZ2h0OiAyNHB4OwogICAgIG92ZXJmbG93OiBo aWRkZW47CiAgICAgei1pbmRleDogMTI7CiB9CkBAIC0yNDI3LDcgKzI0MTQsNyBAQCBib2R5LnBs YXRmb3JtLW1hYyAuc29mdC1jb250ZXh0LW1lbnUtaXRlbS1tb3VzZS1vdmVyIHsKIH0KIAogLnNl YXJjaC1kcmF3ZXItaGVhZGVyIGlucHV0W3R5cGU9InNlYXJjaCJdLnNlYXJjaC1jb25maWctc2Vh cmNoIHsKLQlmb250LXNpemU6IDExcHg7CisgICAgZm9udC1zaXplOiAxMXB4OwogICAgIG1hcmdp bi1sZWZ0OiA0cHg7CiAgICAgY29sb3I6ICMzMDMwMzA7CiAgICAgcG9zaXRpb246IHJlbGF0aXZl OwpAQCAtMjc3OCwzICsyNzY1LDE3IEBAIGJvZHkucGxhdGZvcm0tbWFjICNkcmF3ZXItc3RhdHVz LWJhciAuc2VhcmNoLXN0YXR1cy1iYXItcHJvZ3Jlc3MgewogI2NvbnNvbGUtY29udGV4dCB7CiAg ICAgbWF4LXdpZHRoOiAyMDBweDsKIH0KKworLmluc3BlY3Rvci1mb290ZXIgeworICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKKyAgICBib3R0b206IDA7CisgICAgbGVmdDogMDsKKyAgICByaWdodDog MDsKKyAgICBmb250LXNpemU6IDExcHg7CisgICAgcGFkZGluZy1sZWZ0OiA3cHg7CisgICAgcGFk ZGluZy1ib3R0b206IDdweDsKK30KKworLmluc3BlY3Rvci1mb290ZXIgPiBkaXYgeworICAgIHZl cnRpY2FsLWFsaWduOiBtaWRkbGU7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAppbmRleCBhMTZiMzQxYTU2MmFlMzhhYjhhYmRlZTc1 YmUwZmIxMDA0ZWMyZDhlLi45ZDQ1OGM0MjcxNmRkOGI5YjNjMmQ1YWNmMGMzODU4ODAxNzhhNThh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5odG1sCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y Lmh0bWwKQEAgLTIyNiwxMSArMjI2LDYgQEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAgICAgICAgPGRpdiBjbGFzcz0i dG9vbGJhci1pdGVtIGNsb3NlLWxlZnQiPjxidXR0b24gaWQ9ImNsb3NlLWJ1dHRvbi1sZWZ0Ij48 L2J1dHRvbj48L2Rpdj4KICAgICAgICAgPGRpdiBpZD0idG9vbGJhci1jb250cm9scyI+CiAgICAg ICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0iPjxidXR0b24gaWQ9InRvb2xiYXItZHJv cGRvd24tYXJyb3ciIGNsYXNzPSJ0b29sYmFyLWxhYmVsIj4mcmFxdW87PC9idXR0b24+PC9kaXY+ Ci0gICAgICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0gaGlkZGVuIiBpZD0ic2VhcmNo LXJlc3VsdHMtbWF0Y2hlcyI+PC9kaXY+Ci0gICAgICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFy LWl0ZW0iIGlkPSJ0b29sYmFyLXNlYXJjaC1pdGVtIj4KLSAgICAgICAgICAgICAgICA8aW5wdXQg aWQ9InNlYXJjaCIgdHlwZT0ic2VhcmNoIiBpbmNyZW1lbnRhbCByZXN1bHRzPSIwIj4KLSAgICAg ICAgICAgICAgICA8ZGl2IGlkPSJ0b29sYmFyLXNlYXJjaC1uYXZpZ2F0aW9uLWNvbnRyb2wiPjwv ZGl2PgotICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJ0b29sYmFy LWl0ZW0gY2xvc2UtcmlnaHQiPjxidXR0b24gaWQ9ImNsb3NlLWJ1dHRvbi1yaWdodCI+PC9idXR0 b24+PC9kaXY+CiAgICAgICAgIDwvZGl2PgogICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBlODEzM2FjYjdiNjFmYzMy ZDE1Y2Y2NGIzYzQ3NjFhYjYxNDZiZGRlLi41OWJlMWYzZGQwNDVlY2UzYzZhMzExMzU1YThmOGI5 MTg3ZTY5MmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwpAQCAtMjYxLDkgKzI2MSw2IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAg ICAgIGlmIChXZWJJbnNwZWN0b3IudG9vbGJhcikKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci50 b29sYmFyLmNvbXBhY3QgPSB4OwogCi0gICAgICAgIGlmIChXZWJJbnNwZWN0b3Iuc2VhcmNoQ29u dHJvbGxlcikKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zZWFyY2hDb250cm9sbGVyLnVwZGF0 ZVNlYXJjaExhYmVsKCk7Ci0KICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5kcmF3ZXIpCiAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuZHJhd2VyLnJlc2l6ZSgpOwogICAgIH0sCkBAIC04MTksNyAr ODE2LDcgQEAgV2ViSW5zcGVjdG9yLnBvc3REb2N1bWVudEtleURvd24gPSBmdW5jdGlvbihldmVu dCkKICAgICBpZiAoZXZlbnQuaGFuZGxlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGV2 ZW50LmtleUlkZW50aWZpZXIgPT09ICJVKzAwMUIiKSB7IC8vIEVzY2FwZSBrZXkKKyAgICBpZiAo ZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5Fc2Mu Y29kZSkgewogICAgICAgICAvLyBJZiBkcmF3ZXIgaXMgb3BlbiB3aXRoIHNvbWUgdmlldyBvdGhl ciB0aGFuIGNvbnNvbGUgdGhlbiBjbG9zZSBpdC4KICAgICAgICAgaWYgKCF0aGlzLl90b2dnbGVD b25zb2xlQnV0dG9uLnRvZ2dsZWQgJiYgV2ViSW5zcGVjdG9yLmRyYXdlci52aXNpYmxlKQogICAg ICAgICAgICAgdGhpcy5jbG9zZVZpZXdJbkRyYXdlcigpOwo=