127580 2014-01-24 13:30:45 -0800 Replace LayoutUnit() calls to a more descriptive LayoutUnit::fromPixel(int). 2014-01-28 00:43:08 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 127562 1 zalan zalan commit-queue esprehn+autocc glenn jonlee kondapallykalyan webkit-bug-importer oldest_to_newest 971730 0 zalan 2014-01-24 13:30:45 -0800 LayoutUnit(1) is highly ambiguous. It is intended to set one (CSS) pixel, but it could read as 1 layout unit (1/64th of pixel atm) 971758 1 222155 zalan 2014-01-24 14:23:40 -0800 Created attachment 222155 Patch 971791 2 222155 commit-queue 2014-01-24 16:17:31 -0800 Comment on attachment 222155 Patch Clearing flags on attachment: 222155 Committed r162737: <http://trac.webkit.org/changeset/162737> 971792 3 commit-queue 2014-01-24 16:17:33 -0800 All reviewed patches have been landed. Closing bug. 972825 4 webkit-bug-importer 2014-01-28 00:43:08 -0800 <rdar://problem/15923398> 222155 2014-01-24 14:23:40 -0800 2014-01-24 16:17:31 -0800 Patch bug-127580-20140124142339.patch text/plain 10188 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDJlMzYzZTY4MGVlMDYz N2NhNTBjZTA5ZjlhMDIyMGQ3NTcxZGRhMS4uM2VmNDNhNTgxMjY2ZDY5ZTlkY2M5NGEwZmNjZWRl Yzg1N2YxZmNhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAxLTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwbGFjZSBMYXlvdXRVbml0 KCkgY2FsbHMgdG8gYSBtb3JlIGRlc2NyaXB0aXZlIExheW91dFVuaXQ6OmZyb21QaXhlbChpbnQp LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTgw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTGF5b3V0 VW5pdCgxKSBzdGF0ZW1lbnQgaXMgYW1iaWd1b3VzLiBXaGlsZSBpdCBpcyBpbnRlbmRlZCB0byBz ZXQgb25lIChDU1MpIHBpeGVsLCBpdAorICAgICAgICBjb3VsZCBiZSBpbnRlcnByZXRlZCBhcyAx IGxheW91dCB1bml0ICgxLzY0dGggb2YgYSBDU1MgcGl4ZWwgYXRtKS4KKworICAgICAgICBObyBj aGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yT3Zlcmxh eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpidWlsZE9iamVjdEZvclJlZ2lvbkhpZ2hsaWdodCk6 CisgICAgICAgICogcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpDb21wdXRlRmxvYXRPZmZzZXRGb3JGbG9hdExheW91dEFkYXB0ZXI8RmxvYXRUeXBlVmFs dWU+OjpoZWlnaHRSZW1haW5pbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0U2hhcGVJbnNpZGVJbmZv KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y29sbGFwc2VNYXJnaW5zKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJGbGV4aWJsZUJveDo6cHJlZmVycmVkTWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yQ2hpbGQpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmFsaWduQ2hpbGRyZW4pOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkOjphZGRGb3JjZWRSZWdpb25C cmVhayk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0OjpoZWlnaHRBZGp1c3RlZEZvclNl dE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6Y2FsY3Vs YXRlQmFsYW5jZWRIZWlnaHQpOgorCiAyMDE0LTAxLTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggYXV0b21ha2Ug d2FybmluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JP dmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNw cAppbmRleCBkNjk3ZTUxODE4OTkwZTYwZDllMTI5MzE3ZTFmMDBlZGIyZjA2YjdjLi5mMGFhMTNl OGU0MDFhZTRjYjAzOTU5ZmYzMDAzM2E4YWJmNjRmOWU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCkBAIC00MDYsNyArNDA2LDcgQEAgc3RhdGlj IFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvclJlZ2lvbkhpZ2hsaWdo dChGcmFtZVZpZXcqIG1haW4KIAogICAgIC8vIE1vdmUgdGhlIGxpbmsgYm94ZXMgc2xpZ2h0bHkg aW5zaWRlIHRoZSByZWdpb24gYm9yZGVyIGJveC4KICAgICBMYXlvdXRVbml0IG1heFVzYWJsZUhl aWdodCA9IHN0ZDo6bWF4KExheW91dFVuaXQoKSwgYm9yZGVyQm94LmhlaWdodCgpIC0gbGlua0Jv eE1pZHBvaW50LmhlaWdodCgpKTsKLSAgICBMYXlvdXRVbml0IGxpbmtCb3hWZXJ0aWNhbE9mZnNl dCA9IHN0ZDo6bWluKExheW91dFVuaXQoMTUpLCBtYXhVc2FibGVIZWlnaHQpOworICAgIExheW91 dFVuaXQgbGlua0JveFZlcnRpY2FsT2Zmc2V0ID0gc3RkOjptaW4oTGF5b3V0VW5pdDo6ZnJvbVBp eGVsKDE1KSwgbWF4VXNhYmxlSGVpZ2h0KTsKICAgICBpbmNvbWluZ1JlY3RCb3gubW92ZSgwLCBs aW5rQm94VmVydGljYWxPZmZzZXQpOwogICAgIG91dGdvaW5nUmVjdEJveC5tb3ZlKDAsIC1saW5r Qm94VmVydGljYWxPZmZzZXQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvRmxvYXRpbmdPYmplY3RzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGlu Z09iamVjdHMuY3BwCmluZGV4IDExMjY5MzUzNDg3MzA5OWY4ODA0Y2Y3NmYwMTcwYjA1Y2MwNjk5 MjQuLjc3ZjYyNjliYWVmMWJmNTY2ZWJhZTAxZTYxMTEzZGJiZmI3ODFjNjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuY3BwCkBAIC00NTAsNyArNDUwLDcg QEAgaW5saW5lIGJvb2wgQ29tcHV0ZUZsb2F0T2Zmc2V0Rm9yRmxvYXRMYXlvdXRBZGFwdGVyPEZs b2F0aW5nT2JqZWN0OjpGbG9hdFJpZ2h0PjoKIHRlbXBsYXRlIDxGbG9hdGluZ09iamVjdDo6VHlw ZSBGbG9hdFR5cGVWYWx1ZT4KIExheW91dFVuaXQgQ29tcHV0ZUZsb2F0T2Zmc2V0Rm9yRmxvYXRM YXlvdXRBZGFwdGVyPEZsb2F0VHlwZVZhbHVlPjo6aGVpZ2h0UmVtYWluaW5nKCkgY29uc3QKIHsK LSAgICByZXR1cm4gdGhpcy0+bV9vdXRlcm1vc3RGbG9hdCA/IHRoaXMtPm1fcmVuZGVyZXIubG9n aWNhbEJvdHRvbUZvckZsb2F0KHRoaXMtPm1fb3V0ZXJtb3N0RmxvYXQpIC0gdGhpcy0+bV9saW5l VG9wIDogTGF5b3V0VW5pdCgxKTsKKyAgICByZXR1cm4gdGhpcy0+bV9vdXRlcm1vc3RGbG9hdCA/ IHRoaXMtPm1fcmVuZGVyZXIubG9naWNhbEJvdHRvbUZvckZsb2F0KHRoaXMtPm1fb3V0ZXJtb3N0 RmxvYXQpIC0gdGhpcy0+bV9saW5lVG9wIDogTGF5b3V0VW5pdDo6ZnJvbVBpeGVsKDEpOwogfQog CiB0ZW1wbGF0ZSA8RmxvYXRpbmdPYmplY3Q6OlR5cGUgRmxvYXRUeXBlVmFsdWU+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAppbmRleCBhMmYzMTU4ZmI1NWYzOGQwNTIz OTJhMDFkNTE0NWUxNTNmZWVmYzlkLi41YjczZjNhYWFjMmE1MDM0ZDhhY2MzMWMzMGRjOTcxOTlm OGUzNmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTE0 NjEsNyArMTQ2MSw3IEBAIFNoYXBlSW5zaWRlSW5mbyogUmVuZGVyQmxvY2s6OmxheW91dFNoYXBl SW5zaWRlSW5mbygpIGNvbnN0CiAgICAgaWYgKCFzaGFwZUluc2lkZUluZm8gJiYgZmxvd1RocmVh ZENvbnRhaW5pbmdCbG9jaygpICYmIGFsbG93c1NoYXBlSW5zaWRlSW5mb1NoYXJpbmcoKSkgewog ICAgICAgICBMYXlvdXRVbml0IGxpbmVIZWlnaHQgPSB0aGlzLT5saW5lSGVpZ2h0KGZhbHNlLCBp c0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0aWNhbExpbmUs IFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcyk7CiAgICAgICAgIC8vIHJlZ2lvbkF0QmxvY2tP ZmZzZXQgcmV0dXJucyByZWdpb25zIGxpa2UgYW4gYXJyYXkgZmlyc3Q9ezAsTi0xfSwgc2Vjb25k PXtOLE0tMX0sIC4uLgotICAgICAgICBMYXlvdXRVbml0IG9mZnNldCA9IGxvZ2ljYWxIZWlnaHQo KSArIGxpbmVIZWlnaHQgLSBMYXlvdXRVbml0KDEpOworICAgICAgICBMYXlvdXRVbml0IG9mZnNl dCA9IGxvZ2ljYWxIZWlnaHQoKSArIGxpbmVIZWlnaHQgLSBMYXlvdXRVbml0Ojpmcm9tUGl4ZWwo MSk7CiAgICAgICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNldChv ZmZzZXQpOwogICAgICAgICBpZiAocmVnaW9uICYmIHJlZ2lvbi0+bG9naWNhbEhlaWdodCgpKQog ICAgICAgICAgICAgc2hhcGVJbnNpZGVJbmZvID0gcmVnaW9uLT5zaGFwZUluc2lkZUluZm8oKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggZjJi N2Q0NGUyOGU2Nzg1NGIxYmY4MWY5ZDU3MGE5NzdkZTUwYzk0OS4uYTZiZDFjMmE4YWU3MzU2YjAw YzMxMzIxZWVhMGI0NWFmM2RjYzhhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrRmxvdy5jcHAKQEAgLTkzOSw3ICs5MzksNyBAQCBMYXlvdXRVbml0IFJlbmRlckJs b2NrRmxvdzo6Y29sbGFwc2VNYXJnaW5zKFJlbmRlckJveCYgY2hpbGQsIE1hcmdpbkluZm8mIG1h cmdpbgogICAgICAgICAgICAgLy8gSWYgd2UgYXJlIGF0IHRoZSBiZWZvcmUgc2lkZSBvZiB0aGUg YmxvY2sgYW5kIHdlIGNvbGxhcHNlLCBpZ25vcmUgdGhlIGNvbXB1dGVkIG1hcmdpbgogICAgICAg ICAgICAgLy8gYW5kIGp1c3QgYWRkIHRoZSBjaGlsZCBtYXJnaW4gdG8gdGhlIGNvbnRhaW5lciBo ZWlnaHQuIFRoaXMgd2lsbCBjb3JyZWN0bHkgcG9zaXRpb24KICAgICAgICAgICAgIC8vIHRoZSBj aGlsZCBpbnNpZGUgdGhlIGNvbnRhaW5lci4KLSAgICAgICAgICAgIExheW91dFVuaXQgc2VwYXJh dGVNYXJnaW4gPSAhbWFyZ2luSW5mby5jYW5Db2xsYXBzZVdpdGhNYXJnaW5CZWZvcmUoKSA/IG1h cmdpbkluZm8ubWFyZ2luKCkgOiBMYXlvdXRVbml0KDApOworICAgICAgICAgICAgTGF5b3V0VW5p dCBzZXBhcmF0ZU1hcmdpbiA9ICFtYXJnaW5JbmZvLmNhbkNvbGxhcHNlV2l0aE1hcmdpbkJlZm9y ZSgpID8gbWFyZ2luSW5mby5tYXJnaW4oKSA6IExheW91dFVuaXQ6OmZyb21QaXhlbCgwKTsKICAg ICAgICAgICAgIHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgpICsgc2VwYXJhdGVNYXJn aW4gKyBtYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZCkpOwogICAgICAgICAgICAgbG9naWNhbFRv cCA9IGxvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgfSBlbHNlIGlmICghbWFyZ2luSW5mby5kaXNj YXJkTWFyZ2luKCkgJiYgKCFtYXJnaW5JbmZvLmF0QmVmb3JlU2lkZU9mQmxvY2soKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNjc4MzAy MzcxODc4YTIyMjVlNjI5NGMyNjE1MmVjZWJjMjIwMTAwZi4uZWI0ODFkMWEzM2RhZDY3NzU0MWI4 NWNjODMzMDA5NzdlZGJmNjhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxleGlibGVCb3guY3BwCkBAIC00NTcsNyArNDU3LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJG bGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVudExvZ2lj YWxIZWkKICAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoYm9yZGVyQm94TG9naWNhbEhlaWdo dCwgbG9naWNhbFRvcCgpLCBjb21wdXRlZFZhbHVlcyk7CiAgICAgICAgIGlmIChjb21wdXRlZFZh bHVlcy5tX2V4dGVudCA9PSBMYXlvdXRVbml0OjptYXgoKSkKICAgICAgICAgICAgIHJldHVybiBj b21wdXRlZFZhbHVlcy5tX2V4dGVudDsKLSAgICAgICAgcmV0dXJuIHN0ZDo6bWF4KExheW91dFVu aXQoMCksIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJh cik7CisgICAgICAgIHJldHVybiBzdGQ6Om1heChMYXlvdXRVbml0Ojpmcm9tUGl4ZWwoMCksIGNv bXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyUGFkZGluZ0FuZFNjcm9sbGJhcik7CiAgICAg fQogICAgIHJldHVybiBjb250ZW50TG9naWNhbFdpZHRoKCk7CiB9CkBAIC02ODIsNyArNjgyLDcg QEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6cHJlZmVycmVkTWFpbkF4aXNDb250ZW50 RXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JgogICAgICAgICBBU1NFUlQobWFpbkF4aXNFeHRlbnQg LSBtYWluQXhpc0JvcmRlckFuZFBhZGRpbmdFeHRlbnRGb3JDaGlsZChjaGlsZCkgPj0gMCk7CiAg ICAgICAgIHJldHVybiBtYWluQXhpc0V4dGVudCAtIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZ0V4 dGVudEZvckNoaWxkKGNoaWxkKTsKICAgICB9Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KExheW91dFVu aXQoMCksIGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKGNoaWxkLCBNYWluT3JQcmVmZXJy ZWRTaXplLCBmbGV4QmFzaXMpKTsKKyAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdDo6ZnJv bVBpeGVsKDApLCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCwgTWFpbk9yUHJl ZmVycmVkU2l6ZSwgZmxleEJhc2lzKSk7CiB9CiAKIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6Omxh eW91dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4sIFZlY3RvcjxMaW5lQ29udGV4dD4m IGxpbmVDb250ZXh0cykKQEAgLTEyNjksNyArMTI2OSw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVC b3g6OmFsaWduQ2hpbGRyZW4oY29uc3QgVmVjdG9yPExpbmVDb250ZXh0PiYgbGluZUNvbnRleHRz KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICBpZiAodXBkYXRlQXV0b01hcmdpbnNJbkNyb3NzQXhpcygqY2hpbGQsIHN0ZDo6bWF4KExheW91 dFVuaXQoMCksIGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hpbGQobGluZUNyb3NzQXhpc0V4 dGVudCwgKmNoaWxkKSkpKQorICAgICAgICAgICAgaWYgKHVwZGF0ZUF1dG9NYXJnaW5zSW5Dcm9z c0F4aXMoKmNoaWxkLCBzdGQ6Om1heChMYXlvdXRVbml0Ojpmcm9tUGl4ZWwoMCksIGF2YWlsYWJs ZUFsaWdubWVudFNwYWNlRm9yQ2hpbGQobGluZUNyb3NzQXhpc0V4dGVudCwgKmNoaWxkKSkpKQog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICBzd2l0Y2ggKGFsaWdubWVu dEZvckNoaWxkKCpjaGlsZCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKaW5kZXggYTc3NjZjNThhYzQ0YmRk Njg1MDUzODQ2MTQwZWY1OGFjZWVlYjVhMy4uZDMyM2QyN2QwMjVjMDFlMjEyODA4YmNjZWUwY2Y1 MmYwYmEwMmI3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11 bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKQEAgLTExNSw3ICsxMTUsNyBAQCBib29sIFJl bmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6YWRkRm9yY2VkUmVnaW9uQnJlYWsoY29uc3QgUmVu ZGVyQmxvY2sqIGJsb2NrLAogICAgIGlmIChSZW5kZXJNdWx0aUNvbHVtblNldCogbXVsdGljb2xT ZXQgPSB0b1JlbmRlck11bHRpQ29sdW1uU2V0KHJlZ2lvbkF0QmxvY2tPZmZzZXQoYmxvY2ssIG9m ZnNldCkpKSB7CiAgICAgICAgIG11bHRpY29sU2V0LT5hZGRGb3JjZWRCcmVhayhvZmZzZXQpOwog ICAgICAgICBpZiAob2Zmc2V0QnJlYWtBZGp1c3RtZW50KQotICAgICAgICAgICAgKm9mZnNldEJy ZWFrQWRqdXN0bWVudCA9IHBhZ2VMb2dpY2FsSGVpZ2h0Rm9yT2Zmc2V0KG9mZnNldCkgPyBwYWdl UmVtYWluaW5nTG9naWNhbEhlaWdodEZvck9mZnNldChvZmZzZXQsIEluY2x1ZGVQYWdlQm91bmRh cnkpIDogTGF5b3V0VW5pdCgwKTsKKyAgICAgICAgICAgICpvZmZzZXRCcmVha0FkanVzdG1lbnQg PSBwYWdlTG9naWNhbEhlaWdodEZvck9mZnNldChvZmZzZXQpID8gcGFnZVJlbWFpbmluZ0xvZ2lj YWxIZWlnaHRGb3JPZmZzZXQob2Zmc2V0LCBJbmNsdWRlUGFnZUJvdW5kYXJ5KSA6IExheW91dFVu aXQ6OmZyb21QaXhlbCgwKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogICAgIHJldHVy biBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0 aUNvbHVtblNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1 bW5TZXQuY3BwCmluZGV4IDhiOWI1NjkxYWNmOTQzYjI5ZDk2M2E5ODcwOGJjNjMxZDAyYTUyMDQu LjZhODJiYzI3NTAyZTQzYTVmYThmOWI2MTAxYzhiZWIxNzAyNTQwM2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcApAQCAtNTAsNyAr NTAsNyBAQCBMYXlvdXRVbml0IFJlbmRlck11bHRpQ29sdW1uU2V0OjpoZWlnaHRBZGp1c3RlZEZv clNldE9mZnNldChMYXlvdXRVbml0IGhlaWdodCkgYwogICAgIExheW91dFVuaXQgY29udGVudExv Z2ljYWxUb3AgPSBsb2dpY2FsVG9wKCkgLSBtdWx0aWNvbEJsb2NrLT5ib3JkZXJBbmRQYWRkaW5n QmVmb3JlKCk7CiAKICAgICBoZWlnaHQgLT0gY29udGVudExvZ2ljYWxUb3A7Ci0gICAgcmV0dXJu IHN0ZDo6bWF4KGhlaWdodCwgTGF5b3V0VW5pdCgxKSk7IC8vIExldCdzIGF2b2lkIHplcm8gaGVp Z2h0LCBhcyB0aGF0IHdvdWxkIHByb2JhYmx5IGNhdXNlIGFuIGluZmluaXRlIGFtb3VudCBvZiBj b2x1bW5zIHRvIGJlIGNyZWF0ZWQuCisgICAgcmV0dXJuIHN0ZDo6bWF4KGhlaWdodCwgTGF5b3V0 VW5pdDo6ZnJvbVBpeGVsKDEpKTsgLy8gTGV0J3MgYXZvaWQgemVybyBoZWlnaHQsIGFzIHRoYXQg d291bGQgcHJvYmFibHkgY2F1c2UgYW4gaW5maW5pdGUgYW1vdW50IG9mIGNvbHVtbnMgdG8gYmUg Y3JlYXRlZC4KIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJNdWx0aUNvbHVtblNldDo6cGFnZUxvZ2lj YWxUb3BGb3JPZmZzZXQoTGF5b3V0VW5pdCBvZmZzZXQpIGNvbnN0CkBAIC0xMTksNyArMTE5LDcg QEAgTGF5b3V0VW5pdCBSZW5kZXJNdWx0aUNvbHVtblNldDo6Y2FsY3VsYXRlQmFsYW5jZWRIZWln aHQoYm9vbCBpbml0aWFsKSBjb25zdAogICAgIGlmIChpbml0aWFsKSB7CiAgICAgICAgIC8vIFN0 YXJ0IHdpdGggdGhlIGxvd2VzdCBpbWFnaW5hYmxlIGNvbHVtbiBoZWlnaHQuCiAgICAgICAgIHVu c2lnbmVkIGluZGV4ID0gZmluZFJ1bldpdGhUYWxsZXN0Q29sdW1ucygpOwotICAgICAgICBMYXlv dXRVbml0IHN0YXJ0T2Zmc2V0ID0gaW5kZXggPiAwID8gbV9jb250ZW50UnVuc1tpbmRleCAtIDFd LmJyZWFrT2Zmc2V0KCkgOiBMYXlvdXRVbml0KDApOworICAgICAgICBMYXlvdXRVbml0IHN0YXJ0 T2Zmc2V0ID0gaW5kZXggPiAwID8gbV9jb250ZW50UnVuc1tpbmRleCAtIDFdLmJyZWFrT2Zmc2V0 KCkgOiBMYXlvdXRVbml0Ojpmcm9tUGl4ZWwoMCk7CiAgICAgICAgIHJldHVybiBzdGQ6Om1heDxM YXlvdXRVbml0PihtX2NvbnRlbnRSdW5zW2luZGV4XS5jb2x1bW5Mb2dpY2FsSGVpZ2h0KHN0YXJ0 T2Zmc2V0KSwgbV9taW5pbXVtQ29sdW1uSGVpZ2h0KTsKICAgICB9CiAK