112501 2013-03-16 12:41:09 -0700 Fix GridTrackSize::operator== 2013-03-19 02:48:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 112574 60731 1 hans hans eric esprehn+autocc jchaffraix ojan.autocc simon.fraser webkit.review.bot oldest_to_newest 856604 0 hans 2013-03-16 12:41:09 -0700 Fix GridTrackSize::operator== 856606 1 193443 hans 2013-03-16 12:45:28 -0700 Created attachment 193443 Patch 856607 2 hans 2013-03-16 12:47:07 -0700 Julien, would you like to take a look? 856608 3 eric 2013-03-16 12:52:53 -0700 Would be nice to test. Ojan/tony would know how. 857109 4 jchaffraix 2013-03-18 07:46:02 -0700 As Eric pointed out, this should be tested. operator== is used during style changes to see if we should relayout the grid element so it should be possible to test that. Here is the outline of how this would work: * Set grid-columns to minmax(10px, 20px), layout and check the sizes. * Set grid-columns to minmax(10px, 30px), layout and check that the width changed. We have 0 testing for dynamic updates of grid-{columns|rows} so it's a good idea to add more testing that just this narrow case. Let me see if I can come up with some good testing. 857113 5 hans 2013-03-18 07:49:26 -0700 (In reply to comment #4) > We have 0 testing for dynamic updates of grid-{columns|rows} so it's a good idea to add more testing that just this narrow case. Let me see if I can come up with some good testing. Sounds great, thanks! 857127 6 jchaffraix 2013-03-18 08:16:15 -0700 Actually, we have another bug in the StyleGridData::operator=: bool operator==(const StyleGridData& o) const { return m_gridColumns == o.m_gridColumns && m_gridRows == o.m_gridRows && m_gridAutoFlow != o.m_gridAutoFlow; } This bug is hiding what Hans is trying to fix as any grid-{rows|columns} will still trigger a full layout as grid-auto-flow didn't change. I am on it, then we should be able to test this bug. 857240 7 193591 jchaffraix 2013-03-18 10:07:44 -0700 Created attachment 193591 Test case 857426 8 193628 hans 2013-03-18 12:36:37 -0700 Created attachment 193628 Patch 857485 9 193628 eric 2013-03-18 13:35:09 -0700 Comment on attachment 193628 Patch Hot damn! Thanks for the patch and test! (I assume your test fails before the patch...) 857511 10 193628 webkit.review.bot 2013-03-18 13:58:29 -0700 Comment on attachment 193628 Patch Clearing flags on attachment: 193628 Committed r146117: <http://trac.webkit.org/changeset/146117> 857512 11 webkit.review.bot 2013-03-18 13:58:32 -0700 All reviewed patches have been landed. Closing bug. 857551 12 simon.fraser 2013-03-18 14:23:02 -0700 Might this have caused a this test failure? http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK1%20(Tests)/r146109%20(6473)/fast/frames/flattening/frameset-flattening-grid-pretty-diff.html 857580 13 jchaffraix 2013-03-18 14:45:41 -0700 (In reply to comment #12) > Might this have caused a this test failure? > http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK1%20(Tests)/r146109%20(6473)/fast/frames/flattening/frameset-flattening-grid-pretty-diff.html You need to opt into the grid layout parsing code at runtime. This test doesn't opt in nor does the output / test shows anything grid related so I would think it is not your culprit. 858092 14 hans 2013-03-19 02:48:17 -0700 (In reply to comment #9) > (From update of attachment 193628 [details]) > Hot damn! Thanks for the patch and test! (I assume your test fails before the patch...) Thank Julien for the test :) Yes, it fails without my patch (though the patch in Bug 112574 was required to get there). 193443 2013-03-16 12:45:28 -0700 2013-03-18 12:36:34 -0700 Patch bug-112501-20130316194121.patch text/plain 1630 hans U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFhZDU3NWJjNmEzMjc0 YTliOWUzMDMyZDQ3N2E1YTMzYjE2ZTQ5MS4uMTBhODBmMjZlYTNlZTU0ZGRkMGZlMzYyZDA1Y2Y3 MDM1Yzc1OTczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAzLTE2ICBIYW5z IFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IEdyaWRUcmFja1Np emU6Om9wZXJhdG9yPT0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMjUwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZXJlIHdhcyBhIG1pc3NpbmcgIm90aGVyLiIgaW4gdGhlIGZ1bmN0aW9uLgorCisg ICAgICAgIFRoaXMgd2FzIGZvdW5kIGJ5IGV4cGVyaW1lbnRpbmcgd2l0aCBhIHBvdGVudGlhbCBu ZXcgQ2xhbmcgd2FybmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9HcmlkVHJhY2tT aXplLmg6CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXplOjpvcGVyYXRvcj09KToKKwog MjAxMy0wMy0xNSAgQ2hyaXN0aWFuIEJpZXNpbmdlciAgPGNiaWVzaW5nZXJAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIENvbnZlcnQgb2xkIGZsZXhib3ggdXNlcyBpbiBodG1sLmNzcyB0byBuZXcg ZmxleGJveCAobm9uLTxzZWxlY3Q+KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL0dyaWRUcmFja1NpemUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9HcmlkVHJhY2tTaXplLmgKaW5kZXggMzNkMTk4YWZkNjhmZjc5MjlmZjU3ZTJkNjFiYzIzY2M5 OGQ2Yjc1Ny4uNzJmNjRhNjg3MDIzODNiNTJlOGZjZWQyMzUwMDc2Y2NkOGUyM2I4YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRUcmFja1NpemUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFRyYWNrU2l6ZS5oCkBAIC05NSw3 ICs5NSw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBHcmlkVHJhY2tT aXplJiBvdGhlcikgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBtX3R5cGUgPT0gb3RoZXIu bV90eXBlICYmIG1fbWluVHJhY2tCcmVhZHRoID09IG90aGVyLm1fbWluVHJhY2tCcmVhZHRoICYm IG1fbWF4VHJhY2tCcmVhZHRoID09IG1fbWF4VHJhY2tCcmVhZHRoOworICAgICAgICByZXR1cm4g bV90eXBlID09IG90aGVyLm1fdHlwZSAmJiBtX21pblRyYWNrQnJlYWR0aCA9PSBvdGhlci5tX21p blRyYWNrQnJlYWR0aCAmJiBtX21heFRyYWNrQnJlYWR0aCA9PSBvdGhlci5tX21heFRyYWNrQnJl YWR0aDsKICAgICB9CiAKICAgICBib29sIGhhc01pbk9yTWF4Q29udGVudE1pblRyYWNrQnJlYWR0 aCgpIGNvbnN0IHsgcmV0dXJuIG1pblRyYWNrQnJlYWR0aCgpLmlzTWluQ29udGVudCgpIHx8IG1p blRyYWNrQnJlYWR0aCgpLmlzTWF4Q29udGVudCgpOyB9Cg== 193591 2013-03-18 10:07:44 -0700 2013-03-18 10:07:44 -0700 Test case grid-rows-columns-update.html text/html 3158 jchaffraix PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8c2NyaXB0PgppZiAod2luZG93LnRlc3RSdW5uZXIpCiAg ICB0ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgiV2ViS2l0Q1NTR3JpZExheW91dEVuYWJs ZWQiLCAxKTsKPC9zY3JpcHQ+CjxsaW5rIGhyZWY9InJlc291cmNlcy9ncmlkLmNzcyIgcmVsPSJz dHlsZXNoZWV0Ij4KPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9jaGVjay1sYXlvdXQuanMi Pjwvc2NyaXB0Pgo8c2NyaXB0PgpmdW5jdGlvbiB0ZXN0TGF5b3V0KGdyaWRFbGVtZW50SUQsIGdy aWRUcmFja3MsIHNpemUpCnsKICAgIHZhciBncmlkRWxlbWVudCA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKGdyaWRFbGVtZW50SUQpOwogICAgZ3JpZEVsZW1lbnQuc3R5bGUud2Via2l0R3JpZENv bHVtbnMgPSBncmlkVHJhY2tzLmNvbHVtbnM7CiAgICBncmlkRWxlbWVudC5zdHlsZS53ZWJraXRH cmlkUm93cyA9IGdyaWRUcmFja3Mucm93czsKICAgIHZhciBncmlkSXRlbSA9IGdyaWRFbGVtZW50 LmZpcnN0Q2hpbGQubmV4dFNpYmxpbmc7CiAgICBncmlkSXRlbS5zZXRBdHRyaWJ1dGUoImRhdGEt ZXhwZWN0ZWQtd2lkdGgiLCBzaXplLndpZHRoKTsKICAgIGdyaWRJdGVtLnNldEF0dHJpYnV0ZSgi ZGF0YS1leHBlY3RlZC1oZWlnaHQiLCBzaXplLmhlaWdodCk7CiAgICBjaGVja0xheW91dCgiIyIg KyBncmlkRWxlbWVudElEKTsKfQoKZnVuY3Rpb24gdXBkYXRlUm93c0NvbHVtbnMoKQp7CiAgICAv LyBJbiB0aGUgY29uc3RyYWluZWQgZ3JpZCBjYXNlLCB3ZSB3aWxsIGFsd2F5cyBlbmQgdXAgc2l6 aW5nIGFmdGVyIHRoZSBtaW4gd2lkdGguIFRoaXMgbWVhbnMgd2UgZG9uJ3QgdGVzdCBtYXggd2lk dGggY2hhbmdlcyBhcyB0aGV5IHdvdWxkIG5vdCBiZSBkZXRlY3RhYmxlLgogICAgdGVzdExheW91 dCgiY29uc3RyYWluZWRHcmlkIiwgeyAncm93cyc6ICdtaW5tYXgoMjBweCwgNTBweCknLCAnY29s dW1ucyc6ICdtaW5tYXgoMzBweCwgNTBweCknIH0sIHsgJ3dpZHRoJzogJzMwJywgJ2hlaWdodCc6 ICcyMCcgfSk7CiAgICB0ZXN0TGF5b3V0KCJjb25zdHJhaW5lZEdyaWQiLCB7ICdyb3dzJzogJ21p bm1heCg0MHB4LCA1MHB4KScsICdjb2x1bW5zJzogJ21pbm1heCgzMHB4LCA1MHB4KScgfSwgeyAn d2lkdGgnOiAnMzAnLCAnaGVpZ2h0JzogJzQwJyB9KTsKICAgIHRlc3RMYXlvdXQoImNvbnN0cmFp bmVkR3JpZCIsIHsgJ3Jvd3MnOiAnbWlubWF4KDQwcHgsIDUwcHgpJywgJ2NvbHVtbnMnOiAnbWlu bWF4KDUwcHgsIDUwcHgpJyB9LCB7ICd3aWR0aCc6ICc1MCcsICdoZWlnaHQnOiAnNDAnIH0pOwog ICAgdGVzdExheW91dCgiY29uc3RyYWluZWRHcmlkIiwgeyAncm93cyc6ICdhdXRvJywgJ2NvbHVt bnMnOiAnbWlubWF4KDUwcHgsIDUwcHgpJyB9LCB7ICd3aWR0aCc6ICc1MCcsICdoZWlnaHQnOiAn MjAnIH0pOwogICAgdGVzdExheW91dCgiY29uc3RyYWluZWRHcmlkIiwgeyAncm93cyc6ICdhdXRv JywgJ2NvbHVtbnMnOiAnbWlubWF4KC13ZWJraXQtbWF4LWNvbnRlbnQsIDUwcHgpJyB9LCB7ICd3 aWR0aCc6ICcxMjAnLCAnaGVpZ2h0JzogJzEwJyB9KTsKICAgIHRlc3RMYXlvdXQoImNvbnN0cmFp bmVkR3JpZCIsIHsgJ3Jvd3MnOiAnNzBweCcsICdjb2x1bW5zJzogJ21pbm1heCgtd2Via2l0LW1h eC1jb250ZW50LCA1MHB4KScgfSwgeyAnd2lkdGgnOiAnMTIwJywgJ2hlaWdodCc6ICc3MCcgfSk7 CgogICAgdGVzdExheW91dCgidW5jb25zdHJhaW5lZEdyaWQiLCB7ICdyb3dzJzogJ21pbm1heCgy MHB4LCA1MHB4KScsICdjb2x1bW5zJzogJ21pbm1heCgyMHB4LCA2MHB4KScgfSwgeyAnd2lkdGgn OiAnNjAnLCAnaGVpZ2h0JzogJzUwJyB9KTsKICAgIHRlc3RMYXlvdXQoInVuY29uc3RyYWluZWRH cmlkIiwgeyAncm93cyc6ICdtaW5tYXgoMjBweCwgNTBweCknLCAnY29sdW1ucyc6ICdtaW5tYXgo MjBweCwgNDBweCknIH0sIHsgJ3dpZHRoJzogJzQwJywgJ2hlaWdodCc6ICc1MCcgfSk7CiAgICB0 ZXN0TGF5b3V0KCJ1bmNvbnN0cmFpbmVkR3JpZCIsIHsgJ3Jvd3MnOiAnbWlubWF4KDIwcHgsIDMw cHgpJywgJ2NvbHVtbnMnOiAnbWlubWF4KDIwcHgsIDQwcHgpJyB9LCB7ICd3aWR0aCc6ICc0MCcs ICdoZWlnaHQnOiAnMzAnIH0pOwogICAgdGVzdExheW91dCgidW5jb25zdHJhaW5lZEdyaWQiLCB7 ICdyb3dzJzogJ2F1dG8nLCAnY29sdW1ucyc6ICdtaW5tYXgoMjBweCwgNDBweCknIH0sIHsgJ3dp ZHRoJzogJzQwJywgJ2hlaWdodCc6ICcyMCcgfSk7CiAgICB0ZXN0TGF5b3V0KCJ1bmNvbnN0cmFp bmVkR3JpZCIsIHsgJ3Jvd3MnOiAnYXV0bycsICdjb2x1bW5zJzogJ21pbm1heCgyMHB4LCAtd2Vi a2l0LW1heC1jb250ZW50KScgfSwgeyAnd2lkdGgnOiAnMTIwJywgJ2hlaWdodCc6ICcxMCcgfSk7 CiAgICB0ZXN0TGF5b3V0KCJ1bmNvbnN0cmFpbmVkR3JpZCIsIHsgJ3Jvd3MnOiAnYXV0bycsICdj b2x1bW5zJzogJ21pbm1heCgxNTBweCwgLXdlYmtpdC1tYXgtY29udGVudCknIH0sIHsgJ3dpZHRo JzogJzE1MCcsICdoZWlnaHQnOiAnMTAnIH0pOwogICAgdGVzdExheW91dCgidW5jb25zdHJhaW5l ZEdyaWQiLCB7ICdyb3dzJzogJ2F1dG8nLCAnY29sdW1ucyc6ICdhdXRvJyB9LCB7ICd3aWR0aCc6 ICcxMjAnLCAnaGVpZ2h0JzogJzEwJyB9KTsKfQoKd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImxv YWQiLCB1cGRhdGVSb3dzQ29sdW1ucywgZmFsc2UpOwo8L3NjcmlwdD4KPGJvZHk+CjxkaXY+VGhp cyB0ZXN0IGNoZWNrcyB0aGF0IGdyaWQte3Jvd3N8Y29sdW1uc30gZHluYW1pYyB1cGRhdGVzIHBy b3Blcmx5IHJlbGF5b3V0IHRoZSBncmlkIGl0ZW1zLjwvZGl2Pgo8ZGl2IGNsYXNzPSJjb25zdHJh aW5lZENvbnRhaW5lciI+CiAgICA8ZGl2IGNsYXNzPSJncmlkIiBpZD0iY29uc3RyYWluZWRHcmlk Ij4KICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEiPlhYWFhYIFhYWFhYWDwvZGl2 PgogICAgPC9kaXY+CjwvZGl2PgoKPGRpdiBjbGFzcz0idW5jb25zdHJhaW5lZENvbnRhaW5lciI+ CiAgICA8ZGl2IGNsYXNzPSJncmlkIiBpZD0idW5jb25zdHJhaW5lZEdyaWQiPgogICAgICAgIDxk aXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSI+WFhYWFggWFhYWFhYPC9kaXY+CiAgICA8L2Rpdj4K PC9kaXY+CjwvYm9keT4KPC9odG1sPgo= 193628 2013-03-18 12:36:37 -0700 2013-03-18 13:58:29 -0700 Patch bug-112501-20130318193228.patch text/plain 6654 hans U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcxMmExMjYzOGQ3OGYy ZjZiMzQ0YmU2MjZhMDhmODg5Yzk3NGRiNy4uOTVkMmVkYjUyNTc4N2Q3MDE2MjUxMzQ5NDEyNTdk MzkyMGEzOGY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTE4ICBIYW5z IFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IEdyaWRUcmFja1Np emU6Om9wZXJhdG9yPT0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMjUwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZXJlIHdhcyBhIG1pc3NpbmcgIm90aGVyLiIgaW4gdGhlIGZ1bmN0aW9uLgorCisg ICAgICAgIFRoaXMgd2FzIGZvdW5kIGJ5IGV4cGVyaW1lbnRpbmcgd2l0aCBhIHBvdGVudGlhbCBu ZXcgQ2xhbmcgd2FybmluZy4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWR5bmFtaWMtdXBkYXRlcy1yZWxheW91dC5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvR3JpZFRyYWNrU2l6ZS5oOgorICAgICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6ZTo6 b3BlcmF0b3I9PSk6CisKIDIwMTMtMDMtMTggIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFu LmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgUmVuZGVyRnJhbWVTZXQ6Om5v ZGVBdFBvaW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3Jp ZFRyYWNrU2l6ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0dyaWRUcmFja1Np emUuaAppbmRleCAzM2QxOThhZmQ2OGZmNzkyOWZmNTdlMmQ2MWJjMjNjYzk4ZDZiNzU3Li43MmY2 NGE2ODcwMjM4M2I1MmU4ZmNlZDIzNTAwNzZjY2Q4ZTIzYjhiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvR3JpZFRyYWNrU2l6ZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9HcmlkVHJhY2tTaXplLmgKQEAgLTk1LDcgKzk1LDcgQEAgcHVi bGljOgogCiAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEdyaWRUcmFja1NpemUmIG90aGVyKSBj b25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIG1fdHlwZSA9PSBvdGhlci5tX3R5cGUgJiYgbV9t aW5UcmFja0JyZWFkdGggPT0gb3RoZXIubV9taW5UcmFja0JyZWFkdGggJiYgbV9tYXhUcmFja0Jy ZWFkdGggPT0gbV9tYXhUcmFja0JyZWFkdGg7CisgICAgICAgIHJldHVybiBtX3R5cGUgPT0gb3Ro ZXIubV90eXBlICYmIG1fbWluVHJhY2tCcmVhZHRoID09IG90aGVyLm1fbWluVHJhY2tCcmVhZHRo ICYmIG1fbWF4VHJhY2tCcmVhZHRoID09IG90aGVyLm1fbWF4VHJhY2tCcmVhZHRoOwogICAgIH0K IAogICAgIGJvb2wgaGFzTWluT3JNYXhDb250ZW50TWluVHJhY2tCcmVhZHRoKCkgY29uc3QgeyBy ZXR1cm4gbWluVHJhY2tCcmVhZHRoKCkuaXNNaW5Db250ZW50KCkgfHwgbWluVHJhY2tCcmVhZHRo KCkuaXNNYXhDb250ZW50KCk7IH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1MGE3MGYxOGZkMmE4MDUyODIxYTlhNWQyMWEz ZjJmYTcyOTliYTk5Li44YmMwNmUyYWM5NjhiYzdmOGJmNDNjYmI3NDAzYTZlZmY3YTc4ZjQ4IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDMtMTggIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNo cm9taXVtLm9yZz4KKworICAgICAgICBGaXggR3JpZFRyYWNrU2l6ZTo6b3BlcmF0b3I9PQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNTAxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgdGVzdCB0 byBjaGVjayB0aGF0IHN0eWxlIGNoYW5nZXMgY2F1c2UgcmVsYXlvdXQgY29ycmVjdGx5LgorCisg ICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1keW5hbWljLXVwZGF0ZXMtcmVsYXlv dXQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWR5bmFtaWMtdXBkYXRlcy1yZWxheW91dC5odG1sOiBBZGRlZC4KKwogMjAxMy0wMy0xOCAg S3VuaWhpa28gU2FrYW1vdG8gIDxrc2FrYW1vdG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFRo ZSAnZm9ybW5vdmFsaWRhdGUnIGF0dHJpYnV0ZSBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IG9uIGJ1 dHRvbiBlbGVtZW50cyB3aXRoIGNoaWxkIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWR5bmFtaWMtdXBkYXRlcy1yZWxheW91dC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWR5bmFtaWMt dXBkYXRlcy1yZWxheW91dC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmJlZjMzZTc0NDU0M2Yx NDViMzExMTVmMjkwNzY5NjQ0ZTM5M2IxOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtZHluYW1pYy11cGRhdGVzLXJlbGF5b3V0LWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDE2IEBACitUaGlzIHRlc3QgY2hlY2tzIHRoYXQgZ3JpZC17cm93 c3xjb2x1bW5zfSBkeW5hbWljIHVwZGF0ZXMgcHJvcGVybHkgcmVsYXlvdXQgdGhlIGdyaWQgaXRl bXMuCitYWFhYWCBYWFhYWFgKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1hY WFhYIFhYWFhYWAorUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1keW5hbWljLXVw ZGF0ZXMtcmVsYXlvdXQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dy aWQtZHluYW1pYy11cGRhdGVzLXJlbGF5b3V0Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDFmNDJiZjZkYTBl ZTk1YmM1NmM0MWNmMDcxZmRjODcxNmU0NmY3NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtZHluYW1pYy11cGRhdGVzLXJlbGF5b3V0Lmh0 bWwKQEAgLTAsMCArMSw1NiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxzY3JpcHQ+Citp ZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2Uo IldlYktpdENTU0dyaWRMYXlvdXRFbmFibGVkIiwgMSk7Cis8L3NjcmlwdD4KKzxsaW5rIGhyZWY9 InJlc291cmNlcy9ncmlkLmNzcyIgcmVsPSJzdHlsZXNoZWV0Ij4KKzxzY3JpcHQgc3JjPSIuLi8u Li9yZXNvdXJjZXMvY2hlY2stbGF5b3V0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5jdGlv biB0ZXN0TGF5b3V0KGdyaWRFbGVtZW50SUQsIGdyaWRUcmFja3MsIHNpemUpCit7CisgICAgdmFy IGdyaWRFbGVtZW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoZ3JpZEVsZW1lbnRJRCk7Cisg ICAgZ3JpZEVsZW1lbnQuc3R5bGUud2Via2l0R3JpZENvbHVtbnMgPSBncmlkVHJhY2tzLmNvbHVt bnM7CisgICAgZ3JpZEVsZW1lbnQuc3R5bGUud2Via2l0R3JpZFJvd3MgPSBncmlkVHJhY2tzLnJv d3M7CisgICAgdmFyIGdyaWRJdGVtID0gZ3JpZEVsZW1lbnQuZmlyc3RDaGlsZC5uZXh0U2libGlu ZzsKKyAgICBncmlkSXRlbS5zZXRBdHRyaWJ1dGUoImRhdGEtZXhwZWN0ZWQtd2lkdGgiLCBzaXpl LndpZHRoKTsKKyAgICBncmlkSXRlbS5zZXRBdHRyaWJ1dGUoImRhdGEtZXhwZWN0ZWQtaGVpZ2h0 Iiwgc2l6ZS5oZWlnaHQpOworICAgIGNoZWNrTGF5b3V0KCIjIiArIGdyaWRFbGVtZW50SUQpOwor fQorCitmdW5jdGlvbiB1cGRhdGVSb3dzQ29sdW1ucygpCit7CisgICAgLy8gSW4gdGhlIGNvbnN0 cmFpbmVkIGdyaWQgY2FzZSwgd2Ugd2lsbCBhbHdheXMgZW5kIHVwIHNpemluZyBhZnRlciB0aGUg bWluIHdpZHRoLiBUaGlzIG1lYW5zIHdlIGRvbid0IHRlc3QgbWF4IHdpZHRoIGNoYW5nZXMgYXMg dGhleSB3b3VsZCBub3QgYmUgZGV0ZWN0YWJsZS4KKyAgICB0ZXN0TGF5b3V0KCJjb25zdHJhaW5l ZEdyaWQiLCB7ICdyb3dzJzogJ21pbm1heCgyMHB4LCA1MHB4KScsICdjb2x1bW5zJzogJ21pbm1h eCgzMHB4LCA1MHB4KScgfSwgeyAnd2lkdGgnOiAnMzAnLCAnaGVpZ2h0JzogJzIwJyB9KTsKKyAg ICB0ZXN0TGF5b3V0KCJjb25zdHJhaW5lZEdyaWQiLCB7ICdyb3dzJzogJ21pbm1heCg0MHB4LCA1 MHB4KScsICdjb2x1bW5zJzogJ21pbm1heCgzMHB4LCA1MHB4KScgfSwgeyAnd2lkdGgnOiAnMzAn LCAnaGVpZ2h0JzogJzQwJyB9KTsKKyAgICB0ZXN0TGF5b3V0KCJjb25zdHJhaW5lZEdyaWQiLCB7 ICdyb3dzJzogJ21pbm1heCg0MHB4LCA1MHB4KScsICdjb2x1bW5zJzogJ21pbm1heCg1MHB4LCA1 MHB4KScgfSwgeyAnd2lkdGgnOiAnNTAnLCAnaGVpZ2h0JzogJzQwJyB9KTsKKyAgICB0ZXN0TGF5 b3V0KCJjb25zdHJhaW5lZEdyaWQiLCB7ICdyb3dzJzogJ2F1dG8nLCAnY29sdW1ucyc6ICdtaW5t YXgoNTBweCwgNTBweCknIH0sIHsgJ3dpZHRoJzogJzUwJywgJ2hlaWdodCc6ICcyMCcgfSk7Cisg ICAgdGVzdExheW91dCgiY29uc3RyYWluZWRHcmlkIiwgeyAncm93cyc6ICdhdXRvJywgJ2NvbHVt bnMnOiAnbWlubWF4KC13ZWJraXQtbWF4LWNvbnRlbnQsIDUwcHgpJyB9LCB7ICd3aWR0aCc6ICcx MjAnLCAnaGVpZ2h0JzogJzEwJyB9KTsKKyAgICB0ZXN0TGF5b3V0KCJjb25zdHJhaW5lZEdyaWQi LCB7ICdyb3dzJzogJzcwcHgnLCAnY29sdW1ucyc6ICdtaW5tYXgoLXdlYmtpdC1tYXgtY29udGVu dCwgNTBweCknIH0sIHsgJ3dpZHRoJzogJzEyMCcsICdoZWlnaHQnOiAnNzAnIH0pOworCisgICAg dGVzdExheW91dCgidW5jb25zdHJhaW5lZEdyaWQiLCB7ICdyb3dzJzogJ21pbm1heCgyMHB4LCA1 MHB4KScsICdjb2x1bW5zJzogJ21pbm1heCgyMHB4LCA2MHB4KScgfSwgeyAnd2lkdGgnOiAnNjAn LCAnaGVpZ2h0JzogJzUwJyB9KTsKKyAgICB0ZXN0TGF5b3V0KCJ1bmNvbnN0cmFpbmVkR3JpZCIs IHsgJ3Jvd3MnOiAnbWlubWF4KDIwcHgsIDUwcHgpJywgJ2NvbHVtbnMnOiAnbWlubWF4KDIwcHgs IDQwcHgpJyB9LCB7ICd3aWR0aCc6ICc0MCcsICdoZWlnaHQnOiAnNTAnIH0pOworICAgIHRlc3RM YXlvdXQoInVuY29uc3RyYWluZWRHcmlkIiwgeyAncm93cyc6ICdtaW5tYXgoMjBweCwgMzBweCkn LCAnY29sdW1ucyc6ICdtaW5tYXgoMjBweCwgNDBweCknIH0sIHsgJ3dpZHRoJzogJzQwJywgJ2hl aWdodCc6ICczMCcgfSk7CisgICAgdGVzdExheW91dCgidW5jb25zdHJhaW5lZEdyaWQiLCB7ICdy b3dzJzogJ2F1dG8nLCAnY29sdW1ucyc6ICdtaW5tYXgoMjBweCwgNDBweCknIH0sIHsgJ3dpZHRo JzogJzQwJywgJ2hlaWdodCc6ICcyMCcgfSk7CisgICAgdGVzdExheW91dCgidW5jb25zdHJhaW5l ZEdyaWQiLCB7ICdyb3dzJzogJ2F1dG8nLCAnY29sdW1ucyc6ICdtaW5tYXgoMjBweCwgLXdlYmtp dC1tYXgtY29udGVudCknIH0sIHsgJ3dpZHRoJzogJzEyMCcsICdoZWlnaHQnOiAnMTAnIH0pOwor ICAgIHRlc3RMYXlvdXQoInVuY29uc3RyYWluZWRHcmlkIiwgeyAncm93cyc6ICdhdXRvJywgJ2Nv bHVtbnMnOiAnbWlubWF4KDE1MHB4LCAtd2Via2l0LW1heC1jb250ZW50KScgfSwgeyAnd2lkdGgn OiAnMTUwJywgJ2hlaWdodCc6ICcxMCcgfSk7CisgICAgdGVzdExheW91dCgidW5jb25zdHJhaW5l ZEdyaWQiLCB7ICdyb3dzJzogJ2F1dG8nLCAnY29sdW1ucyc6ICdhdXRvJyB9LCB7ICd3aWR0aCc6 ICcxMjAnLCAnaGVpZ2h0JzogJzEwJyB9KTsKK30KKword2luZG93LmFkZEV2ZW50TGlzdGVuZXIo ImxvYWQiLCB1cGRhdGVSb3dzQ29sdW1ucywgZmFsc2UpOworPC9zY3JpcHQ+Cis8Ym9keT4KKzxk aXY+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGdyaWQte3Jvd3N8Y29sdW1uc30gZHluYW1pYyB1cGRh dGVzIHByb3Blcmx5IHJlbGF5b3V0IHRoZSBncmlkIGl0ZW1zLjwvZGl2PgorPGRpdiBjbGFzcz0i Y29uc3RyYWluZWRDb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImdyaWQiIGlkPSJjb25zdHJh aW5lZEdyaWQiPgorICAgICAgICA8ZGl2IGNsYXNzPSJzaXplZFRvR3JpZEFyZWEiPlhYWFhYIFhY WFhYWDwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9InVuY29uc3RyYWlu ZWRDb250YWluZXIiPgorICAgIDxkaXYgY2xhc3M9ImdyaWQiIGlkPSJ1bmNvbnN0cmFpbmVkR3Jp ZCI+CisgICAgICAgIDxkaXYgY2xhc3M9InNpemVkVG9HcmlkQXJlYSI+WFhYWFggWFhYWFhYPC9k aXY+CisgICAgPC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K