84826 2012-04-24 22:15:16 -0700 Calendar Picker: Resize to minimal size to fit the content 2012-05-01 18:02:56 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 53961 85331 1 tkent tkent haraken keishi morrita oldest_to_newest 609457 0 tkent 2012-04-24 22:15:16 -0700 Calendar Picker: Resize to minimal size to fit the content 609462 1 138739 tkent 2012-04-24 22:30:09 -0700 Created attachment 138739 Patch 609464 2 tkent 2012-04-24 22:32:06 -0700 Keishi, would you do informal review for the patch please? 609466 3 138739 haraken 2012-04-24 22:39:10 -0700 Comment on attachment 138739 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138739&action=review > Source/WebCore/ChangeLog:13 > + The minimal size depends on font settings, localized labels, and > + localizaed formats. So we put objects on a trasparent element, calculate > + minimal size, resize the popup, then show the objects. Does this mean it would be difficult to add pixel tests for the change? I might want to see some test. 609470 4 tkent 2012-04-24 22:48:58 -0700 (In reply to comment #3) > (From update of attachment 138739 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138739&action=review > > > Source/WebCore/ChangeLog:13 > > + The minimal size depends on font settings, localized labels, and > > + localizaed formats. So we put objects on a trasparent element, calculate > > + minimal size, resize the popup, then show the objects. > > Does this mean it would be difficult to add pixel tests for the change? I might want to see some test. No, because we assume test environment is homogeneous. But DRT can't capture the content of popups at all. I have a plain to add tests later. We need to solve Bug 84827. 609509 5 138739 keishi 2012-04-25 00:21:36 -0700 Comment on attachment 138739 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138739&action=review Looks good to me. > Source/WebCore/Resources/calendarPicker.css:52 > + opacity: 0.3; It is impossible to notice for a 0.1s animation, but isn't it better to start completely invisible and set the starting opacity inside the fixWindowSize function? 609514 6 138749 tkent 2012-04-25 00:30:46 -0700 Created attachment 138749 Patch 2 initial opacity, and some typos 609516 7 haraken 2012-04-25 00:32:21 -0700 Delegating review to morrita-san. 610241 8 138749 morrita 2012-04-25 17:57:33 -0700 Comment on attachment 138749 Patch 2 Hopes to have tests somehow. rs=me 610277 9 tkent 2012-04-25 18:25:20 -0700 Committed r115276: <http://trac.webkit.org/changeset/115276> 138739 2012-04-24 22:30:09 -0700 2012-04-25 00:30:35 -0700 Patch bug-84826-20120425143005.patch text/plain 9523 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U1NWE4NWU1MzhjNGQx ZTJiYjNmYTM2MjU5MDA1NmQ3MzU0YjA5Mi4uZjljMWQ1ZDg3NmIzZTRjZTgwMGYyNDEyZGRkZWFj NDhjODQ2ZDA5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEyLTA0LTI0ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDYWxlbmRhciBQaWNrZXI6 IFJlc2l6ZSB0byBtaW5pbWFsIHNpemUgdG8gZml0IHRoZSBjb250ZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDgyNgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIGZpeGVkLXNpemUgcG9wdXAg aXNuJ3QgbmljZS4gVGhlIGNhbGVuZGVyIHBpY2tlciBwb3B1cCBzaXplIHNob3VsZAorICAgICAg ICBiZSBtaW5pbWFsLgorCisgICAgICAgIFRoZSBtaW5pbWFsIHNpemUgZGVwZW5kcyBvbiBmb250 IHNldHRpbmdzLCBsb2NhbGl6ZWQgbGFiZWxzLCBhbmQKKyAgICAgICAgbG9jYWxpemFlZCBmb3Jt YXRzLiBTbyB3ZSBwdXQgb2JqZWN0cyBvbiBhIHRyYXNwYXJlbnQgZWxlbWVudCwgY2FsY3VsYXRl CisgICAgICAgIG1pbmltYWwgc2l6ZSwgcmVzaXplIHRoZSBwb3B1cCwgdGhlbiBzaG93IHRoZSBv YmplY3RzLgorCisgICAgICAgICogUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmNzczoKKyAgICAg ICAgKGJvZHkpOiBEb24ndCB1c2UgcHVycGxlLiBJdCB3YXMgZm9yIGRlYnVnZ2luZyBwdXJwb3Nl LgorICAgICAgICBUaGUgYm9keSBpcyB2aXNpYmxlIGZvciBhIHNob3J0IHBlcmlvZCBiZWN1c2Ug d2UgdXNlIHRyYW5zcGFyZW50IGVsZW1lbnQuCisgICAgICAgICgjbWFpbik6CisgICAgICAgICAt IEFkZCBub3dyYXAgdG8gYXZvaWQgdGV4dCB3cmFwcGluZy4KKyAgICAgICAgIC0gQWRkIHdpZGVy IHdpZHRoIHRvIGF2b2lkIHdyYXBwaW5nLgorICAgICAgICAgLSBBZGQgb3BhY2l0eSB0byBoaWRl IGluY29tcGxldGUgbGF5b3V0LgorICAgICAgICAoLnllYXItbW9udGgtdXBwZXIpOiBEb24ndCBz ZXQgZmxleGlibGUgYm94IHlldC4KKyAgICAgICAgKC5tb250aC1zZWxlY3Rvci1ib3gpOiBGaXgg aW5jb3JyZWN0IGRpc3BsYXkgdmFsdWUuCisgICAgICAgICguZGF5cy1hcmVhKToKKyAgICAgICAg RG9uJ3Qgc2V0IHRhYmxlLWxheW91dDpmaXhlZCBhbmQgd2lkdGg6MTAwJSBpbiBvcmRlciB0aGF0 IGl0IGhhcyB0aGUKKyAgICAgICAgbWluaW1hbCB3aWR0aC4KKworICAgICAgICAqIFJlc291cmNl cy9jYWxlbmRhclBpY2tlci5qczoKKyAgICAgICAgKGluaXRpYWxpemUpOiBNYWtlIGEgbmV3IGZ1 bmN0aW8gdG8gcmVzaXplLgorICAgICAgICAoZml4V2luZG93U2l6ZSk6CisgICAgICAgIENvbXB1 dGUgdGhlIHJlcXVpcmVkIHdpZHRoIGZyb20gdGhlIHJpZ2h0IGVkZ2Ugb2YgdGhlIG5leHQgeWVh ciBidXR0b24sCisgICAgICAgIHRoZSBtYXhpbXVtIGNlbGwgd2lkdGgsIGFuZCBzbyBvbi4gIFRo ZW4sIHNldCBDU1MgcHJvcGVydGllcyB0byBoYXZlCisgICAgICAgIGNvcnJlY3QgbGF5b3V0Lgor ICAgICAgICAoWWVhck1vbnRoQ29udHJvbGxlci5wcm90b3R5cGUuYXR0YWNoVG8pOgorICAgICAg ICBTZXQgbWluLXdpZHRoIHByb3BlcnR5IGZvciBhIGxvbmcgeWVhci1tb250aCBzdHJpbmcuCisg ICAgICAgIChZZWFyTW9udGhDb250cm9sbGVyLnByb3RvdHlwZS5fc2hvd1BvcHVwKToKKyAgICAg ICAgQ2VudGVyIHRoZSBfbW9udGhQb3B1cCB2ZXJ0aWNhbGx5LgorCisgICAgICAgICogaHRtbC9z aGFkb3cvQ2FsZW5kYXJQaWNrZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbGVu ZGFyUGlja2VyRWxlbWVudDo6Y29udGVudFNpemUpOgorICAgICAgICBTcGVjaWZ5IHNtYWxsIHNp emUgZm9yIHRoZSBpbml0aWFsIHNpemUuIEl0J3MgYmV0dGVyIHRoYW4gc2hvd2luZyBhCisgICAg ICAgIGxhcmdlIHdpbmRvdyB0aGVuIHNocmluayB0aGUgc2l6ZS4KKyAgICAgICAgKiBwYWdlL1Bh Z2VQb3B1cENsaWVudC5oOgorICAgICAgICAoUGFnZVBvcHVwQ2xpZW50KTogUmVtb3ZlIGEgZmFs c2UgY29tbWVudC4gV2Ugc2hvdWxkIHN1cHBvcnQgcmVzaXplKigpLgorCiAyMDEyLTA0LTI0ICBZ YWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIE1vdmUg bm90aWZpY2F0aW9uIGljb24gZG93bmxvYWQgb3V0IG9mIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL1Jlc291cmNlcy9jYWxlbmRhclBpY2tlci5jc3MgYi9Tb3VyY2UvV2ViQ29y ZS9SZXNvdXJjZXMvY2FsZW5kYXJQaWNrZXIuY3NzCmluZGV4IDcyYjU5NDMxZmFmNzk0YmI3NjEx N2Y3NzBiMDA4ODkwNmEzM2M5ZmUuLmVjOTM4ZTYzMWNmN2U3ZWYwNDg4NWNkYmNhNjA5OWQzMDMw ZTE0YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9jYWxlbmRhclBpY2tl ci5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmNzcwpA QCAtMzAsNyArMzAsNyBAQAogCiBib2R5IHsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25l OwotICAgIGJhY2tncm91bmQtY29sb3I6IHB1cnBsZTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3 aGl0ZTsKICAgICBmb250OiAtd2Via2l0LXNtYWxsLWNvbnRyb2w7CiAgICAgbWFyZ2luOiAwOwog ICAgIG92ZXJmbG93OiBoaWRkZW47CkBAIC00NiwxMyArNDYsMTcgQEAgYm9keSB7CiAgICAgYm94 LXNoYWRvdzogaW5zZXQgMnB4IDJweCAycHggd2hpdGUsCiAgICAgICAgIGluc2V0IC0ycHggLTJw eCAxcHggcmdiYSgwLDAsMCwwLjEpOwogICAgIHBhZGRpbmc6IDZweDsKKyAgICB3aGl0ZXNwYWNl OiBub3dyYXA7CisgICAgLyogd2lkdGggYW5kIG9wYWNpdHkgYXJlIHJlc2V0IGluIHRoZSBKUyBj b2RlLiAqLworICAgIHdpZHRoOiA1MDBweDsKKyAgICBvcGFjaXR5OiAwLjM7CiB9CiAKIC55ZWFy LW1vbnRoLWFyZWEgewogfQogCiAueWVhci1tb250aC11cHBlciB7Ci0gICAgZGlzcGxheTogLXdl YmtpdC1ib3g7CisgICAgLyogZGlzcGxheTotd2Via2l0LWJveDsgaXMgYWRkZWQgaW4gdGhlIEpT IGNvZGUuICovCiB9CiAKIC55ZWFyLXNlbGVjdG9yIHsKQEAgLTYxLDcgKzY1LDcgQEAgYm9keSB7 CiB9CiAKIC5tb250aC1zZWxlY3Rvci1ib3ggewotICAgIGRpc3BsYXk6IGlubGluZS1ib3g7Cisg ICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwogICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICAt d2Via2l0LWJveC1mbGV4OiAyOwogfQpAQCAtMTQxLDggKzE0NSw3IEBAIGJvZHkgewogICAgIGJv cmRlci1jb2xsYXBzZTogc2VwYXJhdGU7CiAgICAgYm9yZGVyLXNwYWNpbmc6IDBweDsKICAgICBm b250OiAtd2Via2l0LXNtYWxsLWNvbnRyb2w7Ci0gICAgdGFibGUtbGF5b3V0OiBmaXhlZDsKLSAg ICB3aWR0aDogMTAwJTsKKyAgICAvKiB0YWJsZS1sYXlvdXQ6Zml4ZWQgYW5kIHdpZHRoOjEwMCUg YXJlIGFkZGVkIGluIHRoZSBKUyBjb2RlLiAqLwogfQogCiAuZGF5LWxhYmVsIHsgLyogPHRoPiAq LwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmpz IGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmpzCmluZGV4IDYyMTU0 NWY2ZjMwNGVjYWMxOWQ0NDc1YzY1ZGRhNWNkMGIxODhhOGQuLmNlZWJhNzJkNjUyZjM1Mzg2ODFk ZjU4ZjEyYjFjZTE1MjM4YTdhZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jlc291cmNl cy9jYWxlbmRhclBpY2tlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvY2FsZW5k YXJQaWNrZXIuanMKQEAgLTI4NiwxMiArMjg2LDQwIEBAIGZ1bmN0aW9uIGluaXRpYWxpemUoYXJn cykgewogICAgICAgICAgICAgaW5pdGlhbERhdGUgPSBnbG9iYWwubWF4aW11bURhdGU7CiAgICAg ICAgIGdsb2JhbC5kYXlzVGFibGUuc2VsZWN0RGF0ZShpbml0aWFsRGF0ZSk7CiAKLSAgICAgICAg c2V0VGltZW91dChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIGlmICh3aW5kb3cuZnJhbWVFbGVt ZW50KQotICAgICAgICAgICAgICAgIHdpbmRvdy5mcmFtZUVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0g bWFpbi5vZmZzZXRIZWlnaHQgKyAicHgiOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgIHdpbmRvdy5yZXNpemVUbyh3aW5kb3cub3V0ZXJXaWR0aCwgbWFpbi5vZmZzZXRUb3AgKyBt YWluLm9mZnNldEhlaWdodCk7Ci0gICAgICAgIH0sIDApOworICAgICAgICBzZXRUaW1lb3V0KGZp eFdpbmRvd1NpemUsIDApOworICAgIH0KK30KKworZnVuY3Rpb24gZml4V2luZG93U2l6ZSgpIHsK KyAgICB2YXIgeWVhck1vbnRoUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeUNs YXNzTmFtZShDbGFzc05hbWVzLlllYXJNb250aEJ1dHRvblJpZ2h0KVswXTsKKyAgICB2YXIgZGF5 c0FyZWFFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZShDbGFzc05hbWVz LkRheXNBcmVhKVswXTsKKyAgICB2YXIgaGVhZGVycyA9IGRheXNBcmVhRWxlbWVudC5nZXRFbGVt ZW50c0J5Q2xhc3NOYW1lKENsYXNzTmFtZXMuRGF5TGFiZWwpOworICAgIHZhciBtYXhDZWxsV2lk dGggPSAwOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgaGVhZGVycy5sZW5ndGg7ICsraSkgewor ICAgICAgICBpZiAobWF4Q2VsbFdpZHRoIDwgaGVhZGVyc1tpXS5vZmZzZXRXaWR0aCkKKyAgICAg ICAgICAgIG1heENlbGxXaWR0aCA9IGhlYWRlcnNbaV0ub2Zmc2V0V2lkdGg7CisgICAgfQorICAg IHZhciBEYXlzQXJlYUNvbnRhaW5lckJvcmRlciA9IDE7CisgICAgdmFyIG1heFJpZ2h0ID0gTWF0 aC5tYXgoeWVhck1vbnRoUmlnaHRFbGVtZW50Lm9mZnNldExlZnQgKyB5ZWFyTW9udGhSaWdodEVs ZW1lbnQub2Zmc2V0V2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF5c0FyZWFF bGVtZW50Lm9mZnNldExlZnQgKyBtYXhDZWxsV2lkdGggKiA3ICsgRGF5c0FyZWFDb250YWluZXJC b3JkZXIpOworICAgIHZhciBNYWluUGFkZGluZyA9IDY7CisgICAgdmFyIE1haW5Cb3JkZXIgPSAx OworICAgIHZhciBkZXNpcmVkQm9keVdpZHRoID0gbWF4UmlnaHQgKyBNYWluUGFkZGluZyArIE1h aW5Cb3JkZXI7CisKKyAgICB2YXIgbWFpbiA9ICQoIm1haW4iKTsKKyAgICB2YXIgbWFpbkhlaWdo dCA9IG1haW4ub2Zmc2V0SGVpZ2h0OworICAgIG1haW4uc3R5bGUud2lkdGggPSAiYXV0byI7Cisg ICAgZGF5c0FyZWFFbGVtZW50LnN0eWxlLndpZHRoID0gIjEwMCUiOworICAgIGRheXNBcmVhRWxl bWVudC5zdHlsZS50YWJsZUxheW91dCA9ICJmaXhlZCI7CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVu dHNCeUNsYXNzTmFtZShDbGFzc05hbWVzLlllYXJNb250aFVwcGVyKVswXS5zdHlsZS5kaXNwbGF5 ID0gIi13ZWJraXQtYm94IjsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKENs YXNzTmFtZXMuTW9udGhTZWxlY3RvckJveClbMF0uc3R5bGUuZGlzcGxheSA9ICJibG9jayI7Cisg ICAgbWFpbi5zdHlsZS53ZWJraXRUcmFuc2l0aW9uID0gIm9wYWNpdHkgMC4xcyBlYXNlIjsKKyAg ICBtYWluLnN0eWxlLm9wYWNpdHkgPSAiMSI7CisgICAgaWYgKHdpbmRvdy5mcmFtZUVsZW1lbnQp IHsKKyAgICAgICAgd2luZG93LmZyYW1lRWxlbWVudC5zdHlsZS53aWR0aCA9IGRlc2lyZWRCb2R5 V2lkdGggKyAicHgiOworICAgICAgICB3aW5kb3cuZnJhbWVFbGVtZW50LnN0eWxlLmhlaWdodCA9 IG1haW5IZWlnaHQgKyAicHgiOworICAgIH0gZWxzZSB7CisgICAgICAgIHdpbmRvdy5yZXNpemVU byhkZXNpcmVkQm9keVdpZHRoLCBtYWluSGVpZ2h0KTsKICAgICB9CiB9CiAKQEAgLTM5OCw2ICs0 MjYsMTYgQEAgWWVhck1vbnRoQ29udHJvbGxlci5wcm90b3R5cGUuYXR0YWNoVG8gPSBmdW5jdGlv bihtYWluKSB7CiAgICAgdGhpcy5fd2FsbC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIGJpbmQo dGhpcy5fY2xvc2VQb3B1cCwgdGhpcyksIGZhbHNlKTsKICAgICBtYWluLmFwcGVuZENoaWxkKHRo aXMuX3dhbGwpOwogCisgICAgLy8gVGhlIG1heGltdW0geWVhciB3aGljaCA8aW5wdXQgdHlwZT1k YXRlPiBzdXBwb3J0cyBpcyAyNzUsNzYwLgorICAgIC8vIFNlZSBXZWJDb3JlL3BsYXRmb3JtL0Rh dGVDb21wb25lbnRzLmgKKyAgICB2YXIgTWF4aW11bVllYXIgPSAyNzU3NjA7CisgICAgdmFyIG1h eFdpZHRoID0gMDsKKyAgICBmb3IgKHZhciBtID0gMDsgbSA8IDEyOyArK20pIHsKKyAgICAgICAg dGhpcy5fbW9udGgudGV4dENvbnRlbnQgPSBmb3JtYXRZZWFyTW9udGgoTWF4aW11bVllYXIsIG0p OworICAgICAgICBtYXhXaWR0aCA9IE1hdGgubWF4KG1heFdpZHRoLCB0aGlzLl9tb250aC5vZmZz ZXRXaWR0aCk7CisgICAgfQorICAgIHRoaXMuX21vbnRoLnN0eWxlLm1pbldpZHRoID0gbWF4V2lk dGggKyAncHgnOworCiAgICAgZ2xvYmFsLmZpcnN0Rm9jdXNhYmxlQ29udHJvbCA9IHRoaXMuX2xl ZnQyOyAvLyBGSVhNRTogU2hvdWQgaXQgYmUgdGhpcy5tb250aD8KIH07CiAKQEAgLTUxMyw3ICs1 NTEsNyBAQCBZZWFyTW9udGhDb250cm9sbGVyLnByb3RvdHlwZS5fc2hvd1BvcHVwID0gZnVuY3Rp b24oKSB7CiAgICAgdGhpcy5fbW9udGhQb3B1cC5zdHlsZS5kaXNwbGF5ID0gImJsb2NrIjsKICAg ICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLnBvc2l0aW9uID0gImFic29sdXRlIjsKICAgICB0aGlz Ll9tb250aFBvcHVwLnN0eWxlLnpJbmRleCA9ICIxMDAwIjsgLy8gTGFyZ2VyIHRoYW4gdGhlIGRh eXMgYXJlYS4KLSAgICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLmxlZnQgPSB0aGlzLl9tb250aC5v ZmZzZXRMZWZ0ICsgInB4IjsKKyAgICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLmxlZnQgPSB0aGlz Ll9tb250aC5vZmZzZXRMZWZ0ICsgKHRoaXMuX21vbnRoLm9mZnNldFdpZHRoIC0gdGhpcy5fbW9u dGhQb3B1cC5vZmZzZXRXaWR0aCkgLyAyICsgInB4IjsKICAgICB0aGlzLl9tb250aFBvcHVwLnN0 eWxlLnRvcCA9IHRoaXMuX21vbnRoLm9mZnNldFRvcCArIHRoaXMuX21vbnRoLm9mZnNldEhlaWdo dCArICJweCI7CiAgICAgdGhpcy5fbW9udGhQb3B1cC5mb2N1cygpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ2FsZW5kYXJQaWNrZXJFbGVtZW50LmNwcAppbmRleCBh NWQ3ZjBiZjVhODZiMDZmMDg3NmZmYWMyNTUxNTJjYjFlMWVmMTBmLi43Y2U4YjQ0NTkxYjcwYmY4 NWVkZDE4NzExZDVkMDIwMTFjOThmMDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHAKQEAgLTEyOSw3ICsxMjksNyBAQCB2 b2lkIENhbGVuZGFyUGlja2VyRWxlbWVudDo6ZGV0YWNoKCkKIAogSW50U2l6ZSBDYWxlbmRhclBp Y2tlckVsZW1lbnQ6OmNvbnRlbnRTaXplKCkKIHsKLSAgICByZXR1cm4gSW50U2l6ZSgzMjAsIDI1 Nik7CisgICAgcmV0dXJuIEludFNpemUoMTAwLCAxMDApOwogfQogCiAjZGVmaW5lIGFkZExpdGVy YWwobGl0ZXJhbCwgd3JpdGVyKSAgICB3cml0ZXIuYWRkRGF0YShsaXRlcmFsLCBzaXplb2YobGl0 ZXJhbCkgLSAxKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlUG9wdXBDbGll bnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmgKaW5kZXggNDUwYzJk NzMwN2E1Njc3NzVlM2YxOGJhNzcyYzk2OTY1ODJlYmQ3OS4uZDMyOWFkYTkxYTM5MDUwNGJhOTY4 ZjBiNDE1ZTE4NThhODI4YzlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl UG9wdXBDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VQb3B1cENsaWVudC5o CkBAIC00OCw3ICs0OCw2IEBAIHB1YmxpYzoKICAgICAvLyBzb3VyY2UgaXMgcmVuZGVyZWQgaW4g YSBQYWdlUG9wdXAuCiAgICAgLy8gVGhlIGNvbnRlbnQgSFRNTCBzdXBwb3J0czoKICAgICAvLyAg LSBObyA8c2VsZWN0PiBwb3B1cHMKLSAgICAvLyAgLSBObyB3aW5kb3cucmVzaXplQnkoKSBhbmQg cmVzaXplVG8oKQogICAgIC8vICAtIHdpbmRvdy5zZXRWYWx1ZUFuZENsb3NlUG9wdXAobnVtYmVy LCBzdHJpbmcpLgogICAgIHZpcnR1YWwgdm9pZCB3cml0ZURvY3VtZW50KERvY3VtZW50V3JpdGVy JikgPSAwOwogCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggNzdiYjky ZDlkMzc1MWI4NmJmYzM4MDFkZDFkNTc1NDcyMDFhMjczYy4uNzY3ZGVmOGEzOTc3ZDEyMmVkMDE5 NmRmYTY3ODRhZTk1Y2ZhNjkwNCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTI0ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9t aXVtLm9yZz4KKworICAgICAgICBDYWxlbmRhciBQaWNrZXI6IFJlc2l6ZSB0byBtaW5pbWFsIHNp emUgdG8gZml0IHRoZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NDgyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogTWFudWFsVGVzdHMvZm9ybXMvY2FsZW5kYXItcGlja2VyLmh0bWw6Cisg ICAgICAgIFN5bmMgd2l0aCB0aGUgc2l6ZSBzcGVjaWZpZWQgaW4gQ2FsZW5kYXJQaWNrZXJFbGVt ZW50LmNwcC4KKwogMjAxMi0wNC0yMyAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgQWRkIHRlc3QgZnVuY3Rpb24gdG8gZ2V0IHBsYWNlaG9sZGVyIHN0cmluZwpk aWZmIC0tZ2l0IGEvTWFudWFsVGVzdHMvZm9ybXMvY2FsZW5kYXItcGlja2VyLmh0bWwgYi9NYW51 YWxUZXN0cy9mb3Jtcy9jYWxlbmRhci1waWNrZXIuaHRtbAppbmRleCBjNGE3YjViNzMwYWVkNTFm YjM5YTZjYjEyZTFmY2UxZTJmYTU0YmIwLi40M2VlZDVjOTVhNjIyYzE4ZmRmNGRkNzY3YjI0NGU3 YTY3MDc3NTliIDEwMDY0NAotLS0gYS9NYW51YWxUZXN0cy9mb3Jtcy9jYWxlbmRhci1waWNrZXIu aHRtbAorKysgYi9NYW51YWxUZXN0cy9mb3Jtcy9jYWxlbmRhci1waWNrZXIuaHRtbApAQCAtOSw4 ICs5LDggQEAgYm9keSB7CiB9CiBpZnJhbWUgewogICAgIHotaW5kZXg6IDIxNDc0ODM2NDc7Ci0g ICAgd2lkdGg6IDI5MHB4OwotICAgIGhlaWdodDogMjU2cHg7CisgICAgd2lkdGg6IDEwMHB4Owor ICAgIGhlaWdodDogMTAwcHg7CiAgICAgYm9yZGVyOiAwOwogICAgIG92ZXJmbG93OiBoaWRkZW47 CiB9Cg== 138749 2012-04-25 00:30:46 -0700 2012-04-25 17:57:33 -0700 Patch 2 bug-84826-20120425163044.patch text/plain 9529 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2U1NWE4NWU1MzhjNGQx ZTJiYjNmYTM2MjU5MDA1NmQ3MzU0YjA5Mi4uZjEzNzZjYzJkMmViOThiZjk4ZTU4NmM0MzVlOGI5 ZmUwZjJmMDM1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEyLTA0LTI0ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDYWxlbmRhciBQaWNrZXI6 IFJlc2l6ZSB0byBtaW5pbWFsIHNpemUgdG8gZml0IHRoZSBjb250ZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDgyNgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIGZpeGVkLXNpemUgcG9wdXAg aXNuJ3QgbmljZS4gVGhlIGNhbGVuZGVyIHBpY2tlciBwb3B1cCBzaXplIHNob3VsZAorICAgICAg ICBiZSBtaW5pbWFsLgorCisgICAgICAgIFRoZSBtaW5pbWFsIHNpemUgZGVwZW5kcyBvbiBmb250 IHNldHRpbmdzLCBsb2NhbGl6ZWQgbGFiZWxzLCBhbmQKKyAgICAgICAgbG9jYWxpemVkIGZvcm1h dHMuIFNvIHdlIHB1dCB2aXNpYmxlIG9iamVjdHMgb24gYSB0cmFuc3BhcmVudCBlbGVtZW50LAor ICAgICAgICBjYWxjdWxhdGUgbWluaW1hbCBzaXplLCByZXNpemUgdGhlIHBvcHVwLCB0aGVuIHNo b3cgdGhlIG9iamVjdHMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvY2FsZW5kYXJQaWNrZXIuY3Nz OgorICAgICAgICAoYm9keSk6IERvbid0IHVzZSBwdXJwbGUuIEl0IHdhcyBmb3IgZGVidWdnaW5n IHB1cnBvc2UuCisgICAgICAgIFRoZSBib2R5IGlzIHZpc2libGUgZm9yIGEgc2hvcnQgcGVyaW9k IGJlY3VzZSB3ZSB1c2UgdHJhbnNwYXJlbnQgZWxlbWVudC4KKyAgICAgICAgKCNtYWluKToKKyAg ICAgICAgIC0gQWRkIG5vd3JhcCB0byBhdm9pZCB0ZXh0IHdyYXBwaW5nLgorICAgICAgICAgLSBB ZGQgd2lkZXIgd2lkdGggdG8gYXZvaWQgd3JhcHBpbmcuCisgICAgICAgICAtIEFkZCBvcGFjaXR5 IHRvIGhpZGUgaW5jb21wbGV0ZSBsYXlvdXQuCisgICAgICAgICgueWVhci1tb250aC11cHBlcik6 IERvbid0IHNldCBmbGV4aWJsZSBib3ggeWV0LgorICAgICAgICAoLm1vbnRoLXNlbGVjdG9yLWJv eCk6IEZpeCBpbmNvcnJlY3QgZGlzcGxheSB2YWx1ZS4KKyAgICAgICAgKC5kYXlzLWFyZWEpOgor ICAgICAgICBEb24ndCBzZXQgdGFibGUtbGF5b3V0OmZpeGVkIGFuZCB3aWR0aDoxMDAlIGluIG9y ZGVyIHRoYXQgaXQgaGFzIHRoZQorICAgICAgICBtaW5pbWFsIHdpZHRoLgorCisgICAgICAgICog UmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmpzOgorICAgICAgICAoaW5pdGlhbGl6ZSk6IE1ha2Ug YSBuZXcgZnVuY3RpbyB0byByZXNpemUuCisgICAgICAgIChmaXhXaW5kb3dTaXplKToKKyAgICAg ICAgQ29tcHV0ZSB0aGUgcmVxdWlyZWQgd2lkdGggZnJvbSB0aGUgcmlnaHQgZWRnZSBvZiB0aGUg bmV4dCB5ZWFyIGJ1dHRvbiwKKyAgICAgICAgdGhlIG1heGltdW0gY2VsbCB3aWR0aCwgYW5kIHNv IG9uLiAgVGhlbiwgc2V0IENTUyBwcm9wZXJ0aWVzIHRvIGhhdmUKKyAgICAgICAgY29ycmVjdCBs YXlvdXQuCisgICAgICAgIChZZWFyTW9udGhDb250cm9sbGVyLnByb3RvdHlwZS5hdHRhY2hUbyk6 CisgICAgICAgIFNldCBtaW4td2lkdGggcHJvcGVydHkgZm9yIGEgbG9uZyB5ZWFyLW1vbnRoIHN0 cmluZy4KKyAgICAgICAgKFllYXJNb250aENvbnRyb2xsZXIucHJvdG90eXBlLl9zaG93UG9wdXAp OgorICAgICAgICBDZW50ZXIgdGhlIF9tb250aFBvcHVwIHZlcnRpY2FsbHkuCisKKyAgICAgICAg KiBodG1sL3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FsZW5kYXJQaWNrZXJFbGVtZW50Ojpjb250ZW50U2l6ZSk6CisgICAgICAgIFNwZWNpZnkg c21hbGwgc2l6ZSBmb3IgdGhlIGluaXRpYWwgc2l6ZS4gSXQncyBiZXR0ZXIgdGhhbiBzaG93aW5n IGEKKyAgICAgICAgbGFyZ2Ugd2luZG93IHRoZW4gc2hyaW5rIHRoZSBzaXplLgorICAgICAgICAq IHBhZ2UvUGFnZVBvcHVwQ2xpZW50Lmg6CisgICAgICAgIChQYWdlUG9wdXBDbGllbnQpOiBSZW1v dmUgYSBmYWxzZSBjb21tZW50LiBXZSBzaG91bGQgc3VwcG9ydCByZXNpemUqKCkuCisKIDIwMTIt MDQtMjQgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFtR dF0gTW92ZSBub3RpZmljYXRpb24gaWNvbiBkb3dubG9hZCBvdXQgb2YgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmNzcyBiL1NvdXJj ZS9XZWJDb3JlL1Jlc291cmNlcy9jYWxlbmRhclBpY2tlci5jc3MKaW5kZXggNzJiNTk0MzFmYWY3 OTRiYjc2MTE3Zjc3MGIwMDg4OTA2YTMzYzlmZS4uYjA3MzdkMGUyYTBjNTBkZmNkOTE1NGY5N2Ri MWQ3MTZmZGNjOGNlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVu ZGFyUGlja2VyLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvY2FsZW5kYXJQaWNr ZXIuY3NzCkBAIC0zMCw3ICszMCw3IEBACiAKIGJvZHkgewogICAgIC13ZWJraXQtdXNlci1zZWxl Y3Q6IG5vbmU7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogcHVycGxlOworICAgIGJhY2tncm91bmQt Y29sb3I6IHdoaXRlOwogICAgIGZvbnQ6IC13ZWJraXQtc21hbGwtY29udHJvbDsKICAgICBtYXJn aW46IDA7CiAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKQEAgLTQ2LDEzICs0NiwxNyBAQCBib2R5IHsK ICAgICBib3gtc2hhZG93OiBpbnNldCAycHggMnB4IDJweCB3aGl0ZSwKICAgICAgICAgaW5zZXQg LTJweCAtMnB4IDFweCByZ2JhKDAsMCwwLDAuMSk7CiAgICAgcGFkZGluZzogNnB4OworICAgIHdo aXRlc3BhY2U6IG5vd3JhcDsKKyAgICAvKiB3aWR0aCBhbmQgb3BhY2l0eSBhcmUgcmVzZXQgaW4g dGhlIEpTIGNvZGUuICovCisgICAgd2lkdGg6IDUwMHB4OworICAgIG9wYWNpdHk6IDA7CiB9CiAK IC55ZWFyLW1vbnRoLWFyZWEgewogfQogCiAueWVhci1tb250aC11cHBlciB7Ci0gICAgZGlzcGxh eTogLXdlYmtpdC1ib3g7CisgICAgLyogZGlzcGxheTotd2Via2l0LWJveDsgaXMgYWRkZWQgaW4g dGhlIEpTIGNvZGUuICovCiB9CiAKIC55ZWFyLXNlbGVjdG9yIHsKQEAgLTYxLDcgKzY1LDcgQEAg Ym9keSB7CiB9CiAKIC5tb250aC1zZWxlY3Rvci1ib3ggewotICAgIGRpc3BsYXk6IGlubGluZS1i b3g7CisgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwogICAgIHRleHQtYWxpZ246IGNlbnRlcjsK ICAgICAtd2Via2l0LWJveC1mbGV4OiAyOwogfQpAQCAtMTQxLDggKzE0NSw3IEBAIGJvZHkgewog ICAgIGJvcmRlci1jb2xsYXBzZTogc2VwYXJhdGU7CiAgICAgYm9yZGVyLXNwYWNpbmc6IDBweDsK ICAgICBmb250OiAtd2Via2l0LXNtYWxsLWNvbnRyb2w7Ci0gICAgdGFibGUtbGF5b3V0OiBmaXhl ZDsKLSAgICB3aWR0aDogMTAwJTsKKyAgICAvKiB0YWJsZS1sYXlvdXQ6Zml4ZWQgYW5kIHdpZHRo OjEwMCUgYXJlIGFkZGVkIGluIHRoZSBKUyBjb2RlLiAqLwogfQogCiAuZGF5LWxhYmVsIHsgLyog PHRoPiAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlj a2VyLmpzIGIvU291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL2NhbGVuZGFyUGlja2VyLmpzCmluZGV4 IDYyMTU0NWY2ZjMwNGVjYWMxOWQ0NDc1YzY1ZGRhNWNkMGIxODhhOGQuLmNlZWJhNzJkNjUyZjM1 Mzg2ODFkZjU4ZjEyYjFjZTE1MjM4YTdhZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jl c291cmNlcy9jYWxlbmRhclBpY2tlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMv Y2FsZW5kYXJQaWNrZXIuanMKQEAgLTI4NiwxMiArMjg2LDQwIEBAIGZ1bmN0aW9uIGluaXRpYWxp emUoYXJncykgewogICAgICAgICAgICAgaW5pdGlhbERhdGUgPSBnbG9iYWwubWF4aW11bURhdGU7 CiAgICAgICAgIGdsb2JhbC5kYXlzVGFibGUuc2VsZWN0RGF0ZShpbml0aWFsRGF0ZSk7CiAKLSAg ICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIGlmICh3aW5kb3cuZnJh bWVFbGVtZW50KQotICAgICAgICAgICAgICAgIHdpbmRvdy5mcmFtZUVsZW1lbnQuc3R5bGUuaGVp Z2h0ID0gbWFpbi5vZmZzZXRIZWlnaHQgKyAicHgiOwotICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgIHdpbmRvdy5yZXNpemVUbyh3aW5kb3cub3V0ZXJXaWR0aCwgbWFpbi5vZmZzZXRU b3AgKyBtYWluLm9mZnNldEhlaWdodCk7Ci0gICAgICAgIH0sIDApOworICAgICAgICBzZXRUaW1l b3V0KGZpeFdpbmRvd1NpemUsIDApOworICAgIH0KK30KKworZnVuY3Rpb24gZml4V2luZG93U2l6 ZSgpIHsKKyAgICB2YXIgeWVhck1vbnRoUmlnaHRFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dHNCeUNsYXNzTmFtZShDbGFzc05hbWVzLlllYXJNb250aEJ1dHRvblJpZ2h0KVswXTsKKyAgICB2 YXIgZGF5c0FyZWFFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZShDbGFz c05hbWVzLkRheXNBcmVhKVswXTsKKyAgICB2YXIgaGVhZGVycyA9IGRheXNBcmVhRWxlbWVudC5n ZXRFbGVtZW50c0J5Q2xhc3NOYW1lKENsYXNzTmFtZXMuRGF5TGFiZWwpOworICAgIHZhciBtYXhD ZWxsV2lkdGggPSAwOworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgaGVhZGVycy5sZW5ndGg7ICsr aSkgeworICAgICAgICBpZiAobWF4Q2VsbFdpZHRoIDwgaGVhZGVyc1tpXS5vZmZzZXRXaWR0aCkK KyAgICAgICAgICAgIG1heENlbGxXaWR0aCA9IGhlYWRlcnNbaV0ub2Zmc2V0V2lkdGg7CisgICAg fQorICAgIHZhciBEYXlzQXJlYUNvbnRhaW5lckJvcmRlciA9IDE7CisgICAgdmFyIG1heFJpZ2h0 ID0gTWF0aC5tYXgoeWVhck1vbnRoUmlnaHRFbGVtZW50Lm9mZnNldExlZnQgKyB5ZWFyTW9udGhS aWdodEVsZW1lbnQub2Zmc2V0V2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF5 c0FyZWFFbGVtZW50Lm9mZnNldExlZnQgKyBtYXhDZWxsV2lkdGggKiA3ICsgRGF5c0FyZWFDb250 YWluZXJCb3JkZXIpOworICAgIHZhciBNYWluUGFkZGluZyA9IDY7CisgICAgdmFyIE1haW5Cb3Jk ZXIgPSAxOworICAgIHZhciBkZXNpcmVkQm9keVdpZHRoID0gbWF4UmlnaHQgKyBNYWluUGFkZGlu ZyArIE1haW5Cb3JkZXI7CisKKyAgICB2YXIgbWFpbiA9ICQoIm1haW4iKTsKKyAgICB2YXIgbWFp bkhlaWdodCA9IG1haW4ub2Zmc2V0SGVpZ2h0OworICAgIG1haW4uc3R5bGUud2lkdGggPSAiYXV0 byI7CisgICAgZGF5c0FyZWFFbGVtZW50LnN0eWxlLndpZHRoID0gIjEwMCUiOworICAgIGRheXNB cmVhRWxlbWVudC5zdHlsZS50YWJsZUxheW91dCA9ICJmaXhlZCI7CisgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudHNCeUNsYXNzTmFtZShDbGFzc05hbWVzLlllYXJNb250aFVwcGVyKVswXS5zdHlsZS5k aXNwbGF5ID0gIi13ZWJraXQtYm94IjsKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5Q2xhc3NO YW1lKENsYXNzTmFtZXMuTW9udGhTZWxlY3RvckJveClbMF0uc3R5bGUuZGlzcGxheSA9ICJibG9j ayI7CisgICAgbWFpbi5zdHlsZS53ZWJraXRUcmFuc2l0aW9uID0gIm9wYWNpdHkgMC4xcyBlYXNl IjsKKyAgICBtYWluLnN0eWxlLm9wYWNpdHkgPSAiMSI7CisgICAgaWYgKHdpbmRvdy5mcmFtZUVs ZW1lbnQpIHsKKyAgICAgICAgd2luZG93LmZyYW1lRWxlbWVudC5zdHlsZS53aWR0aCA9IGRlc2ly ZWRCb2R5V2lkdGggKyAicHgiOworICAgICAgICB3aW5kb3cuZnJhbWVFbGVtZW50LnN0eWxlLmhl aWdodCA9IG1haW5IZWlnaHQgKyAicHgiOworICAgIH0gZWxzZSB7CisgICAgICAgIHdpbmRvdy5y ZXNpemVUbyhkZXNpcmVkQm9keVdpZHRoLCBtYWluSGVpZ2h0KTsKICAgICB9CiB9CiAKQEAgLTM5 OCw2ICs0MjYsMTYgQEAgWWVhck1vbnRoQ29udHJvbGxlci5wcm90b3R5cGUuYXR0YWNoVG8gPSBm dW5jdGlvbihtYWluKSB7CiAgICAgdGhpcy5fd2FsbC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIs IGJpbmQodGhpcy5fY2xvc2VQb3B1cCwgdGhpcyksIGZhbHNlKTsKICAgICBtYWluLmFwcGVuZENo aWxkKHRoaXMuX3dhbGwpOwogCisgICAgLy8gVGhlIG1heGltdW0geWVhciB3aGljaCA8aW5wdXQg dHlwZT1kYXRlPiBzdXBwb3J0cyBpcyAyNzUsNzYwLgorICAgIC8vIFNlZSBXZWJDb3JlL3BsYXRm b3JtL0RhdGVDb21wb25lbnRzLmgKKyAgICB2YXIgTWF4aW11bVllYXIgPSAyNzU3NjA7CisgICAg dmFyIG1heFdpZHRoID0gMDsKKyAgICBmb3IgKHZhciBtID0gMDsgbSA8IDEyOyArK20pIHsKKyAg ICAgICAgdGhpcy5fbW9udGgudGV4dENvbnRlbnQgPSBmb3JtYXRZZWFyTW9udGgoTWF4aW11bVll YXIsIG0pOworICAgICAgICBtYXhXaWR0aCA9IE1hdGgubWF4KG1heFdpZHRoLCB0aGlzLl9tb250 aC5vZmZzZXRXaWR0aCk7CisgICAgfQorICAgIHRoaXMuX21vbnRoLnN0eWxlLm1pbldpZHRoID0g bWF4V2lkdGggKyAncHgnOworCiAgICAgZ2xvYmFsLmZpcnN0Rm9jdXNhYmxlQ29udHJvbCA9IHRo aXMuX2xlZnQyOyAvLyBGSVhNRTogU2hvdWQgaXQgYmUgdGhpcy5tb250aD8KIH07CiAKQEAgLTUx Myw3ICs1NTEsNyBAQCBZZWFyTW9udGhDb250cm9sbGVyLnByb3RvdHlwZS5fc2hvd1BvcHVwID0g ZnVuY3Rpb24oKSB7CiAgICAgdGhpcy5fbW9udGhQb3B1cC5zdHlsZS5kaXNwbGF5ID0gImJsb2Nr IjsKICAgICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLnBvc2l0aW9uID0gImFic29sdXRlIjsKICAg ICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLnpJbmRleCA9ICIxMDAwIjsgLy8gTGFyZ2VyIHRoYW4g dGhlIGRheXMgYXJlYS4KLSAgICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLmxlZnQgPSB0aGlzLl9t b250aC5vZmZzZXRMZWZ0ICsgInB4IjsKKyAgICB0aGlzLl9tb250aFBvcHVwLnN0eWxlLmxlZnQg PSB0aGlzLl9tb250aC5vZmZzZXRMZWZ0ICsgKHRoaXMuX21vbnRoLm9mZnNldFdpZHRoIC0gdGhp cy5fbW9udGhQb3B1cC5vZmZzZXRXaWR0aCkgLyAyICsgInB4IjsKICAgICB0aGlzLl9tb250aFBv cHVwLnN0eWxlLnRvcCA9IHRoaXMuX21vbnRoLm9mZnNldFRvcCArIHRoaXMuX21vbnRoLm9mZnNl dEhlaWdodCArICJweCI7CiAgICAgdGhpcy5fbW9udGhQb3B1cC5mb2N1cygpOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ2FsZW5kYXJQaWNrZXJFbGVtZW50LmNwcApp bmRleCBhNWQ3ZjBiZjVhODZiMDZmMDg3NmZmYWMyNTUxNTJjYjFlMWVmMTBmLi43Y2U4YjQ0NTkx YjcwYmY4NWVkZDE4NzExZDVkMDIwMTFjOThmMDY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9DYWxlbmRhclBpY2tlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L0NhbGVuZGFyUGlja2VyRWxlbWVudC5jcHAKQEAgLTEyOSw3ICsxMjks NyBAQCB2b2lkIENhbGVuZGFyUGlja2VyRWxlbWVudDo6ZGV0YWNoKCkKIAogSW50U2l6ZSBDYWxl bmRhclBpY2tlckVsZW1lbnQ6OmNvbnRlbnRTaXplKCkKIHsKLSAgICByZXR1cm4gSW50U2l6ZSgz MjAsIDI1Nik7CisgICAgcmV0dXJuIEludFNpemUoMTAwLCAxMDApOwogfQogCiAjZGVmaW5lIGFk ZExpdGVyYWwobGl0ZXJhbCwgd3JpdGVyKSAgICB3cml0ZXIuYWRkRGF0YShsaXRlcmFsLCBzaXpl b2YobGl0ZXJhbCkgLSAxKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlUG9w dXBDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVBvcHVwQ2xpZW50LmgKaW5kZXgg NDUwYzJkNzMwN2E1Njc3NzVlM2YxOGJhNzcyYzk2OTY1ODJlYmQ3OS4uZDMyOWFkYTkxYTM5MDUw NGJhOTY4ZjBiNDE1ZTE4NThhODI4YzlmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlUG9wdXBDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VQb3B1cENs aWVudC5oCkBAIC00OCw3ICs0OCw2IEBAIHB1YmxpYzoKICAgICAvLyBzb3VyY2UgaXMgcmVuZGVy ZWQgaW4gYSBQYWdlUG9wdXAuCiAgICAgLy8gVGhlIGNvbnRlbnQgSFRNTCBzdXBwb3J0czoKICAg ICAvLyAgLSBObyA8c2VsZWN0PiBwb3B1cHMKLSAgICAvLyAgLSBObyB3aW5kb3cucmVzaXplQnko KSBhbmQgcmVzaXplVG8oKQogICAgIC8vICAtIHdpbmRvdy5zZXRWYWx1ZUFuZENsb3NlUG9wdXAo bnVtYmVyLCBzdHJpbmcpLgogICAgIHZpcnR1YWwgdm9pZCB3cml0ZURvY3VtZW50KERvY3VtZW50 V3JpdGVyJikgPSAwOwogCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXgg NzdiYjkyZDlkMzc1MWI4NmJmYzM4MDFkZDFkNTc1NDcyMDFhMjczYy4uNzY3ZGVmOGEzOTc3ZDEy MmVkMDE5NmRmYTY3ODRhZTk1Y2ZhNjkwNCAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTI0ICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KKworICAgICAgICBDYWxlbmRhciBQaWNrZXI6IFJlc2l6ZSB0byBtaW5p bWFsIHNpemUgdG8gZml0IHRoZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04NDgyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogTWFudWFsVGVzdHMvZm9ybXMvY2FsZW5kYXItcGlja2VyLmh0 bWw6CisgICAgICAgIFN5bmMgd2l0aCB0aGUgc2l6ZSBzcGVjaWZpZWQgaW4gQ2FsZW5kYXJQaWNr ZXJFbGVtZW50LmNwcC4KKwogMjAxMi0wNC0yMyAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgQWRkIHRlc3QgZnVuY3Rpb24gdG8gZ2V0IHBsYWNlaG9sZGVyIHN0 cmluZwpkaWZmIC0tZ2l0IGEvTWFudWFsVGVzdHMvZm9ybXMvY2FsZW5kYXItcGlja2VyLmh0bWwg Yi9NYW51YWxUZXN0cy9mb3Jtcy9jYWxlbmRhci1waWNrZXIuaHRtbAppbmRleCBjNGE3YjViNzMw YWVkNTFmYjM5YTZjYjEyZTFmY2UxZTJmYTU0YmIwLi40M2VlZDVjOTVhNjIyYzE4ZmRmNGRkNzY3 YjI0NGU3YTY3MDc3NTliIDEwMDY0NAotLS0gYS9NYW51YWxUZXN0cy9mb3Jtcy9jYWxlbmRhci1w aWNrZXIuaHRtbAorKysgYi9NYW51YWxUZXN0cy9mb3Jtcy9jYWxlbmRhci1waWNrZXIuaHRtbApA QCAtOSw4ICs5LDggQEAgYm9keSB7CiB9CiBpZnJhbWUgewogICAgIHotaW5kZXg6IDIxNDc0ODM2 NDc7Ci0gICAgd2lkdGg6IDI5MHB4OwotICAgIGhlaWdodDogMjU2cHg7CisgICAgd2lkdGg6IDEw MHB4OworICAgIGhlaWdodDogMTAwcHg7CiAgICAgYm9yZGVyOiAwOwogICAgIG92ZXJmbG93OiBo aWRkZW47CiB9Cg==