156466 2016-04-11 07:24:16 -0700 [css-grid] Pass GridSizingData instead of columnTracks to track sizing methods 2016-04-12 01:24:48 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 svillar svillar commit-queue darin esprehn+autocc ggaren glenn jfernandez koivisto kondapallykalyan rego svillar oldest_to_newest 1182693 0 svillar 2016-04-11 07:24:16 -0700 [css-grid] Pass GridSizingData instead of columnTracks to track sizing methods 1182694 1 276148 svillar 2016-04-11 07:27:45 -0700 Created attachment 276148 Patch 1183013 2 276148 svillar 2016-04-12 01:24:39 -0700 Comment on attachment 276148 Patch Clearing flags on attachment: 276148 Committed r199341: <http://trac.webkit.org/changeset/199341> 1183014 3 svillar 2016-04-12 01:24:48 -0700 All reviewed patches have been landed. Closing bug. 276148 2016-04-11 07:27:45 -0700 2016-04-12 01:24:39 -0700 Patch bug-156466-20160411162751.patch text/plain 14473 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5MjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM2ZDUzOTBmYmRkYzUy OGUwOTJmNzc5NmUzODFiN2I3ODQ3NjQyMy4uNTY3YjczNWM0MTM4YTUzYmZhMTM5NDhjNWViOTNm ZjAwMzk4MGI5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA0LTExICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gUGFzcyBHcmlkU2l6aW5nRGF0YSBpbnN0ZWFkIG9mIGNvbHVtblRyYWNrcyB0byB0cmFjayBz aXppbmcgbWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU2NDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2V2ZXJhbCBtZXRob2RzIHVzZWQgdG8gY29tcHV0ZSB0aGUgaXRlbXMnIHNpemUgY29u dHJpYnV0aW9uIHRvIHRoZSB0cmFja3MgdGhleSBzcGFuIGluLCBnZXQKKyAgICAgICAgYXMgYW4g YXJndW1lbnQgYSB2ZWN0b3Igd2l0aCB0aGUgc2l6ZXMgb2YgdGhlIGNvbHVtbiB0cmFja3MuCisK KyAgICAgICAgSW4gb3JkZXIgdG8gc3VwcG9ydCBncmlkcyB3aXRoIG9ydGhvZ29uYWwgZmxvd3Mg KGFtb25nIG90aGVyIHRoaW5ncykgaXQncyBtdWNoIGJldHRlciB0bworICAgICAgICBwYXNzIHRo ZSBHcmlkU2l6aW5nRGF0YSBzdHJ1Y3QgYW5kIGxldCB0aG9zZSBtZXRob2RzIGRlY2lkZSB3aGV0 aGVyIHRvIHVzZSB0aGUgY29sdW1ucyBvcgorICAgICAgICB0aGUgcm93cy4KKworICAgICAgICBO byBuZXcgdGVzdHMgYXMgdGhpcyBpcyBqdXN0IGEgbWlub3IgcmVmYWN0b3Jpbmcgd2l0aCBubyBj aGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpjb21wdXRlVXNlZEJyZWFkdGhPZkdyaWRU cmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bG9naWNhbENvbnRlbnRIZWln aHRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjptaW5TaXplRm9yQ2hp bGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bWluQ29udGVudEZvckNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6Om1heENvbnRlbnRGb3JDaGlsZCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdG dW5jdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cmVzb2x2ZUNvbnRlbnRC YXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9yTm9uU3Bhbm5pbmdJdGVtcyk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJHcmlkOjpjdXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlv blBoYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnJlc29sdmVDb250ZW50QmFz ZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvckl0ZW1zKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyR3JpZC5oOgorCiAyMDE2LTA0LTExICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KIAogICAgICAgICBJbXBsZW1lbnQgZnVuY3Rpb25hbCA6aG9zdCgpIHBzZXVkbyBjbGFzcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCmluZGV4IGU3OTY1ZWY2NGQ1ZGEz YzU0NDAyZTdkNmMwMmQwNGE2OTAzOWZmZGMuLmE3MjIzYzFjNmNiOTBlOWM2MTM1ODU2ZDRkYWI0 MGJmY2JkNTEzZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAg LTU4Niw3ICs1ODYsNyBAQCB2b2lkIFJlbmRlckdyaWQ6OmNvbXB1dGVVc2VkQnJlYWR0aE9mR3Jp ZFRyYWNrcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aQogICAgICAgICAgICAgICAg IGlmIChpID4gMCAmJiBzcGFuLnN0YXJ0TGluZSgpIDw9IGZsZXhpYmxlU2l6ZWRUcmFja3NJbmRl eFtpIC0gMV0pCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICAg ICAgZmxleEZyYWN0aW9uID0gc3RkOjptYXgoZmxleEZyYWN0aW9uLCBmaW5kRmxleEZhY3RvclVu aXRTaXplKHRyYWNrcywgc3BhbiwgZGlyZWN0aW9uLCBtYXhDb250ZW50Rm9yQ2hpbGQoKmdyaWRJ dGVtLCBkaXJlY3Rpb24sIHNpemluZ0RhdGEuY29sdW1uVHJhY2tzKSkpOworICAgICAgICAgICAg ICAgIGZsZXhGcmFjdGlvbiA9IHN0ZDo6bWF4KGZsZXhGcmFjdGlvbiwgZmluZEZsZXhGYWN0b3JV bml0U2l6ZSh0cmFja3MsIHNwYW4sIGRpcmVjdGlvbiwgbWF4Q29udGVudEZvckNoaWxkKCpncmlk SXRlbSwgZGlyZWN0aW9uLCBzaXppbmdEYXRhKSkpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpAQCAtNzEzLDEwICs3MTMsMTAgQEAgR3JpZFRyYWNrU2l6ZSBSZW5kZXJHcmlkOjpn cmlkVHJhY2tTaXplKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIHVuc2kKICAg ICByZXR1cm4gR3JpZFRyYWNrU2l6ZShtaW5UcmFja0JyZWFkdGgsIG1heFRyYWNrQnJlYWR0aCk7 CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3JpZDo6bG9naWNhbENvbnRlbnRIZWlnaHRGb3JDaGls ZChSZW5kZXJCb3gmIGNoaWxkLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzKQorTGF5 b3V0VW5pdCBSZW5kZXJHcmlkOjpsb2dpY2FsQ29udGVudEhlaWdodEZvckNoaWxkKFJlbmRlckJv eCYgY2hpbGQsIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKQogewogICAgIE9wdGlvbmFsPExh eW91dFVuaXQ+IG9sZE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aCA9 IGNoaWxkLmhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoKCkgPyBjaGlsZC5v dmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoKSA6IExheW91dFVuaXQo KTsKLSAgICBMYXlvdXRVbml0IG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxX aWR0aCA9IGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNoaWxkLCBGb3JDb2x1bW5zLCBjb2x1bW5U cmFja3MpOworICAgIExheW91dFVuaXQgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9n aWNhbFdpZHRoID0gZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY2hpbGQsIEZvckNvbHVtbnMsIHNp emluZ0RhdGEuY29sdW1uVHJhY2tzKTsKICAgICBpZiAoY2hpbGQuaGFzT3ZlcnJpZGVMb2dpY2Fs Q29udGVudEhlaWdodCgpIHx8IGNoaWxkLmhhc1JlbGF0aXZlTG9naWNhbEhlaWdodCgpIHx8ICFv bGRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGggfHwgb2xkT3ZlcnJp ZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoLnZhbHVlKCkgIT0gb3ZlcnJpZGVD b250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoKQogICAgICAgICBjaGlsZC5zZXROZWVk c0xheW91dChNYXJrT25seVRoaXMpOwogCkBAIC03MzQsNyArNzM0LDcgQEAgTGF5b3V0VW5pdCBS ZW5kZXJHcmlkOjpsb2dpY2FsQ29udGVudEhlaWdodEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQs IFZlY3RvcjxHcmkKICAgICByZXR1cm4gY2hpbGQubG9naWNhbEhlaWdodCgpICsgY2hpbGQubWFy Z2luTG9naWNhbEhlaWdodCgpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1pblNpemVG b3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0 aW9uLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzKQorTGF5b3V0VW5pdCBSZW5kZXJH cmlkOjptaW5TaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGly ZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCiB7CiAgICAgYm9v bCBoYXNPcnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9k ZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklYTUU6IFByb3Blcmx5 IHN1cHBvcnQgb3J0aG9nb25hbCB3cml0aW5nIG1vZGUuCkBAIC03NDUsNyArNzQ1LDcgQEAgTGF5 b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5TaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW8KICAgICBjb25zdCBMZW5ndGgmIGNoaWxkTWluU2l6ZSA9IGlz Um93QXhpcyA/IGNoaWxkLnN0eWxlKCkubG9naWNhbE1pbldpZHRoKCkgOiBjaGlsZC5zdHlsZSgp LmxvZ2ljYWxNaW5IZWlnaHQoKTsKICAgICBjb25zdCBMZW5ndGgmIGNoaWxkU2l6ZSA9IGlzUm93 QXhpcyA/IGNoaWxkLnN0eWxlKCkubG9naWNhbFdpZHRoKCkgOiBjaGlsZC5zdHlsZSgpLmxvZ2lj YWxIZWlnaHQoKTsKICAgICBpZiAoIWNoaWxkU2l6ZS5pc0F1dG8oKSB8fCBjaGlsZE1pblNpemUu aXNBdXRvKCkpCi0gICAgICAgIHJldHVybiBtaW5Db250ZW50Rm9yQ2hpbGQoY2hpbGQsIGRpcmVj dGlvbiwgY29sdW1uVHJhY2tzKTsKKyAgICAgICAgcmV0dXJuIG1pbkNvbnRlbnRGb3JDaGlsZChj aGlsZCwgZGlyZWN0aW9uLCBzaXppbmdEYXRhKTsKIAogICAgIGlmIChpc1Jvd0F4aXMpCiAgICAg ICAgIHJldHVybiBjaGlsZC5jb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb25Vc2luZyhNaW5TaXpl LCBjaGlsZE1pblNpemUsIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgKnRoaXMsIG51bGxwdHIpOwpA QCAtNzUzLDcgKzc1Myw3IEBAIExheW91dFVuaXQgUmVuZGVyR3JpZDo6bWluU2l6ZUZvckNoaWxk KFJlbmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvCiAgICAgcmV0dXJuIGNo aWxkLmNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgY2hpbGRNaW5TaXplLCBOdWxs b3B0KS52YWx1ZU9yKDApOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1pbkNvbnRlbnRG b3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0 aW9uLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzKQorTGF5b3V0VW5pdCBSZW5kZXJH cmlkOjptaW5Db250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5n RGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCiB7CiAgICAg Ym9vbCBoYXNPcnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5n TW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklYTUU6IFByb3Bl cmx5IHN1cHBvcnQgb3J0aG9nb25hbCB3cml0aW5nIG1vZGUuCkBAIC03NzEsMTAgKzc3MSwxMCBA QCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1pbkNvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNo aWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlYwogICAgICAgICByZXR1cm4gY2hpbGQubWluUHJlZmVy cmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JDaGlsZChj aGlsZCk7CiAgICAgfQogCi0gICAgcmV0dXJuIGxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9yQ2hpbGQo Y2hpbGQsIGNvbHVtblRyYWNrcyk7CisgICAgcmV0dXJuIGxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9y Q2hpbGQoY2hpbGQsIHNpemluZ0RhdGEpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1h eENvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rp b24gZGlyZWN0aW9uLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzKQorTGF5b3V0VW5p dCBSZW5kZXJHcmlkOjptYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRy YWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEp CiB7CiAgICAgYm9vbCBoYXNPcnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklY TUU6IFByb3Blcmx5IHN1cHBvcnQgb3J0aG9nb25hbCB3cml0aW5nIG1vZGUuCkBAIC03OTIsNyAr NzkyLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVy Qm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWMKICAgICAgICAgcmV0dXJuIGNoaWxkLm1h eFByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICsgbWFyZ2luSW50cmluc2ljTG9naWNhbFdpZHRoRm9y Q2hpbGQoY2hpbGQpOwogICAgIH0KIAotICAgIHJldHVybiBsb2dpY2FsQ29udGVudEhlaWdodEZv ckNoaWxkKGNoaWxkLCBjb2x1bW5UcmFja3MpOworICAgIHJldHVybiBsb2dpY2FsQ29udGVudEhl aWdodEZvckNoaWxkKGNoaWxkLCBzaXppbmdEYXRhKTsKIH0KIAogY2xhc3MgR3JpZEl0ZW1XaXRo U3BhbiB7CkBAIC04NDQsNyArODQ0LDcgQEAgdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVu dEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW8KICAgICAg ICAgICAgIGlmIChpdGVtc1NldC5hZGQoZ3JpZEl0ZW0pLmlzTmV3RW50cnkpIHsKICAgICAgICAg ICAgICAgICBjb25zdCBHcmlkU3BhbiYgc3BhbiA9IGNhY2hlZEdyaWRTcGFuKCpncmlkSXRlbSwg ZGlyZWN0aW9uKTsKICAgICAgICAgICAgICAgICBpZiAoc3Bhbi5pbnRlZ2VyU3BhbigpID09IDEp Ci0gICAgICAgICAgICAgICAgICAgIHJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0 aW9uc0Zvck5vblNwYW5uaW5nSXRlbXMoZGlyZWN0aW9uLCBzcGFuLCAqZ3JpZEl0ZW0sIHRyYWNr LCBzaXppbmdEYXRhLmNvbHVtblRyYWNrcyk7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmVD b250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5vblNwYW5uaW5nSXRlbXMoZGlyZWN0 aW9uLCBzcGFuLCAqZ3JpZEl0ZW0sIHRyYWNrLCBzaXppbmdEYXRhKTsKICAgICAgICAgICAgICAg ICBlbHNlIGlmICghc3Bhbm5pbmdJdGVtQ3Jvc3Nlc0ZsZXhpYmxlU2l6ZWRUcmFja3Moc3Bhbiwg ZGlyZWN0aW9uKSkKICAgICAgICAgICAgICAgICAgICAgc2l6aW5nRGF0YS5pdGVtc1NvcnRlZEJ5 SW5jcmVhc2luZ1NwYW4uYXBwZW5kKEdyaWRJdGVtV2l0aFNwYW4oKmdyaWRJdGVtLCBzcGFuKSk7 CiAgICAgICAgICAgICB9CkBAIC04NzEsMjIgKzg3MSwyMiBAQCB2b2lkIFJlbmRlckdyaWQ6OnJl c29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9ucyhHcmlkVHJhY2tTaXppbmdEaXJl Y3RpbwogICAgIH0KIH0KIAotdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJh Y2tTaXppbmdGdW5jdGlvbnNGb3JOb25TcGFubmluZ0l0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVj dGlvbiBkaXJlY3Rpb24sIGNvbnN0IEdyaWRTcGFuJiBzcGFuLCBSZW5kZXJCb3gmIGdyaWRJdGVt LCBHcmlkVHJhY2smIHRyYWNrLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzKQordm9p ZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JO b25TcGFubmluZ0l0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0 IEdyaWRTcGFuJiBzcGFuLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2smIHRyYWNrLCBH cmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKIHsKICAgICB1bnNpZ25lZCB0cmFja1Bvc2l0aW9u ID0gc3Bhbi5zdGFydExpbmUoKTsKICAgICBHcmlkVHJhY2tTaXplIHRyYWNrU2l6ZSA9IGdyaWRU cmFja1NpemUoZGlyZWN0aW9uLCB0cmFja1Bvc2l0aW9uKTsKIAogICAgIGlmICh0cmFja1NpemUu aGFzTWluQ29udGVudE1pblRyYWNrQnJlYWR0aCgpKQotICAgICAgICB0cmFjay5zZXRCYXNlU2l6 ZShzdGQ6Om1heCh0cmFjay5iYXNlU2l6ZSgpLCBtaW5Db250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0s IGRpcmVjdGlvbiwgY29sdW1uVHJhY2tzKSkpOworICAgICAgICB0cmFjay5zZXRCYXNlU2l6ZShz dGQ6Om1heCh0cmFjay5iYXNlU2l6ZSgpLCBtaW5Db250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRp cmVjdGlvbiwgc2l6aW5nRGF0YSkpKTsKICAgICBlbHNlIGlmICh0cmFja1NpemUuaGFzTWF4Q29u dGVudE1pblRyYWNrQnJlYWR0aCgpKQotICAgICAgICB0cmFjay5zZXRCYXNlU2l6ZShzdGQ6Om1h eCh0cmFjay5iYXNlU2l6ZSgpLCBtYXhDb250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlv biwgY29sdW1uVHJhY2tzKSkpOworICAgICAgICB0cmFjay5zZXRCYXNlU2l6ZShzdGQ6Om1heCh0 cmFjay5iYXNlU2l6ZSgpLCBtYXhDb250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwg c2l6aW5nRGF0YSkpKTsKICAgICBlbHNlIGlmICh0cmFja1NpemUuaGFzQXV0b01pblRyYWNrQnJl YWR0aCgpKQotICAgICAgICB0cmFjay5zZXRCYXNlU2l6ZShzdGQ6Om1heCh0cmFjay5iYXNlU2l6 ZSgpLCBtaW5TaXplRm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgY29sdW1uVHJhY2tzKSkp OworICAgICAgICB0cmFjay5zZXRCYXNlU2l6ZShzdGQ6Om1heCh0cmFjay5iYXNlU2l6ZSgpLCBt aW5TaXplRm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgc2l6aW5nRGF0YSkpKTsKIAogICAg IGlmICh0cmFja1NpemUuaGFzTWluQ29udGVudE1heFRyYWNrQnJlYWR0aCgpKQotICAgICAgICB0 cmFjay5zZXRHcm93dGhMaW1pdChzdGQ6Om1heCh0cmFjay5ncm93dGhMaW1pdCgpLCBtaW5Db250 ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgY29sdW1uVHJhY2tzKSkpOworICAgICAg ICB0cmFjay5zZXRHcm93dGhMaW1pdChzdGQ6Om1heCh0cmFjay5ncm93dGhMaW1pdCgpLCBtaW5D b250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgc2l6aW5nRGF0YSkpKTsKICAgICBl bHNlIGlmICh0cmFja1NpemUuaGFzTWF4Q29udGVudE9yQXV0b01heFRyYWNrQnJlYWR0aCgpKQot ICAgICAgICB0cmFjay5zZXRHcm93dGhMaW1pdChzdGQ6Om1heCh0cmFjay5ncm93dGhMaW1pdCgp LCBtYXhDb250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgY29sdW1uVHJhY2tzKSkp OworICAgICAgICB0cmFjay5zZXRHcm93dGhMaW1pdChzdGQ6Om1heCh0cmFjay5ncm93dGhMaW1p dCgpLCBtYXhDb250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgc2l6aW5nRGF0YSkp KTsKIH0KIAogY29uc3QgTGF5b3V0VW5pdCYgUmVuZGVyR3JpZDo6dHJhY2tTaXplRm9yVHJhY2tT aXplQ29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvblBoYXNlIHBoYXNlLCBHcmlk VHJhY2smIHRyYWNrLCBUcmFja1NpemVSZXN0cmljdGlvbiByZXN0cmljdGlvbikKQEAgLTk5MSwx NyArOTkxLDE3IEBAIHZvaWQgUmVuZGVyR3JpZDo6dXBkYXRlVHJhY2tTaXplRm9yVHJhY2tTaXpl Q29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvCiAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3JpZDo6Y3VycmVudEl0ZW1TaXplRm9yVHJh Y2tTaXplQ29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvblBoYXNlIHBoYXNlLCBS ZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBW ZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1uVHJhY2tzKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpj dXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1 dGF0aW9uUGhhc2UgcGhhc2UsIFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFja1NpemluZ0Rp cmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKQogewogICAgIHN3 aXRjaCAocGhhc2UpIHsKICAgICBjYXNlIFJlc29sdmVJbnRyaW5zaWNNaW5pbXVtczoKLSAgICAg ICAgcmV0dXJuIG1pblNpemVGb3JDaGlsZChncmlkSXRlbSwgZGlyZWN0aW9uLCBjb2x1bW5UcmFj a3MpOworICAgICAgICByZXR1cm4gbWluU2l6ZUZvckNoaWxkKGdyaWRJdGVtLCBkaXJlY3Rpb24s IHNpemluZ0RhdGEpOwogICAgIGNhc2UgUmVzb2x2ZUNvbnRlbnRCYXNlZE1pbmltdW1zOgogICAg IGNhc2UgUmVzb2x2ZUludHJpbnNpY01heGltdW1zOgotICAgICAgICByZXR1cm4gbWluQ29udGVu dEZvckNoaWxkKGdyaWRJdGVtLCBkaXJlY3Rpb24sIGNvbHVtblRyYWNrcyk7CisgICAgICAgIHJl dHVybiBtaW5Db250ZW50Rm9yQ2hpbGQoZ3JpZEl0ZW0sIGRpcmVjdGlvbiwgc2l6aW5nRGF0YSk7 CiAgICAgY2FzZSBSZXNvbHZlTWF4Q29udGVudE1pbmltdW1zOgogICAgIGNhc2UgUmVzb2x2ZU1h eENvbnRlbnRNYXhpbXVtczoKLSAgICAgICAgcmV0dXJuIG1heENvbnRlbnRGb3JDaGlsZChncmlk SXRlbSwgZGlyZWN0aW9uLCBjb2x1bW5UcmFja3MpOworICAgICAgICByZXR1cm4gbWF4Q29udGVu dEZvckNoaWxkKGdyaWRJdGVtLCBkaXJlY3Rpb24sIHNpemluZ0RhdGEpOwogICAgIGNhc2UgTWF4 aW1pemVUcmFja3M6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1 cm4gMDsKQEAgLTEwNDYsNyArMTA0Niw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6cmVzb2x2ZUNvbnRl bnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9ySXRlbXMoR3JpZFRyYWNrU2l6aW5nCiAKICAg ICAgICAgc3Bhbm5pbmdUcmFja3NTaXplICs9IGd1dHRlcnNTaXplKGRpcmVjdGlvbiwgaXRlbVNw YW4uaW50ZWdlclNwYW4oKSk7CiAKLSAgICAgICAgTGF5b3V0VW5pdCBleHRyYVNwYWNlID0gY3Vy cmVudEl0ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShwaGFzZSwgZ3JpZEl0ZW1X aXRoU3Bhbi5ncmlkSXRlbSgpLCBkaXJlY3Rpb24sIHNpemluZ0RhdGEuY29sdW1uVHJhY2tzKSAt IHNwYW5uaW5nVHJhY2tzU2l6ZTsKKyAgICAgICAgTGF5b3V0VW5pdCBleHRyYVNwYWNlID0gY3Vy cmVudEl0ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShwaGFzZSwgZ3JpZEl0ZW1X aXRoU3Bhbi5ncmlkSXRlbSgpLCBkaXJlY3Rpb24sIHNpemluZ0RhdGEpIC0gc3Bhbm5pbmdUcmFj a3NTaXplOwogICAgICAgICBleHRyYVNwYWNlID0gc3RkOjptYXg8TGF5b3V0VW5pdD4oZXh0cmFT cGFjZSwgMCk7CiAgICAgICAgIGF1dG8mIHRyYWNrc1RvR3Jvd0JleW9uZEdyb3d0aExpbWl0cyA9 IHNpemluZ0RhdGEuZ3Jvd0JleW9uZEdyb3d0aExpbWl0c1RyYWNrcy5pc0VtcHR5KCkgPyBzaXpp bmdEYXRhLmZpbHRlcmVkVHJhY2tzIDogc2l6aW5nRGF0YS5ncm93QmV5b25kR3Jvd3RoTGltaXRz VHJhY2tzOwogICAgICAgICBkaXN0cmlidXRlU3BhY2VUb1RyYWNrczxwaGFzZT4oc2l6aW5nRGF0 YS5maWx0ZXJlZFRyYWNrcywgJnRyYWNrc1RvR3Jvd0JleW9uZEdyb3d0aExpbWl0cywgZXh0cmFT cGFjZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCAwMTRhMDQ2NmMy NGNkZDViODU1NzRkZWU1YjkyYTUyNGM2MmU5M2IxLi4wNDRiNmUxMGEyZGNkMzMxNmNkZjQ2OTQ4 NDUxMTlmNmNmYzMxZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAg LTExNywxMCArMTE3LDEwIEBAIHByaXZhdGU6CiAgICAgc3RhdGljIGJvb2wgdHJhY2tTaG91bGRH cm93QmV5b25kR3Jvd3RoTGltaXRzRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShUcmFja1Np emVDb21wdXRhdGlvblBoYXNlLCBjb25zdCBHcmlkVHJhY2tTaXplJik7CiAgICAgc3RhdGljIHZv aWQgbWFya0FzSW5maW5pdGVseUdyb3dhYmxlRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShU cmFja1NpemVDb21wdXRhdGlvblBoYXNlLCBHcmlkVHJhY2smKTsKICAgICBzdGF0aWMgdm9pZCB1 cGRhdGVUcmFja1NpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1 dGF0aW9uUGhhc2UsIEdyaWRUcmFjayYpOwotICAgIExheW91dFVuaXQgY3VycmVudEl0ZW1TaXpl Rm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvblBoYXNlLCBS ZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIFZlY3RvcjxHcmlkVHJhY2s+JiBj b2x1bW5UcmFja3MpOworICAgIExheW91dFVuaXQgY3VycmVudEl0ZW1TaXplRm9yVHJhY2tTaXpl Q29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvblBoYXNlLCBSZW5kZXJCb3gmLCBH cmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJik7CiAKICAgICB0eXBlZGVm IHN0cnVjdCBHcmlkSXRlbXNTcGFuR3JvdXBSYW5nZSBHcmlkSXRlbXNTcGFuR3JvdXBSYW5nZTsK LSAgICB2b2lkIHJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5vblNw YW5uaW5nSXRlbXMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBjb25zdCBHcmlkU3BhbiYsIFJl bmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFjayYsIFZlY3RvcjxHcmlkVHJhY2s+JiBjb2x1bW5U cmFja3MpOworICAgIHZvaWQgcmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25z Rm9yTm9uU3Bhbm5pbmdJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIGNvbnN0IEdyaWRT cGFuJiwgUmVuZGVyQm94JiBncmlkSXRlbSwgR3JpZFRyYWNrJiwgR3JpZFNpemluZ0RhdGEmKTsK ICAgICB0ZW1wbGF0ZSA8VHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZT4gdm9pZCByZXNvbHZlQ29u dGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24sIEdyaWRTaXppbmdEYXRhJiwgY29uc3QgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2UmKTsK ICAgICB0ZW1wbGF0ZSA8VHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZT4gdm9pZCBkaXN0cmlidXRl U3BhY2VUb1RyYWNrcyhWZWN0b3I8R3JpZFRyYWNrKj4mLCBjb25zdCBWZWN0b3I8R3JpZFRyYWNr Kj4qIGdyb3dCZXlvbmRHcm93dGhMaW1pdHNUcmFja3MsIExheW91dFVuaXQmIGF2YWlsYWJsZUxv Z2ljYWxTcGFjZSk7CiAKQEAgLTEzMCwxMCArMTMwLDEwIEBAIHByaXZhdGU6CiAKICAgICBHcmlk VHJhY2tTaXplIGdyaWRUcmFja1NpemUoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCB1bnNpZ25l ZCkgY29uc3Q7CiAKLSAgICBMYXlvdXRVbml0IGxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9yQ2hpbGQo UmVuZGVyQm94JiwgVmVjdG9yPEdyaWRUcmFjaz4mKTsKLSAgICBMYXlvdXRVbml0IG1pblNpemVG b3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIFZlY3RvcjxHcmlk VHJhY2s+JiBjb2x1bW5UcmFja3MpOwotICAgIExheW91dFVuaXQgbWluQ29udGVudEZvckNoaWxk KFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgVmVjdG9yPEdyaWRUcmFjaz4m IGNvbHVtblRyYWNrcyk7Ci0gICAgTGF5b3V0VW5pdCBtYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVy Qm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBWZWN0b3I8R3JpZFRyYWNrPiYgY29sdW1u VHJhY2tzKTsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxDb250ZW50SGVpZ2h0Rm9yQ2hpbGQoUmVu ZGVyQm94JiwgR3JpZFNpemluZ0RhdGEmKTsKKyAgICBMYXlvdXRVbml0IG1pblNpemVGb3JDaGls ZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJik7 CisgICAgTGF5b3V0VW5pdCBtaW5Db250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNr U2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpOworICAgIExheW91dFVuaXQgbWF4Q29u dGVudEZvckNoaWxkKFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNp emluZ0RhdGEmKTsKICAgICBHcmlkQXhpc1Bvc2l0aW9uIGNvbHVtbkF4aXNQb3NpdGlvbkZvckNo aWxkKGNvbnN0IFJlbmRlckJveCYpIGNvbnN0OwogICAgIEdyaWRBeGlzUG9zaXRpb24gcm93QXhp c1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAgICAgTGF5b3V0VW5p dCBjb2x1bW5BeGlzT2Zmc2V0Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7Cg==