163200 2016-10-10 01:24:09 -0700 [css-grid] New expected behavior for stretch 2017-03-06 07:30:43 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.chromium.org/p/chromium/issues/detail?id=653433 BlinkMergeCandidate P2 Normal --- 60731 169197 1 rego rego commit-queue esprehn+autocc glenn jfernandez kondapallykalyan simon.fraser svillar oldest_to_newest 1238229 0 rego 2016-10-10 01:24:09 -0700 There were some discussion on GitHub about minimum size of grid items: https://github.com/w3c/csswg-drafts/issues/283 The spec has been modified so it now includes the following sentence (https://drafts.csswg.org/css-grid/#min-size-auto): "However, if the grid item spans only grid tracks that have a fixed max track sizing function, its automatic minimum size in that dimension is further clamped to less than or equal to the size necessary to fit its margin box within the resulting grid area (flooring at zero)." This has changed quite a lot the default behavior, so if a grid cell is very small the item should be shrunk to fit into that cell. This has been already fixed on Blink: https://codereview.chromium.org/2398043002 1238230 1 291076 rego 2016-10-10 01:26:11 -0700 Created attachment 291076 Patch 1238232 2 291076 svillar 2016-10-10 01:29:55 -0700 Comment on attachment 291076 Patch Removing that code looks awesome to me, but I wonder where the "if the grid item spans only grid tracks that have a fixed max track sizing function" restriction is considered now. Shouldn't we keep the current behavior for the other cases? Shouldn't we add new test cases for these two possible situations? 1238235 3 291076 darin 2016-10-10 01:34:44 -0700 Comment on attachment 291076 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291076&action=review > Source/WebCore/rendering/RenderBox.cpp:2429 > if (treatAsReplaced) { > computedValues.m_extent = logicalWidthLength.value() + borderAndPaddingLogicalWidth(); > -#if ENABLE(CSS_GRID_LAYOUT) > - } else if (parent()->isRenderGrid() && style().logicalWidth().isAuto() && style().logicalMinWidth().isAuto() && style().overflowX() == OVISIBLE && containerWidthInInlineDirection < minPreferredLogicalWidth()) { > - // TODO (lajava) Move this logic to the LayoutGrid class. > - // Implied minimum size of Grid items. > - computedValues.m_extent = constrainLogicalWidthInRegionByMinMax(minPreferredLogicalWidth(), containerWidthInInlineDirection, cb); > -#endif > } else { WebKit coding style uses no braces for a one line if body. > Source/WebCore/rendering/RenderBox.cpp:2838 > )) { > - LayoutUnit contentHeight = overrideLogicalContentHeight(); > -#if ENABLE(CSS_GRID_LAYOUT) > - if (parent()->isRenderGrid() && style().logicalHeight().isAuto() && style().logicalMinHeight().isAuto() && style().overflowX() == OVISIBLE) { > - LayoutUnit intrinsicContentHeight = computedValues.m_extent - borderAndPaddingLogicalHeight(); > - if (auto minContentHeight = computeContentLogicalHeight(MinSize, Length(MinContent), intrinsicContentHeight)) > - contentHeight = std::max(contentHeight, constrainContentBoxLogicalHeightByMinMax(minContentHeight.value(), intrinsicContentHeight)); > - } > -#endif > - h = Length(contentHeight, Fixed); > + h = Length(overrideLogicalContentHeight(), Fixed); > } else if (treatAsReplaced) WebKit coding style uses no braces for a one line if body. 1238277 4 rego 2016-10-10 06:09:09 -0700 (In reply to comment #2) > Removing that code looks awesome to me, but I wonder where the "if the grid > item spans only grid tracks that have a fixed max track sizing function" > restriction is considered now. Shouldn't we keep the current behavior for > the other cases? Shouldn't we add new test cases for these two possible > situations? Yes it's true we're not checking those cases. However I'm not 100% sure what would be the expected behavior, let me clarify it with the CSS WG before moving this forward: https://github.com/w3c/csswg-drafts/issues/283#issuecomment-252584331 1283731 5 303508 rego 2017-03-06 05:00:59 -0800 Created attachment 303508 Rebased patch 1283735 6 rego 2017-03-06 05:05:46 -0800 (In reply to comment #4) > (In reply to comment #2) > > Removing that code looks awesome to me, but I wonder where the "if the grid > > item spans only grid tracks that have a fixed max track sizing function" > > restriction is considered now. Shouldn't we keep the current behavior for > > the other cases? Shouldn't we add new test cases for these two possible > > situations? > > Yes it's true we're not checking those cases. > > However I'm not 100% sure what would be the expected behavior, let me > clarify it with the CSS WG before moving this forward: > https://github.com/w3c/csswg-drafts/issues/283#issuecomment-252584331 The issues have been clarified, and the expected behavior matches this patch implementation. There are tests on the W3C test suite checking the cases explained before, and I'm working on getting it imported (see bug #169196). @svillar would you be fine with landing this as is? That would move us closer to Blink implementation, and we can always add more tests cases later if needed. What do you think? 1283752 7 svillar 2017-03-06 06:54:37 -0800 (In reply to comment #6) > (In reply to comment #4) > > (In reply to comment #2) > > > Removing that code looks awesome to me, but I wonder where the "if the grid > > > item spans only grid tracks that have a fixed max track sizing function" > > > restriction is considered now. Shouldn't we keep the current behavior for > > > the other cases? Shouldn't we add new test cases for these two possible > > > situations? > > > > Yes it's true we're not checking those cases. > > > > However I'm not 100% sure what would be the expected behavior, let me > > clarify it with the CSS WG before moving this forward: > > https://github.com/w3c/csswg-drafts/issues/283#issuecomment-252584331 > > The issues have been clarified, and the expected behavior matches this patch > implementation. > > There are tests on the W3C test suite checking the cases explained before, > and I'm working on getting it imported (see bug #169196). > > @svillar would you be fine with landing this as is? > That would move us closer to Blink implementation, > and we can always add more tests cases later if needed. > What do you think? After carefully thinking about it, I think this patch addresses my concerns because it properly stretches items spanning tracks with fixed max track sizing functions. For the other cases (i.e. content sized functions) the tracks would be properly sized to the contents of the items, so they would never overflow. Anyway, it would be awesome to add more test cases for: a) items spanning only non fixed max track sizing functions b) items spanning none non fixed max track sizing functions c) items spanning both types of tracks and check how the same item with the same min-size behaves differently (actually cases b and c should implement the same behavior). I wouldn't block the landing of this patch due to the lack of those tests if you add then later. 1283753 8 303508 rego 2017-03-06 07:02:48 -0800 Comment on attachment 303508 Rebased patch (In reply to comment #7) > I wouldn't block the landing of this patch due to the lack of those tests if > you add then later. Ok, thanks for the new comment. Some of the cases you mentioned are already covered by the W3C Test Suite, and I'm planning to import it very soon. Then I could add there more tests if needed and get them imported. 1283761 9 303508 commit-queue 2017-03-06 07:30:37 -0800 Comment on attachment 303508 Rebased patch Clearing flags on attachment: 303508 Committed r213449: <http://trac.webkit.org/changeset/213449> 1283762 10 commit-queue 2017-03-06 07:30:43 -0800 All reviewed patches have been landed. Closing bug. 291076 2016-10-10 01:26:11 -0700 2017-03-06 05:00:51 -0800 Patch bug-163200-20161010102250.patch text/plain 9604 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY1MDAyODM0YTFmMWU4 ODc5NmYxM2M1ZTdkM2FiZWIzY2JlNDA1Ni4uNWIyNTM2ZDNiZjAxMDlkNmNlOWQxOTg3YTdkZmFk ZDJiMDhmOWRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE2LTEwLTEwICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gU3RyZXRjaCBzaG91bGQgZ3JvdyBhbmQgc2hyaW5rIGl0ZW1zIHRvIGZpdCBpdHMgZ3JpZCBh cmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMy MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZnRl ciBzb21lIGRpc2N1c3Npb25zIHRoZSBDU1MgV0cgYWdyZWVkIHRoYXQgc3RyZXRjaCBzaG91bGQg bm90IG9ubHkKKyAgICAgICAgZ3JvdyBpdGVtcywgYnV0IGFsc28gc2hyaW5rIHRoZW0gdG8gZml0 IGl0cyBncmlkIGFyZWEuCisgICAgICAgIFRoYXQgd2F5IHRoZSAibWluLXdpZHRofGhlaWdodDog YXV0byIgaXMgc29tZWhvdyBpZ25vcmVkIGZvciBncmlkIGl0ZW1zLgorICAgICAgICBNb3JlIGlu Zm8gYXQ6IGh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy8yODMKKwor ICAgICAgICBUaGUgZ29vZCBwYXJ0IGlzIHRoYXQgdGhpcyBhbGxvd3MgdXMgdG8gcmVtb3ZlIHNv bWUgdWdseSBjb2RlIHdlJ3ZlCisgICAgICAgIGluIFJlbmRlckJveCB0aGF0IHdhcyBvbmx5IHVz ZWQgYnkgR3JpZCBMYXlvdXQuCisKKyAgICAgICAgRm9yIGltYWdlcywgd2UnbGwgYmUgc3RyZXRj aGluZyBvbiBib3RoIGF4aXMgcmlnaHQgbm9zLCBzbyB0aGUgYXNwZWN0CisgICAgICAgIHJhdGlv IHdvbid0IGJlIHByZXNlcnZlZC4gVGhlIGRlZmF1bHQgYmVoYXZpb3IgbWlnaHQgY2hhbmdlIGlu IHRob3NlCisgICAgICAgIGNhc2VzLCBidXQgdGhhdCBzaG91bGQgYmUgaW1wbGVtZW50ZWQgaW4g YSBkaWZmZXJlbnQgcGF0Y2guCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9u KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOgor CiAyMDE2LTEwLTA3ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgog CiAgICAgICAgIFVzZSAndXNlIGxpYiAkRmluZEJpbjo6QmluJyB0byBhcHBlbmQgUGVybCBtb2R1 bGUgaW5jbHVkZSBwYXRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4 IDcxNjhkODRiMWJjNTRkZjI5YzEzZDQ1YWI4ZjAzYWMyNGExYTQ3ZmUuLmY2MTgxZGQ1OWUxNGJi MjE5ZDM0MGU3NjVkZDdlMTY5YTExNmRmNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCkBAIC0yNDI2LDEyICsyNDI2LDYgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVM b2dpY2FsV2lkdGhJblJlZ2lvbihMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMmIGNvbXB1dGUK ICAgICAvLyBXaWR0aCBjYWxjdWxhdGlvbnMKICAgICBpZiAodHJlYXRBc1JlcGxhY2VkKSB7CiAg ICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0gbG9naWNhbFdpZHRoTGVuZ3RoLnZhbHVl KCkgKyBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7Ci0jaWYgRU5BQkxFKENTU19HUklE X0xBWU9VVCkKLSAgICB9IGVsc2UgaWYgKHBhcmVudCgpLT5pc1JlbmRlckdyaWQoKSAmJiBzdHls ZSgpLmxvZ2ljYWxXaWR0aCgpLmlzQXV0bygpICYmIHN0eWxlKCkubG9naWNhbE1pbldpZHRoKCku aXNBdXRvKCkgJiYgc3R5bGUoKS5vdmVyZmxvd1goKSA9PSBPVklTSUJMRSAmJiBjb250YWluZXJX aWR0aEluSW5saW5lRGlyZWN0aW9uIDwgbWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkpIHsKLSAg ICAgICAgLy8gVE9ETyAobGFqYXZhKSBNb3ZlIHRoaXMgbG9naWMgdG8gdGhlIExheW91dEdyaWQg Y2xhc3MuCi0gICAgICAgIC8vIEltcGxpZWQgbWluaW11bSBzaXplIG9mIEdyaWQgaXRlbXMuCi0g ICAgICAgIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50ID0gY29uc3RyYWluTG9naWNhbFdpZHRoSW5S ZWdpb25CeU1pbk1heChtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgY29udGFpbmVyV2lkdGhJ bklubGluZURpcmVjdGlvbiwgY2IpOwotI2VuZGlmCiAgICAgfSBlbHNlIHsKICAgICAgICAgTGF5 b3V0VW5pdCBwcmVmZXJyZWRXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5n KE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCksIGNvbnRhaW5l cldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sIGNiLCByZWdpb24pOwogICAgICAgICBjb21wdXRlZFZh bHVlcy5tX2V4dGVudCA9IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9uQnlNaW5NYXgocHJl ZmVycmVkV2lkdGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sIGNiLCByZWdpb24p OwpAQCAtMjg0MCwxNSArMjgzNCw3IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhl aWdodChMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhCiAgICAgICAg ICAgICB8fCBwYXJlbnQoKS0+aXNSZW5kZXJHcmlkKCkKICNlbmRpZgogICAgICAgICApKSB7Ci0g ICAgICAgICAgICBMYXlvdXRVbml0IGNvbnRlbnRIZWlnaHQgPSBvdmVycmlkZUxvZ2ljYWxDb250 ZW50SGVpZ2h0KCk7Ci0jaWYgRU5BQkxFKENTU19HUklEX0xBWU9VVCkKLSAgICAgICAgICAgIGlm IChwYXJlbnQoKS0+aXNSZW5kZXJHcmlkKCkgJiYgc3R5bGUoKS5sb2dpY2FsSGVpZ2h0KCkuaXNB dXRvKCkgJiYgc3R5bGUoKS5sb2dpY2FsTWluSGVpZ2h0KCkuaXNBdXRvKCkgJiYgc3R5bGUoKS5v dmVyZmxvd1goKSA9PSBPVklTSUJMRSkgewotICAgICAgICAgICAgICAgIExheW91dFVuaXQgaW50 cmluc2ljQ29udGVudEhlaWdodCA9IGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50IC0gYm9yZGVyQW5k UGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgICAgICAgICBpZiAoYXV0byBtaW5Db250 ZW50SGVpZ2h0ID0gY29tcHV0ZUNvbnRlbnRMb2dpY2FsSGVpZ2h0KE1pblNpemUsIExlbmd0aChN aW5Db250ZW50KSwgaW50cmluc2ljQ29udGVudEhlaWdodCkpCi0gICAgICAgICAgICAgICAgICAg IGNvbnRlbnRIZWlnaHQgPSBzdGQ6Om1heChjb250ZW50SGVpZ2h0LCBjb25zdHJhaW5Db250ZW50 Qm94TG9naWNhbEhlaWdodEJ5TWluTWF4KG1pbkNvbnRlbnRIZWlnaHQudmFsdWUoKSwgaW50cmlu c2ljQ29udGVudEhlaWdodCkpOwotICAgICAgICAgICAgfQotI2VuZGlmCi0gICAgICAgICAgICBo ID0gTGVuZ3RoKGNvbnRlbnRIZWlnaHQsIEZpeGVkKTsKKyAgICAgICAgICAgIGggPSBMZW5ndGgo b3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpLCBGaXhlZCk7CiAgICAgICAgIH0gZWxzZSBp ZiAodHJlYXRBc1JlcGxhY2VkKQogICAgICAgICAgICAgaCA9IExlbmd0aChjb21wdXRlUmVwbGFj ZWRMb2dpY2FsSGVpZ2h0KCksIEZpeGVkKTsKICAgICAgICAgZWxzZSB7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjliOWNl MGUzYTNhYzAyZTUzM2U2NjNmMWE0N2E4YTNlYjk3MjllMy4uY2Q2YTY5MGRkZTdlMmQ2OTE0Y2Rj YzUwMDhkZTc0N2QyZmQ4MTg5YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisr KyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2LTEwLTEwICBN YW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3Mt Z3JpZF0gU3RyZXRjaCBzaG91bGQgZ3JvdyBhbmQgc2hyaW5rIGl0ZW1zIHRvIGZpdCBpdHMgZ3Jp ZCBhcmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NjMyMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGUgdGVzdHMgaGF2ZSBiZWVuIHVwZGF0ZWQgYWNjb3JkaW5nIHRvIHRoZSBuZXcgZXhwZWN0ZWQg YmVoYXZpb3IuCisKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbnRhaW5l ci1wZXJjZW50YWdlLWNvbHVtbnMuaHRtbDoKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91 dC9taW4td2lkdGgtaGVpZ2h0LWF1dG8tYW5kLW1hcmdpbnMuaHRtbDoKKyAgICAgICAgKiBmYXN0 L2Nzcy1ncmlkLWxheW91dC9taW4td2lkdGgtaGVpZ2h0LWF1dG8uaHRtbDoKKwogMjAxNi0xMC0w NiAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFZh cmlhdGlvbiBmb250cyBkb24ndCBhZmZlY3QgZ2x5cGggYWR2YW5jZXMKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtY29udGFpbmVyLXBlcmNlbnRhZ2Ut Y29sdW1ucy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1jb250 YWluZXItcGVyY2VudGFnZS1jb2x1bW5zLmh0bWwKaW5kZXggZTNkY2ZhNGU0YjQ1M2UzMTYyM2Qz YzQzMjk4MzY4NWVmYTQ5ZTQ2My4uZWI1NGM2ZmE1YWQ4YTUzNDEwYTQ4MmZhZjk4MGEzOGIwNjFk MmIxYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvZ3JpZC1j b250YWluZXItcGVyY2VudGFnZS1jb2x1bW5zLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9j c3MtZ3JpZC1sYXlvdXQvZ3JpZC1jb250YWluZXItcGVyY2VudGFnZS1jb2x1bW5zLmh0bWwKQEAg LTEyNSw3ICsxMjUsNyBAQAogPGRpdiBjbGFzcz0id3JhcHBlciI+CiAgICAgPGRpdiBjbGFzcz0i Z3JpZCBtaW4tY29udGVudCBvbmVDb2x1bW41MCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRh dGEtZXhwZWN0ZWQtaGVpZ2h0PSIyMCI+CiAgICAgICAgIDxkaXYgY2xhc3M9ImZpcnN0Um93Rmly c3RDb2x1bW4iCi0gICAgICAgICAgICBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIw IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIyMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwIj4KKyAg ICAgICAgICAgIGRhdGEtb2Zmc2V0LXg9IjAiIGRhdGEtb2Zmc2V0LXk9IjAiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjEwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjAiPgogICAgICAgICAgICAgWFgg WAogICAgICAgICA8L2Rpdj4KICAgICA8L2Rpdj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzLWdyaWQtbGF5b3V0L21pbi13aWR0aC1oZWlnaHQtYXV0by1hbmQtbWFyZ2lucy5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvbWluLXdpZHRoLWhlaWdodC1hdXRv LWFuZC1tYXJnaW5zLmh0bWwKaW5kZXggODFhYjgyYzhiNmZkZTFiODc0NWVlMGNmZGY1MDQ1N2U2 MzllZTIzMS4uMzMxNmUzMjA2ODU2ZmMyZTJkODNiZmU4YzVjNGI1ZTMyMGQzZDE5MCAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvbWluLXdpZHRoLWhlaWdodC1h dXRvLWFuZC1tYXJnaW5zLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlv dXQvbWluLXdpZHRoLWhlaWdodC1hdXRvLWFuZC1tYXJnaW5zLmh0bWwKQEAgLTQwLDcgKzQwLDcg QEAKIDxwPlN0cmV0Y2hpbmcgYWxsb3dlZCBpbiBib3RoIGF4aXMgfCBjb2x1bW4gc21hbGxlciB0 aGFuIGNvbnRlbnQtYm94LCByb3cgYmlnZ2VyIHRoYW4gbWFyZ2luLWJveDwvcD4KIDxkaXYgY2xh c3M9ImNvbnRhaW5lciI+CiAgICAgPGRpdiBjbGFzcz0iZ3JpZCBjb2x1bW5zU21hbGxlclRoYW5D b250ZW50Qm94IHJvd3NCaWdnZXJUaGFuTWFyZ2luQm94Ij4KLSAgICAgICAgPGRpdiBjbGFzcz0i aXRlbSIgZGF0YS1vZmZzZXQteD0iMjAiIGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI2MCI+WFhYWDwvZGl2PgorICAgICAg ICA8ZGl2IGNsYXNzPSJpdGVtIiBkYXRhLW9mZnNldC14PSIyMCIgZGF0YS1vZmZzZXQteT0iMjAi IGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjQwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNjAiPlhYWFg8 L2Rpdj4KICAgICA8L2Rpdj4KIDwvZGl2PgogCkBAIC0xMTIsNyArMTEyLDcgQEAKIDxwPlN0cmV0 Y2hpbmcgYWxsb3dlZCBpbiBib3RoIGF4aXMgfCByb3cgc21hbGxlciB0aGFuIGNvbnRlbnQtYm94 LCBjb2x1bW4gYmlnZ2VyIHRoYW4gbWFyZ2luLWJveDwvcD4KIDxkaXYgY2xhc3M9ImNvbnRhaW5l ciI+CiAgICAgPGRpdiBjbGFzcz0iZ3JpZCByb3dzU21hbGxlclRoYW5Db250ZW50Qm94IGNvbHVt bnNCaWdnZXJUaGFuTWFyZ2luQm94Ij4KLSAgICAgICAgPGRpdiBjbGFzcz0iaXRlbSIgZGF0YS1v ZmZzZXQteD0iMjAiIGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMTAi IGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyNSI+WFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNz PSJpdGVtIiBkYXRhLW9mZnNldC14PSIyMCIgZGF0YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0 ZWQtd2lkdGg9IjExMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjAiPlhYWFg8L2Rpdj4KICAgICA8 L2Rpdj4KIDwvZGl2PgogCkBAIC0xMjYsNyArMTI2LDcgQEAKIDxwPlN0cmV0Y2hpbmcgYWxsb3dl ZCBpbiBib3RoIGF4aXMgfCByb3cgYmlnZ2VyIHRoYW4gY29udGVudC1ib3gsIGNvbHVtbiBiaWdn ZXIgY29sdW1uIG1hcmdpbi1ib3g8L3A+CiA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAgIDxk aXYgY2xhc3M9ImdyaWQgcm93c0JpZ2dlclRoYW5Db250ZW50Qm94IGNvbHVtbnNCaWdnZXJUaGFu TWFyZ2luQm94Ij4KLSAgICAgICAgPGRpdiBjbGFzcz0iaXRlbSIgZGF0YS1vZmZzZXQteD0iMjAi IGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMTAiIGRhdGEtZXhwZWN0 ZWQtaGVpZ2h0PSIyNSI+WFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJpdGVtIiBkYXRh LW9mZnNldC14PSIyMCIgZGF0YS1vZmZzZXQteT0iMjAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEx MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjEwIj5YWFhYPC9kaXY+CiAgICAgPC9kaXY+CiA8L2Rp dj4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvbWluLXdp ZHRoLWhlaWdodC1hdXRvLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9t aW4td2lkdGgtaGVpZ2h0LWF1dG8uaHRtbAppbmRleCA3ZjlkMzJmMGE5NmZiZjY3OTBmY2ZmMGU3 ZTQxNTVmNWI5YWY4NDdhLi41MDM0MDEzMDA1MjFjOWZiNzI5MTYyNDVhY2M2YmFmZGI0NmYyMTZl IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9taW4td2lkdGgt aGVpZ2h0LWF1dG8uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9t aW4td2lkdGgtaGVpZ2h0LWF1dG8uaHRtbApAQCAtNDYsNyArNDYsNyBAQAogCiA8ZGl2IGNsYXNz PSJjb250YWluZXIiPgogICAgIDxkaXYgY2xhc3M9ImdyaWQiPgotICAgICAgICA8ZGl2IGNsYXNz PSJhaGVtIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIy NSI+WFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJhaGVtIiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSI1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNSI+WFhYWDwvZGl2PgogICAgIDwvZGl2Pgog PC9kaXY+CiAKQEAgLTY0LDMyICs2NCwzMiBAQAogCiA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgog ICAgIDxkaXYgY2xhc3M9ImdyaWQiPgotICAgICAgICA8ZGl2IGNsYXNzPSJhaGVtIG1heFNtYWxs ZXIiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTAiPlhY WFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSBtYXhTbWFsbGVyIiBkYXRhLWV4cGVj dGVkLXdpZHRoPSI1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNSI+WFhYWDwvZGl2PgogICAgIDwv ZGl2PgogPC9kaXY+CiAKIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICAgPGRpdiBjbGFzcz0i Z3JpZCI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImFoZW0gbWF4QmlnZ2VyIiBkYXRhLWV4cGVjdGVk LXdpZHRoPSIxMDAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIyNSI+WFhYWDwvZGl2PgorICAgICAg ICA8ZGl2IGNsYXNzPSJhaGVtIG1heEJpZ2dlciIgZGF0YS1leHBlY3RlZC13aWR0aD0iNSIgZGF0 YS1leHBlY3RlZC1oZWlnaHQ9IjUiPlhYWFg8L2Rpdj4KICAgICA8L2Rpdj4KIDwvZGl2PgogCiA8 IS0tIENoZWNrIHRoYXQgbWluLXdpZHRoIG1pbi1oZWlnaHQgYmVoYXZpb3IgaXMgcHJlc2VydmVk IHdoZW4gdXNpbmcgdmVydGljYWwgd3JpdGluZyBtb2RlcyAtLT4KIDxkaXYgY2xhc3M9ImNvbnRh aW5lciI+CiAgICAgPGRpdiBjbGFzcz0iZ3JpZCB2ZXJ0aWNhbExSIj4KLSAgICAgICAgPGRpdiBj bGFzcz0iYWhlbSIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0 PSIxMDAiPlhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSIgZGF0YS1leHBlY3Rl ZC13aWR0aD0iNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUiPlhYWFg8L2Rpdj4KICAgICA8L2Rp dj4KIDwvZGl2PgogCiA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAgIDxkaXYgY2xhc3M9Imdy aWQgdmVydGljYWxMUiI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImFoZW0gbWluSGVpZ2h0U21hbGxl ciIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMiI+WFhY WDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJhaGVtIG1pbkhlaWdodFNtYWxsZXIiIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMiI+WFhYWDwvZGl2Pgog ICAgIDwvZGl2PgogPC9kaXY+CiAKIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICAgPGRpdiBj bGFzcz0iZ3JpZCB2ZXJ0aWNhbExSIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSBtaW5XaWR0 aFNtYWxsZXIiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjEyIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i MTAwIj5YWFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImFoZW0gbWluV2lkdGhTbWFsbGVy IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMiIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUiPlhYWFg8 L2Rpdj4KICAgICA8L2Rpdj4KIDwvZGl2PgogCg== 303508 2017-03-06 05:00:59 -0800 2017-03-06 07:30:37 -0800 Rebased patch bug-163200-20170306140057.patch text/plain 9725 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzE2YWQyYmQ4ZDlkZmM5 ZGRkNmM0ZjgwOGRiOTk5MWFlNGE2YTA1Ni4uNjM5Mjg3ZmZmMDIzMmYxOTU1ZDJhMWU2NTcwN2Ey YjRhZWZkZWY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAzLTAzICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gU3RyZXRjaCBzaG91bGQgZ3JvdyBhbmQgc2hyaW5rIGl0ZW1zIHRvIGZpdCBpdHMgZ3JpZCBh cmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMy MDAKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBZnRlciBz b21lIGRpc2N1c3Npb25zIHRoZSBDU1MgV0cgYWdyZWVkIHRoYXQgc3RyZXRjaCBzaG91bGQgbm90 IG9ubHkKKyAgICAgICAgZ3JvdyBpdGVtcywgYnV0IGFsc28gc2hyaW5rIHRoZW0gdG8gZml0IGl0 cyBncmlkIGFyZWEuCisgICAgICAgIFRoYXQgd2F5IHRoZSAibWluLXdpZHRofGhlaWdodDogYXV0 byIgaXMgc29tZWhvdyBpZ25vcmVkIGZvciBncmlkIGl0ZW1zLgorICAgICAgICBNb3JlIGluZm8g YXQ6IGh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy8yODMKKworICAg ICAgICBUaGUgZ29vZCBwYXJ0IGlzIHRoYXQgdGhpcyBhbGxvd3MgdXMgdG8gcmVtb3ZlIHNvbWUg dWdseSBjb2RlIHdlJ3ZlCisgICAgICAgIGluIFJlbmRlckJveCB0aGF0IHdhcyBvbmx5IHVzZWQg YnkgR3JpZCBMYXlvdXQuCisKKyAgICAgICAgRm9yIGltYWdlcywgd2UnbGwgYmUgc3RyZXRjaGlu ZyBvbiBib3RoIGF4aXMgcmlnaHQgbm93LCBzbyB0aGUgYXNwZWN0CisgICAgICAgIHJhdGlvIHdv bid0IGJlIHByZXNlcnZlZC4gVGhlIGRlZmF1bHQgYmVoYXZpb3IgbWlnaHQgY2hhbmdlIGluIHRo b3NlCisgICAgICAgIGNhc2VzLCBidXQgdGhhdCBzaG91bGQgYmUgaW1wbGVtZW50ZWQgaW4gYSBk aWZmZXJlbnQgcGF0Y2guCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOgorCiAy MDE3LTAzLTA2ICBWYW5lc3NhIENoaXBpcnLDoXMgTmF2YWzDs24gIDx2Y2hpcGlycmFzQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gQWRvcHQgbnVsbHB0cgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBkZGEyZWMxZTg2NmE5ODQ1MWM0YTU2MjgzNjQy ZWU3M2IzYTJhOGE1Li42YTk5NzVlYmFhNDg4MjFjMGNjMGUzM2FhNWQ0ZWJiYTFlOGZhNGJlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtMjQyNywxMCArMjQyNyw2 IEBAIHZvaWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbFdpZHRoSW5SZWdpb24oTG9naWNhbEV4 dGVudENvbXB1dGVkVmFsdWVzJiBjb21wdXRlCiAgICAgLy8gV2lkdGggY2FsY3VsYXRpb25zCiAg ICAgaWYgKHRyZWF0QXNSZXBsYWNlZCkgewogICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4dGVu dCA9IGxvZ2ljYWxXaWR0aExlbmd0aC52YWx1ZSgpICsgYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxX aWR0aCgpOwotICAgIH0gZWxzZSBpZiAocGFyZW50KCktPmlzUmVuZGVyR3JpZCgpICYmIHN0eWxl KCkubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkgJiYgc3R5bGUoKS5sb2dpY2FsTWluV2lkdGgoKS5p c0F1dG8oKSAmJiBzdHlsZSgpLm92ZXJmbG93WCgpID09IE9WSVNJQkxFICYmIGNvbnRhaW5lcldp ZHRoSW5JbmxpbmVEaXJlY3Rpb24gPCBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSkgewotICAg ICAgICAvLyBUT0RPIChsYWphdmEpIE1vdmUgdGhpcyBsb2dpYyB0byB0aGUgTGF5b3V0R3JpZCBj bGFzcy4KLSAgICAgICAgLy8gSW1wbGllZCBtaW5pbXVtIHNpemUgb2YgR3JpZCBpdGVtcy4KLSAg ICAgICAgY29tcHV0ZWRWYWx1ZXMubV9leHRlbnQgPSBjb25zdHJhaW5Mb2dpY2FsV2lkdGhJblJl Z2lvbkJ5TWluTWF4KG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpLCBjb250YWluZXJXaWR0aElu SW5saW5lRGlyZWN0aW9uLCBjYik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgTGF5b3V0VW5pdCBw cmVmZXJyZWRXaWR0aCA9IGNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKE1haW5PclBy ZWZlcnJlZFNpemUsIHN0eWxlVG9Vc2UubG9naWNhbFdpZHRoKCksIGNvbnRhaW5lcldpZHRoSW5J bmxpbmVEaXJlY3Rpb24sIGNiLCByZWdpb24pOwogICAgICAgICBjb21wdXRlZFZhbHVlcy5tX2V4 dGVudCA9IGNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluUmVnaW9uQnlNaW5NYXgocHJlZmVycmVkV2lk dGgsIGNvbnRhaW5lcldpZHRoSW5JbmxpbmVEaXJlY3Rpb24sIGNiLCByZWdpb24pOwpAQCAtMjg1 MywxMyArMjg0OSw3IEBAIFJlbmRlckJveDo6TG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIFJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoTGF5b3V0VW5pCiAgICAgICAgIC8vIEZJWE1F OiBBY2NvdW50IGZvciBibG9jay1mbG93IGluIGZsZXhpYmxlIGJveGVzLgogICAgICAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY0MTgKICAgICAgICAgaWYg KGhhc092ZXJyaWRlTG9naWNhbENvbnRlbnRIZWlnaHQoKSAmJiAocGFyZW50KCktPmlzRmxleGli bGVCb3hJbmNsdWRpbmdEZXByZWNhdGVkKCkgfHwgcGFyZW50KCktPmlzUmVuZGVyR3JpZCgpKSkg ewotICAgICAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50SGVpZ2h0ID0gb3ZlcnJpZGVMb2dpY2Fs Q29udGVudEhlaWdodCgpOwotICAgICAgICAgICAgaWYgKHBhcmVudCgpLT5pc1JlbmRlckdyaWQo KSAmJiBzdHlsZSgpLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSAmJiBzdHlsZSgpLmxvZ2ljYWxN aW5IZWlnaHQoKS5pc0F1dG8oKSAmJiBzdHlsZSgpLm92ZXJmbG93WCgpID09IE9WSVNJQkxFKSB7 Ci0gICAgICAgICAgICAgICAgTGF5b3V0VW5pdCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0ID0gY29t cHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwot ICAgICAgICAgICAgICAgIGlmIChhdXRvIG1pbkNvbnRlbnRIZWlnaHQgPSBjb21wdXRlQ29udGVu dExvZ2ljYWxIZWlnaHQoTWluU2l6ZSwgTGVuZ3RoKE1pbkNvbnRlbnQpLCBpbnRyaW5zaWNDb250 ZW50SGVpZ2h0KSkKLSAgICAgICAgICAgICAgICAgICAgY29udGVudEhlaWdodCA9IHN0ZDo6bWF4 KGNvbnRlbnRIZWlnaHQsIGNvbnN0cmFpbkNvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0QnlNaW5NYXgo bWluQ29udGVudEhlaWdodC52YWx1ZSgpLCBpbnRyaW5zaWNDb250ZW50SGVpZ2h0KSk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgICAgICBoID0gTGVuZ3RoKGNvbnRlbnRIZWlnaHQsIEZpeGVkKTsK KyAgICAgICAgICAgIGggPSBMZW5ndGgob3ZlcnJpZGVMb2dpY2FsQ29udGVudEhlaWdodCgpLCBG aXhlZCk7CiAgICAgICAgIH0gZWxzZSBpZiAodHJlYXRBc1JlcGxhY2VkKQogICAgICAgICAgICAg aCA9IExlbmd0aChjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KCksIEZpeGVkKTsKICAgICAg ICAgZWxzZSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggNzliNGExMGVlYmE2Y2Y0MjNkOTc0NjkzMjQ1ZTBhNzhjOGU5YmI0 Zi4uMWZkMTljMDZhMTE2ZWM1Yjc5MzMxNjBjYjhlNjYxZjU5MWEzNjcxZSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDE3LTAzLTAzICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2Fs aWEuY29tPgorCisgICAgICAgIFtjc3MtZ3JpZF0gU3RyZXRjaCBzaG91bGQgZ3JvdyBhbmQgc2hy aW5rIGl0ZW1zIHRvIGZpdCBpdHMgZ3JpZCBhcmVhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMyMDAKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KKworICAgICAgICBUaGUgdGVzdHMgaGF2ZSBiZWVuIHVwZGF0ZWQgYWNjb3JkaW5n IHRvIHRoZSBuZXcgZXhwZWN0ZWQgYmVoYXZpb3IuCisKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlk LWxheW91dC9ncmlkLWNvbnRhaW5lci1wZXJjZW50YWdlLWNvbHVtbnMuaHRtbDoKKyAgICAgICAg KiBmYXN0L2Nzcy1ncmlkLWxheW91dC9taW4td2lkdGgtaGVpZ2h0LWF1dG8tYW5kLW1hcmdpbnMu aHRtbDoKKyAgICAgICAgKiBmYXN0L2Nzcy1ncmlkLWxheW91dC9taW4td2lkdGgtaGVpZ2h0LWF1 dG8uaHRtbDoKKwogMjAxNy0wMy0wNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBHVEsrIGdhcmRlbmluZy4gUmViYXNlbGlu ZSBmYXN0L2Nzcy9jc3MyLXN5c3RlbS1mb250cy5odG1sIGFmdGVyIHIyMTMyNjcuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9ncmlkLWNvbnRhaW5lci1wZXJj ZW50YWdlLWNvbHVtbnMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dy aWQtY29udGFpbmVyLXBlcmNlbnRhZ2UtY29sdW1ucy5odG1sCmluZGV4IGUzZGNmYTRlNGI0NTNl MzE2MjNkM2M0MzI5ODM2ODVlZmE0OWU0NjMuLmViNTRjNmZhNWFkOGE1MzQxMGE0ODJmYWY5ODBh MzhiMDYxZDJiMWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0 L2dyaWQtY29udGFpbmVyLXBlcmNlbnRhZ2UtY29sdW1ucy5odG1sCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzLWdyaWQtbGF5b3V0L2dyaWQtY29udGFpbmVyLXBlcmNlbnRhZ2UtY29sdW1ucy5o dG1sCkBAIC0xMjUsNyArMTI1LDcgQEAKIDxkaXYgY2xhc3M9IndyYXBwZXIiPgogICAgIDxkaXYg Y2xhc3M9ImdyaWQgbWluLWNvbnRlbnQgb25lQ29sdW1uNTAiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjIwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjAiPgogICAgICAgICA8ZGl2IGNsYXNzPSJmaXJz dFJvd0ZpcnN0Q29sdW1uIgotICAgICAgICAgICAgZGF0YS1vZmZzZXQteD0iMCIgZGF0YS1vZmZz ZXQteT0iMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMjAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIy MCI+CisgICAgICAgICAgICBkYXRhLW9mZnNldC14PSIwIiBkYXRhLW9mZnNldC15PSIwIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSIxMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjIwIj4KICAgICAgICAg ICAgIFhYIFgKICAgICAgICAgPC9kaXY+CiAgICAgPC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2Nzcy1ncmlkLWxheW91dC9taW4td2lkdGgtaGVpZ2h0LWF1dG8tYW5kLW1hcmdp bnMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L21pbi13aWR0aC1oZWln aHQtYXV0by1hbmQtbWFyZ2lucy5odG1sCmluZGV4IDgxYWI4MmM4YjZmZGUxYjg3NDVlZTBjZmRm NTA0NTdlNjM5ZWUyMzEuLjMzMTZlMzIwNjg1NmZjMmUyZDgzYmZlOGM1YzRiNWUzMjBkM2QxOTAg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0L21pbi13aWR0aC1o ZWlnaHQtYXV0by1hbmQtbWFyZ2lucy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdy aWQtbGF5b3V0L21pbi13aWR0aC1oZWlnaHQtYXV0by1hbmQtbWFyZ2lucy5odG1sCkBAIC00MCw3 ICs0MCw3IEBACiA8cD5TdHJldGNoaW5nIGFsbG93ZWQgaW4gYm90aCBheGlzIHwgY29sdW1uIHNt YWxsZXIgdGhhbiBjb250ZW50LWJveCwgcm93IGJpZ2dlciB0aGFuIG1hcmdpbi1ib3g8L3A+CiA8 ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAgIDxkaXYgY2xhc3M9ImdyaWQgY29sdW1uc1NtYWxs ZXJUaGFuQ29udGVudEJveCByb3dzQmlnZ2VyVGhhbk1hcmdpbkJveCI+Ci0gICAgICAgIDxkaXYg Y2xhc3M9Iml0ZW0iIGRhdGEtb2Zmc2V0LXg9IjIwIiBkYXRhLW9mZnNldC15PSIyMCIgZGF0YS1l eHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iNjAiPlhYWFg8L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0iaXRlbSIgZGF0YS1vZmZzZXQteD0iMjAiIGRhdGEtb2Zmc2V0 LXk9IjIwIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI0MCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjYw Ij5YWFhYPC9kaXY+CiAgICAgPC9kaXY+CiA8L2Rpdj4KIApAQCAtMTEyLDcgKzExMiw3IEBACiA8 cD5TdHJldGNoaW5nIGFsbG93ZWQgaW4gYm90aCBheGlzIHwgcm93IHNtYWxsZXIgdGhhbiBjb250 ZW50LWJveCwgY29sdW1uIGJpZ2dlciB0aGFuIG1hcmdpbi1ib3g8L3A+CiA8ZGl2IGNsYXNzPSJj b250YWluZXIiPgogICAgIDxkaXYgY2xhc3M9ImdyaWQgcm93c1NtYWxsZXJUaGFuQ29udGVudEJv eCBjb2x1bW5zQmlnZ2VyVGhhbk1hcmdpbkJveCI+Ci0gICAgICAgIDxkaXYgY2xhc3M9Iml0ZW0i IGRhdGEtb2Zmc2V0LXg9IjIwIiBkYXRhLW9mZnNldC15PSIyMCIgZGF0YS1leHBlY3RlZC13aWR0 aD0iMTEwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiPlhYWFg8L2Rpdj4KKyAgICAgICAgPGRp diBjbGFzcz0iaXRlbSIgZGF0YS1vZmZzZXQteD0iMjAiIGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRh LWV4cGVjdGVkLXdpZHRoPSIxMTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIwIj5YWFhYPC9kaXY+ CiAgICAgPC9kaXY+CiA8L2Rpdj4KIApAQCAtMTI2LDcgKzEyNiw3IEBACiA8cD5TdHJldGNoaW5n IGFsbG93ZWQgaW4gYm90aCBheGlzIHwgcm93IGJpZ2dlciB0aGFuIGNvbnRlbnQtYm94LCBjb2x1 bW4gYmlnZ2VyIGNvbHVtbiBtYXJnaW4tYm94PC9wPgogPGRpdiBjbGFzcz0iY29udGFpbmVyIj4K ICAgICA8ZGl2IGNsYXNzPSJncmlkIHJvd3NCaWdnZXJUaGFuQ29udGVudEJveCBjb2x1bW5zQmln Z2VyVGhhbk1hcmdpbkJveCI+Ci0gICAgICAgIDxkaXYgY2xhc3M9Iml0ZW0iIGRhdGEtb2Zmc2V0 LXg9IjIwIiBkYXRhLW9mZnNldC15PSIyMCIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTEwIiBkYXRh LWV4cGVjdGVkLWhlaWdodD0iMjUiPlhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iaXRl bSIgZGF0YS1vZmZzZXQteD0iMjAiIGRhdGEtb2Zmc2V0LXk9IjIwIiBkYXRhLWV4cGVjdGVkLXdp ZHRoPSIxMTAiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSIxMCI+WFhYWDwvZGl2PgogICAgIDwvZGl2 PgogPC9kaXY+CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzLWdyaWQtbGF5b3V0 L21pbi13aWR0aC1oZWlnaHQtYXV0by5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1s YXlvdXQvbWluLXdpZHRoLWhlaWdodC1hdXRvLmh0bWwKaW5kZXggN2Y5ZDMyZjBhOTZmYmY2Nzkw ZmNmZjBlN2U0MTU1ZjViOWFmODQ3YS4uNTAzNDAxMzAwNTIxYzlmYjcyOTE2MjQ1YWNjNmJhZmRi NDZmMjE2ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1sYXlvdXQvbWlu LXdpZHRoLWhlaWdodC1hdXRvLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MtZ3JpZC1s YXlvdXQvbWluLXdpZHRoLWhlaWdodC1hdXRvLmh0bWwKQEAgLTQ2LDcgKzQ2LDcgQEAKIAogPGRp diBjbGFzcz0iY29udGFpbmVyIj4KICAgICA8ZGl2IGNsYXNzPSJncmlkIj4KLSAgICAgICAgPGRp diBjbGFzcz0iYWhlbSIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhl aWdodD0iMjUiPlhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSIgZGF0YS1leHBl Y3RlZC13aWR0aD0iNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUiPlhYWFg8L2Rpdj4KICAgICA8 L2Rpdj4KIDwvZGl2PgogCkBAIC02NCwzMiArNjQsMzIgQEAKIAogPGRpdiBjbGFzcz0iY29udGFp bmVyIj4KICAgICA8ZGl2IGNsYXNzPSJncmlkIj4KLSAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSBt YXhTbWFsbGVyIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMCIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9 IjEwIj5YWFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImFoZW0gbWF4U21hbGxlciIgZGF0 YS1leHBlY3RlZC13aWR0aD0iNSIgZGF0YS1leHBlY3RlZC1oZWlnaHQ9IjUiPlhYWFg8L2Rpdj4K ICAgICA8L2Rpdj4KIDwvZGl2PgogCiA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAgIDxkaXYg Y2xhc3M9ImdyaWQiPgotICAgICAgICA8ZGl2IGNsYXNzPSJhaGVtIG1heEJpZ2dlciIgZGF0YS1l eHBlY3RlZC13aWR0aD0iMTAwIiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMjUiPlhYWFg8L2Rpdj4K KyAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSBtYXhCaWdnZXIiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9 IjUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1Ij5YWFhYPC9kaXY+CiAgICAgPC9kaXY+CiA8L2Rp dj4KIAogPCEtLSBDaGVjayB0aGF0IG1pbi13aWR0aCBtaW4taGVpZ2h0IGJlaGF2aW9yIGlzIHBy ZXNlcnZlZCB3aGVuIHVzaW5nIHZlcnRpY2FsIHdyaXRpbmcgbW9kZXMgLS0+CiA8ZGl2IGNsYXNz PSJjb250YWluZXIiPgogICAgIDxkaXYgY2xhc3M9ImdyaWQgdmVydGljYWxMUiI+Ci0gICAgICAg IDxkaXYgY2xhc3M9ImFoZW0iIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjI1IiBkYXRhLWV4cGVjdGVk LWhlaWdodD0iMTAwIj5YWFhYPC9kaXY+CisgICAgICAgIDxkaXYgY2xhc3M9ImFoZW0iIGRhdGEt ZXhwZWN0ZWQtd2lkdGg9IjUiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1Ij5YWFhYPC9kaXY+CiAg ICAgPC9kaXY+CiA8L2Rpdj4KIAogPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KICAgICA8ZGl2IGNs YXNzPSJncmlkIHZlcnRpY2FsTFIiPgotICAgICAgICA8ZGl2IGNsYXNzPSJhaGVtIG1pbkhlaWdo dFNtYWxsZXIiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9IjI1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0i MTIiPlhYWFg8L2Rpdj4KKyAgICAgICAgPGRpdiBjbGFzcz0iYWhlbSBtaW5IZWlnaHRTbWFsbGVy IiBkYXRhLWV4cGVjdGVkLXdpZHRoPSI1IiBkYXRhLWV4cGVjdGVkLWhlaWdodD0iMTIiPlhYWFg8 L2Rpdj4KICAgICA8L2Rpdj4KIDwvZGl2PgogCiA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAg IDxkaXYgY2xhc3M9ImdyaWQgdmVydGljYWxMUiI+Ci0gICAgICAgIDxkaXYgY2xhc3M9ImFoZW0g bWluV2lkdGhTbWFsbGVyIiBkYXRhLWV4cGVjdGVkLXdpZHRoPSIxMiIgZGF0YS1leHBlY3RlZC1o ZWlnaHQ9IjEwMCI+WFhYWDwvZGl2PgorICAgICAgICA8ZGl2IGNsYXNzPSJhaGVtIG1pbldpZHRo U21hbGxlciIgZGF0YS1leHBlY3RlZC13aWR0aD0iMTIiIGRhdGEtZXhwZWN0ZWQtaGVpZ2h0PSI1 Ij5YWFhYPC9kaXY+CiAgICAgPC9kaXY+CiA8L2Rpdj4KIAo=