104818 2012-12-12 08:58:24 -0800 [CSS Grid Layout] Include paddings and borders into the grid element's logical height / width 2012-12-12 18:51:00 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 60731 1 jchaffraix jchaffraix eric ojan.autocc ojan tony webkit.review.bot xan.lopez oldest_to_newest 789608 0 jchaffraix 2012-12-12 08:58:24 -0800 Currently we don't account for paddings and borders on the grid element in computePreferredLogicalWidths and layoutGridItems. This means that we don't compute the right width / height during layout and needs to be fixed. Patch forthcoming. 789614 1 179062 jchaffraix 2012-12-12 09:05:07 -0800 Created attachment 179062 Proposed change. 789724 2 179062 tony 2012-12-12 11:14:34 -0800 Comment on attachment 179062 Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=179062&action=review > Source/WebCore/rendering/RenderGrid.cpp:203 > + LayoutUnit borderAndPaddingInBlockDirection = borderAndPaddingLogicalHeight(); > + setLogicalHeight(logicalHeight() + borderAndPaddingInBlockDirection); Nit: I would remove the temporary variable. > LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html:9 > +.grid { > + display: -webkit-grid; We should consider making a .css file in resources that define classes for the various grid properties. This makes it easier to handle property name changes and makes it possible to make the tests cross platform by adding -ms prefixed properties. See css3/flexbox/resources/flexbox.css for an example of this. Would be good as a separate patch. 790136 3 179062 jchaffraix 2012-12-12 17:52:28 -0800 Comment on attachment 179062 Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=179062&action=review >> Source/WebCore/rendering/RenderGrid.cpp:203 >> + setLogicalHeight(logicalHeight() + borderAndPaddingInBlockDirection); > > Nit: I would remove the temporary variable. Will do. >> LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html:9 >> + display: -webkit-grid; > > We should consider making a .css file in resources that define classes for the various grid properties. This makes it easier to handle property name changes and makes it possible to make the tests cross platform by adding -ms prefixed properties. See css3/flexbox/resources/flexbox.css for an example of this. Would be good as a separate patch. Filed https://bugs.webkit.org/show_bug.cgi?id=104869 about that. 790146 4 179171 jchaffraix 2012-12-12 17:58:21 -0800 Created attachment 179171 Patch for landing 790192 5 179171 webkit.review.bot 2012-12-12 18:50:56 -0800 Comment on attachment 179171 Patch for landing Clearing flags on attachment: 179171 Committed r137560: <http://trac.webkit.org/changeset/137560> 790193 6 webkit.review.bot 2012-12-12 18:51:00 -0800 All reviewed patches have been landed. Closing bug. 179062 2012-12-12 09:05:07 -0800 2012-12-12 17:58:18 -0800 Proposed change. bug-104818-20121212090227.patch text/plain 5358 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjM3MDQyZDgwMDAzMzlj ZTMzYjg1MjUyOTRkMjE1M2M5YWIzOGY0Ny4uNDYyYzFiY2UwNTZjMzY4ZmQ4MjYwYTFkMmQ5OGNk YWIxYmMwMDE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTEyICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEluY2x1ZGUgcGFkZGluZ3MgYW5kIGJvcmRlcnMgaW50byB0aGUgZ3JpZCBlbGVt ZW50J3MgbG9naWNhbCBoZWlnaHQgLyB3aWR0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0ODE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgbWFrZXMgUmVuZGVyR3JpZCBhZGQgdGhl IGJvcmRlcnMgYW5kIHBhZGRpbmdzIGluIHRoZSByaWdodCBkaXJlY3Rpb24gZHVyaW5nIGxheW91 dAorICAgICAgICBzbyB0aGF0IHRoZSBncmlkIGVsZW1lbnQncyBzaXplIGFjY291bnRzIHRoZW0g bGlrZSBhbnkgb3RoZXIgcmVuZGVyZXIuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MtZ3JpZC1s YXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFyZ2luLmh0bWwKKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmNvbXB1 dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6 OmxheW91dEdyaWRJdGVtcyk6CisKIDIwMTItMTItMTEgIE1pY2hhZWwgUHJ1ZXR0ICA8bWljaGFl bEA2OGsub3JnPgogCiAgICAgICAgIFtKU0NdIEFkZCB0ZXN0cyBmb3IgZXhwbGljaXQgc2VyaWFs aXphdGlvbiB2YWx1ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRl eCA0YjBkODM3YWNmMTc1YmVlYjcyNjNlZGE4YmEzMmY5ODBiZDg1ZTFmLi45Y2M5NTEwNTQ2ZTc5 NTE5MDNlZGI0MzBhZGYzMTNhMzVlNzAwY2YxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwCkBAIC0xMzEsNyArMTMxLDkgQEAgdm9pZCBSZW5kZXJHcmlkOjpjb21wdXRl UHJlZmVycmVkTG9naWNhbFdpZHRocygpCiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFjY291 bnQgZm9yIG1pbiAvIG1heCBsb2dpY2FsIHdpZHRoLgogCi0gICAgLy8gRklYTUU6IEluY2x1ZGUg Ym9yZGVycyBhbmQgcGFkZGluZ3MgaW4gaW5saW5lIGRpcmVjdGlvbi4KKyAgICBMYXlvdXRVbml0 IGJvcmRlckFuZFBhZGRpbmdJbklubGluZURpcmVjdGlvbiA9IGJvcmRlckFuZFBhZGRpbmdMb2dp Y2FsV2lkdGgoKTsKKyAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQ YWRkaW5nSW5JbmxpbmVEaXJlY3Rpb247CisgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgg Kz0gYm9yZGVyQW5kUGFkZGluZ0luSW5saW5lRGlyZWN0aW9uOwogCiAgICAgc2V0UHJlZmVycmVk TG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0KQEAgLTE5Miw5ICsxOTQsMTMgQEAgdm9pZCBS ZW5kZXJHcmlkOjpsYXlvdXRHcmlkSXRlbXMoKQogICAgICAgICBjaGlsZC0+c2V0TG9naWNhbExv Y2F0aW9uKGNoaWxkUG9zaXRpb24pOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBIYW5kbGUgYm9y ZGVyICYgcGFkZGluZyBvbiB0aGUgZ3JpZCBlbGVtZW50LgogICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgcm93VHJhY2tzLnNpemUoKTsgKytpKQogICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KGxv Z2ljYWxIZWlnaHQoKSArIHJvd1RyYWNrc1tpXS5tX3VzZWRCcmVhZHRoKTsKKworICAgIC8vIEZJ WE1FOiBXZSBzaG91bGQgaGFuZGxlIG1pbiAvIG1heCBsb2dpY2FsIGhlaWdodC4KKworICAgIExh eW91dFVuaXQgYm9yZGVyQW5kUGFkZGluZ0luQmxvY2tEaXJlY3Rpb24gPSBib3JkZXJBbmRQYWRk aW5nTG9naWNhbEhlaWdodCgpOworICAgIHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgp ICsgYm9yZGVyQW5kUGFkZGluZ0luQmxvY2tEaXJlY3Rpb24pOwogfQogCiBzaXplX3QgUmVuZGVy R3JpZDo6cmVzb2x2ZUdyaWRQb3NpdGlvbihjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0aW9uKSBj b25zdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGU3Y2ExM2MzNDJiYzlkZDAxZDFhOTY3MmVjZmU2OGFjMzNkOGUxYzUuLjdm NTEwOTNiNDM1Y2NlM2MzYjQzNjhhMWM4MjVlYTk3ZmQzOWQ3MjAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAxMi0xMi0xMiAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9y Zz4KKworICAgICAgICBbQ1NTIEdyaWQgTGF5b3V0XSBJbmNsdWRlIHBhZGRpbmdzIGFuZCBib3Jk ZXJzIGludG8gdGhlIGdyaWQgZWxlbWVudCdzIGxvZ2ljYWwgaGVpZ2h0IC8gd2lkdGgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDgxOAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9jc3MtZ3Jp ZC1sYXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFyZ2luLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFy Z2luLmh0bWw6IEFkZGVkLgorCiAyMDEyLTEyLTExICBBZGFtIEtsZWluICA8YWRhbWtAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJlYmFzZWxpbmUgZmxvYXRzLXdyYXAtaW5zaWRlLWlubGluZS0w MDcuaHRtbCBhZnRlciByMTM3MzMxLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3Mt Z3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFyZ2luLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtZWxlbWVudC1wYWRkaW5nLW1hcmdp bi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjFjZWZjM2E1NDU5YzE5Zjg5ZTFjYzI1OTA4ZTdm ZjNmOTE0ZDcwNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQt bGF5b3V0L2dyaWQtZWxlbWVudC1wYWRkaW5nLW1hcmdpbi1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw4IEBACitUZXN0IHRoYXQgcGFkZGluZ3MgYW5kIGJvcmRlcnMgYXJlIGFkZGVkIHRvIGEgZ3Jp ZCBlbGVtZW50J3Mgc2l6ZS4KKworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50 LXBhZGRpbmctbWFyZ2luLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWVsZW1lbnQtcGFkZGluZy1tYXJnaW4uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41MDdlMGQ4ODJkYzli MDlhNWVjMTA2YWVkMjdlZTM0YjgzNmE4Y2QxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFyZ2luLmh0bWwK QEAgLTAsMCArMSw0NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxzY3JpcHQ+CitpZiAo d2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldl YktpdENTU0dyaWRMYXlvdXRFbmFibGVkIiwgMSk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KKy5ncmlk IHsKKyAgICBkaXNwbGF5OiAtd2Via2l0LWdyaWQ7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3Jl eTsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uczogMTAwcHg7CisgICAgLXdlYmtpdC1ncmlkLXJv d3M6IDUwcHg7CisgICAgLyogRm9yY2UgdGhlIGdyaWQgZWxlbWVudCB0byBiZSBzaHJpbmstdG8t Zml0LiAqLworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKK30KKworLnBhZGRpbmcgeworICAgIHBh ZGRpbmc6IDIwcHggMTBweCAzMHB4IDUwcHg7Cit9CisKKy5ib3JkZXIgeworICAgIGJvcmRlci1z dHlsZTogc29saWQ7CisgICAgYm9yZGVyLWNvbG9yOiBncmVlbjsKKyAgICBib3JkZXItd2lkdGg6 IDEwcHggMjBweCAzMHB4IDQwcHg7Cit9CisKKy52ZXJ0aWNhbFJMIHsKKyAgICAtd2Via2l0LXdy aXRpbmctbW9kZTogdmVydGljYWwtcmw7Cit9Cis8L3N0eWxlPgorPHNjcmlwdCBzcmM9Ii4uLy4u L3Jlc291cmNlcy9jaGVjay1sYXlvdXQuanMiPjwvc2NyaXB0PgorPGJvZHkgb25sb2FkPSJjaGVj a0xheW91dCgnLmdyaWQnKSI+CisKKzxwPlRlc3QgdGhhdCBwYWRkaW5ncyBhbmQgYm9yZGVycyBh cmUgYWRkZWQgdG8gYSBncmlkIGVsZW1lbnQncyBzaXplLjwvcD4KKworPGRpdiBjbGFzcz0iZ3Jp ZCBwYWRkaW5nIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSIxNjAiPjwvZGl2PgorPGRpdiBjbGFzcz0iZ3JpZCBwYWRkaW5nIHZlcnRpY2FsUkwiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSIxNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjExMCI+PC9kaXY+Cis8 ZGl2IGNsYXNzPSJncmlkIGJvcmRlciIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSIxNjAiPjwvZGl2PgorPGRpdiBjbGFzcz0iZ3JpZCBib3JkZXIgdmVydGlj YWxSTCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE0MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTEw Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImdyaWQgYm9yZGVyIHBhZGRpbmciIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSIxNDAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIyMCI+PC9kaXY+Cis8ZGl2IGNsYXNz PSJncmlkIGJvcmRlciBwYWRkaW5nIHZlcnRpY2FsUkwiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIx OTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE3MCI+PC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4K 179171 2012-12-12 17:58:21 -0800 2012-12-12 18:50:56 -0800 Patch for landing bug-104818-20121212175542.patch text/plain 5301 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ5MjIzNjcwMjJhOWFj Y2QwNDQ5NmZhMTJiZDgzZGYzMzRjMDZhYi4uNTkzOWQ2ZTI2MzY1ODljYzUyYTkyNDM2MWY3Zjdj OGYxN2IxOTM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTEyLTEyICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgR3Jp ZCBMYXlvdXRdIEluY2x1ZGUgcGFkZGluZ3MgYW5kIGJvcmRlcnMgaW50byB0aGUgZ3JpZCBlbGVt ZW50J3MgbG9naWNhbCBoZWlnaHQgLyB3aWR0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0ODE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBD aGFuZy4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyBSZW5kZXJHcmlkIGFkZCB0aGUgYm9y ZGVycyBhbmQgcGFkZGluZ3MgaW4gdGhlIHJpZ2h0IGRpcmVjdGlvbiBkdXJpbmcgbGF5b3V0Cisg ICAgICAgIHNvIHRoYXQgdGhlIGdyaWQgZWxlbWVudCdzIHNpemUgYWNjb3VudHMgdGhlbSBsaWtl IGFueSBvdGhlciByZW5kZXJlci4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy1ncmlkLWxheW91 dC9ncmlkLWVsZW1lbnQtcGFkZGluZy1tYXJnaW4uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZVBy ZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bGF5 b3V0R3JpZEl0ZW1zKToKKwogMjAxMi0xMi0xMiAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBbV0lOXSBJbXBsZW1lbnQgV2ViQ29yZTo6ZmlsZVN5c3Rl bVJlcHJlc2VudGF0aW9uKCkgZm9yICFVU0UoQ0YpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5jcHAKaW5kZXggNGIwZDgzN2FjZjE3NWJlZWI3MjYzZWRhOGJhMzJmOTgwYmQ4NWUx Zi4uMzIyZDNhODcxNDFjNDc4YWRlNWYxZDA2ZmQzMzE1OGRiNTg5YTI0ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcApAQCAtMTMxLDcgKzEzMSw5IEBAIHZvaWQgUmVu ZGVyR3JpZDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogCiAgICAgLy8gRklYTUU6 IFdlIHNob3VsZCBhY2NvdW50IGZvciBtaW4gLyBtYXggbG9naWNhbCB3aWR0aC4KIAotICAgIC8v IEZJWE1FOiBJbmNsdWRlIGJvcmRlcnMgYW5kIHBhZGRpbmdzIGluIGlubGluZSBkaXJlY3Rpb24u CisgICAgTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRkaW5nSW5JbmxpbmVEaXJlY3Rpb24gPSBib3Jk ZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CisgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGggKz0gYm9yZGVyQW5kUGFkZGluZ0luSW5saW5lRGlyZWN0aW9uOworICAgIG1fbWF4UHJlZmVy cmVkTG9naWNhbFdpZHRoICs9IGJvcmRlckFuZFBhZGRpbmdJbklubGluZURpcmVjdGlvbjsKIAog ICAgIHNldFByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eShmYWxzZSk7CiB9CkBAIC0xOTIsOSAr MTk0LDEyIEBAIHZvaWQgUmVuZGVyR3JpZDo6bGF5b3V0R3JpZEl0ZW1zKCkKICAgICAgICAgY2hp bGQtPnNldExvZ2ljYWxMb2NhdGlvbihjaGlsZFBvc2l0aW9uKTsKICAgICB9CiAKLSAgICAvLyBG SVhNRTogSGFuZGxlIGJvcmRlciAmIHBhZGRpbmcgb24gdGhlIGdyaWQgZWxlbWVudC4KICAgICBm b3IgKHNpemVfdCBpID0gMDsgaSA8IHJvd1RyYWNrcy5zaXplKCk7ICsraSkKICAgICAgICAgc2V0 TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCkgKyByb3dUcmFja3NbaV0ubV91c2VkQnJlYWR0 aCk7CisKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGhhbmRsZSBtaW4gLyBtYXggbG9naWNhbCBo ZWlnaHQuCisKKyAgICBzZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSArIGJvcmRlckFu ZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkpOwogfQogCiBzaXplX3QgUmVuZGVyR3JpZDo6cmVzb2x2 ZUdyaWRQb3NpdGlvbihjb25zdCBHcmlkUG9zaXRpb24mIHBvc2l0aW9uKSBjb25zdApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDc0YTQ1N2M3MGJjMjIzOWJjNzE0YWU2NzBmZWZhZTAxYTM0MWZkOWUuLjY3ZjU2Mzk2MGZkM2Iw YjRjOTcxYzdlNmM4MGJhYzk2MTIxZGZmNzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0x Mi0xMiAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KKworICAgICAg ICBbQ1NTIEdyaWQgTGF5b3V0XSBJbmNsdWRlIHBhZGRpbmdzIGFuZCBib3JkZXJzIGludG8gdGhl IGdyaWQgZWxlbWVudCdzIGxvZ2ljYWwgaGVpZ2h0IC8gd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDgxOAorCisgICAgICAgIFJldmlld2Vk IGJ5IFRvbnkgQ2hhbmcuCisKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWVs ZW1lbnQtcGFkZGluZy1tYXJnaW4tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2Nzcy1ncmlkLWxheW91dC9ncmlkLWVsZW1lbnQtcGFkZGluZy1tYXJnaW4uaHRtbDogQWRkZWQu CisKIDIwMTItMTItMTIgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgUmViYXNlbGluZSBzb21lIHRpbGVkIHNjcm9sbGluZyByZXN1bHRzIHRoYXQgd2Vy ZSBhZmZlY3RlZCBieSByMTM3Mzg3LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3Mt Z3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFyZ2luLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtZWxlbWVudC1wYWRkaW5nLW1hcmdp bi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjFjZWZjM2E1NDU5YzE5Zjg5ZTFjYzI1OTA4ZTdm ZjNmOTE0ZDcwNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQt bGF5b3V0L2dyaWQtZWxlbWVudC1wYWRkaW5nLW1hcmdpbi1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw4IEBACitUZXN0IHRoYXQgcGFkZGluZ3MgYW5kIGJvcmRlcnMgYXJlIGFkZGVkIHRvIGEgZ3Jp ZCBlbGVtZW50J3Mgc2l6ZS4KKworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUworUEFTUwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50 LXBhZGRpbmctbWFyZ2luLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9n cmlkLWVsZW1lbnQtcGFkZGluZy1tYXJnaW4uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41MDdlMGQ4ODJkYzli MDlhNWVjMTA2YWVkMjdlZTM0YjgzNmE4Y2QxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1lbGVtZW50LXBhZGRpbmctbWFyZ2luLmh0bWwK QEAgLTAsMCArMSw0NCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxzY3JpcHQ+CitpZiAo d2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldl YktpdENTU0dyaWRMYXlvdXRFbmFibGVkIiwgMSk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KKy5ncmlk IHsKKyAgICBkaXNwbGF5OiAtd2Via2l0LWdyaWQ7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3Jl eTsKKyAgICAtd2Via2l0LWdyaWQtY29sdW1uczogMTAwcHg7CisgICAgLXdlYmtpdC1ncmlkLXJv d3M6IDUwcHg7CisgICAgLyogRm9yY2UgdGhlIGdyaWQgZWxlbWVudCB0byBiZSBzaHJpbmstdG8t Zml0LiAqLworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKK30KKworLnBhZGRpbmcgeworICAgIHBh ZGRpbmc6IDIwcHggMTBweCAzMHB4IDUwcHg7Cit9CisKKy5ib3JkZXIgeworICAgIGJvcmRlci1z dHlsZTogc29saWQ7CisgICAgYm9yZGVyLWNvbG9yOiBncmVlbjsKKyAgICBib3JkZXItd2lkdGg6 IDEwcHggMjBweCAzMHB4IDQwcHg7Cit9CisKKy52ZXJ0aWNhbFJMIHsKKyAgICAtd2Via2l0LXdy aXRpbmctbW9kZTogdmVydGljYWwtcmw7Cit9Cis8L3N0eWxlPgorPHNjcmlwdCBzcmM9Ii4uLy4u L3Jlc291cmNlcy9jaGVjay1sYXlvdXQuanMiPjwvc2NyaXB0PgorPGJvZHkgb25sb2FkPSJjaGVj a0xheW91dCgnLmdyaWQnKSI+CisKKzxwPlRlc3QgdGhhdCBwYWRkaW5ncyBhbmQgYm9yZGVycyBh cmUgYWRkZWQgdG8gYSBncmlkIGVsZW1lbnQncyBzaXplLjwvcD4KKworPGRpdiBjbGFzcz0iZ3Jp ZCBwYWRkaW5nIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAwIiBkYXRhLWV4cGVjdGVkLXdpZHRo PSIxNjAiPjwvZGl2PgorPGRpdiBjbGFzcz0iZ3JpZCBwYWRkaW5nIHZlcnRpY2FsUkwiIGRhdGEt ZXhwZWN0ZWQtaGVpZ2h0PSIxNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjExMCI+PC9kaXY+Cis8 ZGl2IGNsYXNzPSJncmlkIGJvcmRlciIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjkwIiBkYXRhLWV4 cGVjdGVkLXdpZHRoPSIxNjAiPjwvZGl2PgorPGRpdiBjbGFzcz0iZ3JpZCBib3JkZXIgdmVydGlj YWxSTCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjE0MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTEw Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImdyaWQgYm9yZGVyIHBhZGRpbmciIGRhdGEtZXhwZWN0ZWQt aGVpZ2h0PSIxNDAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjIyMCI+PC9kaXY+Cis8ZGl2IGNsYXNz PSJncmlkIGJvcmRlciBwYWRkaW5nIHZlcnRpY2FsUkwiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIx OTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjE3MCI+PC9kaXY+CisKKzwvYm9keT4KKzwvaHRtbD4K