170474 2017-04-04 14:59:07 -0700 Do some minor FEColorMatrix code cleanup and optimization 2017-04-04 17:23:52 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser buildbot commit-queue dino kondapallykalyan sabouhallawa simon.fraser thorton oldest_to_newest 1294194 0 simon.fraser 2017-04-04 14:59:07 -0700 Do some minor FEColorMatrix code cleanup and optimization 1294257 1 306228 simon.fraser 2017-04-04 16:30:32 -0700 Created attachment 306228 Patch 1294258 2 306229 simon.fraser 2017-04-04 16:31:34 -0700 Created attachment 306229 Patch 1294262 3 buildbot 2017-04-04 16:33:34 -0700 Attachment 306229 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp:83: Extra space before [. [whitespace/brackets] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1294296 4 306229 commit-queue 2017-04-04 17:23:50 -0700 Comment on attachment 306229 Patch Clearing flags on attachment: 306229 Committed r214916: <http://trac.webkit.org/changeset/214916> 1294297 5 commit-queue 2017-04-04 17:23:52 -0700 All reviewed patches have been landed. Closing bug. 306228 2017-04-04 16:30:32 -0700 2017-04-04 16:31:33 -0700 Patch bug-170474-20170404163031.patch text/plain 9017 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEwYTExZGRkZDc1ODc0 Yjg0Y2NkNzg4ZTcxYjYzNmVhMjg2ZjI5ZC4uMWI2N2NhYTY1MzhhOTg5ZTM2ZjdjZDZiYWY3Njk2 YjAzYzFkMzY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA0LTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIERvIHNvbWUgbWlu b3IgRkVDb2xvck1hdHJpeCBjb2RlIGNsZWFudXAgYW5kIG9wdGltaXphdGlvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNDc0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc3dpdGNoIGluc2lk ZSBvZiBhIHBpeGVsIHByb2Nlc3NpbmcgbG9vcDsgcmVwZWF0IHRoZSBsb29wIGluc2lkZSBzd2l0 Y2ggKGZpbHRlclR5cGUpLgorICAgICAgICAKKyAgICAgICAgQ2hhbmdlIG1hdHJpeCgpIGFuZCBz YXR1cmF0ZUFuZEh1ZVJvdGF0ZSgpIHRvIGRlcmVmZXJlbmNlIHRoZSBzb3VyY2UgcGl4ZWxzIG9u Y2UsIGluc3RlYWQKKyAgICAgICAgb2YgbXVsdGlwbGUgdGltZXMsIHdoaWNoIGlzIGZhc3Rlci4K KyAgICAgICAgCisgICAgICAgIFRoaXMga2luZCBvZiBjb2RlIGJlbmVmaXRzIGZyb20gYWxpZ25p bmcgdGhpbmdzIHdpdGggc3BhY2VzIGZvciByZWFkYWJpbGl0eSwgc28gZG8gc28sCisgICAgICAg IHZpb2xhdGluZyB3ZWJraXQgc3R5bGUuCisgICAgICAgIAorICAgICAgICBBZGQgc29tZSBvZmYt YnktZGVmYXVsdCBwZXJmb3JtYW5jZSBsb2dnaW5nIGNvZGUuCisKKyAgICAgICAgSW5jcmVhc2Vz IHBpeGVsIHByb2Nlc3NpbmcgcGVyZm9ybWFuY2UgZnJvbSBhYm91dCA4Nm1zIHBlciBtZWdhcGl4 ZWwgdG8gNjUgbXMgcGVyIG1lZ2FwaXhlbC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2ZpbHRlcnMvRkVDb2xvck1hdHJpeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjptYXRyaXgpOgor ICAgICAgICAoV2ViQ29yZTo6c2F0dXJhdGVBbmRIdWVSb3RhdGUpOgorICAgICAgICAoV2ViQ29y ZTo6ZWZmZWN0VHlwZSk6CisgICAgICAgIChXZWJDb3JlOjpGRUNvbG9yTWF0cml4OjpwbGF0Zm9y bUFwcGx5U29mdHdhcmUpOgorCiAyMDE3LTAzLTMxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIFJvbGxpbmcgYmFjayBodHRwczovL3RyYWMud2Via2l0Lm9y Zy9yMjE0Njg5LCBhcyBpdCBjYXVzZWQgbWFueSBjcmFzaGVzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xvck1hdHJpeC5jcHAK aW5kZXggMjMyMGQ1MmMyMjQyYTczY2U3Zjg3YzRmOTEzMWU2NmQ3YzRlMjczOS4uNTBiMmYxNDFi ZDE0MWU3ODQ3NjU2Y2U0N2Y4M2M1OTdhZDE1NTM3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29sb3JNYXRyaXguY3BwCkBA IC0zMCw2ICszMCw4IEBACiAjaW5jbHVkZSA8cnVudGltZS9VaW50OENsYW1wZWRBcnJheS5oPgog I2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAKKyNkZWZpbmUgUFJJTlRfRklMVEVSX1BFUkZP Uk1BTkNFIDAKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBGRUNvbG9yTWF0cml4OjpGRUNvbG9y TWF0cml4KEZpbHRlciYgZmlsdGVyLCBDb2xvck1hdHJpeFR5cGUgdHlwZSwgY29uc3QgVmVjdG9y PGZsb2F0PiYgdmFsdWVzKQpAQCAtNzIsMjYgKzc0LDI2IEBAIGJvb2wgRkVDb2xvck1hdHJpeDo6 c2V0VmFsdWVzKGNvbnN0IFZlY3RvcjxmbG9hdD4gJnZhbHVlcykKIAogaW5saW5lIHZvaWQgbWF0 cml4KGZsb2F0JiByZWQsIGZsb2F0JiBncmVlbiwgZmxvYXQmIGJsdWUsIGZsb2F0JiBhbHBoYSwg Y29uc3QgVmVjdG9yPGZsb2F0PiYgdmFsdWVzKQogewotICAgIGZsb2F0IHIgPSB2YWx1ZXNbMF0g KiByZWQgKyB2YWx1ZXNbMV0gKiBncmVlbiArIHZhbHVlc1syXSAqIGJsdWUgKyB2YWx1ZXNbM10g KiBhbHBoYSArIHZhbHVlc1s0XSAqIDI1NTsKLSAgICBmbG9hdCBnID0gdmFsdWVzWzVdICogcmVk ICsgdmFsdWVzWzZdICogZ3JlZW4gKyB2YWx1ZXNbN10gKiBibHVlICsgdmFsdWVzWzhdICogYWxw aGEgKyB2YWx1ZXNbOV0gKiAyNTU7Ci0gICAgZmxvYXQgYiA9IHZhbHVlc1sxMF0gKiByZWQgKyB2 YWx1ZXNbMTFdICogZ3JlZW4gKyB2YWx1ZXNbMTJdICogYmx1ZSArIHZhbHVlc1sxM10gKiBhbHBo YSArIHZhbHVlc1sxNF0gKiAyNTU7Ci0gICAgZmxvYXQgYSA9IHZhbHVlc1sxNV0gKiByZWQgKyB2 YWx1ZXNbMTZdICogZ3JlZW4gKyB2YWx1ZXNbMTddICogYmx1ZSArIHZhbHVlc1sxOF0gKiBhbHBo YSArIHZhbHVlc1sxOV0gKiAyNTU7Ci0KLSAgICByZWQgPSByOwotICAgIGdyZWVuID0gZzsKLSAg ICBibHVlID0gYjsKLSAgICBhbHBoYSA9IGE7CisgICAgZmxvYXQgciA9IHJlZDsKKyAgICBmbG9h dCBnID0gZ3JlZW47CisgICAgZmxvYXQgYiA9IGJsdWU7CisgICAgZmxvYXQgYSA9IGFscGhhOwor CisgICAgcmVkICAgICA9IHZhbHVlc1sgMF0gKiByICsgdmFsdWVzWyAxXSAqIGcgKyB2YWx1ZXNb IDJdICogYiArIHZhbHVlc1sgM10gKiBhICsgdmFsdWVzWyA0XSAqIDI1NTsKKyAgICBncmVlbiAg ID0gdmFsdWVzWyA1XSAqIHIgKyB2YWx1ZXNbIDZdICogZyArIHZhbHVlcyBbN10gKiBiICsgdmFs dWVzWyA4XSAqIGEgKyB2YWx1ZXNbIDldICogMjU1OworICAgIGJsdWUgICAgPSB2YWx1ZXNbMTBd ICogciArIHZhbHVlc1sxMV0gKiBnICsgdmFsdWVzWzEyXSAqIGIgKyB2YWx1ZXNbMTNdICogYSAr IHZhbHVlc1sxNF0gKiAyNTU7CisgICAgYWxwaGEgICA9IHZhbHVlc1sxNV0gKiByICsgdmFsdWVz WzE2XSAqIGcgKyB2YWx1ZXNbMTddICogYiArIHZhbHVlc1sxOF0gKiBhICsgdmFsdWVzWzE5XSAq IDI1NTsKIH0KIAogaW5saW5lIHZvaWQgc2F0dXJhdGVBbmRIdWVSb3RhdGUoZmxvYXQmIHJlZCwg ZmxvYXQmIGdyZWVuLCBmbG9hdCYgYmx1ZSwgY29uc3QgZmxvYXQqIGNvbXBvbmVudHMpCiB7Ci0g ICAgZmxvYXQgciA9IHJlZCAqIGNvbXBvbmVudHNbMF0gKyBncmVlbiAqIGNvbXBvbmVudHNbMV0g KyBibHVlICogY29tcG9uZW50c1syXTsKLSAgICBmbG9hdCBnID0gcmVkICogY29tcG9uZW50c1sz XSArIGdyZWVuICogY29tcG9uZW50c1s0XSArIGJsdWUgKiBjb21wb25lbnRzWzVdOwotICAgIGZs b2F0IGIgPSByZWQgKiBjb21wb25lbnRzWzZdICsgZ3JlZW4gKiBjb21wb25lbnRzWzddICsgYmx1 ZSAqIGNvbXBvbmVudHNbOF07CisgICAgZmxvYXQgciA9IHJlZDsKKyAgICBmbG9hdCBnID0gZ3Jl ZW47CisgICAgZmxvYXQgYiA9IGJsdWU7CiAKLSAgICByZWQgPSByOwotICAgIGdyZWVuID0gZzsK LSAgICBibHVlID0gYjsKKyAgICByZWQgICAgID0gciAqIGNvbXBvbmVudHNbMF0gKyBnICogY29t cG9uZW50c1sxXSArIGIgKiBjb21wb25lbnRzWzJdOworICAgIGdyZWVuICAgPSByICogY29tcG9u ZW50c1szXSArIGcgKiBjb21wb25lbnRzWzRdICsgYiAqIGNvbXBvbmVudHNbNV07CisgICAgYmx1 ZSAgICA9IHIgKiBjb21wb25lbnRzWzZdICsgZyAqIGNvbXBvbmVudHNbN10gKyBiICogY29tcG9u ZW50c1s4XTsKIH0KIAogaW5saW5lIHZvaWQgbHVtaW5hbmNlKGZsb2F0JiByZWQsIGZsb2F0JiBn cmVlbiwgZmxvYXQmIGJsdWUsIGZsb2F0JiBhbHBoYSkKQEAgLTEwNSw3ICsxMDcsNiBAQCBpbmxp bmUgdm9pZCBsdW1pbmFuY2UoZmxvYXQmIHJlZCwgZmxvYXQmIGdyZWVuLCBmbG9hdCYgYmx1ZSwg ZmxvYXQmIGFscGhhKQogdGVtcGxhdGU8Q29sb3JNYXRyaXhUeXBlIGZpbHRlclR5cGU+CiB2b2lk IGVmZmVjdFR5cGUoVWludDhDbGFtcGVkQXJyYXkqIHBpeGVsQXJyYXksIGNvbnN0IFZlY3Rvcjxm bG9hdD4mIHZhbHVlcykKIHsKLSAgICB1bnNpZ25lZCBwaXhlbEFycmF5TGVuZ3RoID0gcGl4ZWxB cnJheS0+bGVuZ3RoKCk7CiAgICAgZmxvYXQgY29tcG9uZW50c1s5XTsKIAogICAgIGlmIChmaWx0 ZXJUeXBlID09IEZFQ09MT1JNQVRSSVhfVFlQRV9TQVRVUkFURSkKQEAgLTExMywyOSArMTE0LDUx IEBAIHZvaWQgZWZmZWN0VHlwZShVaW50OENsYW1wZWRBcnJheSogcGl4ZWxBcnJheSwgY29uc3Qg VmVjdG9yPGZsb2F0PiYgdmFsdWVzKQogICAgIGVsc2UgaWYgKGZpbHRlclR5cGUgPT0gRkVDT0xP Uk1BVFJJWF9UWVBFX0hVRVJPVEFURSkKICAgICAgICAgRkVDb2xvck1hdHJpeDo6Y2FsY3VsYXRl SHVlUm90YXRlQ29tcG9uZW50cyhjb21wb25lbnRzLCB2YWx1ZXNbMF0pOwogCi0gICAgZm9yICh1 bnNpZ25lZCBwaXhlbEJ5dGVPZmZzZXQgPSAwOyBwaXhlbEJ5dGVPZmZzZXQgPCBwaXhlbEFycmF5 TGVuZ3RoOyBwaXhlbEJ5dGVPZmZzZXQgKz0gNCkgewotICAgICAgICBmbG9hdCByZWQgPSBwaXhl bEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCk7Ci0gICAgICAgIGZsb2F0IGdyZWVuID0gcGl4 ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZzZXQgKyAxKTsKLSAgICAgICAgZmxvYXQgYmx1ZSA9 IHBpeGVsQXJyYXktPml0ZW0ocGl4ZWxCeXRlT2Zmc2V0ICsgMik7Ci0gICAgICAgIGZsb2F0IGFs cGhhID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZzZXQgKyAzKTsKLQotICAgICAgICBz d2l0Y2ggKGZpbHRlclR5cGUpIHsKLSAgICAgICAgICAgIGNhc2UgRkVDT0xPUk1BVFJJWF9UWVBF X01BVFJJWDoKLSAgICAgICAgICAgICAgICBtYXRyaXgocmVkLCBncmVlbiwgYmx1ZSwgYWxwaGEs IHZhbHVlcyk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIEZFQ09M T1JNQVRSSVhfVFlQRV9TQVRVUkFURToKLSAgICAgICAgICAgIGNhc2UgRkVDT0xPUk1BVFJJWF9U WVBFX0hVRVJPVEFURToKLSAgICAgICAgICAgICAgICBzYXR1cmF0ZUFuZEh1ZVJvdGF0ZShyZWQs IGdyZWVuLCBibHVlLCBjb21wb25lbnRzKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgICAgIGNhc2UgRkVDT0xPUk1BVFJJWF9UWVBFX0xVTUlOQU5DRVRPQUxQSEE6Ci0gICAgICAg ICAgICAgICAgbHVtaW5hbmNlKHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhhKTsKLSAgICAgICAgICAg ICAgICBicmVhazsKKyAgICB1bnNpZ25lZCBwaXhlbEFycmF5TGVuZ3RoID0gcGl4ZWxBcnJheS0+ bGVuZ3RoKCk7CisKKyAgICBzd2l0Y2ggKGZpbHRlclR5cGUpIHsKKyAgICBjYXNlIEZFQ09MT1JN QVRSSVhfVFlQRV9NQVRSSVg6CisgICAgICAgIGZvciAodW5zaWduZWQgcGl4ZWxCeXRlT2Zmc2V0 ID0gMDsgcGl4ZWxCeXRlT2Zmc2V0IDwgcGl4ZWxBcnJheUxlbmd0aDsgcGl4ZWxCeXRlT2Zmc2V0 ICs9IDQpIHsKKyAgICAgICAgICAgIGZsb2F0IHJlZCA9IHBpeGVsQXJyYXktPml0ZW0ocGl4ZWxC eXRlT2Zmc2V0KTsKKyAgICAgICAgICAgIGZsb2F0IGdyZWVuID0gcGl4ZWxBcnJheS0+aXRlbShw aXhlbEJ5dGVPZmZzZXQgKyAxKTsKKyAgICAgICAgICAgIGZsb2F0IGJsdWUgPSBwaXhlbEFycmF5 LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCArIDIpOworICAgICAgICAgICAgZmxvYXQgYWxwaGEgPSBw aXhlbEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCArIDMpOworICAgICAgICAgICAgbWF0cml4 KHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhhLCB2YWx1ZXMpOworICAgICAgICAgICAgcGl4ZWxBcnJh eS0+c2V0KHBpeGVsQnl0ZU9mZnNldCwgcmVkKTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNl dChwaXhlbEJ5dGVPZmZzZXQgKyAxLCBncmVlbik7CisgICAgICAgICAgICBwaXhlbEFycmF5LT5z ZXQocGl4ZWxCeXRlT2Zmc2V0ICsgMiwgYmx1ZSk7CisgICAgICAgICAgICBwaXhlbEFycmF5LT5z ZXQocGl4ZWxCeXRlT2Zmc2V0ICsgMywgYWxwaGEpOwogICAgICAgICB9CisgICAgICAgIGJyZWFr OwogCi0gICAgICAgIHBpeGVsQXJyYXktPnNldChwaXhlbEJ5dGVPZmZzZXQsIHJlZCk7Ci0gICAg ICAgIHBpeGVsQXJyYXktPnNldChwaXhlbEJ5dGVPZmZzZXQgKyAxLCBncmVlbik7Ci0gICAgICAg IHBpeGVsQXJyYXktPnNldChwaXhlbEJ5dGVPZmZzZXQgKyAyLCBibHVlKTsKLSAgICAgICAgcGl4 ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCArIDMsIGFscGhhKTsKKyAgICBjYXNlIEZFQ09M T1JNQVRSSVhfVFlQRV9TQVRVUkFURToKKyAgICBjYXNlIEZFQ09MT1JNQVRSSVhfVFlQRV9IVUVS T1RBVEU6CisgICAgICAgIGZvciAodW5zaWduZWQgcGl4ZWxCeXRlT2Zmc2V0ID0gMDsgcGl4ZWxC eXRlT2Zmc2V0IDwgcGl4ZWxBcnJheUxlbmd0aDsgcGl4ZWxCeXRlT2Zmc2V0ICs9IDQpIHsKKyAg ICAgICAgICAgIGZsb2F0IHJlZCA9IHBpeGVsQXJyYXktPml0ZW0ocGl4ZWxCeXRlT2Zmc2V0KTsK KyAgICAgICAgICAgIGZsb2F0IGdyZWVuID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZz ZXQgKyAxKTsKKyAgICAgICAgICAgIGZsb2F0IGJsdWUgPSBwaXhlbEFycmF5LT5pdGVtKHBpeGVs Qnl0ZU9mZnNldCArIDIpOworICAgICAgICAgICAgZmxvYXQgYWxwaGEgPSBwaXhlbEFycmF5LT5p dGVtKHBpeGVsQnl0ZU9mZnNldCArIDMpOworICAgICAgICAgICAgc2F0dXJhdGVBbmRIdWVSb3Rh dGUocmVkLCBncmVlbiwgYmx1ZSwgY29tcG9uZW50cyk7CisgICAgICAgICAgICBwaXhlbEFycmF5 LT5zZXQocGl4ZWxCeXRlT2Zmc2V0LCByZWQpOworICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0 KHBpeGVsQnl0ZU9mZnNldCArIDEsIGdyZWVuKTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNl dChwaXhlbEJ5dGVPZmZzZXQgKyAyLCBibHVlKTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNl dChwaXhlbEJ5dGVPZmZzZXQgKyAzLCBhbHBoYSk7CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7 CisKKyAgICBjYXNlIEZFQ09MT1JNQVRSSVhfVFlQRV9MVU1JTkFOQ0VUT0FMUEhBOgorICAgICAg ICBmb3IgKHVuc2lnbmVkIHBpeGVsQnl0ZU9mZnNldCA9IDA7IHBpeGVsQnl0ZU9mZnNldCA8IHBp eGVsQXJyYXlMZW5ndGg7IHBpeGVsQnl0ZU9mZnNldCArPSA0KSB7CisgICAgICAgICAgICBmbG9h dCByZWQgPSBwaXhlbEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCk7CisgICAgICAgICAgICBm bG9hdCBncmVlbiA9IHBpeGVsQXJyYXktPml0ZW0ocGl4ZWxCeXRlT2Zmc2V0ICsgMSk7CisgICAg ICAgICAgICBmbG9hdCBibHVlID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZzZXQgKyAy KTsKKyAgICAgICAgICAgIGZsb2F0IGFscGhhID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVP ZmZzZXQgKyAzKTsKKyAgICAgICAgICAgIGx1bWluYW5jZShyZWQsIGdyZWVuLCBibHVlLCBhbHBo YSk7CisgICAgICAgICAgICBwaXhlbEFycmF5LT5zZXQocGl4ZWxCeXRlT2Zmc2V0LCByZWQpOwor ICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCArIDEsIGdyZWVuKTsK KyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNldChwaXhlbEJ5dGVPZmZzZXQgKyAyLCBibHVlKTsK KyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNldChwaXhlbEJ5dGVPZmZzZXQgKyAzLCBhbHBoYSk7 CisgICAgICAgIH0KKyAgICAgICAgYnJlYWs7CiAgICAgfQogfQogCkBAIC0xNDcsNiArMTcwLDEw IEBAIHZvaWQgRkVDb2xvck1hdHJpeDo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkKICAgICBpZiAo IXJlc3VsdEltYWdlKQogICAgICAgICByZXR1cm47CiAKKyNpZiBQUklOVF9GSUxURVJfUEVSRk9S TUFOQ0UKKyAgICBNb25vdG9uaWNUaW1lIHN0YXJ0VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygp OworI2VuZGlmCisKICAgICBJbWFnZUJ1ZmZlciogaW5CdWZmZXIgPSBpbi0+YXNJbWFnZUJ1ZmZl cigpOwogICAgIGlmIChpbkJ1ZmZlcikKICAgICAgICAgcmVzdWx0SW1hZ2UtPmNvbnRleHQoKS5k cmF3SW1hZ2VCdWZmZXIoKmluQnVmZmVyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluLT5h YnNvbHV0ZVBhaW50UmVjdCgpKSk7CkBAIC0xNzQsNiArMjAxLDIwIEBAIHZvaWQgRkVDb2xvck1h dHJpeDo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkKICAgICB9CiAKICAgICByZXN1bHRJbWFnZS0+ cHV0Qnl0ZUFycmF5KFVubXVsdGlwbGllZCwgcGl4ZWxBcnJheS5nZXQoKSwgaW1hZ2VSZWN0LnNp emUoKSwgaW1hZ2VSZWN0LCBJbnRQb2ludCgpKTsKKworI2lmIFBSSU5UX0ZJTFRFUl9QRVJGT1JN QU5DRQorICAgIE1vbm90b25pY1RpbWUgZW5kVGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOwor ICAgIFNlY29uZHMgZHVyYXRpb24gPSBlbmRUaW1lIC0gc3RhcnRUaW1lOworICAgIHVuc2lnbmVk IHBpeGVsQ291bnQgPSBpbWFnZVJlY3Qud2lkdGgoKSAqIGltYWdlUmVjdC5oZWlnaHQoKTsKKyAg ICAKKyAgICBzdGF0aWMgZG91YmxlIHRvdGFsTWVnYXBpeGVsczsKKyAgICB0b3RhbE1lZ2FwaXhl bHMgKz0gKGRvdWJsZSlwaXhlbENvdW50IC8gMTA0ODU3Ni4wOworICAgIAorICAgIHN0YXRpYyBT ZWNvbmRzIHRvdGFsVGltZTsKKyAgICB0b3RhbFRpbWUgKz0gZHVyYXRpb247CisgICAgCisgICAg V1RGTG9nQWx3YXlzKCJGRUNvbG9yTWF0cml4OjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUgKCVkeCVk KSB0b29rICUuNGZtcyAoYXZlICUuNGZtcy9tcCkiLCBpbWFnZVJlY3Qud2lkdGgoKSwgaW1hZ2VS ZWN0LmhlaWdodCgpLCBkdXJhdGlvbi5taWxsaXNlY29uZHMoKSwgdG90YWxUaW1lLm1pbGxpc2Vj b25kcygpIC8gdG90YWxNZWdhcGl4ZWxzKTsKKyNlbmRpZgogfQogCiB2b2lkIEZFQ29sb3JNYXRy aXg6OmR1bXAoKQo= 306229 2017-04-04 16:31:34 -0700 2017-04-04 17:23:50 -0700 Patch bug-170474-20170404163133.patch text/plain 9016 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTEwYTExZGRkZDc1ODc0 Yjg0Y2NkNzg4ZTcxYjYzNmVhMjg2ZjI5ZC4uN2NkMDFkMDhiZGEzYzkzMzcyNTY5ODM0MWNiYTI3 NTVkY2I4MmIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA0LTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIERvIHNvbWUgbWlu b3IgRkVDb2xvck1hdHJpeCBjb2RlIGNsZWFudXAgYW5kIG9wdGltaXphdGlvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNDc0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc3dpdGNoIGluc2lk ZSBvZiBhIHBpeGVsIHByb2Nlc3NpbmcgbG9vcDsgcmVwZWF0IHRoZSBsb29wIGluc2lkZSBzd2l0 Y2ggKGZpbHRlclR5cGUpLgorICAgICAgICAKKyAgICAgICAgQ2hhbmdlIG1hdHJpeCgpIGFuZCBz YXR1cmF0ZUFuZEh1ZVJvdGF0ZSgpIHRvIGRlcmVmZXJlbmNlIHRoZSBzb3VyY2UgcGl4ZWxzIG9u Y2UsIGluc3RlYWQKKyAgICAgICAgb2YgbXVsdGlwbGUgdGltZXMsIHdoaWNoIGlzIGZhc3Rlci4K KyAgICAgICAgCisgICAgICAgIFRoaXMga2luZCBvZiBjb2RlIGJlbmVmaXRzIGZyb20gYWxpZ25p bmcgdGhpbmdzIHdpdGggc3BhY2VzIGZvciByZWFkYWJpbGl0eSwgc28gZG8gc28sCisgICAgICAg IHZpb2xhdGluZyB3ZWJraXQgc3R5bGUuCisgICAgICAgIAorICAgICAgICBBZGQgc29tZSBvZmYt YnktZGVmYXVsdCBwZXJmb3JtYW5jZSBsb2dnaW5nIGNvZGUuCisKKyAgICAgICAgSW5jcmVhc2Vz IHBpeGVsIHByb2Nlc3NpbmcgcGVyZm9ybWFuY2UgZnJvbSBhYm91dCA4Nm1zIHBlciBtZWdhcGl4 ZWwgdG8gNjVtcyBwZXIgbWVnYXBpeGVsLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1hdHJpeCk6Cisg ICAgICAgIChXZWJDb3JlOjpzYXR1cmF0ZUFuZEh1ZVJvdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjplZmZlY3RUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkZFQ29sb3JNYXRyaXg6OnBsYXRmb3Jt QXBwbHlTb2Z0d2FyZSk6CisKIDIwMTctMDMtMzEgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBh cHBsZS5jb20+CiAKICAgICAgICAgUm9sbGluZyBiYWNrIGh0dHBzOi8vdHJhYy53ZWJraXQub3Jn L3IyMTQ2ODksIGFzIGl0IGNhdXNlZCBtYW55IGNyYXNoZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29sb3JNYXRyaXguY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcApp bmRleCAyMzIwZDUyYzIyNDJhNzNjZTdmODdjNGY5MTMxZTY2ZDdjNGUyNzM5Li41MGIyZjE0MWJk MTQxZTc4NDc2NTZjZTQ3ZjgzYzU5N2FkMTU1MzdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29sb3JNYXRyaXguY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xvck1hdHJpeC5jcHAKQEAg LTMwLDYgKzMwLDggQEAKICNpbmNsdWRlIDxydW50aW1lL1VpbnQ4Q2xhbXBlZEFycmF5Lmg+CiAj aW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAorI2RlZmluZSBQUklOVF9GSUxURVJfUEVSRk9S TUFOQ0UgMAorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEZFQ29sb3JNYXRyaXg6OkZFQ29sb3JN YXRyaXgoRmlsdGVyJiBmaWx0ZXIsIENvbG9yTWF0cml4VHlwZSB0eXBlLCBjb25zdCBWZWN0b3I8 ZmxvYXQ+JiB2YWx1ZXMpCkBAIC03MiwyNiArNzQsMjYgQEAgYm9vbCBGRUNvbG9yTWF0cml4Ojpz ZXRWYWx1ZXMoY29uc3QgVmVjdG9yPGZsb2F0PiAmdmFsdWVzKQogCiBpbmxpbmUgdm9pZCBtYXRy aXgoZmxvYXQmIHJlZCwgZmxvYXQmIGdyZWVuLCBmbG9hdCYgYmx1ZSwgZmxvYXQmIGFscGhhLCBj b25zdCBWZWN0b3I8ZmxvYXQ+JiB2YWx1ZXMpCiB7Ci0gICAgZmxvYXQgciA9IHZhbHVlc1swXSAq IHJlZCArIHZhbHVlc1sxXSAqIGdyZWVuICsgdmFsdWVzWzJdICogYmx1ZSArIHZhbHVlc1szXSAq IGFscGhhICsgdmFsdWVzWzRdICogMjU1OwotICAgIGZsb2F0IGcgPSB2YWx1ZXNbNV0gKiByZWQg KyB2YWx1ZXNbNl0gKiBncmVlbiArIHZhbHVlc1s3XSAqIGJsdWUgKyB2YWx1ZXNbOF0gKiBhbHBo YSArIHZhbHVlc1s5XSAqIDI1NTsKLSAgICBmbG9hdCBiID0gdmFsdWVzWzEwXSAqIHJlZCArIHZh bHVlc1sxMV0gKiBncmVlbiArIHZhbHVlc1sxMl0gKiBibHVlICsgdmFsdWVzWzEzXSAqIGFscGhh ICsgdmFsdWVzWzE0XSAqIDI1NTsKLSAgICBmbG9hdCBhID0gdmFsdWVzWzE1XSAqIHJlZCArIHZh bHVlc1sxNl0gKiBncmVlbiArIHZhbHVlc1sxN10gKiBibHVlICsgdmFsdWVzWzE4XSAqIGFscGhh ICsgdmFsdWVzWzE5XSAqIDI1NTsKLQotICAgIHJlZCA9IHI7Ci0gICAgZ3JlZW4gPSBnOwotICAg IGJsdWUgPSBiOwotICAgIGFscGhhID0gYTsKKyAgICBmbG9hdCByID0gcmVkOworICAgIGZsb2F0 IGcgPSBncmVlbjsKKyAgICBmbG9hdCBiID0gYmx1ZTsKKyAgICBmbG9hdCBhID0gYWxwaGE7CisK KyAgICByZWQgICAgID0gdmFsdWVzWyAwXSAqIHIgKyB2YWx1ZXNbIDFdICogZyArIHZhbHVlc1sg Ml0gKiBiICsgdmFsdWVzWyAzXSAqIGEgKyB2YWx1ZXNbIDRdICogMjU1OworICAgIGdyZWVuICAg PSB2YWx1ZXNbIDVdICogciArIHZhbHVlc1sgNl0gKiBnICsgdmFsdWVzIFs3XSAqIGIgKyB2YWx1 ZXNbIDhdICogYSArIHZhbHVlc1sgOV0gKiAyNTU7CisgICAgYmx1ZSAgICA9IHZhbHVlc1sxMF0g KiByICsgdmFsdWVzWzExXSAqIGcgKyB2YWx1ZXNbMTJdICogYiArIHZhbHVlc1sxM10gKiBhICsg dmFsdWVzWzE0XSAqIDI1NTsKKyAgICBhbHBoYSAgID0gdmFsdWVzWzE1XSAqIHIgKyB2YWx1ZXNb MTZdICogZyArIHZhbHVlc1sxN10gKiBiICsgdmFsdWVzWzE4XSAqIGEgKyB2YWx1ZXNbMTldICog MjU1OwogfQogCiBpbmxpbmUgdm9pZCBzYXR1cmF0ZUFuZEh1ZVJvdGF0ZShmbG9hdCYgcmVkLCBm bG9hdCYgZ3JlZW4sIGZsb2F0JiBibHVlLCBjb25zdCBmbG9hdCogY29tcG9uZW50cykKIHsKLSAg ICBmbG9hdCByID0gcmVkICogY29tcG9uZW50c1swXSArIGdyZWVuICogY29tcG9uZW50c1sxXSAr IGJsdWUgKiBjb21wb25lbnRzWzJdOwotICAgIGZsb2F0IGcgPSByZWQgKiBjb21wb25lbnRzWzNd ICsgZ3JlZW4gKiBjb21wb25lbnRzWzRdICsgYmx1ZSAqIGNvbXBvbmVudHNbNV07Ci0gICAgZmxv YXQgYiA9IHJlZCAqIGNvbXBvbmVudHNbNl0gKyBncmVlbiAqIGNvbXBvbmVudHNbN10gKyBibHVl ICogY29tcG9uZW50c1s4XTsKKyAgICBmbG9hdCByID0gcmVkOworICAgIGZsb2F0IGcgPSBncmVl bjsKKyAgICBmbG9hdCBiID0gYmx1ZTsKIAotICAgIHJlZCA9IHI7Ci0gICAgZ3JlZW4gPSBnOwot ICAgIGJsdWUgPSBiOworICAgIHJlZCAgICAgPSByICogY29tcG9uZW50c1swXSArIGcgKiBjb21w b25lbnRzWzFdICsgYiAqIGNvbXBvbmVudHNbMl07CisgICAgZ3JlZW4gICA9IHIgKiBjb21wb25l bnRzWzNdICsgZyAqIGNvbXBvbmVudHNbNF0gKyBiICogY29tcG9uZW50c1s1XTsKKyAgICBibHVl ICAgID0gciAqIGNvbXBvbmVudHNbNl0gKyBnICogY29tcG9uZW50c1s3XSArIGIgKiBjb21wb25l bnRzWzhdOwogfQogCiBpbmxpbmUgdm9pZCBsdW1pbmFuY2UoZmxvYXQmIHJlZCwgZmxvYXQmIGdy ZWVuLCBmbG9hdCYgYmx1ZSwgZmxvYXQmIGFscGhhKQpAQCAtMTA1LDcgKzEwNyw2IEBAIGlubGlu ZSB2b2lkIGx1bWluYW5jZShmbG9hdCYgcmVkLCBmbG9hdCYgZ3JlZW4sIGZsb2F0JiBibHVlLCBm bG9hdCYgYWxwaGEpCiB0ZW1wbGF0ZTxDb2xvck1hdHJpeFR5cGUgZmlsdGVyVHlwZT4KIHZvaWQg ZWZmZWN0VHlwZShVaW50OENsYW1wZWRBcnJheSogcGl4ZWxBcnJheSwgY29uc3QgVmVjdG9yPGZs b2F0PiYgdmFsdWVzKQogewotICAgIHVuc2lnbmVkIHBpeGVsQXJyYXlMZW5ndGggPSBwaXhlbEFy cmF5LT5sZW5ndGgoKTsKICAgICBmbG9hdCBjb21wb25lbnRzWzldOwogCiAgICAgaWYgKGZpbHRl clR5cGUgPT0gRkVDT0xPUk1BVFJJWF9UWVBFX1NBVFVSQVRFKQpAQCAtMTEzLDI5ICsxMTQsNTEg QEAgdm9pZCBlZmZlY3RUeXBlKFVpbnQ4Q2xhbXBlZEFycmF5KiBwaXhlbEFycmF5LCBjb25zdCBW ZWN0b3I8ZmxvYXQ+JiB2YWx1ZXMpCiAgICAgZWxzZSBpZiAoZmlsdGVyVHlwZSA9PSBGRUNPTE9S TUFUUklYX1RZUEVfSFVFUk9UQVRFKQogICAgICAgICBGRUNvbG9yTWF0cml4OjpjYWxjdWxhdGVI dWVSb3RhdGVDb21wb25lbnRzKGNvbXBvbmVudHMsIHZhbHVlc1swXSk7CiAKLSAgICBmb3IgKHVu c2lnbmVkIHBpeGVsQnl0ZU9mZnNldCA9IDA7IHBpeGVsQnl0ZU9mZnNldCA8IHBpeGVsQXJyYXlM ZW5ndGg7IHBpeGVsQnl0ZU9mZnNldCArPSA0KSB7Ci0gICAgICAgIGZsb2F0IHJlZCA9IHBpeGVs QXJyYXktPml0ZW0ocGl4ZWxCeXRlT2Zmc2V0KTsKLSAgICAgICAgZmxvYXQgZ3JlZW4gPSBwaXhl bEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCArIDEpOwotICAgICAgICBmbG9hdCBibHVlID0g cGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZzZXQgKyAyKTsKLSAgICAgICAgZmxvYXQgYWxw aGEgPSBwaXhlbEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCArIDMpOwotCi0gICAgICAgIHN3 aXRjaCAoZmlsdGVyVHlwZSkgewotICAgICAgICAgICAgY2FzZSBGRUNPTE9STUFUUklYX1RZUEVf TUFUUklYOgotICAgICAgICAgICAgICAgIG1hdHJpeChyZWQsIGdyZWVuLCBibHVlLCBhbHBoYSwg dmFsdWVzKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2UgRkVDT0xP Uk1BVFJJWF9UWVBFX1NBVFVSQVRFOgotICAgICAgICAgICAgY2FzZSBGRUNPTE9STUFUUklYX1RZ UEVfSFVFUk9UQVRFOgotICAgICAgICAgICAgICAgIHNhdHVyYXRlQW5kSHVlUm90YXRlKHJlZCwg Z3JlZW4sIGJsdWUsIGNvbXBvbmVudHMpOwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgY2FzZSBGRUNPTE9STUFUUklYX1RZUEVfTFVNSU5BTkNFVE9BTFBIQToKLSAgICAgICAg ICAgICAgICBsdW1pbmFuY2UocmVkLCBncmVlbiwgYmx1ZSwgYWxwaGEpOwotICAgICAgICAgICAg ICAgIGJyZWFrOworICAgIHVuc2lnbmVkIHBpeGVsQXJyYXlMZW5ndGggPSBwaXhlbEFycmF5LT5s ZW5ndGgoKTsKKworICAgIHN3aXRjaCAoZmlsdGVyVHlwZSkgeworICAgIGNhc2UgRkVDT0xPUk1B VFJJWF9UWVBFX01BVFJJWDoKKyAgICAgICAgZm9yICh1bnNpZ25lZCBwaXhlbEJ5dGVPZmZzZXQg PSAwOyBwaXhlbEJ5dGVPZmZzZXQgPCBwaXhlbEFycmF5TGVuZ3RoOyBwaXhlbEJ5dGVPZmZzZXQg Kz0gNCkgeworICAgICAgICAgICAgZmxvYXQgcmVkID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5 dGVPZmZzZXQpOworICAgICAgICAgICAgZmxvYXQgZ3JlZW4gPSBwaXhlbEFycmF5LT5pdGVtKHBp eGVsQnl0ZU9mZnNldCArIDEpOworICAgICAgICAgICAgZmxvYXQgYmx1ZSA9IHBpeGVsQXJyYXkt Pml0ZW0ocGl4ZWxCeXRlT2Zmc2V0ICsgMik7CisgICAgICAgICAgICBmbG9hdCBhbHBoYSA9IHBp eGVsQXJyYXktPml0ZW0ocGl4ZWxCeXRlT2Zmc2V0ICsgMyk7CisgICAgICAgICAgICBtYXRyaXgo cmVkLCBncmVlbiwgYmx1ZSwgYWxwaGEsIHZhbHVlcyk7CisgICAgICAgICAgICBwaXhlbEFycmF5 LT5zZXQocGl4ZWxCeXRlT2Zmc2V0LCByZWQpOworICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0 KHBpeGVsQnl0ZU9mZnNldCArIDEsIGdyZWVuKTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNl dChwaXhlbEJ5dGVPZmZzZXQgKyAyLCBibHVlKTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNl dChwaXhlbEJ5dGVPZmZzZXQgKyAzLCBhbHBoYSk7CiAgICAgICAgIH0KKyAgICAgICAgYnJlYWs7 CiAKLSAgICAgICAgcGl4ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCwgcmVkKTsKLSAgICAg ICAgcGl4ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCArIDEsIGdyZWVuKTsKLSAgICAgICAg cGl4ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCArIDIsIGJsdWUpOwotICAgICAgICBwaXhl bEFycmF5LT5zZXQocGl4ZWxCeXRlT2Zmc2V0ICsgMywgYWxwaGEpOworICAgIGNhc2UgRkVDT0xP Uk1BVFJJWF9UWVBFX1NBVFVSQVRFOgorICAgIGNhc2UgRkVDT0xPUk1BVFJJWF9UWVBFX0hVRVJP VEFURToKKyAgICAgICAgZm9yICh1bnNpZ25lZCBwaXhlbEJ5dGVPZmZzZXQgPSAwOyBwaXhlbEJ5 dGVPZmZzZXQgPCBwaXhlbEFycmF5TGVuZ3RoOyBwaXhlbEJ5dGVPZmZzZXQgKz0gNCkgeworICAg ICAgICAgICAgZmxvYXQgcmVkID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZzZXQpOwor ICAgICAgICAgICAgZmxvYXQgZ3JlZW4gPSBwaXhlbEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNl dCArIDEpOworICAgICAgICAgICAgZmxvYXQgYmx1ZSA9IHBpeGVsQXJyYXktPml0ZW0ocGl4ZWxC eXRlT2Zmc2V0ICsgMik7CisgICAgICAgICAgICBmbG9hdCBhbHBoYSA9IHBpeGVsQXJyYXktPml0 ZW0ocGl4ZWxCeXRlT2Zmc2V0ICsgMyk7CisgICAgICAgICAgICBzYXR1cmF0ZUFuZEh1ZVJvdGF0 ZShyZWQsIGdyZWVuLCBibHVlLCBjb21wb25lbnRzKTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXkt PnNldChwaXhlbEJ5dGVPZmZzZXQsIHJlZCk7CisgICAgICAgICAgICBwaXhlbEFycmF5LT5zZXQo cGl4ZWxCeXRlT2Zmc2V0ICsgMSwgZ3JlZW4pOworICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0 KHBpeGVsQnl0ZU9mZnNldCArIDIsIGJsdWUpOworICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0 KHBpeGVsQnl0ZU9mZnNldCArIDMsIGFscGhhKTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsK KworICAgIGNhc2UgRkVDT0xPUk1BVFJJWF9UWVBFX0xVTUlOQU5DRVRPQUxQSEE6CisgICAgICAg IGZvciAodW5zaWduZWQgcGl4ZWxCeXRlT2Zmc2V0ID0gMDsgcGl4ZWxCeXRlT2Zmc2V0IDwgcGl4 ZWxBcnJheUxlbmd0aDsgcGl4ZWxCeXRlT2Zmc2V0ICs9IDQpIHsKKyAgICAgICAgICAgIGZsb2F0 IHJlZCA9IHBpeGVsQXJyYXktPml0ZW0ocGl4ZWxCeXRlT2Zmc2V0KTsKKyAgICAgICAgICAgIGZs b2F0IGdyZWVuID0gcGl4ZWxBcnJheS0+aXRlbShwaXhlbEJ5dGVPZmZzZXQgKyAxKTsKKyAgICAg ICAgICAgIGZsb2F0IGJsdWUgPSBwaXhlbEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9mZnNldCArIDIp OworICAgICAgICAgICAgZmxvYXQgYWxwaGEgPSBwaXhlbEFycmF5LT5pdGVtKHBpeGVsQnl0ZU9m ZnNldCArIDMpOworICAgICAgICAgICAgbHVtaW5hbmNlKHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhh KTsKKyAgICAgICAgICAgIHBpeGVsQXJyYXktPnNldChwaXhlbEJ5dGVPZmZzZXQsIHJlZCk7Cisg ICAgICAgICAgICBwaXhlbEFycmF5LT5zZXQocGl4ZWxCeXRlT2Zmc2V0ICsgMSwgZ3JlZW4pOwor ICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCArIDIsIGJsdWUpOwor ICAgICAgICAgICAgcGl4ZWxBcnJheS0+c2V0KHBpeGVsQnl0ZU9mZnNldCArIDMsIGFscGhhKTsK KyAgICAgICAgfQorICAgICAgICBicmVhazsKICAgICB9CiB9CiAKQEAgLTE0Nyw2ICsxNzAsMTAg QEAgdm9pZCBGRUNvbG9yTWF0cml4OjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUoKQogICAgIGlmICgh cmVzdWx0SW1hZ2UpCiAgICAgICAgIHJldHVybjsKIAorI2lmIFBSSU5UX0ZJTFRFUl9QRVJGT1JN QU5DRQorICAgIE1vbm90b25pY1RpbWUgc3RhcnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7 CisjZW5kaWYKKwogICAgIEltYWdlQnVmZmVyKiBpbkJ1ZmZlciA9IGluLT5hc0ltYWdlQnVmZmVy KCk7CiAgICAgaWYgKGluQnVmZmVyKQogICAgICAgICByZXN1bHRJbWFnZS0+Y29udGV4dCgpLmRy YXdJbWFnZUJ1ZmZlcigqaW5CdWZmZXIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4tPmFi c29sdXRlUGFpbnRSZWN0KCkpKTsKQEAgLTE3NCw2ICsyMDEsMjAgQEAgdm9pZCBGRUNvbG9yTWF0 cml4OjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUoKQogICAgIH0KIAogICAgIHJlc3VsdEltYWdlLT5w dXRCeXRlQXJyYXkoVW5tdWx0aXBsaWVkLCBwaXhlbEFycmF5LmdldCgpLCBpbWFnZVJlY3Quc2l6 ZSgpLCBpbWFnZVJlY3QsIEludFBvaW50KCkpOworCisjaWYgUFJJTlRfRklMVEVSX1BFUkZPUk1B TkNFCisgICAgTW9ub3RvbmljVGltZSBlbmRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7Cisg ICAgU2Vjb25kcyBkdXJhdGlvbiA9IGVuZFRpbWUgLSBzdGFydFRpbWU7CisgICAgdW5zaWduZWQg cGl4ZWxDb3VudCA9IGltYWdlUmVjdC53aWR0aCgpICogaW1hZ2VSZWN0LmhlaWdodCgpOworICAg IAorICAgIHN0YXRpYyBkb3VibGUgdG90YWxNZWdhcGl4ZWxzOworICAgIHRvdGFsTWVnYXBpeGVs cyArPSAoZG91YmxlKXBpeGVsQ291bnQgLyAxMDQ4NTc2LjA7CisgICAgCisgICAgc3RhdGljIFNl Y29uZHMgdG90YWxUaW1lOworICAgIHRvdGFsVGltZSArPSBkdXJhdGlvbjsKKyAgICAKKyAgICBX VEZMb2dBbHdheXMoIkZFQ29sb3JNYXRyaXg6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSAoJWR4JWQp IHRvb2sgJS40Zm1zIChhdmUgJS40Zm1zL21wKSIsIGltYWdlUmVjdC53aWR0aCgpLCBpbWFnZVJl Y3QuaGVpZ2h0KCksIGR1cmF0aW9uLm1pbGxpc2Vjb25kcygpLCB0b3RhbFRpbWUubWlsbGlzZWNv bmRzKCkgLyB0b3RhbE1lZ2FwaXhlbHMpOworI2VuZGlmCiB9CiAKIHZvaWQgRkVDb2xvck1hdHJp eDo6ZHVtcCgpCg==