109956 2013-02-15 11:16:07 -0800 -webkit-margin-collapse: separate doesn't work correctly for before margins 2013-02-21 09:43:56 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abucur abucur eric esprehn+autocc ojan.autocc webkit.review.bot oldest_to_newest 834198 0 abucur 2013-02-15 11:16:07 -0800 Specifying -webkit-margin-collapse doesn't work correctly in the case of child-container adjoining margins. At the before side of the block, the child is positioned at the sum of the margins if it specifies separate. This is wrong: the block and the child should be placed at their own margin values inside their containers. 838390 1 189523 abucur 2013-02-21 06:52:48 -0800 Created attachment 189523 Patch 838470 2 189523 hyatt 2013-02-21 08:51:41 -0800 Comment on attachment 189523 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189523&action=review r=me > Source/WebCore/rendering/RenderBlock.cpp:2079 > + if (marginInfo.canCollapseWithMarginBefore()) > + setLogicalHeight(logicalHeight() + marginBeforeForChild(child)); > + else > + setLogicalHeight(logicalHeight() + marginInfo.margin() + marginBeforeForChild(child)); I think this would a bit better as: LayoutUnit separateMargin = !marginInfo.canCollapseWithMarginBefore() ? marginInfo.margin() : 0; setLogicalHeight(logicalHeight() + marginBeforeForChild(child) + separateMargin); 838489 3 189543 abucur 2013-02-21 09:06:17 -0800 Created attachment 189543 Patch for landing 838495 4 189543 webkit.review.bot 2013-02-21 09:12:33 -0800 Comment on attachment 189543 Patch for landing Rejecting attachment 189543 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-04', 'build', '--no-clean', '--no-update', '--build-style=release', '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: y-inlines-hidden -Wsign-compare -c ../../Source/WebCore/rendering/RenderBlock.cpp -o obj/Source/WebCore/rendering/webcore_rendering.RenderBlock.o ../../Source/WebCore/rendering/RenderBlock.cpp: In member function 'WebCore::LayoutUnit WebCore::RenderBlock::collapseMargins(WebCore::RenderBox*, WebCore::RenderBlock::MarginInfo&)': ../../Source/WebCore/rendering/RenderBlock.cpp:2084: error: operands to ?: have different types 'WebCore::LayoutUnit' and 'int' ninja: build stopped: subcommand failed. Full output: http://queues.webkit.org/results/16701044 838506 5 189546 abucur 2013-02-21 09:26:16 -0800 Created attachment 189546 Patch for landing v2 Fix the build error. 838518 6 189546 webkit.review.bot 2013-02-21 09:43:53 -0800 Comment on attachment 189546 Patch for landing v2 Clearing flags on attachment: 189546 Committed r143617: <http://trac.webkit.org/changeset/143617> 838519 7 webkit.review.bot 2013-02-21 09:43:56 -0800 All reviewed patches have been landed. Closing bug. 189523 2013-02-21 06:52:48 -0800 2013-02-21 09:06:11 -0800 Patch bug-109956-20130221164907.patch text/plain 6674 abucur U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDNjZjZhNGVkYjkwMjBj MmUyMDE2OGFkNzQyOGE5MTAzNGNlZjcxNC4uNzcxZmNkZTM4NjhjZmMyZjQwNTNlMWJjNWJiZDlj OTM0MzFkNTFkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIxICBBbmRy ZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgorCisgICAgICAgIC13ZWJraXQtbWFyZ2luLWNv bGxhcHNlOiBzZXBhcmF0ZSBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IGZvciBiZWZvcmUgbWFyZ2lu cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5OTU2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNv bGxhcHNpbmcgY29kZSBmb3IgIi13ZWJraXQtbWFyZ2luLWNvbGxhcHNlOiBzZXBhcmF0ZSIgYXNz dW1lZCB0aGUgbWFyZ2luIHZhbHVlIGluc2lkZQorICAgICAgICBtYXJnaW5JbmZvIGFsd2F5cyBj b250cmlidXRlcyB0byB0aGUgcG9zaXRpb24gb2YgdGhlIGNoaWxkLiBUaGlzIGlzIHZhbGlkIG9u bHkgaWYgdGhlIGNvbGxhcHNlCisgICAgICAgIGRvZXNuJ3QgaGFwcGVuIGF0IHRoZSBiZWZvcmUg c2lkZSBvZiB0aGUgY29udGFpbmVyLiBJbiB0aGF0IGNhc2UsIHRoZSBjaGlsZCBuZWVkcyB0byBi ZSBwb3NpdGlvbmVkIAorICAgICAgICBhdCB0aGUgbWFyZ2luIHZhbHVlIHNwZWNpZmllZCBpbiB0 aGUgc3R5bGUgc2hlZXQuCisKKyAgICAgICAgVGVzdDogZmFzdC9ibG9jay9tYXJnaW4tY29sbGFw c2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2s6OmNvbGxhcHNlTWFyZ2lucyk6CisKIDIwMTMtMDItMjAgIEFuZHJleSBMdXNobmlrb3Yg IDxsdXNobmlrb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhpZ2hs aWdodCB1bmRlZmluZWQgd29yZCBpbiBKYXZhU2NyaXB0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAppbmRleCAzY2RlZWY3ZDQwZjk5N2RjYjAyYzU3OGI5MTc3YTAxZDFl NjVlMWQyLi43ZTkzY2U2ZWI5NjYzZDAyYmY0YTRlYmJkZGUwYzI3NTdjZjZmZTE3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTIwNzAsNyArMjA3MCwxMyBA QCBMYXlvdXRVbml0IFJlbmRlckJsb2NrOjpjb2xsYXBzZU1hcmdpbnMoUmVuZGVyQm94KiBjaGls ZCwgTWFyZ2luSW5mbyYgbWFyZ2luSW5mbwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChtdXN0 U2VwYXJhdGVNYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAgICAgIEFTU0VS VCghbWFyZ2luSW5mby5kaXNjYXJkTWFyZ2luKCkgfHwgKG1hcmdpbkluZm8uZGlzY2FyZE1hcmdp bigpICYmICFtYXJnaW5JbmZvLm1hcmdpbigpKSk7Ci0gICAgICAgICAgICBzZXRMb2dpY2FsSGVp Z2h0KGxvZ2ljYWxIZWlnaHQoKSArIG1hcmdpbkluZm8ubWFyZ2luKCkgKyBtYXJnaW5CZWZvcmVG b3JDaGlsZChjaGlsZCkpOworICAgICAgICAgICAgLy8gSWYgd2UgYXJlIGF0IHRoZSBiZWZvcmUg c2lkZSBvZiB0aGUgYmxvY2sgYW5kIHdlIGNvbGxhcHNlLCBpZ25vcmUgdGhlIGNvbXB1dGVkIG1h cmdpbgorICAgICAgICAgICAgLy8gYW5kIGp1c3QgYWRkIHRoZSBjaGlsZCBtYXJnaW4gdG8gdGhl IGNvbnRhaW5lciBoZWlnaHQuIFRoaXMgd2lsbCBjb3JyZWN0bHkgcG9zaXRpb24KKyAgICAgICAg ICAgIC8vIHRoZSBjaGlsZCBpbnNpZGUgdGhlIGNvbnRhaW5lci4KKyAgICAgICAgICAgIGlmICht YXJnaW5JbmZvLmNhbkNvbGxhcHNlV2l0aE1hcmdpbkJlZm9yZSgpKQorICAgICAgICAgICAgICAg IHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgpICsgbWFyZ2luQmVmb3JlRm9yQ2hpbGQo Y2hpbGQpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBzZXRMb2dpY2FsSGVp Z2h0KGxvZ2ljYWxIZWlnaHQoKSArIG1hcmdpbkluZm8ubWFyZ2luKCkgKyBtYXJnaW5CZWZvcmVG b3JDaGlsZChjaGlsZCkpOwogICAgICAgICAgICAgbG9naWNhbFRvcCA9IGxvZ2ljYWxIZWlnaHQo KTsKICAgICAgICAgfSBlbHNlIGlmICghbWFyZ2luSW5mby5kaXNjYXJkTWFyZ2luKCkgJiYgKCFt YXJnaW5JbmZvLmF0QmVmb3JlU2lkZU9mQmxvY2soKQogICAgICAgICAgICAgfHwgKCFtYXJnaW5J bmZvLmNhbkNvbGxhcHNlTWFyZ2luQmVmb3JlV2l0aENoaWxkcmVuKCkKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ZTNmYmQ0 ZWU3OGRlODQyZDFmOGMwODdjMDQzMjYwN2VlY2VmZWYxLi43MWM2N2JmZWQ1ZmZiMTAyZDRmZDk0 NTc2ZDkxYThjNTk3ZDIzYjU3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDItMjEgIEFu ZHJlaSBCdWN1ciAgPGFidWN1ckBhZG9iZS5jb20+CisKKyAgICAgICAgLXdlYmtpdC1tYXJnaW4t Y29sbGFwc2U6IHNlcGFyYXRlIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgZm9yIGJlZm9yZSBtYXJn aW5zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5 NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg dGVzdCB2ZXJpZmllcyBhIGNoaWxkIHNwZWNpZnlpbmcgIi13ZWJraXQtbWFyZ2luLWNvbGxhcHNl OiBzZXBhcmF0ZSIgaXMgY29ycmVjdGx5IHBvc2l0aW9uZWQgaW5zaWRlCisgICAgICAgIGl0cyBj b250YWluZXIsIGF0IGEgdmFsdWUgZXF1YWwgd2l0aCB0aGUgdG9wIG1hcmdpbiBvZiB0aGUgY2hp bGQuIFRoZSBjb250YWluZXIgYWxzbyBuZWVkIHRvIGJlIHNpemVkCisgICAgICAgIGFjY29yZGlu Z2x5LgorCisgICAgICAgICogZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdp bi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvYmxvY2svbWFyZ2luLWNvbGxhcHNlL3dlYmtpdC1tYXJnaW4tY29sbGFwc2Utc2Vw YXJhdGUtcG9zaXRpb24uaHRtbDogQWRkZWQuCisKIDIwMTMtMDItMjAgIEFuZHJleSBMdXNobmlr b3YgIDxsdXNobmlrb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhp Z2hsaWdodCB1bmRlZmluZWQgd29yZCBpbiBKYXZhU2NyaXB0CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2Jsb2NrL21hcmdpbi1jb2xsYXBzZS93ZWJraXQtbWFyZ2luLWNvbGxhcHNlLXNl cGFyYXRlLXBvc2l0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvYmxvY2svbWFy Z2luLWNvbGxhcHNlL3dlYmtpdC1tYXJnaW4tY29sbGFwc2Utc2VwYXJhdGUtcG9zaXRpb24tZXhw ZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjgzYjE1ZWNiMzMzMDU1NzcxOTAxNjQzZGUyNWI3MjNlYzNj YWFkYWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL21hcmdpbi1j b2xsYXBzZS93ZWJraXQtbWFyZ2luLWNvbGxhcHNlLXNlcGFyYXRlLXBvc2l0aW9uLWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDExIEBACitUZXN0IGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA5OTU2IC13ZWJraXQtbWFyZ2luLWNvbGxhcHNlOiBzZXBhcmF0ZSBk b2Vzbid0IHdvcmsgY29ycmVjdGx5IGZvciBiZWZvcmUgbWFyZ2lucy4gVGhlIHRlc3QgYmFzaWNh bGx5IGNyZWF0ZXMgYW4gZW1wdHkgYmxvY2sgaW5zaWRlIGEgY29udGFpbmVyIHdpdGggYSBtYXJn aW4gdGhhdCBjb2xsYXBzZXMgd2l0aCBjaGlsZHJlbi4gVGhlIGVtcHR5IGJsb2NrIGhhcyB0aGUg bWFyZ2lucyBzZXQgdG8gc2VwYXJhdGUgc28gaXRzIGhlaWdodCBzaG91bGQgYmUgMHB4LiBUaGUg Y29udGFpbmVyIGlzIG5vdCBzZWxmY29sbGFwc2luZyBzbyBpdCBzaG91bGQgaGF2ZSBhIGhlaWdo dCBvZiAxMHB4KzEwcHgrMnB4PTIycHguCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNl cmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKwor CitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ6ZXJvX2hlaWdodCIpLm9mZnNldEhlaWdo dCBpcyAwCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCIyMnB4X2hlaWdodCIpLm9mZnNl dEhlaWdodCBpcyAyMgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENP TVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvYmxvY2svbWFyZ2luLWNvbGxh cHNlL3dlYmtpdC1tYXJnaW4tY29sbGFwc2Utc2VwYXJhdGUtcG9zaXRpb24uaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvYmxvY2svbWFyZ2luLWNvbGxhcHNlL3dlYmtpdC1tYXJnaW4tY29sbGFwc2Ut c2VwYXJhdGUtcG9zaXRpb24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yYTg2NmJkY2VlMmE1ZGYyM2MyZWNi MmY4MDliMTMzMTA0M2E2MzVkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9i bG9jay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3Np dGlvbi5odG1sCkBAIC0wLDAgKzEsNDEgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8 c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwv c2NyaXB0PgorICAgICAgICA8c3R5bGU+CisgICAgICAgIC5jb250YWluZXIgeworICAgICAgICAg ICAgYm9yZGVyOiB0aGluIHNvbGlkIGJsdWU7CisgICAgICAgIH0KKworICAgICAgICAuY2hpbGRf d2l0aF9tYXJnaW5zIHsKKyAgICAgICAgICAgIG1hcmdpbi10b3A6IDEwcHg7CisgICAgICAgICAg ICBtYXJnaW4tYm90dG9tOiAxMHB4OworICAgICAgICB9CisKKyAgICAgICAgLnNlcGFyYXRlX3Rv cCB7CisgICAgICAgICAgICAtd2Via2l0LW1hcmdpbi10b3AtY29sbGFwc2U6IHNlcGFyYXRlOwor ICAgICAgICB9CisKKyAgICAgICAgLnNlcGFyYXRlX2JvdHRvbSB7CisgICAgICAgICAgICAtd2Vi a2l0LW1hcmdpbi1ib3R0b20tY29sbGFwc2U6IHNlcGFyYXRlOworICAgICAgICB9CisgICAgICAg IDwvc3R5bGU+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8ZGl2IGNsYXNzPSJj b250YWluZXIiIGlkPSIyMnB4X2hlaWdodCI+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjaGls ZF93aXRoX21hcmdpbnMiIGlkPSJ6ZXJvX2hlaWdodCI+CisgICAgICAgICAgICAgICAgPGRpdiBj bGFzcz0ic2VwYXJhdGVfdG9wIHNlcGFyYXRlX2JvdHRvbSI+PC9kaXY+CisgICAgICAgICAgICA8 L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5k b3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworCisg ICAgICAgIGRlc2NyaXB0aW9uKCJUZXN0IGZvciBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5OTU2IC13ZWJraXQtbWFyZ2luLWNvbGxhcHNlOiBzZXBhcmF0ZSBkb2Vz bid0IHdvcmsgY29ycmVjdGx5IGZvciBiZWZvcmUgbWFyZ2lucy4gXAorICAgICAgICAgICAgVGhl IHRlc3QgYmFzaWNhbGx5IGNyZWF0ZXMgYW4gZW1wdHkgYmxvY2sgaW5zaWRlIGEgY29udGFpbmVy IHdpdGggYSBtYXJnaW4gdGhhdCBjb2xsYXBzZXMgd2l0aCBjaGlsZHJlbi4gVGhlIGVtcHR5IGJs b2NrIGhhcyB0aGUgbWFyZ2lucyBcCisgICAgICAgICAgICBzZXQgdG8gc2VwYXJhdGUgc28gaXRz IGhlaWdodCBzaG91bGQgYmUgMHB4LiBUaGUgY29udGFpbmVyIGlzIG5vdCBzZWxmY29sbGFwc2lu ZyBzbyBpdCBzaG91bGQgaGF2ZSBhIGhlaWdodCBvZiAxMHB4KzEwcHgrMnB4PTIycHguIik7Cisg ICAgICAgIHNob3VsZEV2YWx1YXRlVG8oJ2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ6ZXJvX2hl aWdodCIpLm9mZnNldEhlaWdodCcsICcwJyk7CisgICAgICAgIHNob3VsZEV2YWx1YXRlVG8oJ2Rv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCIyMnB4X2hlaWdodCIpLm9mZnNldEhlaWdodCcsICcyMicp OworICAgICAgICA8L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3Qv anMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9o dG1sPgo= 189543 2013-02-21 09:06:17 -0800 2013-02-21 09:26:16 -0800 Patch for landing bug-109956-20130221190236.patch text/plain 6610 abucur U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDNjZjZhNGVkYjkwMjBj MmUyMDE2OGFkNzQyOGE5MTAzNGNlZjcxNC4uOTY3MzIxYTg4NTRkZWIxOTNjMjJlODZjNjEwYTMx ZGRkYjdmNDEwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIxICBBbmRy ZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgorCisgICAgICAgIC13ZWJraXQtbWFyZ2luLWNv bGxhcHNlOiBzZXBhcmF0ZSBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IGZvciBiZWZvcmUgbWFyZ2lu cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5OTU2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCisKKyAgICAgICAgVGhlIGNvbGxh cHNpbmcgY29kZSBmb3IgIi13ZWJraXQtbWFyZ2luLWNvbGxhcHNlOiBzZXBhcmF0ZSIgYXNzdW1l ZCB0aGUgbWFyZ2luIHZhbHVlIGluc2lkZQorICAgICAgICBtYXJnaW5JbmZvIGFsd2F5cyBjb250 cmlidXRlcyB0byB0aGUgcG9zaXRpb24gb2YgdGhlIGNoaWxkLiBUaGlzIGlzIHZhbGlkIG9ubHkg aWYgdGhlIGNvbGxhcHNlCisgICAgICAgIGRvZXNuJ3QgaGFwcGVuIGF0IHRoZSBiZWZvcmUgc2lk ZSBvZiB0aGUgY29udGFpbmVyLiBJbiB0aGF0IGNhc2UsIHRoZSBjaGlsZCBuZWVkcyB0byBiZSBw b3NpdGlvbmVkIAorICAgICAgICBhdCB0aGUgbWFyZ2luIHZhbHVlIHNwZWNpZmllZCBpbiB0aGUg c3R5bGUgc2hlZXQuCisKKyAgICAgICAgVGVzdDogZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uv d2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxv Y2s6OmNvbGxhcHNlTWFyZ2lucyk6CisKIDIwMTMtMDItMjAgIEFuZHJleSBMdXNobmlrb3YgIDxs dXNobmlrb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhpZ2hsaWdo dCB1bmRlZmluZWQgd29yZCBpbiBKYXZhU2NyaXB0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAppbmRleCAzY2RlZWY3ZDQwZjk5N2RjYjAyYzU3OGI5MTc3YTAxZDFlNjVl MWQyLi41YzI1NWI0YTY0NDdkOTZjYWZkNzc4ZDNiNzBmZjhiMzRhYTdkOWMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTIwNzAsNyArMjA3MCwxMSBAQCBM YXlvdXRVbml0IFJlbmRlckJsb2NrOjpjb2xsYXBzZU1hcmdpbnMoUmVuZGVyQm94KiBjaGlsZCwg TWFyZ2luSW5mbyYgbWFyZ2luSW5mbwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChtdXN0U2Vw YXJhdGVNYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAgICAgIEFTU0VSVCgh bWFyZ2luSW5mby5kaXNjYXJkTWFyZ2luKCkgfHwgKG1hcmdpbkluZm8uZGlzY2FyZE1hcmdpbigp ICYmICFtYXJnaW5JbmZvLm1hcmdpbigpKSk7Ci0gICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0 KGxvZ2ljYWxIZWlnaHQoKSArIG1hcmdpbkluZm8ubWFyZ2luKCkgKyBtYXJnaW5CZWZvcmVGb3JD aGlsZChjaGlsZCkpOworICAgICAgICAgICAgLy8gSWYgd2UgYXJlIGF0IHRoZSBiZWZvcmUgc2lk ZSBvZiB0aGUgYmxvY2sgYW5kIHdlIGNvbGxhcHNlLCBpZ25vcmUgdGhlIGNvbXB1dGVkIG1hcmdp bgorICAgICAgICAgICAgLy8gYW5kIGp1c3QgYWRkIHRoZSBjaGlsZCBtYXJnaW4gdG8gdGhlIGNv bnRhaW5lciBoZWlnaHQuIFRoaXMgd2lsbCBjb3JyZWN0bHkgcG9zaXRpb24KKyAgICAgICAgICAg IC8vIHRoZSBjaGlsZCBpbnNpZGUgdGhlIGNvbnRhaW5lci4KKyAgICAgICAgICAgIExheW91dFVu aXQgc2VwYXJhdGVNYXJnaW4gPSAhbWFyZ2luSW5mby5jYW5Db2xsYXBzZVdpdGhNYXJnaW5CZWZv cmUoKSA/IG1hcmdpbkluZm8ubWFyZ2luKCkgOiAwOworICAgICAgICAgICAgc2V0TG9naWNhbEhl aWdodChsb2dpY2FsSGVpZ2h0KCkgKyBzZXBhcmF0ZU1hcmdpbiArIG1hcmdpbkJlZm9yZUZvckNo aWxkKGNoaWxkKSk7CiAgICAgICAgICAgICBsb2dpY2FsVG9wID0gbG9naWNhbEhlaWdodCgpOwog ICAgICAgICB9IGVsc2UgaWYgKCFtYXJnaW5JbmZvLmRpc2NhcmRNYXJnaW4oKSAmJiAoIW1hcmdp bkluZm8uYXRCZWZvcmVTaWRlT2ZCbG9jaygpCiAgICAgICAgICAgICB8fCAoIW1hcmdpbkluZm8u Y2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4oKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDhlM2ZiZDRlZTc4 ZGU4NDJkMWY4YzA4N2MwNDMyNjA3ZWVjZWZlZjEuLjZmNmRmYzY0MjJjODNkY2IxNTE3ZjNmZWY1 MTlkYzFiYmQwM2MwZjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMi0yMSAgQW5kcmVp IEJ1Y3VyICA8YWJ1Y3VyQGFkb2JlLmNvbT4KKworICAgICAgICAtd2Via2l0LW1hcmdpbi1jb2xs YXBzZTogc2VwYXJhdGUgZG9lc24ndCB3b3JrIGNvcnJlY3RseSBmb3IgYmVmb3JlIG1hcmdpbnMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTk1Ngor CisgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0LgorCisgICAgICAgIFRoZSB0ZXN0IHZl cmlmaWVzIGEgY2hpbGQgc3BlY2lmeWluZyAiLXdlYmtpdC1tYXJnaW4tY29sbGFwc2U6IHNlcGFy YXRlIiBpcyBjb3JyZWN0bHkgcG9zaXRpb25lZCBpbnNpZGUKKyAgICAgICAgaXRzIGNvbnRhaW5l ciwgYXQgYSB2YWx1ZSBlcXVhbCB3aXRoIHRoZSB0b3AgbWFyZ2luIG9mIHRoZSBjaGlsZC4gVGhl IGNvbnRhaW5lciBhbHNvIG5lZWQgdG8gYmUgc2l6ZWQKKyAgICAgICAgYWNjb3JkaW5nbHkuCisK KyAgICAgICAgKiBmYXN0L2Jsb2NrL21hcmdpbi1jb2xsYXBzZS93ZWJraXQtbWFyZ2luLWNvbGxh cHNlLXNlcGFyYXRlLXBvc2l0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9ibG9jay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1w b3NpdGlvbi5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMCAgQW5kcmV5IEx1c2huaWtvdiAgPGx1 c2huaWtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogaGlnaGxpZ2h0 IHVuZGVmaW5lZCB3b3JkIGluIEphdmFTY3JpcHQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvYmxvY2svbWFyZ2luLWNvbGxhcHNlL3dlYmtpdC1tYXJnaW4tY29sbGFwc2Utc2VwYXJhdGUt cG9zaXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9tYXJnaW4tY29s bGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uODNiMTVlY2IzMzMwNTU3NzE5MDE2NDNkZTI1YjcyM2VjM2NhYWRhZgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYmxvY2svbWFyZ2luLWNvbGxhcHNl L3dlYmtpdC1tYXJnaW4tY29sbGFwc2Utc2VwYXJhdGUtcG9zaXRpb24tZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTEgQEAKK1Rlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDk5NTYgLXdlYmtpdC1tYXJnaW4tY29sbGFwc2U6IHNlcGFyYXRlIGRvZXNuJ3Qg d29yayBjb3JyZWN0bHkgZm9yIGJlZm9yZSBtYXJnaW5zLiBUaGUgdGVzdCBiYXNpY2FsbHkgY3Jl YXRlcyBhbiBlbXB0eSBibG9jayBpbnNpZGUgYSBjb250YWluZXIgd2l0aCBhIG1hcmdpbiB0aGF0 IGNvbGxhcHNlcyB3aXRoIGNoaWxkcmVuLiBUaGUgZW1wdHkgYmxvY2sgaGFzIHRoZSBtYXJnaW5z IHNldCB0byBzZXBhcmF0ZSBzbyBpdHMgaGVpZ2h0IHNob3VsZCBiZSAwcHguIFRoZSBjb250YWlu ZXIgaXMgbm90IHNlbGZjb2xsYXBzaW5nIHNvIGl0IHNob3VsZCBoYXZlIGEgaGVpZ2h0IG9mIDEw cHgrMTBweCsycHg9MjJweC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInplcm9faGVpZ2h0Iikub2Zmc2V0SGVpZ2h0IGlzIDAK K1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIjIycHhfaGVpZ2h0Iikub2Zmc2V0SGVpZ2h0 IGlzIDIyCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uvd2Vi a2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0 ZS1wb3NpdGlvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJhODY2YmRjZWUyYTVkZjIzYzJlY2IyZjgwOWIx MzMxMDQzYTYzNWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL21h cmdpbi1jb2xsYXBzZS93ZWJraXQtbWFyZ2luLWNvbGxhcHNlLXNlcGFyYXRlLXBvc2l0aW9uLmh0 bWwKQEAgLTAsMCArMSw0MSBAQAorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxzY3JpcHQg c3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+ CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAgICAgICAgICBib3Jk ZXI6IHRoaW4gc29saWQgYmx1ZTsKKyAgICAgICAgfQorCisgICAgICAgIC5jaGlsZF93aXRoX21h cmdpbnMgeworICAgICAgICAgICAgbWFyZ2luLXRvcDogMTBweDsKKyAgICAgICAgICAgIG1hcmdp bi1ib3R0b206IDEwcHg7CisgICAgICAgIH0KKworICAgICAgICAuc2VwYXJhdGVfdG9wIHsKKyAg ICAgICAgICAgIC13ZWJraXQtbWFyZ2luLXRvcC1jb2xsYXBzZTogc2VwYXJhdGU7CisgICAgICAg IH0KKworICAgICAgICAuc2VwYXJhdGVfYm90dG9tIHsKKyAgICAgICAgICAgIC13ZWJraXQtbWFy Z2luLWJvdHRvbS1jb2xsYXBzZTogc2VwYXJhdGU7CisgICAgICAgIH0KKyAgICAgICAgPC9zdHls ZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5l ciIgaWQ9IjIycHhfaGVpZ2h0Ij4KKyAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNoaWxkX3dpdGhf bWFyZ2lucyIgaWQ9Inplcm9faGVpZ2h0Ij4KKyAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJz ZXBhcmF0ZV90b3Agc2VwYXJhdGVfYm90dG9tIj48L2Rpdj4KKyAgICAgICAgICAgIDwvZGl2Pgor ICAgICAgICA8L2Rpdj4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0 UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisKKyAgICAgICAg ZGVzY3JpcHRpb24oIlRlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDk5NTYgLXdlYmtpdC1tYXJnaW4tY29sbGFwc2U6IHNlcGFyYXRlIGRvZXNuJ3Qgd29y ayBjb3JyZWN0bHkgZm9yIGJlZm9yZSBtYXJnaW5zLiBcCisgICAgICAgICAgICBUaGUgdGVzdCBi YXNpY2FsbHkgY3JlYXRlcyBhbiBlbXB0eSBibG9jayBpbnNpZGUgYSBjb250YWluZXIgd2l0aCBh IG1hcmdpbiB0aGF0IGNvbGxhcHNlcyB3aXRoIGNoaWxkcmVuLiBUaGUgZW1wdHkgYmxvY2sgaGFz IHRoZSBtYXJnaW5zIFwKKyAgICAgICAgICAgIHNldCB0byBzZXBhcmF0ZSBzbyBpdHMgaGVpZ2h0 IHNob3VsZCBiZSAwcHguIFRoZSBjb250YWluZXIgaXMgbm90IHNlbGZjb2xsYXBzaW5nIHNvIGl0 IHNob3VsZCBoYXZlIGEgaGVpZ2h0IG9mIDEwcHgrMTBweCsycHg9MjJweC4iKTsKKyAgICAgICAg c2hvdWxkRXZhbHVhdGVUbygnZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInplcm9faGVpZ2h0Iiku b2Zmc2V0SGVpZ2h0JywgJzAnKTsKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVUbygnZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIjIycHhfaGVpZ2h0Iikub2Zmc2V0SGVpZ2h0JywgJzIyJyk7CisgICAg ICAgIDwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 189546 2013-02-21 09:26:16 -0800 2013-02-21 09:43:53 -0800 Patch for landing v2 b109956.patch text/plain 6622 abucur U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDNjZjZhNGVkYjkwMjBj MmUyMDE2OGFkNzQyOGE5MTAzNGNlZjcxNC4uOTY3MzIxYTg4NTRkZWIxOTNjMjJlODZjNjEwYTMx ZGRkYjdmNDEwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIxICBBbmRy ZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgorCisgICAgICAgIC13ZWJraXQtbWFyZ2luLWNv bGxhcHNlOiBzZXBhcmF0ZSBkb2Vzbid0IHdvcmsgY29ycmVjdGx5IGZvciBiZWZvcmUgbWFyZ2lu cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5OTU2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCisKKyAgICAgICAgVGhlIGNvbGxh cHNpbmcgY29kZSBmb3IgIi13ZWJraXQtbWFyZ2luLWNvbGxhcHNlOiBzZXBhcmF0ZSIgYXNzdW1l ZCB0aGUgbWFyZ2luIHZhbHVlIGluc2lkZQorICAgICAgICBtYXJnaW5JbmZvIGFsd2F5cyBjb250 cmlidXRlcyB0byB0aGUgcG9zaXRpb24gb2YgdGhlIGNoaWxkLiBUaGlzIGlzIHZhbGlkIG9ubHkg aWYgdGhlIGNvbGxhcHNlCisgICAgICAgIGRvZXNuJ3QgaGFwcGVuIGF0IHRoZSBiZWZvcmUgc2lk ZSBvZiB0aGUgY29udGFpbmVyLiBJbiB0aGF0IGNhc2UsIHRoZSBjaGlsZCBuZWVkcyB0byBiZSBw b3NpdGlvbmVkIAorICAgICAgICBhdCB0aGUgbWFyZ2luIHZhbHVlIHNwZWNpZmllZCBpbiB0aGUg c3R5bGUgc2hlZXQuCisKKyAgICAgICAgVGVzdDogZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uv d2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxv Y2s6OmNvbGxhcHNlTWFyZ2lucyk6CisKIDIwMTMtMDItMjAgIEFuZHJleSBMdXNobmlrb3YgIDxs dXNobmlrb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGhpZ2hsaWdo dCB1bmRlZmluZWQgd29yZCBpbiBKYXZhU2NyaXB0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAppbmRleCAzY2RlZWY3ZDQwZjk5N2RjYjAyYzU3OGI5MTc3YTAxZDFlNjVl MWQyLi41YzI1NWI0YTY0NDdkOTZjYWZkNzc4ZDNiNzBmZjhiMzRhYTdkOWMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKQEAgLTIwNzAsNyArMjA3MCwxMSBAQCBM YXlvdXRVbml0IFJlbmRlckJsb2NrOjpjb2xsYXBzZU1hcmdpbnMoUmVuZGVyQm94KiBjaGlsZCwg TWFyZ2luSW5mbyYgbWFyZ2luSW5mbwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChtdXN0U2Vw YXJhdGVNYXJnaW5CZWZvcmVGb3JDaGlsZChjaGlsZCkpIHsKICAgICAgICAgICAgIEFTU0VSVCgh bWFyZ2luSW5mby5kaXNjYXJkTWFyZ2luKCkgfHwgKG1hcmdpbkluZm8uZGlzY2FyZE1hcmdpbigp ICYmICFtYXJnaW5JbmZvLm1hcmdpbigpKSk7Ci0gICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0 KGxvZ2ljYWxIZWlnaHQoKSArIG1hcmdpbkluZm8ubWFyZ2luKCkgKyBtYXJnaW5CZWZvcmVGb3JD aGlsZChjaGlsZCkpOworICAgICAgICAgICAgLy8gSWYgd2UgYXJlIGF0IHRoZSBiZWZvcmUgc2lk ZSBvZiB0aGUgYmxvY2sgYW5kIHdlIGNvbGxhcHNlLCBpZ25vcmUgdGhlIGNvbXB1dGVkIG1hcmdp bgorICAgICAgICAgICAgLy8gYW5kIGp1c3QgYWRkIHRoZSBjaGlsZCBtYXJnaW4gdG8gdGhlIGNv bnRhaW5lciBoZWlnaHQuIFRoaXMgd2lsbCBjb3JyZWN0bHkgcG9zaXRpb24KKyAgICAgICAgICAg IC8vIHRoZSBjaGlsZCBpbnNpZGUgdGhlIGNvbnRhaW5lci4KKyAgICAgICAgICAgIExheW91dFVu aXQgc2VwYXJhdGVNYXJnaW4gPSAhbWFyZ2luSW5mby5jYW5Db2xsYXBzZVdpdGhNYXJnaW5CZWZv cmUoKSA/IG1hcmdpbkluZm8ubWFyZ2luKCkgOiBMYXlvdXRVbml0KDApOworICAgICAgICAgICAg c2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCkgKyBzZXBhcmF0ZU1hcmdpbiArIG1hcmdp bkJlZm9yZUZvckNoaWxkKGNoaWxkKSk7CiAgICAgICAgICAgICBsb2dpY2FsVG9wID0gbG9naWNh bEhlaWdodCgpOwogICAgICAgICB9IGVsc2UgaWYgKCFtYXJnaW5JbmZvLmRpc2NhcmRNYXJnaW4o KSAmJiAoIW1hcmdpbkluZm8uYXRCZWZvcmVTaWRlT2ZCbG9jaygpCiAgICAgICAgICAgICB8fCAo IW1hcmdpbkluZm8uY2FuQ29sbGFwc2VNYXJnaW5CZWZvcmVXaXRoQ2hpbGRyZW4oKQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDhlM2ZiZDRlZTc4ZGU4NDJkMWY4YzA4N2MwNDMyNjA3ZWVjZWZlZjEuLjZmNmRmYzY0MjJjODNk Y2IxNTE3ZjNmZWY1MTlkYzFiYmQwM2MwZjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0w Mi0yMSAgQW5kcmVpIEJ1Y3VyICA8YWJ1Y3VyQGFkb2JlLmNvbT4KKworICAgICAgICAtd2Via2l0 LW1hcmdpbi1jb2xsYXBzZTogc2VwYXJhdGUgZG9lc24ndCB3b3JrIGNvcnJlY3RseSBmb3IgYmVm b3JlIG1hcmdpbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwOTk1NgorCisgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0LgorCisgICAgICAg IFRoZSB0ZXN0IHZlcmlmaWVzIGEgY2hpbGQgc3BlY2lmeWluZyAiLXdlYmtpdC1tYXJnaW4tY29s bGFwc2U6IHNlcGFyYXRlIiBpcyBjb3JyZWN0bHkgcG9zaXRpb25lZCBpbnNpZGUKKyAgICAgICAg aXRzIGNvbnRhaW5lciwgYXQgYSB2YWx1ZSBlcXVhbCB3aXRoIHRoZSB0b3AgbWFyZ2luIG9mIHRo ZSBjaGlsZC4gVGhlIGNvbnRhaW5lciBhbHNvIG5lZWQgdG8gYmUgc2l6ZWQKKyAgICAgICAgYWNj b3JkaW5nbHkuCisKKyAgICAgICAgKiBmYXN0L2Jsb2NrL21hcmdpbi1jb2xsYXBzZS93ZWJraXQt bWFyZ2luLWNvbGxhcHNlLXNlcGFyYXRlLXBvc2l0aW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBz ZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sOiBBZGRlZC4KKwogMjAxMy0wMi0yMCAgQW5kcmV5IEx1 c2huaWtvdiAgPGx1c2huaWtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogaGlnaGxpZ2h0IHVuZGVmaW5lZCB3b3JkIGluIEphdmFTY3JpcHQKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvYmxvY2svbWFyZ2luLWNvbGxhcHNlL3dlYmtpdC1tYXJnaW4tY29sbGFw c2Utc2VwYXJhdGUtcG9zaXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ibG9j ay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlv bi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODNiMTVlY2IzMzMwNTU3NzE5MDE2NDNkZTI1Yjcy M2VjM2NhYWRhZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYmxvY2svbWFy Z2luLWNvbGxhcHNlL3dlYmtpdC1tYXJnaW4tY29sbGFwc2Utc2VwYXJhdGUtcG9zaXRpb24tZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTEgQEAKK1Rlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk5NTYgLXdlYmtpdC1tYXJnaW4tY29sbGFwc2U6IHNlcGFy YXRlIGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgZm9yIGJlZm9yZSBtYXJnaW5zLiBUaGUgdGVzdCBi YXNpY2FsbHkgY3JlYXRlcyBhbiBlbXB0eSBibG9jayBpbnNpZGUgYSBjb250YWluZXIgd2l0aCBh IG1hcmdpbiB0aGF0IGNvbGxhcHNlcyB3aXRoIGNoaWxkcmVuLiBUaGUgZW1wdHkgYmxvY2sgaGFz IHRoZSBtYXJnaW5zIHNldCB0byBzZXBhcmF0ZSBzbyBpdHMgaGVpZ2h0IHNob3VsZCBiZSAwcHgu IFRoZSBjb250YWluZXIgaXMgbm90IHNlbGZjb2xsYXBzaW5nIHNvIGl0IHNob3VsZCBoYXZlIGEg aGVpZ2h0IG9mIDEwcHgrMTBweCsycHg9MjJweC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2Vl IGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUi LgorCisKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInplcm9faGVpZ2h0Iikub2Zmc2V0 SGVpZ2h0IGlzIDAKK1BBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIjIycHhfaGVpZ2h0Iiku b2Zmc2V0SGVpZ2h0IGlzIDIyCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9tYXJnaW4t Y29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xsYXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sIGIv TGF5b3V0VGVzdHMvZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2Uvd2Via2l0LW1hcmdpbi1jb2xs YXBzZS1zZXBhcmF0ZS1wb3NpdGlvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJhODY2YmRjZWUyYTVkZjIz YzJlY2IyZjgwOWIxMzMxMDQzYTYzNWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2Jsb2NrL21hcmdpbi1jb2xsYXBzZS93ZWJraXQtbWFyZ2luLWNvbGxhcHNlLXNlcGFyYXRl LXBvc2l0aW9uLmh0bWwKQEAgLTAsMCArMSw0MSBAQAorPGh0bWw+CisgICAgPGhlYWQ+CisgICAg ICAgIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5q cyI+PC9zY3JpcHQ+CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgLmNvbnRhaW5lciB7CisgICAg ICAgICAgICBib3JkZXI6IHRoaW4gc29saWQgYmx1ZTsKKyAgICAgICAgfQorCisgICAgICAgIC5j aGlsZF93aXRoX21hcmdpbnMgeworICAgICAgICAgICAgbWFyZ2luLXRvcDogMTBweDsKKyAgICAg ICAgICAgIG1hcmdpbi1ib3R0b206IDEwcHg7CisgICAgICAgIH0KKworICAgICAgICAuc2VwYXJh dGVfdG9wIHsKKyAgICAgICAgICAgIC13ZWJraXQtbWFyZ2luLXRvcC1jb2xsYXBzZTogc2VwYXJh dGU7CisgICAgICAgIH0KKworICAgICAgICAuc2VwYXJhdGVfYm90dG9tIHsKKyAgICAgICAgICAg IC13ZWJraXQtbWFyZ2luLWJvdHRvbS1jb2xsYXBzZTogc2VwYXJhdGU7CisgICAgICAgIH0KKyAg ICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxkaXYgY2xh c3M9ImNvbnRhaW5lciIgaWQ9IjIycHhfaGVpZ2h0Ij4KKyAgICAgICAgICAgIDxkaXYgY2xhc3M9 ImNoaWxkX3dpdGhfbWFyZ2lucyIgaWQ9Inplcm9faGVpZ2h0Ij4KKyAgICAgICAgICAgICAgICA8 ZGl2IGNsYXNzPSJzZXBhcmF0ZV90b3Agc2VwYXJhdGVfYm90dG9tIj48L2Rpdj4KKyAgICAgICAg ICAgIDwvZGl2PgorICAgICAgICA8L2Rpdj4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7 CisKKyAgICAgICAgZGVzY3JpcHRpb24oIlRlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDk5NTYgLXdlYmtpdC1tYXJnaW4tY29sbGFwc2U6IHNlcGFyYXRl IGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgZm9yIGJlZm9yZSBtYXJnaW5zLiBcCisgICAgICAgICAg ICBUaGUgdGVzdCBiYXNpY2FsbHkgY3JlYXRlcyBhbiBlbXB0eSBibG9jayBpbnNpZGUgYSBjb250 YWluZXIgd2l0aCBhIG1hcmdpbiB0aGF0IGNvbGxhcHNlcyB3aXRoIGNoaWxkcmVuLiBUaGUgZW1w dHkgYmxvY2sgaGFzIHRoZSBtYXJnaW5zIFwKKyAgICAgICAgICAgIHNldCB0byBzZXBhcmF0ZSBz byBpdHMgaGVpZ2h0IHNob3VsZCBiZSAwcHguIFRoZSBjb250YWluZXIgaXMgbm90IHNlbGZjb2xs YXBzaW5nIHNvIGl0IHNob3VsZCBoYXZlIGEgaGVpZ2h0IG9mIDEwcHgrMTBweCsycHg9MjJweC4i KTsKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVUbygnZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInpl cm9faGVpZ2h0Iikub2Zmc2V0SGVpZ2h0JywgJzAnKTsKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVU bygnZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIjIycHhfaGVpZ2h0Iikub2Zmc2V0SGVpZ2h0Jywg JzIyJyk7CisgICAgICAgIDwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4v ZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKyAgICA8L2JvZHk+ Cis8L2h0bWw+Cg==