166799 2017-01-07 02:00:46 -0800 Implement find-in-page in MiniBrowser 2017-01-07 13:10:43 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin enrica mitz simon.fraser oldest_to_newest 1264675 0 thorton 2017-01-07 02:00:46 -0800 Implement find-in-page in MiniBrowser 1264676 1 298262 thorton 2017-01-07 02:02:04 -0800 Created attachment 298262 Patch 1264677 2 thorton 2017-01-07 02:02:50 -0800 Implementation mostly cribbed from WebEditingTester. It's less broken there because that app doesn't have a top content inset, but I'm not really sure how it's possible that this feature is as broken as it is. 1264680 3 298264 thorton 2017-01-07 02:17:27 -0800 Created attachment 298264 Patch 1264701 4 298264 aestes 2017-01-07 05:54:35 -0800 Comment on attachment 298264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298264&action=review > Tools/MiniBrowser/mac/WK2BrowserWindowController.m:681 > + [_textFindBarView setFrame:NSMakeRect(0, 0, containerView.bounds.size.width, _textFindBarView.frame.size.height)]; Should you use CGRectGet{Width,Height}() here to ensure the rect is normalized? 1264729 5 298264 thorton 2017-01-07 13:10:40 -0800 Comment on attachment 298264 Patch Clearing flags on attachment: 298264 Committed r210482: <http://trac.webkit.org/changeset/210482> 1264730 6 thorton 2017-01-07 13:10:43 -0800 All reviewed patches have been landed. Closing bug. 298262 2017-01-07 02:02:04 -0800 2017-01-07 02:17:24 -0800 Patch bug-166799-20170107020033.patch text/plain 16258 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTkwODUyODM1NTdjNDMwMjk1ZWUwNDM1NTFmYzFhNmM5 ZjBhZWZjMS4uYTg2ZGIzNGQyNzQwNTBhMmM3ODI1MWM1MjJmNWVlMjc0NmMyY2ViNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2 IEBACisyMDE3LTAxLTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgor CisgICAgICAgIEltcGxlbWVudCBmaW5kLWluLXBhZ2UgaW4gTWluaUJyb3dzZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Njc5OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3cueGliOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2lu ZG93Q29udHJvbGxlci5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93 Q29udHJvbGxlci5tOgorICAgICAgICAoLVtCcm93c2VyV2luZG93Q29udHJvbGxlciBmaW5kOl0p OiBEZWxldGVkLgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWI6CisgICAg ICAgICogTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAg ICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHRvZ2dsZVNocmlua1RvRml0Ol0pOgor ICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciBmaW5kOl0pOiBEZWxldGVkLgor ICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tOgor ICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBhd2FrZUZyb21OaWJdKToKKyAg ICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgZGVhbGxvY10pOgorICAgICAgICAo LVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciB2YWxpZGF0ZU1lbnVJdGVtOl0pOgorICAgICAg ICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBwZXJmb3JtVGV4dEZpbmRlckFjdGlvbjpd KToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgZmluZEJhclZpZXddKToK KyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgc2V0RmluZEJhclZpZXc6XSk6 CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGlzRmluZEJhclZpc2libGVd KToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgc2V0RmluZEJhclZpc2li bGU6XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGNvbnRlbnRWaWV3 XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGZpbmRCYXJWaWV3RGlk Q2hhbmdlSGVpZ2h0XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHBl cmZvcm1GaW5kUGFuZWxBY3Rpb246XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLMkJyb3dzZXJX aW5kb3dDb250cm9sbGVyIGZpbmQ6XSk6IERlbGV0ZWQuCisgICAgICAgIEltcGxlbWVudCBmaW5k LWluLXBhZ2UgdXNpbmcgV0tXZWJWaWV3J3MgY29uZm9ybWFuY2UgdG8gdGhlIE5TVGV4dEZpbmRl ckNsaWVudAorICAgICAgICBwcm90b2NvbC4gQXQgZmlyc3QgZ2xhbmNlLCBpdCdzIHByZXR0eSBi cm9rZW4sIGJ1dCB2YWd1ZWx5IHdvcmtzLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0Jy b3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAgICAgICgtW0Jyb3dzZXJXaW5kb3dDb250cm9s bGVyIHNob3dIaWRlV2ViVmlldzpdKToKKyAgICAgICAgKC1bQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXIgcmVtb3ZlUmVpbnNlcnRXZWJWaWV3Ol0pOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9X SzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tOgorICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93 Q29udHJvbGxlciBzaG93SGlkZVdlYlZpZXc6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLMUJy b3dzZXJXaW5kb3dDb250cm9sbGVyIHJlbW92ZVJlaW5zZXJ0V2ViVmlldzpdKTogRGVsZXRlZC4K KyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToK KyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgc2hvd0hpZGVXZWJWaWV3Ol0p OiBEZWxldGVkLgorICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciByZW1vdmVS ZWluc2VydFdlYlZpZXc6XSk6IERlbGV0ZWQuCisgICAgICAgIE1vdmUgdGhlIGltcGxlbWVudGF0 aW9uIG9mIHRoZXNlIHR3byB0aGluZ3MgdG8gdGhlIHNoYXJlZCBzdXBlcmNsYXNzLAorICAgICAg ICBzaW5jZSB0aGV5IGRvbid0IGRlcGVuZCBvbiBXZWJLaXQtc3BlY2lmaWMgdGhpbmdzLgorCiAy MDE3LTAxLTA2ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29j b2FdIENvbnNvbGlkYXRlIGR1cGxpY2F0ZSBjb3BpZXMgb2YgV2ViQXJjaGl2ZUR1bXBTdXBwb3J0 IGluIERSVCBhbmQgV0tUUiBpbnRvIFdlYkNvcmVUZXN0U3VwcG9ydApkaWZmIC0tZ2l0IGEvVG9v bHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3cueGliIGIvVG9vbHMvTWluaUJyb3dzZXIv bWFjL0Jyb3dzZXJXaW5kb3cueGliCmluZGV4IGE0NjJiOTA4ODAwYmNjN2M5OTU1YTlkODYxZTIz ZWQ1ZjM3ZGRhMTYuLjViZGVlZGU4NWQxZTI1YTU2MTM4NDVjMzE2YzM5ZDA1MzhkMmY5YjUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93LnhpYgorKysgYi9U b29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvdy54aWIKQEAgLTEsMTUgKzEsMTQgQEAK IDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Ci08ZG9jdW1lbnQgdHlwZT0i Y29tLmFwcGxlLkludGVyZmFjZUJ1aWxkZXIzLkNvY29hLlhJQiIgdmVyc2lvbj0iMy4wIiB0b29s c1ZlcnNpb249IjExMDg1IiBzeXN0ZW1WZXJzaW9uPSIxNkExNjciIHRhcmdldFJ1bnRpbWU9Ik1h Y09TWC5Db2NvYSIgcHJvcGVydHlBY2Nlc3NDb250cm9sPSJub25lIj4KKzxkb2N1bWVudCB0eXBl PSJjb20uYXBwbGUuSW50ZXJmYWNlQnVpbGRlcjMuQ29jb2EuWElCIiB2ZXJzaW9uPSIzLjAiIHRv b2xzVmVyc2lvbj0iMTExOTEiIHN5c3RlbVZlcnNpb249IjE2RDE3YSIgdGFyZ2V0UnVudGltZT0i TWFjT1NYLkNvY29hIiBwcm9wZXJ0eUFjY2Vzc0NvbnRyb2w9Im5vbmUiPgogICAgIDxkZXBlbmRl bmNpZXM+CiAgICAgICAgIDxkZXBsb3ltZW50IGlkZW50aWZpZXI9Im1hY29zeCIvPgotICAgICAg ICA8cGx1Z0luIGlkZW50aWZpZXI9ImNvbS5hcHBsZS5JbnRlcmZhY2VCdWlsZGVyLkNvY29hUGx1 Z2luIiB2ZXJzaW9uPSIxMTA4NSIvPgorICAgICAgICA8cGx1Z0luIGlkZW50aWZpZXI9ImNvbS5h cHBsZS5JbnRlcmZhY2VCdWlsZGVyLkNvY29hUGx1Z2luIiB2ZXJzaW9uPSIxMTE5MSIvPgogICAg IDwvZGVwZW5kZW5jaWVzPgogICAgIDxvYmplY3RzPgogICAgICAgICA8Y3VzdG9tT2JqZWN0IGlk PSItMiIgdXNlckxhYmVsPSJGaWxlJ3MgT3duZXIiIGN1c3RvbUNsYXNzPSJCcm93c2VyV2luZG93 Q29udHJvbGxlciI+CiAgICAgICAgICAgICA8Y29ubmVjdGlvbnM+CiAgICAgICAgICAgICAgICAg PG91dGxldCBwcm9wZXJ0eT0iYmFja0J1dHRvbiIgZGVzdGluYXRpb249IjQwIiBpZD0iNDYiLz4K ICAgICAgICAgICAgICAgICA8b3V0bGV0IHByb3BlcnR5PSJjb250YWluZXJWaWV3IiBkZXN0aW5h dGlvbj0iOSIgaWQ9IjM3Ii8+Ci0gICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0iZmlu ZFBhbmVsV2luZG93IiBkZXN0aW5hdGlvbj0iNzAiIGlkPSI3NyIvPgogICAgICAgICAgICAgICAg IDxvdXRsZXQgcHJvcGVydHk9ImZvcndhcmRCdXR0b24iIGRlc3RpbmF0aW9uPSI0MiIgaWQ9IjQ3 Ii8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0icHJvZ3Jlc3NJbmRpY2F0b3Ii IGRlc3RpbmF0aW9uPSIyMSIgaWQ9IjMzIi8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9w ZXJ0eT0icmVsb2FkQnV0dG9uIiBkZXN0aW5hdGlvbj0iMjMiIGlkPSIzNCIvPgpAQCAtMTU5LDMw ICsxNTgsNiBAQAogICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9ImRlbGVnYXRlIiBk ZXN0aW5hdGlvbj0iLTIiIGlkPSI0Ii8+CiAgICAgICAgICAgICA8L2Nvbm5lY3Rpb25zPgogICAg ICAgICA8L3dpbmRvdz4KLSAgICAgICAgPHdpbmRvdyB0aXRsZT0iRmluZCIgYWxsb3dzVG9vbFRp cHNXaGVuQXBwbGljYXRpb25Jc0luYWN0aXZlPSJOTyIgYXV0b3JlY2FsY3VsYXRlc0tleVZpZXdM b29wPSJOTyIgaGlkZXNPbkRlYWN0aXZhdGU9IllFUyIgb25lU2hvdD0iTk8iIHJlbGVhc2VkV2hl bkNsb3NlZD0iTk8iIHZpc2libGVBdExhdW5jaD0iTk8iIGFuaW1hdGlvbkJlaGF2aW9yPSJkZWZh dWx0IiBpZD0iNzAiIGN1c3RvbUNsYXNzPSJOU1BhbmVsIj4KLSAgICAgICAgICAgIDx3aW5kb3dT dHlsZU1hc2sga2V5PSJzdHlsZU1hc2siIHRpdGxlZD0iWUVTIiBjbG9zYWJsZT0iWUVTIiB1dGls aXR5PSJZRVMiIG5vbmFjdGl2YXRpbmdQYW5lbD0iWUVTIi8+Ci0gICAgICAgICAgICA8d2luZG93 UG9zaXRpb25NYXNrIGtleT0iaW5pdGlhbFBvc2l0aW9uTWFzayIgbGVmdFN0cnV0PSJZRVMiIHJp Z2h0U3RydXQ9IllFUyIgdG9wU3RydXQ9IllFUyIgYm90dG9tU3RydXQ9IllFUyIvPgotICAgICAg ICAgICAgPHJlY3Qga2V5PSJjb250ZW50UmVjdCIgeD0iMjMwIiB5PSI0NzkiIHdpZHRoPSI0NTIi IGhlaWdodD0iNjIiLz4KLSAgICAgICAgICAgIDxyZWN0IGtleT0ic2NyZWVuUmVjdCIgeD0iMC4w IiB5PSIwLjAiIHdpZHRoPSIxOTIwIiBoZWlnaHQ9IjExNzciLz4KLSAgICAgICAgICAgIDx2aWV3 IGtleT0iY29udGVudFZpZXciIGlkPSI3MSI+Ci0gICAgICAgICAgICAgICAgPHJlY3Qga2V5PSJm cmFtZSIgeD0iMC4wIiB5PSIwLjAiIHdpZHRoPSI0NTIiIGhlaWdodD0iNjIiLz4KLSAgICAgICAg ICAgICAgICA8YXV0b3Jlc2l6aW5nTWFzayBrZXk9ImF1dG9yZXNpemluZ01hc2siLz4KLSAgICAg ICAgICAgICAgICA8c3Vidmlld3M+Ci0gICAgICAgICAgICAgICAgICAgIDxzZWFyY2hGaWVsZCB2 ZXJ0aWNhbEh1Z2dpbmdQcmlvcml0eT0iNzUwIiBpZD0iNzQiPgotICAgICAgICAgICAgICAgICAg ICAgICAgPHJlY3Qga2V5PSJmcmFtZSIgeD0iMjAiIHk9IjIwIiB3aWR0aD0iNDEyIiBoZWlnaHQ9 IjIyIi8+Ci0gICAgICAgICAgICAgICAgICAgICAgICA8YXV0b3Jlc2l6aW5nTWFzayBrZXk9ImF1 dG9yZXNpemluZ01hc2siIGZsZXhpYmxlTWF4WD0iWUVTIiBmbGV4aWJsZU1pblk9IllFUyIvPgot ICAgICAgICAgICAgICAgICAgICAgICAgPHNlYXJjaEZpZWxkQ2VsbCBrZXk9ImNlbGwiIHNjcm9s bGFibGU9IllFUyIgbGluZUJyZWFrTW9kZT0iY2xpcHBpbmciIHNlbGVjdGFibGU9IllFUyIgZWRp dGFibGU9IllFUyIgYm9yZGVyU3R5bGU9ImJlemVsIiB1c2VzU2luZ2xlTGluZU1vZGU9IllFUyIg YmV6ZWxTdHlsZT0icm91bmQiIGlkPSI3NSI+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg PGZvbnQga2V5PSJmb250IiBtZXRhRm9udD0ic3lzdGVtIi8+Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgPGNvbG9yIGtleT0idGV4dENvbG9yIiBuYW1lPSJjb250cm9sVGV4dENvbG9yIiBj YXRhbG9nPSJTeXN0ZW0iIGNvbG9yU3BhY2U9ImNhdGFsb2ciLz4KLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8Y29sb3Iga2V5PSJiYWNrZ3JvdW5kQ29sb3IiIG5hbWU9InRleHRCYWNrZ3Jv dW5kQ29sb3IiIGNhdGFsb2c9IlN5c3RlbSIgY29sb3JTcGFjZT0iY2F0YWxvZyIvPgotICAgICAg ICAgICAgICAgICAgICAgICAgPC9zZWFyY2hGaWVsZENlbGw+Ci0gICAgICAgICAgICAgICAgICAg ICAgICA8Y29ubmVjdGlvbnM+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgPGFjdGlvbiBz ZWxlY3Rvcj0iZmluZDoiIHRhcmdldD0iLTIiIGlkPSI3NiIvPgotICAgICAgICAgICAgICAgICAg ICAgICAgPC9jb25uZWN0aW9ucz4KLSAgICAgICAgICAgICAgICAgICAgPC9zZWFyY2hGaWVsZD4K LSAgICAgICAgICAgICAgICA8L3N1YnZpZXdzPgotICAgICAgICAgICAgPC92aWV3PgotICAgICAg ICA8L3dpbmRvdz4KICAgICA8L29iamVjdHM+CiAgICAgPHJlc291cmNlcz4KICAgICAgICAgPGlt YWdlIG5hbWU9Ik5TRW50ZXJGdWxsU2NyZWVuVGVtcGxhdGUiIHdpZHRoPSIxNSIgaGVpZ2h0PSIx NSIvPgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250 cm9sbGVyLmggYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIu aAppbmRleCBhOWNlZWQ3NTU5NWI0ZDgwNTZiNjNhMDE3MThlNTZiYWI5OTM5OWE3Li41Yjg1Y2U0 Njg0MmMzNWI0NTE1YjY1YTUyMmM1ZjQxYmUyODRmNTQ1IDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaAorKysgYi9Ub29scy9NaW5pQnJv d3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaApAQCAtMzUsOCArMzUsNiBAQAogICAg IElCT3V0bGV0IE5TVGV4dEZpZWxkICp1cmxUZXh0OwogICAgIElCT3V0bGV0IE5TVmlldyAqY29u dGFpbmVyVmlldzsKICAgICBJQk91dGxldCBOU0J1dHRvbiAqdG9nZ2xlVXNlU2hyaW5rVG9GaXRC dXR0b247Ci0gICAgCi0gICAgSUJPdXRsZXQgTlNXaW5kb3cgKmZpbmRQYW5lbFdpbmRvdzsKIAog ICAgIEJPT0wgX3pvb21UZXh0T25seTsKIH0KQEAgLTczLDcgKzcxLDYgQEAKIC0gKElCQWN0aW9u KXRvZ2dsZVNocmlua1RvRml0OihpZClzZW5kZXI7CiAKIC0gKElCQWN0aW9uKWR1bXBTb3VyY2VU b0NvbnNvbGU6KGlkKXNlbmRlcjsKLS0gKElCQWN0aW9uKWZpbmQ6KGlkKXNlbmRlcjsKIAogLSAo dm9pZClkaWRDaGFuZ2VTZXR0aW5nczsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv bWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJv d3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCA2YzRiMTM1YjE4NjUwZDFjMDA0MDczYTdmOWQ4 YjYyYWQzNTc0MjQzLi4wYzBmNTQ4YTM4ZmQ2YjY0M2MxZGFjZDNiZDdkMTQ2YzgxYWU1YTQ4IDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIu bQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpA QCAtMTExLDEyICsxMTEsMTUgQEAgLSAoSUJBY3Rpb24pZ29Gb3J3YXJkOihpZClzZW5kZXIKIAog LSAoSUJBY3Rpb24pc2hvd0hpZGVXZWJWaWV3OihpZClzZW5kZXIKIHsKLSAgICBbc2VsZiBkb2Vz Tm90UmVjb2duaXplU2VsZWN0b3I6X2NtZF07CisgICAgc2VsZi5tYWluQ29udGVudFZpZXcuaGlk ZGVuID0gIXNlbGYubWFpbkNvbnRlbnRWaWV3LmlzSGlkZGVuOwogfQogCiAtIChJQkFjdGlvbily ZW1vdmVSZWluc2VydFdlYlZpZXc6KGlkKXNlbmRlcgogewotICAgIFtzZWxmIGRvZXNOb3RSZWNv Z25pemVTZWxlY3RvcjpfY21kXTsKKyAgICBpZiAoc2VsZi5tYWluQ29udGVudFZpZXcud2luZG93 KQorICAgICAgICBbc2VsZi5tYWluQ29udGVudFZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107Cisg ICAgZWxzZQorICAgICAgICBbY29udGFpbmVyVmlldyBhZGRTdWJ2aWV3OnNlbGYubWFpbkNvbnRl bnRWaWV3XTsKIH0KIAogLSAoSUJBY3Rpb24pem9vbUluOihpZClzZW5kZXIKQEAgLTE5MSwxMSAr MTk0LDYgQEAgLSAoSUJBY3Rpb24pZHVtcFNvdXJjZVRvQ29uc29sZTooaWQpc2VuZGVyCiAgICAg W3NlbGYgZG9lc05vdFJlY29nbml6ZVNlbGVjdG9yOl9jbWRdOwogfQogCi0tIChJQkFjdGlvbilm aW5kOihpZClzZW5kZXIKLXsKLSAgICBbc2VsZiBkb2VzTm90UmVjb2duaXplU2VsZWN0b3I6X2Nt ZF07Ci19Ci0KIC0gKHZvaWQpZGlkQ2hhbmdlU2V0dGluZ3MKIHsKICAgICBbc2VsZiBkb2VzTm90 UmVjb2duaXplU2VsZWN0b3I6X2NtZF07CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9t YWMvTWFpbk1lbnUueGliIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYgppbmRl eCBlYzRlNDIwMjRiNjg3ODExZDhiZTZlMTdiMDlmMWU1MGRmZjlkMTY2Li42N2E5NDVmNGY5YjEz Mzk3M2FhYjRmOTliYjE2NTgzMjAxNzBmZjIzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci9tYWMvTWFpbk1lbnUueGliCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54 aWIKQEAgLTIwMiwyMyArMjAyLDIzIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8aXRlbXM+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1l bnVJdGVtIHRpdGxlPSJGaW5k4oCmIiB0YWc9IjEiIGtleUVxdWl2YWxlbnQ9ImYiIGlkPSIyMDki PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y29ubmVjdGlv bnM+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8YWN0 aW9uIHNlbGVjdG9yPSJwZXJmb3JtRmluZFBhbmVsQWN0aW9uOiIgdGFyZ2V0PSItMSIgaWQ9IjI0 MSIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGFj dGlvbiBzZWxlY3Rvcj0icGVyZm9ybVRleHRGaW5kZXJBY3Rpb246IiB0YXJnZXQ9Ii0xIiBpZD0i MjQxIi8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29u bmVjdGlvbnM+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9tZW51 SXRlbT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bWVudUl0ZW0g dGl0bGU9IkZpbmQgTmV4dCIgdGFnPSIyIiBrZXlFcXVpdmFsZW50PSJnIiBpZD0iMjA4Ij4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGFjdGlvbiBz ZWxlY3Rvcj0icGVyZm9ybUZpbmRQYW5lbEFjdGlvbjoiIHRhcmdldD0iLTEiIGlkPSI0ODciLz4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24g c2VsZWN0b3I9InBlcmZvcm1UZXh0RmluZGVyQWN0aW9uOiIgdGFyZ2V0PSItMSIgaWQ9IjQ4NyIv PgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2Nvbm5lY3Rp b25zPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvbWVudUl0ZW0+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1lbnVJdGVtIHRpdGxl PSJGaW5kIFByZXZpb3VzIiB0YWc9IjMiIGtleUVxdWl2YWxlbnQ9IkciIGlkPSIyMTMiPgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtl eT0ia2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzayIgc2hpZnQ9IllFUyIgY29tbWFuZD0iWUVTIi8+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjb25uZWN0aW9u cz4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rp b24gc2VsZWN0b3I9InBlcmZvcm1GaW5kUGFuZWxBY3Rpb246IiB0YXJnZXQ9Ii0xIiBpZD0iNDg4 Ii8+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8YWN0 aW9uIHNlbGVjdG9yPSJwZXJmb3JtVGV4dEZpbmRlckFjdGlvbjoiIHRhcmdldD0iLTEiIGlkPSI0 ODgiLz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jb25u ZWN0aW9ucz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L21lbnVJ dGVtPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0 aXRsZT0iVXNlIFNlbGVjdGlvbiBmb3IgRmluZCIgdGFnPSI3IiBrZXlFcXVpdmFsZW50PSJlIiBp ZD0iMjIxIj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNv bm5lY3Rpb25zPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPGFjdGlvbiBzZWxlY3Rvcj0icGVyZm9ybUZpbmRQYW5lbEFjdGlvbjoiIHRhcmdldD0iLTEi IGlkPSI0ODkiLz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxhY3Rpb24gc2VsZWN0b3I9InBlcmZvcm1UZXh0RmluZGVyQWN0aW9uOiIgdGFyZ2V0PSIt MSIgaWQ9IjQ4OSIvPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8L2Nvbm5lY3Rpb25zPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDwvbWVudUl0ZW0+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1l bnVJdGVtIHRpdGxlPSJKdW1wIHRvIFNlbGVjdGlvbiIga2V5RXF1aXZhbGVudD0iaiIgaWQ9IjIx MCI+CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJv bGxlci5tCmluZGV4IDgzZjQwYTU4OTdkMTRjNmU4YzRkYjUwMmRmOTNkYTIwOTNjYjE0YTguLmJi NDI4YjVjN2Y2YWM0MjExNmZjZjQwNWE3MDU3YTg2ZjBkMDYyNTIgMTAwNjQ0Ci0tLSBhL1Rvb2xz L01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xz L01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC04NiwyNCAr ODYsNiBAQCAtIChJQkFjdGlvbilmZXRjaDooaWQpc2VuZGVyCiAgICAgW1tfd2ViVmlldyBtYWlu RnJhbWVdIGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6dXJsXV07CiB9 CiAKLS0gKElCQWN0aW9uKXNob3dIaWRlV2ViVmlldzooaWQpc2VuZGVyCi17Ci0gICAgQk9PTCBo aWRkZW4gPSAhW193ZWJWaWV3IGlzSGlkZGVuXTsKLSAgICAKLSAgICBbX3dlYlZpZXcgc2V0SGlk ZGVuOmhpZGRlbl07Ci19Ci0KLS0gKElCQWN0aW9uKXJlbW92ZVJlaW5zZXJ0V2ViVmlldzooaWQp c2VuZGVyCi17Ci0gICAgaWYgKFtfd2ViVmlldyB3aW5kb3ddKSB7Ci0gICAgICAgIFtfd2ViVmll dyByZXRhaW5dOwotICAgICAgICBbX3dlYlZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107IAotICAg IH0gZWxzZSB7Ci0gICAgICAgIFtjb250YWluZXJWaWV3IGFkZFN1YnZpZXc6X3dlYlZpZXddOwot ICAgICAgICBbX3dlYlZpZXcgcmVsZWFzZV07Ci0gICAgfQotfQotCiAtIChJQkFjdGlvbilzZXRQ YWdlU2NhbGU6KGlkKXNlbmRlcgogewogICAgIENHRmxvYXQgc2NhbGUgPSBbc2VsZiBwYWdlU2Nh bGVGb3JNZW51SXRlbVRhZzpbc2VuZGVyIHRhZ11dOwpAQCAtMjQ5LDExICsyMzEsNiBAQCAtIChJ QkFjdGlvbil0b2dnbGVab29tTW9kZTooaWQpc2VuZGVyCiAKIC0gKElCQWN0aW9uKXRvZ2dsZVNo cmlua1RvRml0OihpZClzZW5kZXIKIHsKLQotfQotCi0tIChJQkFjdGlvbilmaW5kOihpZClzZW5k ZXIKLXsKIH0KIAogLSAoSUJBY3Rpb24pZHVtcFNvdXJjZVRvQ29uc29sZTooaWQpc2VuZGVyCmRp ZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXIubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5t CmluZGV4IGZkMGY2YzQ0MzAxYzc5YTVmNTg4ZDlkOWZjMzczZGNjZGFkMWNjNDguLjE1Mzg0NjMz ZjFkNGJjYjgxNjU2ZmUzOGZjYTU0NmM4YTYwOWU1ZDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlC cm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01pbmlC cm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC00Niw3ICs0Niw3IEBA CiBzdGF0aWMgY29uc3QgaW50IHRlc3RIZWFkZXJCYW5uZXJIZWlnaHQgPSA0MjsKIHN0YXRpYyBj b25zdCBpbnQgdGVzdEZvb3RlckJhbm5lckhlaWdodCA9IDU4OwogCi1AaW50ZXJmYWNlIFdLMkJy b3dzZXJXaW5kb3dDb250cm9sbGVyICgpIDxXS05hdmlnYXRpb25EZWxlZ2F0ZSwgV0tVSURlbGVn YXRlLCBfV0tJY29uTG9hZGluZ0RlbGVnYXRlPgorQGludGVyZmFjZSBXSzJCcm93c2VyV2luZG93 Q29udHJvbGxlciAoKSA8TlNUZXh0RmluZGVyQmFyQ29udGFpbmVyLCBXS05hdmlnYXRpb25EZWxl Z2F0ZSwgV0tVSURlbGVnYXRlLCBfV0tJY29uTG9hZGluZ0RlbGVnYXRlPgogQGVuZAogCiBAaW1w bGVtZW50YXRpb24gV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgewpAQCAtNTYsNiArNTYsMTAg QEAgQGltcGxlbWVudGF0aW9uIFdLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHsKICAgICBCT09M IF9pc1ByaXZhdGVCcm93c2luZ1dpbmRvdzsKIAogICAgIEJPT0wgX3VzZVNocmlua1RvRml0Owor CisgICAgTlNUZXh0RmluZGVyICpfdGV4dEZpbmRlcjsKKyAgICBOU1ZpZXcgKl90ZXh0RmluZEJh clZpZXc7CisgICAgQk9PTCBfZmluZEJhclZpc2libGU7CiB9CiAKIC0gKHZvaWQpYXdha2VGcm9t TmliCkBAIC05MCw2ICs5NCwxMiBAQCAtICh2b2lkKWF3YWtlRnJvbU5pYgogICAgICAgICB8IF9X S1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFBhaW50QWZ0ZXJTdXBwcmVzc2VkSW5jcmVtZW50 YWxSZW5kZXJpbmc7CiAKICAgICBfem9vbVRleHRPbmx5ID0gTk87CisKKyAgICBfdGV4dEZpbmRl ciA9IFtbTlNUZXh0RmluZGVyIGFsbG9jXSBpbml0XTsKKyAgICBfdGV4dEZpbmRlci5pbmNyZW1l bnRhbFNlYXJjaGluZ0VuYWJsZWQgPSBZRVM7CisgICAgX3RleHRGaW5kZXIuaW5jcmVtZW50YWxT ZWFyY2hpbmdTaG91bGREaW1Db250ZW50VmlldyA9IFlFUzsKKyAgICBfdGV4dEZpbmRlci5jbGll bnQgPSBfd2ViVmlldzsKKyAgICBfdGV4dEZpbmRlci5maW5kQmFyQ29udGFpbmVyID0gc2VsZjsK IH0KIAogLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoQ29uZmlndXJhdGlvbjooV0tXZWJWaWV3Q29u ZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KQEAgLTExMSw2ICsxMjEsOCBAQCAtICh2b2lkKWRl YWxsb2MKICAgICBbcHJvZ3Jlc3NJbmRpY2F0b3IgdW5iaW5kOk5TSGlkZGVuQmluZGluZ107CiAg ICAgW3Byb2dyZXNzSW5kaWNhdG9yIHVuYmluZDpOU1ZhbHVlQmluZGluZ107CiAKKyAgICBbX3Rl eHRGaW5kZXIgcmVsZWFzZV07CisKICAgICBbX3dlYlZpZXcgcmVsZWFzZV07CiAgICAgW19jb25m aWd1cmF0aW9uIHJlbGVhc2VdOwogCkBAIC0xMjQsMjQgKzEzNiw2IEBAIC0gKElCQWN0aW9uKWZl dGNoOihpZClzZW5kZXIKICAgICBbX3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCBy ZXF1ZXN0V2l0aFVSTDpbTlNVUkwgX3dlYmtpdF9VUkxXaXRoVXNlclR5cGVkU3RyaW5nOlt1cmxU ZXh0IHN0cmluZ1ZhbHVlXV1dXTsKIH0KIAotLSAoSUJBY3Rpb24pc2hvd0hpZGVXZWJWaWV3Oihp ZClzZW5kZXIKLXsKLSAgICBCT09MIGhpZGRlbiA9ICFbX3dlYlZpZXcgaXNIaWRkZW5dOwotICAg IAotICAgIFtfd2ViVmlldyBzZXRIaWRkZW46aGlkZGVuXTsKLX0KLQotLSAoSUJBY3Rpb24pcmVt b3ZlUmVpbnNlcnRXZWJWaWV3OihpZClzZW5kZXIKLXsKLSAgICBpZiAoW193ZWJWaWV3IHdpbmRv d10pIHsKLSAgICAgICAgW193ZWJWaWV3IHJldGFpbl07Ci0gICAgICAgIFtfd2ViVmlldyByZW1v dmVGcm9tU3VwZXJ2aWV3XTsgCi0gICAgfSBlbHNlIHsKLSAgICAgICAgW2NvbnRhaW5lclZpZXcg YWRkU3Vidmlldzpfd2ViVmlld107Ci0gICAgICAgIFtfd2ViVmlldyByZWxlYXNlXTsKLSAgICB9 Ci19Ci0KIC0gKElCQWN0aW9uKXNldFBhZ2VTY2FsZTooaWQpc2VuZGVyCiB7CiAgICAgQ0dGbG9h dCBzY2FsZSA9IFtzZWxmIHBhZ2VTY2FsZUZvck1lbnVJdGVtVGFnOltzZW5kZXIgdGFnXV07CkBA IC0xODcsNyArMTgxLDcgQEAgc3RhdGljIEJPT0wgYXJlRXNzZW50aWFsbHlFcXVhbChkb3VibGUg YSwgZG91YmxlIGIpCiAKIC0gKEJPT0wpdmFsaWRhdGVNZW51SXRlbTooTlNNZW51SXRlbSAqKW1l bnVJdGVtCiB7Ci0gICAgU0VMIGFjdGlvbiA9IFttZW51SXRlbSBhY3Rpb25dOworICAgIFNFTCBh Y3Rpb24gPSBtZW51SXRlbS5hY3Rpb247CiAKICAgICBpZiAoYWN0aW9uID09IEBzZWxlY3Rvcih6 b29tSW46KSkKICAgICAgICAgcmV0dXJuIFtzZWxmIGNhblpvb21Jbl07CkBAIC0xOTgsNyArMTky LDYgQEAgLSAoQk9PTCl2YWxpZGF0ZU1lbnVJdGVtOihOU01lbnVJdGVtICopbWVudUl0ZW0KICAg ICAKICAgICAvLyBEaXNhYmxlZCB1bnRpbCBtaXNzaW5nIFdLMiBmdW5jdGlvbmFsaXR5IGlzIGV4 cG9zZWQgdmlhIEFQSS9TUEkuCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IoZHVtcFNvdXJj ZVRvQ29uc29sZTopCi0gICAgICAgIHx8IGFjdGlvbiA9PSBAc2VsZWN0b3IoZmluZDopCiAgICAg ICAgIHx8IGFjdGlvbiA9PSBAc2VsZWN0b3IoZm9yY2VSZXBhaW50OikpCiAgICAgICAgIHJldHVy biBOTzsKICAgICAKQEAgLTUzMiwxNSArNTI1LDYgQEAgLSAodm9pZClsb2FkVVJMU3RyaW5nOihO U1N0cmluZyAqKXVybFN0cmluZwogICAgIFtzZWxmIGZldGNoOm5pbF07CiB9CiAKLS0gKElCQWN0 aW9uKXBlcmZvcm1GaW5kUGFuZWxBY3Rpb246KGlkKXNlbmRlcgotewotICAgIFtmaW5kUGFuZWxX aW5kb3cgbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2VuZGVyXTsKLX0KLQotLSAoSUJBY3Rpb24pZmlu ZDooaWQpc2VuZGVyCi17Ci19Ci0KIHN0YXRpYyBOU1NldCAqZGF0YVR5cGVzKCkKIHsKICAgICBy ZXR1cm4gW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXTsKQEAgLTY3NSw2 ICs2NTksNTEgQEAgLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHNob3VsZExv YWRJY29uV2l0aFBhcmFtZXRlcnM6KF9XS0xpbmtJY29uUGEKICAgICB9KTsKIH0KIAorI3ByYWdt YSBtYXJrIEZpbmQgaW4gUGFnZQorCistIChJQkFjdGlvbilwZXJmb3JtVGV4dEZpbmRlckFjdGlv bjooaWQpc2VuZGVyCit7CisgICAgW190ZXh0RmluZGVyIHBlcmZvcm1BY3Rpb246W3NlbmRlciB0 YWddXTsKK30KKworLSAoTlNWaWV3ICopZmluZEJhclZpZXcKK3sKKyAgICByZXR1cm4gX3RleHRG aW5kQmFyVmlldzsKK30KKworLSAodm9pZClzZXRGaW5kQmFyVmlldzooTlNWaWV3ICopZmluZEJh clZpZXcKK3sKKyAgICBpZiAoX3RleHRGaW5kQmFyVmlldykKKyAgICAgICAgW190ZXh0RmluZEJh clZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CisgICAgX3RleHRGaW5kQmFyVmlldyA9IGZpbmRC YXJWaWV3OworICAgIF9maW5kQmFyVmlzaWJsZSA9IFlFUzsKKyAgICBbY29udGFpbmVyVmlldyBh ZGRTdWJ2aWV3Ol90ZXh0RmluZEJhclZpZXddOworICAgIFtfdGV4dEZpbmRCYXJWaWV3IHNldEZy YW1lOk5TTWFrZVJlY3QoMCwgMCwgY29udGFpbmVyVmlldy5ib3VuZHMuc2l6ZS53aWR0aCwgX3Rl eHRGaW5kQmFyVmlldy5mcmFtZS5zaXplLmhlaWdodCldOworfQorCistIChCT09MKWlzRmluZEJh clZpc2libGUKK3sKKyAgICByZXR1cm4gX2ZpbmRCYXJWaXNpYmxlOworfQorCistICh2b2lkKXNl dEZpbmRCYXJWaXNpYmxlOihCT09MKWZpbmRCYXJWaXNpYmxlCit7CisgICAgX2ZpbmRCYXJWaXNp YmxlID0gZmluZEJhclZpc2libGU7CisgICAgaWYgKGZpbmRCYXJWaXNpYmxlKQorICAgICAgICBb Y29udGFpbmVyVmlldyBhZGRTdWJ2aWV3Ol90ZXh0RmluZEJhclZpZXddOworICAgIGVsc2UKKyAg ICAgICAgW190ZXh0RmluZEJhclZpZXcgcmVtb3ZlRnJvbVN1cGVydmlld107Cit9CisKKy0gKE5T VmlldyAqKWNvbnRlbnRWaWV3Cit7CisgICAgcmV0dXJuIF93ZWJWaWV3OworfQorCistICh2b2lk KWZpbmRCYXJWaWV3RGlkQ2hhbmdlSGVpZ2h0Cit7Cit9CisKIEBlbmQKIAogI2VuZGlmIC8vIFdL X0FQSV9FTkFCTEVECg== 298264 2017-01-07 02:17:27 -0800 2017-01-07 13:10:40 -0800 Patch bug-166799-20170107021557.patch text/plain 13802 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTgyZTU0YmUzYTg2NWEzNjRlMTA1Njk2OTdjNWE5MzJh ZGE2ZTRhYy4uYjYwYmM2Y2MwYzM4N2Y0NGJjZDU5ZWE4OTQyZDJkN2M4NTJhOTNmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2 IEBACiAyMDE3LTAxLTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CisgICAgICAgIEltcGxlbWVudCBmaW5kLWluLXBhZ2UgaW4gTWluaUJyb3dzZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Njc5OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3cueGliOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2lu ZG93Q29udHJvbGxlci5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93 Q29udHJvbGxlci5tOgorICAgICAgICAoLVtCcm93c2VyV2luZG93Q29udHJvbGxlciBmaW5kOl0p OiBEZWxldGVkLgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWI6CisgICAg ICAgICogTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAg ICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHRvZ2dsZVNocmlua1RvRml0Ol0pOgor ICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciBmaW5kOl0pOiBEZWxldGVkLgor ICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tOgor ICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBhd2FrZUZyb21OaWJdKToKKyAg ICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgZGVhbGxvY10pOgorICAgICAgICAo LVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciB2YWxpZGF0ZU1lbnVJdGVtOl0pOgorICAgICAg ICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBwZXJmb3JtVGV4dEZpbmRlckFjdGlvbjpd KToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgZmluZEJhclZpZXddKToK KyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgc2V0RmluZEJhclZpZXc6XSk6 CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGlzRmluZEJhclZpc2libGVd KToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgc2V0RmluZEJhclZpc2li bGU6XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGNvbnRlbnRWaWV3 XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGZpbmRCYXJWaWV3RGlk Q2hhbmdlSGVpZ2h0XSk6CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIHBl cmZvcm1GaW5kUGFuZWxBY3Rpb246XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLMkJyb3dzZXJX aW5kb3dDb250cm9sbGVyIGZpbmQ6XSk6IERlbGV0ZWQuCisgICAgICAgIEltcGxlbWVudCBmaW5k LWluLXBhZ2UgdXNpbmcgV0tXZWJWaWV3J3MgY29uZm9ybWFuY2UgdG8gdGhlIE5TVGV4dEZpbmRl ckNsaWVudAorICAgICAgICBwcm90b2NvbC4gQXQgZmlyc3QgZ2xhbmNlLCBpdCdzIHByZXR0eSBi cm9rZW4sIGJ1dCB2YWd1ZWx5IHdvcmtzLgorCisyMDE3LTAxLTA3ICBUaW0gSG9ydG9uICA8dGlt b3RoeV9ob3J0b25AYXBwbGUuY29tPgorCiAgICAgICAgIFNoYXJlIHRoZSBpbXBsZW1lbnRhdGlv biBvZiBNaW5pQnJvd3NlciB2aWV3IGhpZGluZyBmdW5jdGlvbmFsaXR5CiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjY4MDAKIApkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3cueGliIGIvVG9vbHMvTWluaUJyb3dz ZXIvbWFjL0Jyb3dzZXJXaW5kb3cueGliCmluZGV4IGE0NjJiOTA4ODAwYmNjN2M5OTU1YTlkODYx ZTIzZWQ1ZjM3ZGRhMTYuLjViZGVlZGU4NWQxZTI1YTU2MTM4NDVjMzE2YzM5ZDA1MzhkMmY5YjUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93LnhpYgorKysg Yi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvdy54aWIKQEAgLTEsMTUgKzEsMTQg QEAKIDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Ci08ZG9jdW1lbnQgdHlw ZT0iY29tLmFwcGxlLkludGVyZmFjZUJ1aWxkZXIzLkNvY29hLlhJQiIgdmVyc2lvbj0iMy4wIiB0 b29sc1ZlcnNpb249IjExMDg1IiBzeXN0ZW1WZXJzaW9uPSIxNkExNjciIHRhcmdldFJ1bnRpbWU9 Ik1hY09TWC5Db2NvYSIgcHJvcGVydHlBY2Nlc3NDb250cm9sPSJub25lIj4KKzxkb2N1bWVudCB0 eXBlPSJjb20uYXBwbGUuSW50ZXJmYWNlQnVpbGRlcjMuQ29jb2EuWElCIiB2ZXJzaW9uPSIzLjAi IHRvb2xzVmVyc2lvbj0iMTExOTEiIHN5c3RlbVZlcnNpb249IjE2RDE3YSIgdGFyZ2V0UnVudGlt ZT0iTWFjT1NYLkNvY29hIiBwcm9wZXJ0eUFjY2Vzc0NvbnRyb2w9Im5vbmUiPgogICAgIDxkZXBl bmRlbmNpZXM+CiAgICAgICAgIDxkZXBsb3ltZW50IGlkZW50aWZpZXI9Im1hY29zeCIvPgotICAg ICAgICA8cGx1Z0luIGlkZW50aWZpZXI9ImNvbS5hcHBsZS5JbnRlcmZhY2VCdWlsZGVyLkNvY29h UGx1Z2luIiB2ZXJzaW9uPSIxMTA4NSIvPgorICAgICAgICA8cGx1Z0luIGlkZW50aWZpZXI9ImNv bS5hcHBsZS5JbnRlcmZhY2VCdWlsZGVyLkNvY29hUGx1Z2luIiB2ZXJzaW9uPSIxMTE5MSIvPgog ICAgIDwvZGVwZW5kZW5jaWVzPgogICAgIDxvYmplY3RzPgogICAgICAgICA8Y3VzdG9tT2JqZWN0 IGlkPSItMiIgdXNlckxhYmVsPSJGaWxlJ3MgT3duZXIiIGN1c3RvbUNsYXNzPSJCcm93c2VyV2lu ZG93Q29udHJvbGxlciI+CiAgICAgICAgICAgICA8Y29ubmVjdGlvbnM+CiAgICAgICAgICAgICAg ICAgPG91dGxldCBwcm9wZXJ0eT0iYmFja0J1dHRvbiIgZGVzdGluYXRpb249IjQwIiBpZD0iNDYi Lz4KICAgICAgICAgICAgICAgICA8b3V0bGV0IHByb3BlcnR5PSJjb250YWluZXJWaWV3IiBkZXN0 aW5hdGlvbj0iOSIgaWQ9IjM3Ii8+Ci0gICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0i ZmluZFBhbmVsV2luZG93IiBkZXN0aW5hdGlvbj0iNzAiIGlkPSI3NyIvPgogICAgICAgICAgICAg ICAgIDxvdXRsZXQgcHJvcGVydHk9ImZvcndhcmRCdXR0b24iIGRlc3RpbmF0aW9uPSI0MiIgaWQ9 IjQ3Ii8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0icHJvZ3Jlc3NJbmRpY2F0 b3IiIGRlc3RpbmF0aW9uPSIyMSIgaWQ9IjMzIi8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBw cm9wZXJ0eT0icmVsb2FkQnV0dG9uIiBkZXN0aW5hdGlvbj0iMjMiIGlkPSIzNCIvPgpAQCAtMTU5 LDMwICsxNTgsNiBAQAogICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9ImRlbGVnYXRl IiBkZXN0aW5hdGlvbj0iLTIiIGlkPSI0Ii8+CiAgICAgICAgICAgICA8L2Nvbm5lY3Rpb25zPgog ICAgICAgICA8L3dpbmRvdz4KLSAgICAgICAgPHdpbmRvdyB0aXRsZT0iRmluZCIgYWxsb3dzVG9v bFRpcHNXaGVuQXBwbGljYXRpb25Jc0luYWN0aXZlPSJOTyIgYXV0b3JlY2FsY3VsYXRlc0tleVZp ZXdMb29wPSJOTyIgaGlkZXNPbkRlYWN0aXZhdGU9IllFUyIgb25lU2hvdD0iTk8iIHJlbGVhc2Vk V2hlbkNsb3NlZD0iTk8iIHZpc2libGVBdExhdW5jaD0iTk8iIGFuaW1hdGlvbkJlaGF2aW9yPSJk ZWZhdWx0IiBpZD0iNzAiIGN1c3RvbUNsYXNzPSJOU1BhbmVsIj4KLSAgICAgICAgICAgIDx3aW5k b3dTdHlsZU1hc2sga2V5PSJzdHlsZU1hc2siIHRpdGxlZD0iWUVTIiBjbG9zYWJsZT0iWUVTIiB1 dGlsaXR5PSJZRVMiIG5vbmFjdGl2YXRpbmdQYW5lbD0iWUVTIi8+Ci0gICAgICAgICAgICA8d2lu ZG93UG9zaXRpb25NYXNrIGtleT0iaW5pdGlhbFBvc2l0aW9uTWFzayIgbGVmdFN0cnV0PSJZRVMi IHJpZ2h0U3RydXQ9IllFUyIgdG9wU3RydXQ9IllFUyIgYm90dG9tU3RydXQ9IllFUyIvPgotICAg ICAgICAgICAgPHJlY3Qga2V5PSJjb250ZW50UmVjdCIgeD0iMjMwIiB5PSI0NzkiIHdpZHRoPSI0 NTIiIGhlaWdodD0iNjIiLz4KLSAgICAgICAgICAgIDxyZWN0IGtleT0ic2NyZWVuUmVjdCIgeD0i MC4wIiB5PSIwLjAiIHdpZHRoPSIxOTIwIiBoZWlnaHQ9IjExNzciLz4KLSAgICAgICAgICAgIDx2 aWV3IGtleT0iY29udGVudFZpZXciIGlkPSI3MSI+Ci0gICAgICAgICAgICAgICAgPHJlY3Qga2V5 PSJmcmFtZSIgeD0iMC4wIiB5PSIwLjAiIHdpZHRoPSI0NTIiIGhlaWdodD0iNjIiLz4KLSAgICAg ICAgICAgICAgICA8YXV0b3Jlc2l6aW5nTWFzayBrZXk9ImF1dG9yZXNpemluZ01hc2siLz4KLSAg ICAgICAgICAgICAgICA8c3Vidmlld3M+Ci0gICAgICAgICAgICAgICAgICAgIDxzZWFyY2hGaWVs ZCB2ZXJ0aWNhbEh1Z2dpbmdQcmlvcml0eT0iNzUwIiBpZD0iNzQiPgotICAgICAgICAgICAgICAg ICAgICAgICAgPHJlY3Qga2V5PSJmcmFtZSIgeD0iMjAiIHk9IjIwIiB3aWR0aD0iNDEyIiBoZWln aHQ9IjIyIi8+Ci0gICAgICAgICAgICAgICAgICAgICAgICA8YXV0b3Jlc2l6aW5nTWFzayBrZXk9 ImF1dG9yZXNpemluZ01hc2siIGZsZXhpYmxlTWF4WD0iWUVTIiBmbGV4aWJsZU1pblk9IllFUyIv PgotICAgICAgICAgICAgICAgICAgICAgICAgPHNlYXJjaEZpZWxkQ2VsbCBrZXk9ImNlbGwiIHNj cm9sbGFibGU9IllFUyIgbGluZUJyZWFrTW9kZT0iY2xpcHBpbmciIHNlbGVjdGFibGU9IllFUyIg ZWRpdGFibGU9IllFUyIgYm9yZGVyU3R5bGU9ImJlemVsIiB1c2VzU2luZ2xlTGluZU1vZGU9IllF UyIgYmV6ZWxTdHlsZT0icm91bmQiIGlkPSI3NSI+Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgPGZvbnQga2V5PSJmb250IiBtZXRhRm9udD0ic3lzdGVtIi8+Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgPGNvbG9yIGtleT0idGV4dENvbG9yIiBuYW1lPSJjb250cm9sVGV4dENvbG9y IiBjYXRhbG9nPSJTeXN0ZW0iIGNvbG9yU3BhY2U9ImNhdGFsb2ciLz4KLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICA8Y29sb3Iga2V5PSJiYWNrZ3JvdW5kQ29sb3IiIG5hbWU9InRleHRCYWNr Z3JvdW5kQ29sb3IiIGNhdGFsb2c9IlN5c3RlbSIgY29sb3JTcGFjZT0iY2F0YWxvZyIvPgotICAg ICAgICAgICAgICAgICAgICAgICAgPC9zZWFyY2hGaWVsZENlbGw+Ci0gICAgICAgICAgICAgICAg ICAgICAgICA8Y29ubmVjdGlvbnM+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgPGFjdGlv biBzZWxlY3Rvcj0iZmluZDoiIHRhcmdldD0iLTIiIGlkPSI3NiIvPgotICAgICAgICAgICAgICAg ICAgICAgICAgPC9jb25uZWN0aW9ucz4KLSAgICAgICAgICAgICAgICAgICAgPC9zZWFyY2hGaWVs ZD4KLSAgICAgICAgICAgICAgICA8L3N1YnZpZXdzPgotICAgICAgICAgICAgPC92aWV3PgotICAg ICAgICA8L3dpbmRvdz4KICAgICA8L29iamVjdHM+CiAgICAgPHJlc291cmNlcz4KICAgICAgICAg PGltYWdlIG5hbWU9Ik5TRW50ZXJGdWxsU2NyZWVuVGVtcGxhdGUiIHdpZHRoPSIxNSIgaGVpZ2h0 PSIxNSIvPgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dD b250cm9sbGVyLmggYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXIuaAppbmRleCBhOWNlZWQ3NTU5NWI0ZDgwNTZiNjNhMDE3MThlNTZiYWI5OTM5OWE3Li41Yjg1 Y2U0Njg0MmMzNWI0NTE1YjY1YTUyMmM1ZjQxYmUyODRmNTQ1IDEwMDY0NAotLS0gYS9Ub29scy9N aW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaAorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaApAQCAtMzUsOCArMzUsNiBAQAog ICAgIElCT3V0bGV0IE5TVGV4dEZpZWxkICp1cmxUZXh0OwogICAgIElCT3V0bGV0IE5TVmlldyAq Y29udGFpbmVyVmlldzsKICAgICBJQk91dGxldCBOU0J1dHRvbiAqdG9nZ2xlVXNlU2hyaW5rVG9G aXRCdXR0b247Ci0gICAgCi0gICAgSUJPdXRsZXQgTlNXaW5kb3cgKmZpbmRQYW5lbFdpbmRvdzsK IAogICAgIEJPT0wgX3pvb21UZXh0T25seTsKIH0KQEAgLTczLDcgKzcxLDYgQEAKIC0gKElCQWN0 aW9uKXRvZ2dsZVNocmlua1RvRml0OihpZClzZW5kZXI7CiAKIC0gKElCQWN0aW9uKWR1bXBTb3Vy Y2VUb0NvbnNvbGU6KGlkKXNlbmRlcjsKLS0gKElCQWN0aW9uKWZpbmQ6KGlkKXNlbmRlcjsKIAog LSAodm9pZClkaWRDaGFuZ2VTZXR0aW5nczsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dz ZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMv QnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCA5MmQ4NzMzYTI1ZTVkOGZjNjVkNTVmZjZh M2NiZTlmOWE4ZGU1OTQxLi4wYzBmNTQ4YTM4ZmQ2YjY0M2MxZGFjZDNiZDdkMTQ2YzgxYWU1YTQ4 IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIu bQpAQCAtMTk0LDExICsxOTQsNiBAQCAtIChJQkFjdGlvbilkdW1wU291cmNlVG9Db25zb2xlOihp ZClzZW5kZXIKICAgICBbc2VsZiBkb2VzTm90UmVjb2duaXplU2VsZWN0b3I6X2NtZF07CiB9CiAK LS0gKElCQWN0aW9uKWZpbmQ6KGlkKXNlbmRlcgotewotICAgIFtzZWxmIGRvZXNOb3RSZWNvZ25p emVTZWxlY3RvcjpfY21kXTsKLX0KLQogLSAodm9pZClkaWRDaGFuZ2VTZXR0aW5ncwogewogICAg IFtzZWxmIGRvZXNOb3RSZWNvZ25pemVTZWxlY3RvcjpfY21kXTsKZGlmZiAtLWdpdCBhL1Rvb2xz L01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvTWFp bk1lbnUueGliCmluZGV4IGVjNGU0MjAyNGI2ODc4MTFkOGJlNmUxN2IwOWYxZTUwZGZmOWQxNjYu LjY3YTk0NWY0ZjliMTMzOTczYWFiNGY5OWJiMTY1ODMyMDE3MGZmMjMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIv bWFjL01haW5NZW51LnhpYgpAQCAtMjAyLDIzICsyMDIsMjMgQEAKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxpdGVtcz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8bWVudUl0ZW0gdGl0bGU9IkZpbmTigKYiIHRhZz0iMSIga2V5RXF1aXZhbGVu dD0iZiIgaWQ9IjIwOSI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxjb25uZWN0aW9ucz4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9InBlcmZvcm1GaW5kUGFuZWxBY3Rpb246IiB0YXJn ZXQ9Ii0xIiBpZD0iMjQxIi8+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJwZXJmb3JtVGV4dEZpbmRlckFjdGlvbjoiIHRh cmdldD0iLTEiIGlkPSIyNDEiLz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPC9jb25uZWN0aW9ucz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8L21lbnVJdGVtPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxtZW51SXRlbSB0aXRsZT0iRmluZCBOZXh0IiB0YWc9IjIiIGtleUVxdWl2YWxlbnQ9Imci IGlkPSIyMDgiPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 Y29ubmVjdGlvbnM+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8YWN0aW9uIHNlbGVjdG9yPSJwZXJmb3JtRmluZFBhbmVsQWN0aW9uOiIgdGFyZ2V0PSIt MSIgaWQ9IjQ4NyIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0icGVyZm9ybVRleHRGaW5kZXJBY3Rpb246IiB0YXJnZXQ9 Ii0xIiBpZD0iNDg3Ii8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDwvY29ubmVjdGlvbnM+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPC9tZW51SXRlbT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 bWVudUl0ZW0gdGl0bGU9IkZpbmQgUHJldmlvdXMiIHRhZz0iMyIga2V5RXF1aXZhbGVudD0iRyIg aWQ9IjIxMyI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxt b2RpZmllck1hc2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIiBzaGlmdD0iWUVTIiBj b21tYW5kPSJZRVMiLz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPGNvbm5lY3Rpb25zPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0icGVyZm9ybUZpbmRQYW5lbEFjdGlvbjoiIHRhcmdl dD0iLTEiIGlkPSI0ODgiLz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9InBlcmZvcm1UZXh0RmluZGVyQWN0aW9uOiIgdGFy Z2V0PSItMSIgaWQ9IjQ4OCIvPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8L2Nvbm5lY3Rpb25zPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDwvbWVudUl0ZW0+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPG1lbnVJdGVtIHRpdGxlPSJVc2UgU2VsZWN0aW9uIGZvciBGaW5kIiB0YWc9IjciIGtleUVx dWl2YWxlbnQ9ImUiIGlkPSIyMjEiPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8Y29ubmVjdGlvbnM+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJwZXJmb3JtRmluZFBhbmVsQWN0aW9u OiIgdGFyZ2V0PSItMSIgaWQ9IjQ4OSIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0icGVyZm9ybVRleHRGaW5kZXJBY3Rp b246IiB0YXJnZXQ9Ii0xIiBpZD0iNDg5Ii8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8bWVudUl0ZW0gdGl0bGU9Ikp1bXAgdG8gU2VsZWN0aW9uIiBrZXlFcXVpdmFs ZW50PSJqIiBpZD0iMjEwIj4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzFC cm93c2VyV2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dz ZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXggOTNjNWZmN2QwMTQ5OWU2MTlmN2E0ZWMxZmE5ZDFl MWZhYTU1NzVhMy4uYmI0MjhiNWM3ZjZhYzQyMTE2ZmNmNDA1YTcwNTdhODZmMGQwNjI1MiAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVy Lm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVy Lm0KQEAgLTIzMSwxMSArMjMxLDYgQEAgLSAoSUJBY3Rpb24pdG9nZ2xlWm9vbU1vZGU6KGlkKXNl bmRlcgogCiAtIChJQkFjdGlvbil0b2dnbGVTaHJpbmtUb0ZpdDooaWQpc2VuZGVyCiB7Ci0KLX0K LQotLSAoSUJBY3Rpb24pZmluZDooaWQpc2VuZGVyCi17CiB9CiAKIC0gKElCQWN0aW9uKWR1bXBT b3VyY2VUb0NvbnNvbGU6KGlkKXNlbmRlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv bWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMv V0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCBmMjU0NmRhYjFlMDRjZDI2MDhkMjVk NDVkMGE5ZTgwYzU4MTlmYTE0Li4xNTM4NDYzM2YxZDRiY2I4MTY1NmZlMzhmY2E1NDZjOGE2MDll NWQyIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIubQpAQCAtNDYsNyArNDYsNyBAQAogc3RhdGljIGNvbnN0IGludCB0ZXN0SGVhZGVy QmFubmVySGVpZ2h0ID0gNDI7CiBzdGF0aWMgY29uc3QgaW50IHRlc3RGb290ZXJCYW5uZXJIZWln aHQgPSA1ODsKIAotQGludGVyZmFjZSBXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciAoKSA8V0tO YXZpZ2F0aW9uRGVsZWdhdGUsIFdLVUlEZWxlZ2F0ZSwgX1dLSWNvbkxvYWRpbmdEZWxlZ2F0ZT4K K0BpbnRlcmZhY2UgV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgKCkgPE5TVGV4dEZpbmRlckJh ckNvbnRhaW5lciwgV0tOYXZpZ2F0aW9uRGVsZWdhdGUsIFdLVUlEZWxlZ2F0ZSwgX1dLSWNvbkxv YWRpbmdEZWxlZ2F0ZT4KIEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLMkJyb3dzZXJXaW5kb3dD b250cm9sbGVyIHsKQEAgLTU2LDYgKzU2LDEwIEBAIEBpbXBsZW1lbnRhdGlvbiBXSzJCcm93c2Vy V2luZG93Q29udHJvbGxlciB7CiAgICAgQk9PTCBfaXNQcml2YXRlQnJvd3NpbmdXaW5kb3c7CiAK ICAgICBCT09MIF91c2VTaHJpbmtUb0ZpdDsKKworICAgIE5TVGV4dEZpbmRlciAqX3RleHRGaW5k ZXI7CisgICAgTlNWaWV3ICpfdGV4dEZpbmRCYXJWaWV3OworICAgIEJPT0wgX2ZpbmRCYXJWaXNp YmxlOwogfQogCiAtICh2b2lkKWF3YWtlRnJvbU5pYgpAQCAtOTAsNiArOTQsMTIgQEAgLSAodm9p ZClhd2FrZUZyb21OaWIKICAgICAgICAgfCBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RQ YWludEFmdGVyU3VwcHJlc3NlZEluY3JlbWVudGFsUmVuZGVyaW5nOwogCiAgICAgX3pvb21UZXh0 T25seSA9IE5POworCisgICAgX3RleHRGaW5kZXIgPSBbW05TVGV4dEZpbmRlciBhbGxvY10gaW5p dF07CisgICAgX3RleHRGaW5kZXIuaW5jcmVtZW50YWxTZWFyY2hpbmdFbmFibGVkID0gWUVTOwor ICAgIF90ZXh0RmluZGVyLmluY3JlbWVudGFsU2VhcmNoaW5nU2hvdWxkRGltQ29udGVudFZpZXcg PSBZRVM7CisgICAgX3RleHRGaW5kZXIuY2xpZW50ID0gX3dlYlZpZXc7CisgICAgX3RleHRGaW5k ZXIuZmluZEJhckNvbnRhaW5lciA9IHNlbGY7CiB9CiAKIC0gKGluc3RhbmNldHlwZSlpbml0V2l0 aENvbmZpZ3VyYXRpb246KFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCkBA IC0xMTEsNiArMTIxLDggQEAgLSAodm9pZClkZWFsbG9jCiAgICAgW3Byb2dyZXNzSW5kaWNhdG9y IHVuYmluZDpOU0hpZGRlbkJpbmRpbmddOwogICAgIFtwcm9ncmVzc0luZGljYXRvciB1bmJpbmQ6 TlNWYWx1ZUJpbmRpbmddOwogCisgICAgW190ZXh0RmluZGVyIHJlbGVhc2VdOworCiAgICAgW193 ZWJWaWV3IHJlbGVhc2VdOwogICAgIFtfY29uZmlndXJhdGlvbiByZWxlYXNlXTsKIApAQCAtMTY5 LDcgKzE4MSw3IEBAIHN0YXRpYyBCT09MIGFyZUVzc2VudGlhbGx5RXF1YWwoZG91YmxlIGEsIGRv dWJsZSBiKQogCiAtIChCT09MKXZhbGlkYXRlTWVudUl0ZW06KE5TTWVudUl0ZW0gKiltZW51SXRl bQogewotICAgIFNFTCBhY3Rpb24gPSBbbWVudUl0ZW0gYWN0aW9uXTsKKyAgICBTRUwgYWN0aW9u ID0gbWVudUl0ZW0uYWN0aW9uOwogCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3Ioem9vbUlu OikpCiAgICAgICAgIHJldHVybiBbc2VsZiBjYW5ab29tSW5dOwpAQCAtMTgwLDcgKzE5Miw2IEBA IC0gKEJPT0wpdmFsaWRhdGVNZW51SXRlbTooTlNNZW51SXRlbSAqKW1lbnVJdGVtCiAgICAgCiAg ICAgLy8gRGlzYWJsZWQgdW50aWwgbWlzc2luZyBXSzIgZnVuY3Rpb25hbGl0eSBpcyBleHBvc2Vk IHZpYSBBUEkvU1BJLgogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKGR1bXBTb3VyY2VUb0Nv bnNvbGU6KQotICAgICAgICB8fCBhY3Rpb24gPT0gQHNlbGVjdG9yKGZpbmQ6KQogICAgICAgICB8 fCBhY3Rpb24gPT0gQHNlbGVjdG9yKGZvcmNlUmVwYWludDopKQogICAgICAgICByZXR1cm4gTk87 CiAgICAgCkBAIC01MTQsMTUgKzUyNSw2IEBAIC0gKHZvaWQpbG9hZFVSTFN0cmluZzooTlNTdHJp bmcgKil1cmxTdHJpbmcKICAgICBbc2VsZiBmZXRjaDpuaWxdOwogfQogCi0tIChJQkFjdGlvbilw ZXJmb3JtRmluZFBhbmVsQWN0aW9uOihpZClzZW5kZXIKLXsKLSAgICBbZmluZFBhbmVsV2luZG93 IG1ha2VLZXlBbmRPcmRlckZyb250OnNlbmRlcl07Ci19Ci0KLS0gKElCQWN0aW9uKWZpbmQ6KGlk KXNlbmRlcgotewotfQotCiBzdGF0aWMgTlNTZXQgKmRhdGFUeXBlcygpCiB7CiAgICAgcmV0dXJu IFtXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vic2l0ZURhdGFUeXBlc107CkBAIC02NTcsNiArNjU5 LDUxIEBAIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBzaG91bGRMb2FkSWNv bldpdGhQYXJhbWV0ZXJzOihfV0tMaW5rSWNvblBhCiAgICAgfSk7CiB9CiAKKyNwcmFnbWEgbWFy ayBGaW5kIGluIFBhZ2UKKworLSAoSUJBY3Rpb24pcGVyZm9ybVRleHRGaW5kZXJBY3Rpb246KGlk KXNlbmRlcgoreworICAgIFtfdGV4dEZpbmRlciBwZXJmb3JtQWN0aW9uOltzZW5kZXIgdGFnXV07 Cit9CisKKy0gKE5TVmlldyAqKWZpbmRCYXJWaWV3Cit7CisgICAgcmV0dXJuIF90ZXh0RmluZEJh clZpZXc7Cit9CisKKy0gKHZvaWQpc2V0RmluZEJhclZpZXc6KE5TVmlldyAqKWZpbmRCYXJWaWV3 Cit7CisgICAgaWYgKF90ZXh0RmluZEJhclZpZXcpCisgICAgICAgIFtfdGV4dEZpbmRCYXJWaWV3 IHJlbW92ZUZyb21TdXBlcnZpZXddOworICAgIF90ZXh0RmluZEJhclZpZXcgPSBmaW5kQmFyVmll dzsKKyAgICBfZmluZEJhclZpc2libGUgPSBZRVM7CisgICAgW2NvbnRhaW5lclZpZXcgYWRkU3Vi dmlldzpfdGV4dEZpbmRCYXJWaWV3XTsKKyAgICBbX3RleHRGaW5kQmFyVmlldyBzZXRGcmFtZTpO U01ha2VSZWN0KDAsIDAsIGNvbnRhaW5lclZpZXcuYm91bmRzLnNpemUud2lkdGgsIF90ZXh0Rmlu ZEJhclZpZXcuZnJhbWUuc2l6ZS5oZWlnaHQpXTsKK30KKworLSAoQk9PTClpc0ZpbmRCYXJWaXNp YmxlCit7CisgICAgcmV0dXJuIF9maW5kQmFyVmlzaWJsZTsKK30KKworLSAodm9pZClzZXRGaW5k QmFyVmlzaWJsZTooQk9PTClmaW5kQmFyVmlzaWJsZQoreworICAgIF9maW5kQmFyVmlzaWJsZSA9 IGZpbmRCYXJWaXNpYmxlOworICAgIGlmIChmaW5kQmFyVmlzaWJsZSkKKyAgICAgICAgW2NvbnRh aW5lclZpZXcgYWRkU3VidmlldzpfdGV4dEZpbmRCYXJWaWV3XTsKKyAgICBlbHNlCisgICAgICAg IFtfdGV4dEZpbmRCYXJWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOworfQorCistIChOU1ZpZXcg Kiljb250ZW50VmlldworeworICAgIHJldHVybiBfd2ViVmlldzsKK30KKworLSAodm9pZClmaW5k QmFyVmlld0RpZENoYW5nZUhlaWdodAoreworfQorCiBAZW5kCiAKICNlbmRpZiAvLyBXS19BUElf RU5BQkxFRAo=