117120 2013-06-02 07:29:06 -0700 [CSS Regions] Positioned elements in regions get clipped if they fall outside the region 2013-12-17 12:10:41 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED AdobeTracked P2 Normal --- 116295 1 mibalan stavila commit-queue esprehn+autocc glenn kondapallykalyan stavila WebkitBugTracker oldest_to_newest 896207 0 mibalan 2013-06-02 07:29:06 -0700 Positioned elements in a named flow get clipped to the region rectangle. This effectively means that positioned elements outside of the region rectangle are not rendered at all. 956891 1 218512 stavila 2013-12-05 06:50:28 -0800 Created attachment 218512 Patch 960491 2 218512 mihnea 2013-12-17 07:15:41 -0800 Comment on attachment 218512 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218512&action=review r- In general looks good but i have some comments. > LayoutTests/ChangeLog:8 > + Added tests for the correct painting of the borders of differently positioned elements overflowing regions. Please add a link to the bug for all the tests and/or a description of what each test is trying to achieve - you only describe the passing condition. > LayoutTests/fast/regions/sticky-border-overflow.html:1 > +<!DOCTYPE html> The other 2 tests were testing the behaviour of static/absolute positioned elements inside the relative positioned element. This test is using a different pattern for testing - is this what you intended? > Source/WebCore/ChangeLog:8 > + Fixed the computing of the box decorations clip rect when having statically positioned I would like to see a description of the problem - what was wrong and how this patch if fixing that problem. > Source/WebCore/rendering/RenderFlowThread.cpp:1307 > + if (containerBlock->style().writingMode() != iterBox->style().writingMode()) Where is this code path tested within your proposed tests for this patch? I do not see any writing modes declarations. > Source/WebCore/rendering/RenderFlowThread.cpp:1316 > + // point in restricting the X clipping rect (this also saves us the trouble Do you mean " restricting the clipping rect dimensions perpendicular to the fragmentation direction" ? From what i can tell you also adjust the width, not only the x. > Source/WebCore/rendering/RenderFlowThread.cpp:1317 > + // of handling percent-based widths and margins). I do not understand this comment about handling percent-based widths and margins and i do not see any related tests on this. 960509 3 218512 stavila 2013-12-17 08:13:35 -0800 Comment on attachment 218512 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218512&action=review >> LayoutTests/ChangeLog:8 >> + Added tests for the correct painting of the borders of differently positioned elements overflowing regions. > > Please add a link to the bug for all the tests and/or a description of what each test is trying to achieve - you only describe the passing condition. OK. >> LayoutTests/fast/regions/sticky-border-overflow.html:1 >> +<!DOCTYPE html> > > The other 2 tests were testing the behaviour of static/absolute positioned elements inside the relative positioned element. This test is using a different pattern for testing - is this what you intended? Yes, tests for absolute-positioned elements and for relative-positioned elements were added in a previous patch (https://bugs.webkit.org/show_bug.cgi?id=124919). This test adds the same testing for sticky-positioned elements. >> Source/WebCore/ChangeLog:8 >> + Fixed the computing of the box decorations clip rect when having statically positioned > > I would like to see a description of the problem - what was wrong and how this patch if fixing that problem. OK, will update description. >> Source/WebCore/rendering/RenderFlowThread.cpp:1307 >> + if (containerBlock->style().writingMode() != iterBox->style().writingMode()) > > Where is this code path tested within your proposed tests for this patch? I do not see any writing modes declarations. This is not new code. It just appears as if it was in the diff because it was indented. >> Source/WebCore/rendering/RenderFlowThread.cpp:1316 >> + // point in restricting the X clipping rect (this also saves us the trouble > > Do you mean " restricting the clipping rect dimensions perpendicular to the fragmentation direction" ? From what i can tell you also adjust the width, not only the x. I meant the X axis, will update the comment. >> Source/WebCore/rendering/RenderFlowThread.cpp:1317 >> + // of handling percent-based widths and margins). > > I do not understand this comment about handling percent-based widths and margins and i do not see any related tests on this. Will update comment. This handles an existing test - positioned-objects-block-static-spanning-regions.html 960523 4 219423 stavila 2013-12-17 08:58:11 -0800 Created attachment 219423 Patch integrating feedback 960534 5 219423 mihnea 2013-12-17 09:17:17 -0800 Comment on attachment 219423 Patch integrating feedback r=me 960621 6 219423 commit-queue 2013-12-17 12:10:38 -0800 Comment on attachment 219423 Patch integrating feedback Clearing flags on attachment: 219423 Committed r160721: <http://trac.webkit.org/changeset/160721> 960622 7 commit-queue 2013-12-17 12:10:41 -0800 All reviewed patches have been landed. Closing bug. 218512 2013-12-05 06:50:28 -0800 2013-12-17 08:58:11 -0800 Patch 117120.patch text/plain 14606 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhNDliMGM2Li4zMDY3MjIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMTIt MDUgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgUmVn aW9uc10gUG9zaXRpb25lZCBlbGVtZW50cyBpbiByZWdpb25zIGdldCBjbGlwcGVkIGlmIHRoZXkg ZmFsbCBvdXRzaWRlIHRoZSByZWdpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNzEyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZGVkIHRlc3RzIGZvciB0aGUgY29ycmVjdCBwYWludGluZyBvZiB0 aGUgYm9yZGVycyBvZiBkaWZmZXJlbnRseSBwb3NpdGlvbmVkIGVsZW1lbnRzIG92ZXJmbG93aW5n IHJlZ2lvbnMuCisKKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvYWJzb2x1dGUtaW4tcmVsYXRpdmUt b3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9yZWdpb25zL2Fi c29sdXRlLWluLXJlbGF0aXZlLW92ZXJmbG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv cmVnaW9ucy9zdGF0aWMtaW4tcmVsYXRpdmUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9yZWdpb25zL3N0YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVyZmxvdy1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRl ci1vdmVyZmxvdy5odG1sOiBBZGRlZC4KKwogMjAxMy0xMi0wNSAgTWljaGHFgiBQYWt1xYJhIHZl bCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgRUZM IGdhcmRlbmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL2Fic29sdXRl LWluLXJlbGF0aXZlLW92ZXJmbG93LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Jl Z2lvbnMvYWJzb2x1dGUtaW4tcmVsYXRpdmUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iNzc4YmMxCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL2Fic29sdXRlLWluLXJlbGF0aXZlLW92ZXJmbG93LWV4 cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxzdHlsZT4K KyAgICAjcmVnaW9uRmxvdyB7CisgICAgICAgIGJvcmRlcjogNHB4IHNvbGlkIGJyb3duOworICAg ICAgICB3aWR0aDogMTgwcHg7CisgICAgICAgIGhlaWdodDogMTQwcHg7CisgICAgICAgIHBhZGRp bmc6IDVweDsKKyAgICB9CisKKyAgICAjcmVsIHsKKyAgICAgICAgYm9yZGVyOiAycHggc29saWQg Z3JlZW47CisgICAgICAgIHdpZHRoOiAyMTBweDsKKyAgICAgICAgaGVpZ2h0OiAxNTBweDsKKyAg ICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgICAgICBsZWZ0OiAzMHB4OworICAgICAgICB0 b3A6IDIwcHg7CisgICAgICAgIHBhZGRpbmc6IDNweDsKKyAgICB9CisKKyAgICAjYWJzIHsKKyAg ICAgICAgYm9yZGVyOiAxcHggc29saWQgbWFnZW50YTsKKyAgICAgICAgcG9zaXRpb246IGFic29s dXRlOworICAgICAgICB3aWR0aDogMjUwcHg7CisgICAgICAgIHRvcDogNTBweDsKKyAgICAgICAg bGVmdDogMzBweDsKKyAgICB9Cis8L3N0eWxlPgorCis8Ym9keT4KKyAgICA8cD5UaGUgdGVzdCBw YXNzZXMgaWYgYWxsIGJvcmRlcnMgYXJlIGNvbXBsZXRlbHkgdmlzaWJsZSBhbmQgdGhlIHRleHQg PHNwYW4gc3R5bGU9ImNvbG9yOmJyb3duIj48Yj5USEUgRU5EPC9iPjwvc3Bhbj4gaXMgdmlzaWJs ZTwvcD4KKyAgICA8ZGl2IGlkPSJyZWdpb25GbG93Ij4KKyAgICAgICAgPGRpdiBpZD0icmVsIj4K KyAgICAgICAgICAgIDxkaXYgaWQ9ImFicyI+CisgICAgICAgICAgICAgICAgTG9yZW0gaXBzdW0g ZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2ljaW5nIGVsaXQsIHNlZCBkbyBlaXVz bW9kIHRlbXBvciBpbmNpZGlkdW50IHV0IGxhYm9yZSBldCBkb2xvcmUgbWFnbmEgYWxpcXVhLiBM b3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwg c2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWdu YSBhbGlxdWEuIDxzcGFuIHN0eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVORDwvYj48L3NwYW4+ LgorICAgICAgICAgICAgPC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorPC9ib2R5 PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvcmVnaW9ucy9hYnNvbHV0ZS1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9yZWdpb25zL2Fic29sdXRlLWluLXJlbGF0aXZlLW92ZXJmbG93Lmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjQ3NDVmNgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9hYnNvbHV0ZS1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5o dG1sCkBAIC0wLDAgKzEsNDEgQEAKKzwhRE9DVFlQRSBodG1sPgorCis8c3R5bGU+CisgICAgI3Jl Z2lvbkZsb3cgeworICAgICAgICAtd2Via2l0LWZsb3ctZnJvbTogZmxvdzI7CisgICAgICAgIGJv cmRlcjogNHB4IHNvbGlkIGJyb3duOworICAgICAgICB3aWR0aDogMTgwcHg7CisgICAgICAgIGhl aWdodDogMTQwcHg7CisgICAgICAgIHBhZGRpbmc6IDVweDsKKyAgICB9CisKKyAgICAjcmVsIHsK KyAgICAgICAgLXdlYmtpdC1mbG93LWludG86IGZsb3cyOworICAgICAgICBib3JkZXI6IDJweCBz b2xpZCBncmVlbjsKKyAgICAgICAgd2lkdGg6IDIxMHB4OworICAgICAgICBoZWlnaHQ6IDE1MHB4 OworICAgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICAgIGxlZnQ6IDMwcHg7CisgICAg ICAgIHRvcDogMjBweDsKKyAgICAgICAgcGFkZGluZzogM3B4OworICAgIH0KKworICAgICNhYnMg eworICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBtYWdlbnRhOworICAgICAgICBwb3NpdGlvbjog YWJzb2x1dGU7CisgICAgICAgIHdpZHRoOiAyNTBweDsKKyAgICAgICAgdG9wOiA1MHB4OworICAg ICAgICBsZWZ0OiAzMHB4OworICAgIH0KKzwvc3R5bGU+CisKKzxib2R5PgorICAgIDxwPlRoZSB0 ZXN0IHBhc3NlcyBpZiBhbGwgYm9yZGVycyBhcmUgY29tcGxldGVseSB2aXNpYmxlIGFuZCB0aGUg dGV4dCA8c3BhbiBzdHlsZT0iY29sb3I6YnJvd24iPjxiPlRIRSBFTkQ8L2I+PC9zcGFuPiBpcyB2 aXNpYmxlPC9wPgorICAgIDxkaXYgaWQ9InJlZ2lvbkZsb3ciPjwvZGl2PgorCisgICAgPGRpdiBp ZD0icmVsIj4KKyAgICAgICAgPGRpdiBpZD0iYWJzIj4KKyAgICAgICAgICAgIExvcmVtIGlwc3Vt IGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1 c21vZCB0ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4g TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2ljaW5nIGVsaXQs IHNlZCBkbyBlaXVzbW9kIHRlbXBvciBpbmNpZGlkdW50IHV0IGxhYm9yZSBldCBkb2xvcmUgbWFn bmEgYWxpcXVhLiA8c3BhbiBzdHlsZT0iY29sb3I6YnJvd24iPjxiPlRIRSBFTkQ8L2I+PC9zcGFu Pi4KKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+ClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3N0YXRpYy1p bi1yZWxhdGl2ZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL3N0YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmFmNDMyMDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92ZXJmbG93LWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwzNiBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxzdHlsZT4KKyAgICAj cmVnaW9uRmxvdyB7CisgICAgICAgIGJvcmRlcjogNHB4IHNvbGlkIGJyb3duOworICAgICAgICB3 aWR0aDogMTgwcHg7CisgICAgICAgIGhlaWdodDogMTQwcHg7CisgICAgICAgIHBhZGRpbmc6IDVw eDsKKyAgICB9CisKKyAgICAjcmVsIHsKKyAgICAgICAgYm9yZGVyOiAycHggc29saWQgZ3JlZW47 CisgICAgICAgIHdpZHRoOiAyMTBweDsKKyAgICAgICAgaGVpZ2h0OiAxNTBweDsKKyAgICAgICAg cG9zaXRpb246IHJlbGF0aXZlOworICAgICAgICBsZWZ0OiAzMHB4OworICAgICAgICB0b3A6IDIw cHg7CisgICAgICAgIHBhZGRpbmc6IDNweDsKKyAgICB9CisKKyAgICAjc3RhdGljIHsKKyAgICAg ICAgYm9yZGVyOiAxcHggc29saWQgbWFnZW50YTsKKyAgICAgICAgd2lkdGg6IDI1MHB4OworICAg IH0KKzwvc3R5bGU+CisKKzxib2R5PgorICAgIDxwPlRoZSB0ZXN0IHBhc3NlcyBpZiBhbGwgYm9y ZGVycyBhcmUgY29tcGxldGVseSB2aXNpYmxlIGFuZCB0aGUgdGV4dCA8c3BhbiBzdHlsZT0iY29s b3I6YnJvd24iPjxiPlRIRSBFTkQ8L2I+PC9zcGFuPiBpcyB2aXNpYmxlPC9wPgorICAgIDxkaXYg aWQ9InJlZ2lvbkZsb3ciPgorICAgICAgICA8ZGl2IGlkPSJyZWwiPgorICAgICAgICAgICAgPGRp diBpZD0ic3RhdGljIj4KKyAgICAgICAgICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1l dCwgY29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGlu Y2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIExvcmVtIGlwc3VtIGRv bG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21v ZCB0ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gPHNw YW4gc3R5bGU9ImNvbG9yOmJyb3duIj48Yj5USEUgRU5EPC9iPjwvc3Bhbj4uCisgICAgICAgICAg ICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3N0 YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L3N0YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLjExOTdlZTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L3JlZ2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92ZXJmbG93Lmh0bWwKQEAgLTAsMCArMSwzOCBA QAorPCFET0NUWVBFIGh0bWw+CisKKzxzdHlsZT4KKyAgICAjcmVnaW9uRmxvdyB7CisgICAgICAg IC13ZWJraXQtZmxvdy1mcm9tOiBmbG93MjsKKyAgICAgICAgYm9yZGVyOiA0cHggc29saWQgYnJv d247CisgICAgICAgIHdpZHRoOiAxODBweDsKKyAgICAgICAgaGVpZ2h0OiAxNDBweDsKKyAgICAg ICAgcGFkZGluZzogNXB4OworICAgIH0KKworICAgICNyZWwgeworICAgICAgICAtd2Via2l0LWZs b3ctaW50bzogZmxvdzI7CisgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGdyZWVuOworICAgICAg ICB3aWR0aDogMjEwcHg7CisgICAgICAgIGhlaWdodDogMTUwcHg7CisgICAgICAgIHBvc2l0aW9u OiByZWxhdGl2ZTsKKyAgICAgICAgbGVmdDogMzBweDsKKyAgICAgICAgdG9wOiAyMHB4OworICAg ICAgICBwYWRkaW5nOiAzcHg7CisgICAgfQorCisgICAgI3N0YXRpYyB7CisgICAgICAgIGJvcmRl cjogMXB4IHNvbGlkIG1hZ2VudGE7CisgICAgICAgIHdpZHRoOiAyNTBweDsKKyAgICB9Cis8L3N0 eWxlPgorCis8Ym9keT4KKyAgICA8cD5UaGUgdGVzdCBwYXNzZXMgaWYgYWxsIGJvcmRlcnMgYXJl IGNvbXBsZXRlbHkgdmlzaWJsZSBhbmQgdGhlIHRleHQgPHNwYW4gc3R5bGU9ImNvbG9yOmJyb3du Ij48Yj5USEUgRU5EPC9iPjwvc3Bhbj4gaXMgdmlzaWJsZTwvcD4KKyAgICA8ZGl2IGlkPSJyZWdp b25GbG93Ij48L2Rpdj4KKworICAgIDxkaXYgaWQ9InJlbCI+CisgICAgICAgIDxkaXYgaWQ9InN0 YXRpYyI+CisgICAgICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0 dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQg bGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0 LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0ZW1wb3IgaW5j aWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gPHNwYW4gc3R5bGU9ImNv bG9yOmJyb3duIj48Yj5USEUgRU5EPC9iPjwvc3Bhbj4uCisgICAgICAgIDwvZGl2PgorICAgIDwv ZGl2PgorPC9ib2R5PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zdGlja3ktYm9yZGVyLW92ZXJmbG93LWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVyZmxvdy1leHBl Y3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc0ZGNjOWUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1v dmVyZmxvdy1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjggQEAKKzwhRE9DVFlQRSBodG1sPgor Cis8c3R5bGU+CisgICAgI3JlZ2lvbkZsb3cgeworICAgICAgICBib3JkZXI6IDRweCBzb2xpZCBi cm93bjsKKyAgICAgICAgd2lkdGg6IDE4MHB4OworICAgICAgICBoZWlnaHQ6IDE0MHB4OworICAg ICAgICBwYWRkaW5nOiA1cHg7CisgICAgfQorCisgICAgI3N0aWNreSB7CisgICAgICAgIGJvcmRl cjogMXB4IHNvbGlkIG1hZ2VudGE7CisgICAgICAgIHBvc2l0aW9uOiAtd2Via2l0LXN0aWNreTsK KyAgICAgICAgd2lkdGg6IDI1MHB4OworICAgICAgICB0b3A6IDUwcHg7CisgICAgICAgIG1hcmdp bjogNTBweDsKKyAgICAgICAgcGFkZGluZzogNXB4OworICAgIH0KKzwvc3R5bGU+CisKKzxib2R5 PgorICAgIDxwPlRoZSB0ZXN0IHBhc3NlcyBpZiBhbGwgYm9yZGVycyBhcmUgY29tcGxldGVseSB2 aXNpYmxlIGFuZCB0aGUgdGV4dCA8c3BhbiBzdHlsZT0iY29sb3I6YnJvd24iPjxiPlRIRSBFTkQ8 L2I+PC9zcGFuPiBpcyB2aXNpYmxlPC9wPgorICAgIDxkaXYgaWQ9InJlZ2lvbkZsb3ciPgorICAg ICAgICA8ZGl2IGlkPSJzdGlja3kiPgorICAgICAgICAgICAgTG9yZW0gaXBzdW0gZG9sb3Igc2l0 IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2ljaW5nIGVsaXQsIHNlZCBkbyBlaXVzbW9kIHRlbXBv ciBpbmNpZGlkdW50IHV0IGxhYm9yZSBldCBkb2xvcmUgbWFnbmEgYWxpcXVhLiBMb3JlbSBpcHN1 bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVp dXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEu IDxzcGFuIHN0eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVORDwvYj48L3NwYW4+LgorICAgICAg ICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVy Zmxvdy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3N0aWNreS1ib3JkZXItb3ZlcmZs b3cuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZTIzNGRlCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3N0aWNreS1ib3JkZXItb3Zl cmZsb3cuaHRtbApAQCAtMCwwICsxLDMwIEBACis8IURPQ1RZUEUgaHRtbD4KKworPHN0eWxlPgor ICAgICNyZWdpb25GbG93IHsKKyAgICAgICAgLXdlYmtpdC1mbG93LWZyb206IGZsb3cyOworICAg ICAgICBib3JkZXI6IDRweCBzb2xpZCBicm93bjsKKyAgICAgICAgd2lkdGg6IDE4MHB4OworICAg ICAgICBoZWlnaHQ6IDE0MHB4OworICAgICAgICBwYWRkaW5nOiA1cHg7CisgICAgfQorCisgICAg I3N0aWNreSB7CisgICAgICAgIC13ZWJraXQtZmxvdy1pbnRvOiBmbG93MjsKKyAgICAgICAgYm9y ZGVyOiAxcHggc29saWQgbWFnZW50YTsKKyAgICAgICAgcG9zaXRpb246IC13ZWJraXQtc3RpY2t5 OworICAgICAgICB3aWR0aDogMjUwcHg7CisgICAgICAgIHRvcDogNTBweDsKKyAgICAgICAgbWFy Z2luOiA1MHB4OworICAgICAgICBwYWRkaW5nOiA1cHg7CisgICAgfQorPC9zdHlsZT4KKworPGJv ZHk+CisgICAgPHA+VGhlIHRlc3QgcGFzc2VzIGlmIGFsbCBib3JkZXJzIGFyZSBjb21wbGV0ZWx5 IHZpc2libGUgYW5kIHRoZSB0ZXh0IDxzcGFuIHN0eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVO RDwvYj48L3NwYW4+IGlzIHZpc2libGU8L3A+CisgICAgPGRpdiBpZD0icmVnaW9uRmxvdyI+PC9k aXY+CisKKyAgICA8ZGl2IGlkPSJzdGlja3kiPgorICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBz aXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVt cG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIExvcmVtIGlw c3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8g ZWl1c21vZCB0ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1 YS4gPHNwYW4gc3R5bGU9ImNvbG9yOmJyb3duIj48Yj5USEUgRU5EPC9iPjwvc3Bhbj4uCisgICAg PC9kaXY+Cis8L2JvZHk+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IGI1ZmZkMDAuLmRmOGQzODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0xMi0w NSAgUmFkdSBTdGF2aWxhICA8c3RhdmlsYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBSZWdp b25zXSBQb3NpdGlvbmVkIGVsZW1lbnRzIGluIHJlZ2lvbnMgZ2V0IGNsaXBwZWQgaWYgdGhleSBm YWxsIG91dHNpZGUgdGhlIHJlZ2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE3MTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRml4ZWQgdGhlIGNvbXB1dGluZyBvZiB0aGUgYm94IGRlY29yYXRpb25z IGNsaXAgcmVjdCB3aGVuIGhhdmluZyBzdGF0aWNhbGx5IHBvc2l0aW9uZWQKKyAgICAgICAgZWxl bWVudHMgaW5zaWRlIHBvc2l0aW9uZWQgZWxlbWVudHMuIEFsc28gY2hhbmdlZCBpdCBzbyB0aGUg Y2xpcCBpcyBvbmx5IHBlcmZvcm1lZAorICAgICAgICBpbiB0aGUgZnJhZ21lbnRhdGlvbiBkaXJl Y3Rpb24gYXMgdGhhdCB3YXMgdGhlIG9yaWdpbmFsIHB1cnBvc2Ugb2YgdGhpcyBtZXRob2QuCisK KyAgICAgICAgVGVzdHM6IGZhc3QvcmVnaW9ucy9hYnNvbHV0ZS1pbi1yZWxhdGl2ZS1vdmVyZmxv dy5odG1sCisgICAgICAgICAgICAgICBmYXN0L3JlZ2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92 ZXJmbG93Lmh0bWwKKyAgICAgICAgICAgICAgIGZhc3QvcmVnaW9ucy9zdGlja3ktYm9yZGVyLW92 ZXJmbG93Lmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmRlY29yYXRpb25zQ2xpcFJlY3RG b3JCb3hJblJlZ2lvbik6CisKIDIwMTMtMTItMDUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFVwZGF0ZSBHT2JqZWN0IERP TSBiaW5kaW5ncyBzeW1ib2xzIGZpbGUgYWZ0ZXIgcjE1OTcxMS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAppbmRleCA5MTUxYTY1Li42Zjg2ZTQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCkBAIC0x MjY2LDcgKzEyNjYsOCBAQCBMYXlvdXRSZWN0IFJlbmRlckZsb3dUaHJlYWQ6Om1hcEZyb21GbG93 VGhyZWFkVG9Mb2NhbChjb25zdCBSZW5kZXJCb3gqIGJveCwgY29ucwogTGF5b3V0UmVjdCBSZW5k ZXJGbG93VGhyZWFkOjpkZWNvcmF0aW9uc0NsaXBSZWN0Rm9yQm94SW5SZWdpb24oY29uc3QgUmVu ZGVyQm94JiBib3gsIFJlbmRlclJlZ2lvbiYgcmVnaW9uKSBjb25zdAogewogICAgIExheW91dFJl Y3QgdmlzdWFsT3ZlcmZsb3dSZWN0ID0gcmVnaW9uLnZpc3VhbE92ZXJmbG93UmVjdEZvckJveCgm Ym94KTsKLSAgICAKKyAgICBMYXlvdXRVbml0IGluaXRpYWxMb2dpY2FsWCA9IHN0eWxlKCkuaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHZpc3VhbE92ZXJmbG93UmVjdC54KCkgOiB2aXN1YWxP dmVyZmxvd1JlY3QueSgpOworCiAgICAgLy8gVGhlIHZpc3VhbCBvdmVyZmxvdyByZWN0IHJldHVy bmVkIGJ5IHZpc3VhbE92ZXJmbG93UmVjdEZvckJveCBpcyBhbHJlYWR5IGZsaXBwZWQgYnV0IHRo ZQogICAgIC8vIFJlbmRlclJlZ2lvbjo6cmVjdEZsb3dQb3J0aW9uRm9yQm94IG1ldGhvZCBleHBl Y3RzIGl0IHVuZmxpcHBlZC4KICAgICBmbGlwRm9yV3JpdGluZ01vZGVMb2NhbENvb3JkaW5hdGVz KHZpc3VhbE92ZXJmbG93UmVjdCk7CkBAIC0xMjgzLDMwICsxMjg0LDQ3IEBAIExheW91dFJlY3Qg UmVuZGVyRmxvd1RocmVhZDo6ZGVjb3JhdGlvbnNDbGlwUmVjdEZvckJveEluUmVnaW9uKGNvbnN0 IFJlbmRlckJveCYKICAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93UmVjdC5tb3ZlQnkoTGF5b3V0 UG9pbnQod2lkdGgoKSwgMCkpOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBUaGlzIGRvZXNuJ3Qg d29yayBwcm9wZXJseSB3aXRoIGZsaXBwZWQgd3JpdGluZyBtb2Rlcy4KLSAgICAvLyBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MTQ5Ci0gICAgaWYgKGJveC5pc1Jl bFBvc2l0aW9uZWQoKSkgewotICAgICAgICAvLyBGb3IgcmVsYXRpdmUtcG9zaXRpb25lZCBlbGVt ZW50cywganVzdCB1c2UgdGhlIGxheWVyJ3MgbG9jYXRpb24uCi0gICAgICAgIHZpc3VhbE92ZXJm bG93UmVjdC5tb3ZlQnkoYm94LmxheWVyKCktPmFic29sdXRlQm91bmRpbmdCb3goKS5sb2NhdGlv bigpKTsKLSAgICB9IGVsc2UgewotICAgICAgICBjb25zdCBSZW5kZXJCb3gqIGl0ZXJCb3ggPSAm Ym94OwotICAgICAgICB3aGlsZSAoaXRlckJveCAmJiBpdGVyQm94ICE9IHRoaXMpIHsKLSAgICAg ICAgICAgIFJlbmRlckJsb2NrKiBjb250YWluZXJCbG9jayA9IGl0ZXJCb3gtPmNvbnRhaW5pbmdC bG9jaygpOwotCi0gICAgICAgICAgICBMYXlvdXRSZWN0IGN1cnJlbnRCb3hSZWN0ID0gaXRlckJv eC0+ZnJhbWVSZWN0KCk7Ci0gICAgICAgICAgICBpZiAoaXRlckJveC0+c3R5bGUoKS5pc0ZsaXBw ZWRCbG9ja3NXcml0aW5nTW9kZSgpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGl0ZXJCb3gtPnN0 eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgY3Vy cmVudEJveFJlY3Quc2V0WShjdXJyZW50Qm94UmVjdC5oZWlnaHQoKSAtIGN1cnJlbnRCb3hSZWN0 Lm1heFkoKSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBjdXJy ZW50Qm94UmVjdC5zZXRYKGN1cnJlbnRCb3hSZWN0LndpZHRoKCkgLSBjdXJyZW50Qm94UmVjdC5t YXhYKCkpOwotICAgICAgICAgICAgfQorICAgIGNvbnN0IFJlbmRlckJveCogaXRlckJveCA9ICZi b3g7CisgICAgd2hpbGUgKGl0ZXJCb3ggJiYgaXRlckJveCAhPSB0aGlzKSB7CisgICAgICAgIFJl bmRlckJsb2NrKiBjb250YWluZXJCbG9jayA9IGl0ZXJCb3gtPmNvbnRhaW5pbmdCbG9jaygpOwog Ci0gICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2stPnN0eWxlKCkud3JpdGluZ01vZGUoKSAh PSBpdGVyQm94LT5zdHlsZSgpLndyaXRpbmdNb2RlKCkpCi0gICAgICAgICAgICAgICAgaXRlckJv eC0+ZmxpcEZvcldyaXRpbmdNb2RlKGN1cnJlbnRCb3hSZWN0KTsKKyAgICAgICAgLy8gRklYTUU6 IFRoaXMgZG9lc24ndCB3b3JrIHByb3Blcmx5IHdpdGggZmxpcHBlZCB3cml0aW5nIG1vZGVzLgor ICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MTQ5 CisgICAgICAgIGlmIChpdGVyQm94LT5pc1Bvc2l0aW9uZWQoKSkgeworICAgICAgICAgICAgLy8g Rm9yIHBvc2l0aW9uZWQgZWxlbWVudHMsIGp1c3QgdXNlIHRoZSBsYXllcidzIGFic29sdXRlIGJv dW5kaW5nIGJveC4KKyAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93UmVjdC5tb3ZlQnkoaXRlckJv eC0+bGF5ZXIoKS0+YWJzb2x1dGVCb3VuZGluZ0JveCgpLmxvY2F0aW9uKCkpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIH0KIAotICAgICAgICAgICAgdmlzdWFsT3ZlcmZsb3dSZWN0Lm1v dmVCeShjdXJyZW50Qm94UmVjdC5sb2NhdGlvbigpKTsKLSAgICAgICAgICAgIGl0ZXJCb3ggPSBj b250YWluZXJCbG9jazsKKyAgICAgICAgTGF5b3V0UmVjdCBjdXJyZW50Qm94UmVjdCA9IGl0ZXJC b3gtPmZyYW1lUmVjdCgpOworICAgICAgICBpZiAoaXRlckJveC0+c3R5bGUoKS5pc0ZsaXBwZWRC bG9ja3NXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICBpZiAoaXRlckJveC0+c3R5bGUoKS5p c0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAgICAgIGN1cnJlbnRCb3hSZWN0 LnNldFkoY3VycmVudEJveFJlY3QuaGVpZ2h0KCkgLSBjdXJyZW50Qm94UmVjdC5tYXhZKCkpOwor ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGN1cnJlbnRCb3hSZWN0LnNldFgoY3Vy cmVudEJveFJlY3Qud2lkdGgoKSAtIGN1cnJlbnRCb3hSZWN0Lm1heFgoKSk7CiAgICAgICAgIH0K KworICAgICAgICBpZiAoY29udGFpbmVyQmxvY2stPnN0eWxlKCkud3JpdGluZ01vZGUoKSAhPSBp dGVyQm94LT5zdHlsZSgpLndyaXRpbmdNb2RlKCkpCisgICAgICAgICAgICBpdGVyQm94LT5mbGlw Rm9yV3JpdGluZ01vZGUoY3VycmVudEJveFJlY3QpOworCisgICAgICAgIHZpc3VhbE92ZXJmbG93 UmVjdC5tb3ZlQnkoY3VycmVudEJveFJlY3QubG9jYXRpb24oKSk7CisgICAgICAgIGl0ZXJCb3gg PSBjb250YWluZXJCbG9jazsKKyAgICB9CisKKyAgICAvLyBTaW5jZSB0aGUgcHVycG9zZSBvZiB0 aGlzIG1ldGhvZCBpcyB0byBtYWtlIHN1cmUgdGhlIGJvcmRlcnMgb2YgYSBmcmFnbWVudGVkCisg ICAgLy8gZWxlbWVudCBkb24ndCBvdmVyZmxvdyB0aGUgcmVnaW9uIGluIHRoZSBmcmFnbWVudGF0 aW9uIGRpcmVjdGlvbiwgdGhlcmUncyBubworICAgIC8vIHBvaW50IGluIHJlc3RyaWN0aW5nIHRo ZSBYIGNsaXBwaW5nIHJlY3QgKHRoaXMgYWxzbyBzYXZlcyB1cyB0aGUgdHJvdWJsZQorICAgIC8v IG9mIGhhbmRsaW5nIHBlcmNlbnQtYmFzZWQgd2lkdGhzIGFuZCBtYXJnaW5zKS4KKyAgICBpZiAo c3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKSB7CisgICAgICAgIGlmIChpbml0aWFs TG9naWNhbFggPCB2aXN1YWxPdmVyZmxvd1JlY3QueCgpKQorICAgICAgICAgICAgdmlzdWFsT3Zl cmZsb3dSZWN0LnNoaWZ0WEVkZ2VUbyhpbml0aWFsTG9naWNhbFgpOworICAgICAgICBpZiAodmlz dWFsT3ZlcmZsb3dSZWN0LndpZHRoKCkgPCBmcmFtZVJlY3QoKS53aWR0aCgpKQorICAgICAgICAg ICAgdmlzdWFsT3ZlcmZsb3dSZWN0LnNldFdpZHRoKGZyYW1lUmVjdCgpLndpZHRoKCkpOworICAg IH0gZWxzZSB7CisgICAgICAgIGlmIChpbml0aWFsTG9naWNhbFggPCB2aXN1YWxPdmVyZmxvd1Jl Y3QueSgpKQorICAgICAgICAgICAgdmlzdWFsT3ZlcmZsb3dSZWN0LnNoaWZ0WUVkZ2VUbyhpbml0 aWFsTG9naWNhbFgpOworICAgICAgICBpZiAodmlzdWFsT3ZlcmZsb3dSZWN0LmhlaWdodCgpIDwg ZnJhbWVSZWN0KCkuaGVpZ2h0KCkpCisgICAgICAgICAgICB2aXN1YWxPdmVyZmxvd1JlY3Quc2V0 SGVpZ2h0KGZyYW1lUmVjdCgpLmhlaWdodCgpKTsKICAgICB9CiAKICAgICByZXR1cm4gdmlzdWFs T3ZlcmZsb3dSZWN0Owo= 219423 2013-12-17 08:58:11 -0800 2013-12-17 12:10:38 -0800 Patch integrating feedback 117120.patch text/plain 16851 stavila ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZTM4MjY3Li4wMzhmZGNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMTIt MDUgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRvYmUuY29tPgorCisgICAgICAgIFtDU1MgUmVn aW9uc10gUG9zaXRpb25lZCBlbGVtZW50cyBpbiByZWdpb25zIGdldCBjbGlwcGVkIGlmIHRoZXkg ZmFsbCBvdXRzaWRlIHRoZSByZWdpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNzEyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZGVkIHRlc3RzIGZvciB0aGUgY29ycmVjdCBwYWludGluZyBvZiB0 aGUgYm9yZGVycyBvZiBkaWZmZXJlbnRseSBwb3NpdGlvbmVkIGVsZW1lbnRzIG92ZXJmbG93aW5n IHJlZ2lvbnMuCisKKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvYWJzb2x1dGUtaW4tcmVsYXRpdmUt b3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9yZWdpb25zL2Fi c29sdXRlLWluLXJlbGF0aXZlLW92ZXJmbG93Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv cmVnaW9ucy9zdGF0aWMtaW4tcmVsYXRpdmUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9yZWdpb25zL3N0YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVyZmxvdy1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRl ci1vdmVyZmxvdy5odG1sOiBBZGRlZC4KKwogMjAxMy0xMi0xNyAgTWlobmVhIE92aWRlbmllICA8 bWlobmVhQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTUmVnaW9uc10gUmVtb3ZlIGxlZnQtb3Zl ciB0ZXN0IGV4cGVjdGF0aW9ucyBpbiBmYXN0L3JlZ2lvbnMvbGF5ZXJzCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvYWJzb2x1dGUtaW4tcmVsYXRpdmUtb3ZlcmZsb3ctZXhw ZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9hYnNvbHV0ZS1pbi1yZWxhdGl2 ZS1vdmVyZmxvdy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLmIzYTZhZTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMv YWJzb2x1dGUtaW4tcmVsYXRpdmUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDQw IEBACis8IURPQ1RZUEUgaHRtbD4KKworPHN0eWxlPgorICAgICNyZWdpb25GbG93IHsKKyAgICAg ICAgYm9yZGVyOiA0cHggc29saWQgYnJvd247CisgICAgICAgIHdpZHRoOiAxODBweDsKKyAgICAg ICAgaGVpZ2h0OiAxNDBweDsKKyAgICAgICAgcGFkZGluZzogNXB4OworICAgIH0KKworICAgICNy ZWwgeworICAgICAgICBib3JkZXI6IDJweCBzb2xpZCBncmVlbjsKKyAgICAgICAgd2lkdGg6IDIx MHB4OworICAgICAgICBoZWlnaHQ6IDE1MHB4OworICAgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7 CisgICAgICAgIGxlZnQ6IDMwcHg7CisgICAgICAgIHRvcDogMjBweDsKKyAgICAgICAgcGFkZGlu ZzogM3B4OworICAgIH0KKworICAgICNhYnMgeworICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBt YWdlbnRhOworICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAgIHdpZHRoOiAyNTBw eDsKKyAgICAgICAgdG9wOiA1MHB4OworICAgICAgICBsZWZ0OiAzMHB4OworICAgIH0KKzwvc3R5 bGU+CisKKzxib2R5PgorICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTcxMjAiPltDU1MgUmVnaW9uc10gUG9zaXRpb25lZCBlbGVtZW50cyBpbiBy ZWdpb25zIGdldCBjbGlwcGVkIGlmIHRoZXkgZmFsbCBvdXRzaWRlIHRoZSByZWdpb248L2E+Cisg ICAgPHA+VGhpcyB0ZXN0cyB0aGF0IG92ZXJmbG93aW5nIGJvcmRlcnMgYXJlIHByb3Blcmx5IHBh aW50ZWQgZm9yIGFic29sdXRlLXBvc2l0aW9uZWQgZWxlbWVudHMgaW5zaWRlIHJlbGF0aXZlLXBv c2l0aW9uZWQgZWxlbWVudHMuIFRoZSB0ZXN0IHBhc3NlcyBpZiBhbGwgYm9yZGVycyBhcmUgY29t cGxldGVseSB2aXNpYmxlIGFuZCB0aGUgdGV4dCA8c3BhbiBzdHlsZT0iY29sb3I6YnJvd24iPjxi PlRIRSBFTkQ8L2I+PC9zcGFuPiBpcyB2aXNpYmxlPC9wPgorICAgIDxkaXYgaWQ9InJlZ2lvbkZs b3ciPgorICAgICAgICA8ZGl2IGlkPSJyZWwiPgorICAgICAgICAgICAgPGRpdiBpZD0iYWJzIj4K KyAgICAgICAgICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIg YWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFi b3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBj b25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0ZW1wb3IgaW5jaWRp ZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gPHNwYW4gc3R5bGU9ImNvbG9y OmJyb3duIj48Yj5USEUgRU5EPC9iPjwvc3Bhbj4uCisgICAgICAgICAgICA8L2Rpdj4KKyAgICAg ICAgPC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmls ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL2Fic29sdXRlLWluLXJlbGF0 aXZlLW92ZXJmbG93Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvYWJzb2x1dGUtaW4t cmVsYXRpdmUtb3ZlcmZsb3cuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li43NWFjMGI3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL2Fi c29sdXRlLWluLXJlbGF0aXZlLW92ZXJmbG93Lmh0bWwKQEAgLTAsMCArMSw0MiBAQAorPCFET0NU WVBFIGh0bWw+CisKKzxzdHlsZT4KKyAgICAjcmVnaW9uRmxvdyB7CisgICAgICAgIC13ZWJraXQt Zmxvdy1mcm9tOiBmbG93MjsKKyAgICAgICAgYm9yZGVyOiA0cHggc29saWQgYnJvd247CisgICAg ICAgIHdpZHRoOiAxODBweDsKKyAgICAgICAgaGVpZ2h0OiAxNDBweDsKKyAgICAgICAgcGFkZGlu ZzogNXB4OworICAgIH0KKworICAgICNyZWwgeworICAgICAgICAtd2Via2l0LWZsb3ctaW50bzog ZmxvdzI7CisgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGdyZWVuOworICAgICAgICB3aWR0aDog MjEwcHg7CisgICAgICAgIGhlaWdodDogMTUwcHg7CisgICAgICAgIHBvc2l0aW9uOiByZWxhdGl2 ZTsKKyAgICAgICAgbGVmdDogMzBweDsKKyAgICAgICAgdG9wOiAyMHB4OworICAgICAgICBwYWRk aW5nOiAzcHg7CisgICAgfQorCisgICAgI2FicyB7CisgICAgICAgIGJvcmRlcjogMXB4IHNvbGlk IG1hZ2VudGE7CisgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgd2lkdGg6IDI1 MHB4OworICAgICAgICB0b3A6IDUwcHg7CisgICAgICAgIGxlZnQ6IDMwcHg7CisgICAgfQorPC9z dHlsZT4KKworPGJvZHk+CisgICAgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNzEyMCI+W0NTUyBSZWdpb25zXSBQb3NpdGlvbmVkIGVsZW1lbnRzIGlu IHJlZ2lvbnMgZ2V0IGNsaXBwZWQgaWYgdGhleSBmYWxsIG91dHNpZGUgdGhlIHJlZ2lvbjwvYT4K KyAgICA8cD5UaGlzIHRlc3RzIHRoYXQgb3ZlcmZsb3dpbmcgYm9yZGVycyBhcmUgcHJvcGVybHkg cGFpbnRlZCBmb3IgYWJzb2x1dGUtcG9zaXRpb25lZCBlbGVtZW50cyBpbnNpZGUgcmVsYXRpdmUt cG9zaXRpb25lZCBlbGVtZW50cy4gVGhlIHRlc3QgcGFzc2VzIGlmIGFsbCBib3JkZXJzIGFyZSBj b21wbGV0ZWx5IHZpc2libGUgYW5kIHRoZSB0ZXh0IDxzcGFuIHN0eWxlPSJjb2xvcjpicm93biI+ PGI+VEhFIEVORDwvYj48L3NwYW4+IGlzIHZpc2libGU8L3A+CisgICAgPGRpdiBpZD0icmVnaW9u RmxvdyI+PC9kaXY+CisKKyAgICA8ZGl2IGlkPSJyZWwiPgorICAgICAgICA8ZGl2IGlkPSJhYnMi PgorICAgICAgICAgICAgTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFk aXBpc2ljaW5nIGVsaXQsIHNlZCBkbyBlaXVzbW9kIHRlbXBvciBpbmNpZGlkdW50IHV0IGxhYm9y ZSBldCBkb2xvcmUgbWFnbmEgYWxpcXVhLiBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29u c2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1 bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIDxzcGFuIHN0eWxlPSJjb2xvcjpi cm93biI+PGI+VEhFIEVORDwvYj48L3NwYW4+LgorICAgICAgICA8L2Rpdj4KKyAgICA8L2Rpdj4K KzwvYm9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L3JlZ2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92ZXJmbG93LWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92ZXJmbG93 LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNzg3ZGM3 MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9ucy9zdGF0aWMtaW4t cmVsYXRpdmUtb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDM3IEBACis8IURPQ1RZ UEUgaHRtbD4KKworPHN0eWxlPgorICAgICNyZWdpb25GbG93IHsKKyAgICAgICAgYm9yZGVyOiA0 cHggc29saWQgYnJvd247CisgICAgICAgIHdpZHRoOiAxODBweDsKKyAgICAgICAgaGVpZ2h0OiAx NDBweDsKKyAgICAgICAgcGFkZGluZzogNXB4OworICAgIH0KKworICAgICNyZWwgeworICAgICAg ICBib3JkZXI6IDJweCBzb2xpZCBncmVlbjsKKyAgICAgICAgd2lkdGg6IDIxMHB4OworICAgICAg ICBoZWlnaHQ6IDE1MHB4OworICAgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICAgIGxl ZnQ6IDMwcHg7CisgICAgICAgIHRvcDogMjBweDsKKyAgICAgICAgcGFkZGluZzogM3B4OworICAg IH0KKworICAgICNzdGF0aWMgeworICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBtYWdlbnRhOwor ICAgICAgICB3aWR0aDogMjUwcHg7CisgICAgfQorPC9zdHlsZT4KKworPGJvZHk+CisgICAgPGEg aHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzEyMCI+W0NT UyBSZWdpb25zXSBQb3NpdGlvbmVkIGVsZW1lbnRzIGluIHJlZ2lvbnMgZ2V0IGNsaXBwZWQgaWYg dGhleSBmYWxsIG91dHNpZGUgdGhlIHJlZ2lvbjwvYT4KKyAgICA8cD5UaGlzIHRlc3RzIHRoYXQg b3ZlcmZsb3dpbmcgYm9yZGVycyBhcmUgcHJvcGVybHkgcGFpbnRlZCBmb3Igc3RhdGljLXBvc2l0 aW9uZWQgZWxlbWVudHMgaW5zaWRlIHJlbGF0aXZlLXBvc2l0aW9uZWQgZWxlbWVudHMuIFRoZSB0 ZXN0IHBhc3NlcyBpZiBhbGwgYm9yZGVycyBhcmUgY29tcGxldGVseSB2aXNpYmxlIGFuZCB0aGUg dGV4dCA8c3BhbiBzdHlsZT0iY29sb3I6YnJvd24iPjxiPlRIRSBFTkQ8L2I+PC9zcGFuPiBpcyB2 aXNpYmxlPC9wPgorICAgIDxkaXYgaWQ9InJlZ2lvbkZsb3ciPgorICAgICAgICA8ZGl2IGlkPSJy ZWwiPgorICAgICAgICAgICAgPGRpdiBpZD0ic3RhdGljIj4KKyAgICAgICAgICAgICAgICBMb3Jl bSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2Vk IGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBh bGlxdWEuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2lu ZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9s b3JlIG1hZ25hIGFsaXF1YS4gPHNwYW4gc3R5bGU9ImNvbG9yOmJyb3duIj48Yj5USEUgRU5EPC9i Pjwvc3Bhbj4uCisgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+ Cis8L2JvZHk+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9yZWdpb25zL3N0YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9yZWdpb25zL3N0YXRpYy1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmU0MGZiYTQKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92ZXJmbG93 Lmh0bWwKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIGh0bWw+CisKKzxzdHlsZT4KKyAgICAj cmVnaW9uRmxvdyB7CisgICAgICAgIC13ZWJraXQtZmxvdy1mcm9tOiBmbG93MjsKKyAgICAgICAg Ym9yZGVyOiA0cHggc29saWQgYnJvd247CisgICAgICAgIHdpZHRoOiAxODBweDsKKyAgICAgICAg aGVpZ2h0OiAxNDBweDsKKyAgICAgICAgcGFkZGluZzogNXB4OworICAgIH0KKworICAgICNyZWwg eworICAgICAgICAtd2Via2l0LWZsb3ctaW50bzogZmxvdzI7CisgICAgICAgIGJvcmRlcjogMnB4 IHNvbGlkIGdyZWVuOworICAgICAgICB3aWR0aDogMjEwcHg7CisgICAgICAgIGhlaWdodDogMTUw cHg7CisgICAgICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICAgICAgbGVmdDogMzBweDsKKyAg ICAgICAgdG9wOiAyMHB4OworICAgICAgICBwYWRkaW5nOiAzcHg7CisgICAgfQorCisgICAgI3N0 YXRpYyB7CisgICAgICAgIGJvcmRlcjogMXB4IHNvbGlkIG1hZ2VudGE7CisgICAgICAgIHdpZHRo OiAyNTBweDsKKyAgICB9Cis8L3N0eWxlPgorCis8Ym9keT4KKyAgICA8YSBocmVmPSJodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTIwIj5bQ1NTIFJlZ2lvbnNdIFBv c2l0aW9uZWQgZWxlbWVudHMgaW4gcmVnaW9ucyBnZXQgY2xpcHBlZCBpZiB0aGV5IGZhbGwgb3V0 c2lkZSB0aGUgcmVnaW9uPC9hPgorICAgIDxwPlRoaXMgdGVzdHMgdGhhdCBvdmVyZmxvd2luZyBi b3JkZXJzIGFyZSBwcm9wZXJseSBwYWludGVkIGZvciBzdGF0aWMtcG9zaXRpb25lZCBlbGVtZW50 cyBpbnNpZGUgcmVsYXRpdmUtcG9zaXRpb25lZCBlbGVtZW50cy4gVGhlIHRlc3QgcGFzc2VzIGlm IGFsbCBib3JkZXJzIGFyZSBjb21wbGV0ZWx5IHZpc2libGUgYW5kIHRoZSB0ZXh0IDxzcGFuIHN0 eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVORDwvYj48L3NwYW4+IGlzIHZpc2libGU8L3A+Cisg ICAgPGRpdiBpZD0icmVnaW9uRmxvdyI+PC9kaXY+CisKKyAgICA8ZGl2IGlkPSJyZWwiPgorICAg ICAgICA8ZGl2IGlkPSJzdGF0aWMiPgorICAgICAgICAgICAgTG9yZW0gaXBzdW0gZG9sb3Igc2l0 IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2ljaW5nIGVsaXQsIHNlZCBkbyBlaXVzbW9kIHRlbXBv ciBpbmNpZGlkdW50IHV0IGxhYm9yZSBldCBkb2xvcmUgbWFnbmEgYWxpcXVhLiBMb3JlbSBpcHN1 bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVp dXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEu IDxzcGFuIHN0eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVORDwvYj48L3NwYW4+LgorICAgICAg ICA8L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVy Zmxvdy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25zL3N0aWNreS1ib3Jk ZXItb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5kNDI2Yzg3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L3N0aWNreS1ib3JkZXItb3ZlcmZsb3ctZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI5IEBACis8 IURPQ1RZUEUgaHRtbD4KKworPHN0eWxlPgorICAgICNyZWdpb25GbG93IHsKKyAgICAgICAgYm9y ZGVyOiA0cHggc29saWQgYnJvd247CisgICAgICAgIHdpZHRoOiAxODBweDsKKyAgICAgICAgaGVp Z2h0OiAxNDBweDsKKyAgICAgICAgcGFkZGluZzogNXB4OworICAgIH0KKworICAgICNzdGlja3kg eworICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBtYWdlbnRhOworICAgICAgICBwb3NpdGlvbjog LXdlYmtpdC1zdGlja3k7CisgICAgICAgIHdpZHRoOiAyNTBweDsKKyAgICAgICAgdG9wOiA1MHB4 OworICAgICAgICBtYXJnaW46IDUwcHg7CisgICAgICAgIHBhZGRpbmc6IDVweDsKKyAgICB9Cis8 L3N0eWxlPgorCis8Ym9keT4KKyAgICA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE3MTIwIj5bQ1NTIFJlZ2lvbnNdIFBvc2l0aW9uZWQgZWxlbWVudHMg aW4gcmVnaW9ucyBnZXQgY2xpcHBlZCBpZiB0aGV5IGZhbGwgb3V0c2lkZSB0aGUgcmVnaW9uPC9h PgorICAgIDxwPlRoaXMgdGVzdHMgdGhhdCBvdmVyZmxvd2luZyBib3JkZXJzIGFyZSBwcm9wZXJs eSBwYWludGVkIGZvciBzdGlja3ktcG9zaXRpb25lZCBlbGVtZW50cy4gVGhlIHRlc3QgcGFzc2Vz IGlmIGFsbCBib3JkZXJzIGFyZSBjb21wbGV0ZWx5IHZpc2libGUgYW5kIHRoZSB0ZXh0IDxzcGFu IHN0eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVORDwvYj48L3NwYW4+IGlzIHZpc2libGU8L3A+ CisgICAgPGRpdiBpZD0icmVnaW9uRmxvdyI+CisgICAgICAgIDxkaXYgaWQ9InN0aWNreSI+Cisg ICAgICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlz aWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFib3JlIGV0 IGRvbG9yZSBtYWduYSBhbGlxdWEuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0 ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0ZW1wb3IgaW5jaWRpZHVudCB1 dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gPHNwYW4gc3R5bGU9ImNvbG9yOmJyb3du Ij48Yj5USEUgRU5EPC9iPjwvc3Bhbj4uCisgICAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorPC9i b2R5PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvcmVnaW9ucy9zdGlja3ktYm9yZGVyLW92ZXJmbG93Lmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVyZmxvdy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLmQyNmRlODAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L3JlZ2lvbnMvc3RpY2t5LWJvcmRlci1vdmVyZmxvdy5odG1sCkBAIC0wLDAgKzEsMzEg QEAKKzwhRE9DVFlQRSBodG1sPgorCis8c3R5bGU+CisgICAgI3JlZ2lvbkZsb3cgeworICAgICAg ICAtd2Via2l0LWZsb3ctZnJvbTogZmxvdzI7CisgICAgICAgIGJvcmRlcjogNHB4IHNvbGlkIGJy b3duOworICAgICAgICB3aWR0aDogMTgwcHg7CisgICAgICAgIGhlaWdodDogMTQwcHg7CisgICAg ICAgIHBhZGRpbmc6IDVweDsKKyAgICB9CisKKyAgICAjc3RpY2t5IHsKKyAgICAgICAgLXdlYmtp dC1mbG93LWludG86IGZsb3cyOworICAgICAgICBib3JkZXI6IDFweCBzb2xpZCBtYWdlbnRhOwor ICAgICAgICBwb3NpdGlvbjogLXdlYmtpdC1zdGlja3k7CisgICAgICAgIHdpZHRoOiAyNTBweDsK KyAgICAgICAgdG9wOiA1MHB4OworICAgICAgICBtYXJnaW46IDUwcHg7CisgICAgICAgIHBhZGRp bmc6IDVweDsKKyAgICB9Cis8L3N0eWxlPgorCis8Ym9keT4KKyAgICA8YSBocmVmPSJodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTIwIj5bQ1NTIFJlZ2lvbnNdIFBv c2l0aW9uZWQgZWxlbWVudHMgaW4gcmVnaW9ucyBnZXQgY2xpcHBlZCBpZiB0aGV5IGZhbGwgb3V0 c2lkZSB0aGUgcmVnaW9uPC9hPgorICAgIDxwPlRoaXMgdGVzdHMgdGhhdCBvdmVyZmxvd2luZyBi b3JkZXJzIGFyZSBwcm9wZXJseSBwYWludGVkIGZvciBzdGlja3ktcG9zaXRpb25lZCBlbGVtZW50 cy4gVGhlIHRlc3QgcGFzc2VzIGlmIGFsbCBib3JkZXJzIGFyZSBjb21wbGV0ZWx5IHZpc2libGUg YW5kIHRoZSB0ZXh0IDxzcGFuIHN0eWxlPSJjb2xvcjpicm93biI+PGI+VEhFIEVORDwvYj48L3Nw YW4+IGlzIHZpc2libGU8L3A+CisgICAgPGRpdiBpZD0icmVnaW9uRmxvdyI+PC9kaXY+CisKKyAg ICA8ZGl2IGlkPSJzdGlja3kiPgorICAgICAgICBMb3JlbSBpcHN1bSBkb2xvciBzaXQgYW1ldCwg Y29uc2VjdGV0dXIgYWRpcGlzaWNpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lk aWR1bnQgdXQgbGFib3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIExvcmVtIGlwc3VtIGRvbG9y IHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNpY2luZyBlbGl0LCBzZWQgZG8gZWl1c21vZCB0 ZW1wb3IgaW5jaWRpZHVudCB1dCBsYWJvcmUgZXQgZG9sb3JlIG1hZ25hIGFsaXF1YS4gPHNwYW4g c3R5bGU9ImNvbG9yOmJyb3duIj48Yj5USEUgRU5EPC9iPjwvc3Bhbj4uCisgICAgPC9kaXY+Cis8 L2JvZHk+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGVmYTJjMjgu LjJiZTNiMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMy0xMi0wNSAgUmFkdSBT dGF2aWxhICA8c3RhdmlsYUBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBSZWdpb25zXSBQb3Np dGlvbmVkIGVsZW1lbnRzIGluIHJlZ2lvbnMgZ2V0IGNsaXBwZWQgaWYgdGhleSBmYWxsIG91dHNp ZGUgdGhlIHJlZ2lvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE3MTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRml4ZWQgdGhlIGNvbXB1dGluZyBvZiB0aGUgYm94IGRlY29yYXRpb25zIGNsaXAgcmVj dCB3aGVuIGhhdmluZyBzdGF0aWNhbGx5IHBvc2l0aW9uZWQKKyAgICAgICAgZWxlbWVudHMgaW5z aWRlIHBvc2l0aW9uZWQgZWxlbWVudHMuIFRoZSBleGlzdGluZyBhbGdvcml0aG0gY29tcHV0ZWQg dGhlIHJlY3QgaW4gYSBsb29wCisgICAgICAgIHJ1bm5pbmcgdXAgdGhlIGNvbnRhaW5pbmcgYmxv Y2sgY2hhaW4gYW5kIG9ubHkgY2hlY2tlZCBmb3IgcG9zaXRpb25lZCBlbGVtZW50cyBiZWZvcmUg CisgICAgICAgIHN0YXJ0aW5nIHRoZSBsb29wLiBJZiBhIHBvc2l0aW9uZWQgZWxlbWVudHMgd2Fz IGZvdW5kIGluIHRoZSBtaWRkbGUgb2YgYSBsb29wIChhcyB3b3VsZAorICAgICAgICBiZSB0aGUg Y2FzZSB3aXRoIGEgcG9zaXRpb25lZCBlbGVtZW50IHBhcmVudGluZyBhIG5vbi1wb3NpdGlvbmVk IGVsZW1lbnQpLCBpdCB3YXMgbm90IAorICAgICAgICBjb3JyZWN0bHkgaGFuZGxlZC4KKyAgICAg ICAgQWxzbyBjaGFuZ2VkIGl0IHNvIHRoZSBjbGlwIGlzIG9ubHkgcGVyZm9ybWVkIGluIHRoZSBm cmFnbWVudGF0aW9uIGRpcmVjdGlvbiBhcyB0aGF0IHdhcyAKKyAgICAgICAgdGhlIG9yaWdpbmFs IHB1cnBvc2Ugb2YgdGhpcyBtZXRob2QuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvcmVnaW9ucy9h YnNvbHV0ZS1pbi1yZWxhdGl2ZS1vdmVyZmxvdy5odG1sCisgICAgICAgICAgICAgICBmYXN0L3Jl Z2lvbnMvc3RhdGljLWluLXJlbGF0aXZlLW92ZXJmbG93Lmh0bWwKKyAgICAgICAgICAgICAgIGZh c3QvcmVnaW9ucy9zdGlja3ktYm9yZGVyLW92ZXJmbG93Lmh0bWwKKworICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dU aHJlYWQ6OmRlY29yYXRpb25zQ2xpcFJlY3RGb3JCb3hJblJlZ2lvbik6CisKIDIwMTMtMTItMTcg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQuIFVwZGF0ZSBHT2JqZWN0IERPTSBzeW1ib2xzIGZpbGUgYWZ0ZXIgcjE2MDMzNi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcAppbmRleCA3 MWFlMTZlLi4wYmExOTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs b3dUaHJlYWQuY3BwCkBAIC0xMjY2LDcgKzEyNjYsOCBAQCBMYXlvdXRSZWN0IFJlbmRlckZsb3dU aHJlYWQ6Om1hcEZyb21GbG93VGhyZWFkVG9Mb2NhbChjb25zdCBSZW5kZXJCb3gqIGJveCwgY29u cwogTGF5b3V0UmVjdCBSZW5kZXJGbG93VGhyZWFkOjpkZWNvcmF0aW9uc0NsaXBSZWN0Rm9yQm94 SW5SZWdpb24oY29uc3QgUmVuZGVyQm94JiBib3gsIFJlbmRlclJlZ2lvbiYgcmVnaW9uKSBjb25z dAogewogICAgIExheW91dFJlY3QgdmlzdWFsT3ZlcmZsb3dSZWN0ID0gcmVnaW9uLnZpc3VhbE92 ZXJmbG93UmVjdEZvckJveCgmYm94KTsKLSAgICAKKyAgICBMYXlvdXRVbml0IGluaXRpYWxMb2dp Y2FsWCA9IHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHZpc3VhbE92ZXJmbG93 UmVjdC54KCkgOiB2aXN1YWxPdmVyZmxvd1JlY3QueSgpOworCiAgICAgLy8gVGhlIHZpc3VhbCBv dmVyZmxvdyByZWN0IHJldHVybmVkIGJ5IHZpc3VhbE92ZXJmbG93UmVjdEZvckJveCBpcyBhbHJl YWR5IGZsaXBwZWQgYnV0IHRoZQogICAgIC8vIFJlbmRlclJlZ2lvbjo6cmVjdEZsb3dQb3J0aW9u Rm9yQm94IG1ldGhvZCBleHBlY3RzIGl0IHVuZmxpcHBlZC4KICAgICBmbGlwRm9yV3JpdGluZ01v ZGVMb2NhbENvb3JkaW5hdGVzKHZpc3VhbE92ZXJmbG93UmVjdCk7CkBAIC0xMjgzLDMwICsxMjg0 LDUwIEBAIExheW91dFJlY3QgUmVuZGVyRmxvd1RocmVhZDo6ZGVjb3JhdGlvbnNDbGlwUmVjdEZv ckJveEluUmVnaW9uKGNvbnN0IFJlbmRlckJveCYKICAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93 UmVjdC5tb3ZlQnkoTGF5b3V0UG9pbnQod2lkdGgoKSwgMCkpOwogICAgIH0KIAotICAgIC8vIEZJ WE1FOiBUaGlzIGRvZXNuJ3Qgd29yayBwcm9wZXJseSB3aXRoIGZsaXBwZWQgd3JpdGluZyBtb2Rl cy4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MTQ5 Ci0gICAgaWYgKGJveC5pc1JlbFBvc2l0aW9uZWQoKSkgewotICAgICAgICAvLyBGb3IgcmVsYXRp dmUtcG9zaXRpb25lZCBlbGVtZW50cywganVzdCB1c2UgdGhlIGxheWVyJ3MgbG9jYXRpb24uCi0g ICAgICAgIHZpc3VhbE92ZXJmbG93UmVjdC5tb3ZlQnkoYm94LmxheWVyKCktPmFic29sdXRlQm91 bmRpbmdCb3goKS5sb2NhdGlvbigpKTsKLSAgICB9IGVsc2UgewotICAgICAgICBjb25zdCBSZW5k ZXJCb3gqIGl0ZXJCb3ggPSAmYm94OwotICAgICAgICB3aGlsZSAoaXRlckJveCAmJiBpdGVyQm94 ICE9IHRoaXMpIHsKLSAgICAgICAgICAgIFJlbmRlckJsb2NrKiBjb250YWluZXJCbG9jayA9IGl0 ZXJCb3gtPmNvbnRhaW5pbmdCbG9jaygpOwotCi0gICAgICAgICAgICBMYXlvdXRSZWN0IGN1cnJl bnRCb3hSZWN0ID0gaXRlckJveC0+ZnJhbWVSZWN0KCk7Ci0gICAgICAgICAgICBpZiAoaXRlckJv eC0+c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKGl0ZXJCb3gtPnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKLSAgICAg ICAgICAgICAgICAgICAgY3VycmVudEJveFJlY3Quc2V0WShjdXJyZW50Qm94UmVjdC5oZWlnaHQo KSAtIGN1cnJlbnRCb3hSZWN0Lm1heFkoKSk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgICAgICBjdXJyZW50Qm94UmVjdC5zZXRYKGN1cnJlbnRCb3hSZWN0LndpZHRoKCkg LSBjdXJyZW50Qm94UmVjdC5tYXhYKCkpOwotICAgICAgICAgICAgfQorICAgIGNvbnN0IFJlbmRl ckJveCogaXRlckJveCA9ICZib3g7CisgICAgd2hpbGUgKGl0ZXJCb3ggJiYgaXRlckJveCAhPSB0 aGlzKSB7CisgICAgICAgIFJlbmRlckJsb2NrKiBjb250YWluZXJCbG9jayA9IGl0ZXJCb3gtPmNv bnRhaW5pbmdCbG9jaygpOwogCi0gICAgICAgICAgICBpZiAoY29udGFpbmVyQmxvY2stPnN0eWxl KCkud3JpdGluZ01vZGUoKSAhPSBpdGVyQm94LT5zdHlsZSgpLndyaXRpbmdNb2RlKCkpCi0gICAg ICAgICAgICAgICAgaXRlckJveC0+ZmxpcEZvcldyaXRpbmdNb2RlKGN1cnJlbnRCb3hSZWN0KTsK KyAgICAgICAgLy8gRklYTUU6IFRoaXMgZG9lc24ndCB3b3JrIHByb3Blcmx5IHdpdGggZmxpcHBl ZCB3cml0aW5nIG1vZGVzLgorICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI1MTQ5CisgICAgICAgIGlmIChpdGVyQm94LT5pc1Bvc2l0aW9uZWQoKSkg eworICAgICAgICAgICAgLy8gRm9yIHBvc2l0aW9uZWQgZWxlbWVudHMsIGp1c3QgdXNlIHRoZSBs YXllcidzIGFic29sdXRlIGJvdW5kaW5nIGJveC4KKyAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93 UmVjdC5tb3ZlQnkoaXRlckJveC0+bGF5ZXIoKS0+YWJzb2x1dGVCb3VuZGluZ0JveCgpLmxvY2F0 aW9uKCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KIAotICAgICAgICAgICAgdmlz dWFsT3ZlcmZsb3dSZWN0Lm1vdmVCeShjdXJyZW50Qm94UmVjdC5sb2NhdGlvbigpKTsKLSAgICAg ICAgICAgIGl0ZXJCb3ggPSBjb250YWluZXJCbG9jazsKKyAgICAgICAgTGF5b3V0UmVjdCBjdXJy ZW50Qm94UmVjdCA9IGl0ZXJCb3gtPmZyYW1lUmVjdCgpOworICAgICAgICBpZiAoaXRlckJveC0+ c3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKSB7CisgICAgICAgICAgICBpZiAo aXRlckJveC0+c3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAgICAgICAgICAg ICAgIGN1cnJlbnRCb3hSZWN0LnNldFkoY3VycmVudEJveFJlY3QuaGVpZ2h0KCkgLSBjdXJyZW50 Qm94UmVjdC5tYXhZKCkpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGN1cnJl bnRCb3hSZWN0LnNldFgoY3VycmVudEJveFJlY3Qud2lkdGgoKSAtIGN1cnJlbnRCb3hSZWN0Lm1h eFgoKSk7CiAgICAgICAgIH0KKworICAgICAgICBpZiAoY29udGFpbmVyQmxvY2stPnN0eWxlKCku d3JpdGluZ01vZGUoKSAhPSBpdGVyQm94LT5zdHlsZSgpLndyaXRpbmdNb2RlKCkpCisgICAgICAg ICAgICBpdGVyQm94LT5mbGlwRm9yV3JpdGluZ01vZGUoY3VycmVudEJveFJlY3QpOworCisgICAg ICAgIHZpc3VhbE92ZXJmbG93UmVjdC5tb3ZlQnkoY3VycmVudEJveFJlY3QubG9jYXRpb24oKSk7 CisgICAgICAgIGl0ZXJCb3ggPSBjb250YWluZXJCbG9jazsKKyAgICB9CisKKyAgICAvLyBTaW5j ZSB0aGUgcHVycG9zZSBvZiB0aGlzIG1ldGhvZCBpcyB0byBtYWtlIHN1cmUgdGhlIGJvcmRlcnMg b2YgYSBmcmFnbWVudGVkCisgICAgLy8gZWxlbWVudCBkb24ndCBvdmVyZmxvdyB0aGUgcmVnaW9u IGluIHRoZSBmcmFnbWVudGF0aW9uIGRpcmVjdGlvbiwgdGhlcmUncyBubworICAgIC8vIHBvaW50 IGluIHJlc3RyaWN0aW5nIHRoZSBjbGlwcGluZyByZWN0IG9uIHRoZSBsb2dpY2FsIFggYXhpcy4g CisgICAgLy8gVGhpcyBhbHNvIHNhdmVzIHVzIHRoZSB0cm91YmxlIG9mIGhhbmRsaW5nIHBlcmNl bnQtYmFzZWQgd2lkdGhzIGFuZCBtYXJnaW5zCisgICAgLy8gc2luY2UgdGhlIGFic29sdXRlIGJv dW5kaW5nIGJveCBvZiBhIHBvc2l0aW9uZWQgZWxlbWVudCB3b3VsZCBub3QgY29udGFpbgorICAg IC8vIHRoZSBjb3JyZWN0IGNvb3JkaW5hdGVzIHJlbGF0aXZlIHRvIHRoZSByZWdpb24gd2UncmUg aW50ZXJlc3RlZCBpbiwgYnV0IHJhdGhlcgorICAgIC8vIHJlbGF0aXZlIHRvIHRoZSBhY3R1YWwg ZmxvdyB0aHJlYWQuCisgICAgaWYgKHN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkg eworICAgICAgICBpZiAoaW5pdGlhbExvZ2ljYWxYIDwgdmlzdWFsT3ZlcmZsb3dSZWN0LngoKSkK KyAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93UmVjdC5zaGlmdFhFZGdlVG8oaW5pdGlhbExvZ2lj YWxYKTsKKyAgICAgICAgaWYgKHZpc3VhbE92ZXJmbG93UmVjdC53aWR0aCgpIDwgZnJhbWVSZWN0 KCkud2lkdGgoKSkKKyAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93UmVjdC5zZXRXaWR0aChmcmFt ZVJlY3QoKS53aWR0aCgpKTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAoaW5pdGlhbExvZ2lj YWxYIDwgdmlzdWFsT3ZlcmZsb3dSZWN0LnkoKSkKKyAgICAgICAgICAgIHZpc3VhbE92ZXJmbG93 UmVjdC5zaGlmdFlFZGdlVG8oaW5pdGlhbExvZ2ljYWxYKTsKKyAgICAgICAgaWYgKHZpc3VhbE92 ZXJmbG93UmVjdC5oZWlnaHQoKSA8IGZyYW1lUmVjdCgpLmhlaWdodCgpKQorICAgICAgICAgICAg dmlzdWFsT3ZlcmZsb3dSZWN0LnNldEhlaWdodChmcmFtZVJlY3QoKS5oZWlnaHQoKSk7CiAgICAg fQogCiAgICAgcmV0dXJuIHZpc3VhbE92ZXJmbG93UmVjdDsK