91137 2012-07-12 12:59:15 -0700 REGRESSION(r117339): cell in block-level table in inline-block are aligned with their last line box 2012-08-09 18:06:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED HasReduction P1 Normal --- 15365 1 jchaffraix jchaffraix browserbugs2 darin eric hyatt mitz robert tony webkit.review.bot oldest_to_newest 668115 0 jchaffraix 2012-07-12 12:59:15 -0700 Bug 84167 changed RenderTable to properly account for its baseline. This made block-level table behaves like normal divs when inserted into inline-block and align according their last line box. This doesn't match Firefox and IE 9 though and is a deviation from our old behavior. 668116 1 152033 jchaffraix 2012-07-12 12:59:40 -0700 Created attachment 152033 Reproduction - the 2 boxes should be aligned 668120 2 jchaffraix 2012-07-12 13:01:10 -0700 *** Bug 91136 has been marked as a duplicate of this bug. *** 668128 3 robert 2012-07-12 13:07:13 -0700 WebKit matches Opera here btw. :) 668129 4 robert 2012-07-12 13:08:31 -0700 Hi Gérard, Do you have a view on this one? Should adjacent inline-blocks interact with each other like this or not? Thanks, Robert 668190 5 jchaffraix 2012-07-12 14:08:45 -0700 I am going to attach a patch to this bug that solves the issue to get it out of my repository. It's not meant for review until Gérard has replied. 668193 6 152055 jchaffraix 2012-07-12 14:10:20 -0700 Created attachment 152055 WIP patch: solves the issue, some testing but not much. Comments welcome. 668358 7 browserbugs2 2012-07-12 16:13:54 -0700 > Do you have a view on this one? > Should adjacent inline-blocks interact with each other like this or not? The test of attachment 152033 should indicate what are the expected results in an non-equivocal manner. I think middle-vertical-alignment of cells decides here: both cells should be vertically-aligned like no5 of the diagram in section 17.5.3 with legend "Diagram showing the effect of various values of 'vertical-align' on table cells." http://www.w3.org/TR/CSS21/tables.html#height-layout Ideally, you would need a test like http://test.csswg.org/suites/css2.1/nightly-unstable/html4/vertical-align-applies-to-007.htm and then modify it to emulate the test of attachment 152033 --------- Btw, I am using Chrome 20.0.1132.57 and none of the tests in bug 23544 are passed by Chrome 20.0.1132.57. So, I'm still wondering if/when I will be able to check these with Chrome or Safari. Gérard 668503 8 jchaffraix 2012-07-12 19:01:07 -0700 Thanks for the comment, Gérard. (In reply to comment #7) > > Do you have a view on this one? > Should adjacent inline-blocks interact with each other like this or not? > > The test of attachment 152033 [details] should indicate what are the expected results in an non-equivocal manner. I thought the output was clear here but it's likely me staring at this test for too long: the 2 green boxes should be vertically aligned for the test to pass. > I think middle-vertical-alignment of cells decides here: both cells should be vertically-aligned like no5 of the diagram in section 17.5.3 with legend "Diagram showing the effect of various values of 'vertical-align' on table cells." > http://www.w3.org/TR/CSS21/tables.html#height-layout For some reason, the vertical-align: middle is needed in WebKit to trigger this bug but I don't think this is the core of the issue: the 2 anonymous tables have only one cell that should have the same size as the table (modulo the border-spacing). It looks like WebKit/ Opera are aligning the anonymous tables' last line boxes where FF / IE 9 are aligning their baselines. > Btw, I am using Chrome 20.0.1132.57 and none of the tests in bug 23544 are passed by Chrome 20.0.1132.57. > > So, I'm still wondering if/when I will be able to check these with Chrome or Safari. Chrome 20 was branched at WebKit r116185 which is why you don't see it. You need M21+ to get this change. For Safari, you can always use a nightly for testing (http://nightly.webkit.org/). 668593 9 browserbugs2 2012-07-12 21:32:16 -0700 (In reply to comment #8) > Thanks for the comment, Gérard. > > (In reply to comment #7) > > > Do you have a view on this one? > Should adjacent inline-blocks interact with each other like this or not? > > > > The test of attachment 152033 [details] [details] should indicate what are the expected results in an non-equivocal manner. > > I thought the output was clear here The test pass/fail condition of attachment 152033 could be clearer and the test could be designed to be more demanding, requiring so that we really challenge implementations. Often, vertical-align tests require very precise layout. Ideally, in testing, an inline-block should always have at least (minimum) 2 blocks. Something like (using inline style for demo purpose only): <div>LLL <div style="display: inline-block;"> <span style="display: block;">TOP</span> <span style="display: block;">LLL</span> </div>LLL </div> with the bottom part of all 9 "L" glyohs all vertically aligned and emulating the baseline. If an inline-block only has 1 sole child (table or block, whatever), then the whole inline-block should behave like an inline. We have 13 tests at the end of http://test.csswg.org/suites/css2.1/nightly-unstable/html4/chapter-10.htm#s10.8.1 section (all tests starting with vertical-align-baseline-*) and I would not be surprised if a few of them were weak or not very trustworthy. > but it's likely me staring at this test for too long: the 2 green boxes > should be vertically aligned for the test to pass. > > > I think middle-vertical-alignment of cells decides here: both cells should be vertically-aligned like no5 of the diagram in section 17.5.3 with legend "Diagram showing the effect of various values of 'vertical-align' on table cells." > > http://www.w3.org/TR/CSS21/tables.html#height-layout > One detail to have in mind is Issue 26 Does vertical-align affect cell contents or cell's content box? http://wiki.csswg.org/spec/css2.1#issue-26 > For some reason, the vertical-align: middle is needed in WebKit to trigger this bug but I don't think this is the core of the issue: the 2 anonymous tables have only one cell that should have the same size as the table (modulo the border-spacing). It looks like WebKit/ Opera are aligning the anonymous tables' last line boxes where FF / IE 9 are aligning their baselines. > If a table is contained by an inline element (and this is the case here), then the anonymous tables should be inline-tables. Bullet 3 "Generate missing parents" of section 17.2.1 http://www.w3.org/TR/CSS2/tables.html#anonymous-boxes states this, as far as I can say. But inline-blocks are also supposed to be laid out as inline for itself (on the baseline) but its own children content are supposed to behave like blocks with the last one sitting on the baseline. "[inline-block] causes an element to generate an inline-level block container. The inside of an inline-block is formatted as a block box, and the element itself is formatted as an atomic inline-level box. " <deep breath> You have definitely a difficult, challenging situation here and .. I'm supposed to be taking a vacation/break these days to recuperate, recharge my batteries :) . > > Btw, I am using Chrome 20.0.1132.57 and none of the tests in bug 23544 are passed by Chrome 20.0.1132.57. > > > > So, I'm still wondering if/when I will be able to check these with Chrome or Safari. > > Chrome 20 was branched at WebKit r116185 which is why you don't see it. You need M21+ to get this change. For Safari, you can always use a nightly for testing (http://nightly.webkit.org/). I'm very often under Linux KDE; I'm now using Chromium which seems to be lagging 2 whole releases behind Chrome in terms of stable releases. ------- Okay. I suggest you try to improve the test, maybe create a few others and present these in www-style mailing list. Gérard P.S.: I met Simon Fraser at Test the Web Forward in San Francisco on june 15th and 16th; were you attending, Julien? Were you there, Robert? Just asking.. am just curious.. 669224 10 jchaffraix 2012-07-13 10:46:53 -0700 > If a table is contained by an inline element (and this is the case here), then the anonymous tables should be inline-tables. Bullet 3 "Generate missing parents" of section 17.2.1 > http://www.w3.org/TR/CSS2/tables.html#anonymous-boxes > states this, as far as I can say. WebKit doesn't properly implement that so the anonymous tables are blocks. See bug 15365. Maybe fixing this bug would help us. I will improve the test case(s) and follow off bugzilla for the other questions. 675769 11 jchaffraix 2012-07-23 09:27:26 -0700 OK, here is my understanding of why our new baseline is wrong and why this is a bug. The baseline of an inline-block is defined as the "baseline of its last line box in the normal flow, unless it has either no in-flow line boxes or if its 'overflow' property has a computed value other than 'visible', in which case the baseline is the bottom margin edge." [1]. Because an inline-block creates an inline formatting context, each cell (and its anonymous wrappers) gets a line box. This means that the inline-block baseline is the anonymous inline table's baseline. Now an inline-table baseline is defined as the first row baseline [1]. The baseline of the row is the baseline of the only cell present as we have a very simple case [2]. Finally the cell's baseline is "baseline of the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first." [2] [1] http://www.w3.org/TR/CSS2/visudet.html#line-height (see the vertical-align text) [2] http://www.w3.org/TR/CSS2/tables.html#height-layout 675928 12 robert 2012-07-23 13:01:55 -0700 We only calculate the baseline for a cell if it's one of b(In reply to comment #11) > Now an inline-table baseline is defined as the first row baseline [1]. The baseline of the row is the baseline of the only cell present as we have a very simple case [2]. Finally the cell's baseline is "baseline of the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first." [2] "If a row has no cell box aligned to its baseline, the baseline of that row is the bottom content edge of the lowest cell in the row." [1] In this case, the cell is vertical-align middle so the above statement seems to apply - which would mean this is not a bug. [1] http://www.w3.org/TR/CSS21/tables.html#height-layout 676134 13 jchaffraix 2012-07-23 16:11:09 -0700 (In reply to comment #12) > We only calculate the baseline for a cell if it's one of b(In reply to comment #11) > > Now an inline-table baseline is defined as the first row baseline [1]. The baseline of the row is the baseline of the only cell present as we have a very simple case [2]. Finally the cell's baseline is "baseline of the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first." [2] > > "If a row has no cell box aligned to its baseline, the baseline of that row is the bottom content edge of the lowest cell in the row." [1] > > In this case, the cell is vertical-align middle so the above statement seems to apply - which would mean this is not a bug. Your argument makes sense indeed - all the more since changing vertical-align to anything that resolve to 'baseline' removes the issue. I will still send an email to www-style to see if we didn't miss anything. 678496 14 jchaffraix 2012-07-25 14:45:49 -0700 http://lists.w3.org/Archives/Public/www-style/2012Jul/0542.html Looks like we were wrong about the 'inline-table' wrapper, it should be a 'table' wrapper for which the baseline doesn't seem to be defined in CSS 2.1. 685594 15 robert 2012-08-02 11:11:30 -0700 (In reply to comment #14) > http://lists.w3.org/Archives/Public/www-style/2012Jul/0542.html > > Looks like we were wrong about the 'inline-table' wrapper, it should be a 'table' wrapper for which the baseline doesn't seem to be defined in CSS 2.1. So I had a quick look and this works without regressions: --- a/Source/WebCore/rendering/RenderTableSection.cpp +++ b/Source/WebCore/rendering/RenderTableSection.cpp @@ -948,6 +948,9 @@ LayoutUnit RenderTableSection::firstLineBoxBaseline() const if (!m_grid.size()) return -1; + if (table()->parent()->isInlineBlockOrInlineTable()) + return -1; + Do we need to worry about anything beyond whether the table is wrapped by an inline-block? 685596 16 robert 2012-08-02 11:12:14 -0700 (In reply to comment #15) > (In reply to comment #14) > > http://lists.w3.org/Archives/Public/www-style/2012Jul/0542.html > > > > Looks like we were wrong about the 'inline-table' wrapper, it should be a 'table' wrapper for which the baseline doesn't seem to be defined in CSS 2.1. > > So I had a quick look and this works without regressions: > > --- a/Source/WebCore/rendering/RenderTableSection.cpp > +++ b/Source/WebCore/rendering/RenderTableSection.cpp > @@ -948,6 +948,9 @@ LayoutUnit RenderTableSection::firstLineBoxBaseline() const > if (!m_grid.size()) > return -1; > > + if (table()->parent()->isInlineBlockOrInlineTable()) > + return -1; > + > > Do we need to worry about anything beyond whether the table is wrapped by an inline-block? BTW, this is apropos of http://lists.w3.org/Archives/Public/www-style/2012Jul/0721.html 686869 17 jchaffraix 2012-08-03 09:55:35 -0700 (In reply to comment #15) > (In reply to comment #14) > > http://lists.w3.org/Archives/Public/www-style/2012Jul/0542.html > > > > Looks like we were wrong about the 'inline-table' wrapper, it should be a 'table' wrapper for which the baseline doesn't seem to be defined in CSS 2.1. > > So I had a quick look and this works without regressions: > > --- a/Source/WebCore/rendering/RenderTableSection.cpp > +++ b/Source/WebCore/rendering/RenderTableSection.cpp > @@ -948,6 +948,9 @@ LayoutUnit RenderTableSection::firstLineBoxBaseline() const > if (!m_grid.size()) > return -1; > > + if (table()->parent()->isInlineBlockOrInlineTable()) > + return -1; > + > > Do we need to worry about anything beyond whether the table is wrapped by an inline-block? I don't think this is correct: you shouldn't be poking at the table's parent. On top of that, the issue is not with firstLineBoxBaseline but lastLineBoxBaseline that is used for inline-block alignment. The WIP fix I attached matches the spec from that perspective so I am going to revive it. 687355 18 156508 jchaffraix 2012-08-03 19:46:51 -0700 Created attachment 156508 WIP fix 2. Fix the code to do the right thing per the spec. 688337 19 156740 jchaffraix 2012-08-06 12:09:42 -0700 Created attachment 156740 Proposed fix 1: Fix the baseline table logic to match the discussion on www-style. 689654 20 156740 tony 2012-08-07 17:33:03 -0700 Comment on attachment 156740 Proposed fix 1: Fix the baseline table logic to match the discussion on www-style. View in context: https://bugs.webkit.org/attachment.cgi?id=156740&action=review This change looks sane to me, but I don't know much about RenderTable. Maybe give Hyatt a day or two to take a look before landing? > Source/WebCore/rendering/RenderTable.cpp:1226 > + // The baseline of a 'table' is the same as the 'inline-table' baseline per CSS 3 Flexbox (CSS 2.1 Huh, it's interesting that this detail is in the flexbox spec. > Source/WebCore/rendering/RenderTable.h:254 > + virtual LayoutUnit baselinePosition(FontBaseline, bool, LineDirectionMode, LinePositionMode) const OVERRIDE; Nit: I would copy this line from RenderBlock.h (i.e., name the bool and make sure that LinePositionMode has a default value). > LayoutTests/fast/table/anonymous-table-no-baseline-align-expected.html:12 > + display: table-cell; Nit: When making a ref test, I think it's slightly better if the -expected.html doesn't use the element your testing. E.g., if you can get the same layout without using tables, then that would be preferred. Maybe that's not possible in this test. 691062 21 jchaffraix 2012-08-08 18:36:32 -0700 Thanks Tony! > This change looks sane to me, but I don't know much about RenderTable. Maybe give Hyatt a day or two to take a look before landing? Sure, I will land it tomorrow. > > Source/WebCore/rendering/RenderTable.cpp:1226 > > + // The baseline of a 'table' is the same as the 'inline-table' baseline per CSS 3 Flexbox (CSS 2.1 > > Huh, it's interesting that this detail is in the flexbox spec. Yes, baselines are pretty fragmented in the spec with 'inline-table' baseline requiring you to move around to understand how it's actually defined. Flexbox needed to define the baseline of a 'table' which is why it is there and not in CSS 2.1. > > Source/WebCore/rendering/RenderTable.h:254 > > + virtual LayoutUnit baselinePosition(FontBaseline, bool, LineDirectionMode, LinePositionMode) const OVERRIDE; > > Nit: I would copy this line from RenderBlock.h (i.e., name the bool and make sure that LinePositionMode has a default value). Indeed. > > LayoutTests/fast/table/anonymous-table-no-baseline-align-expected.html:12 > > + display: table-cell; > > Nit: When making a ref test, I think it's slightly better if the -expected.html doesn't use the element your testing. E.g., if you can get the same layout without using tables, then that would be preferred. Maybe that's not possible in this test. I see what you mean. Here the table content is reversed between the test and the expected to catch how we compute the baseline. It should be possible to remove the table from the expected and I will do that before landing. 691939 22 157566 jchaffraix 2012-08-09 15:48:40 -0700 Created attachment 157566 Patch for landing 692057 23 157566 webkit.review.bot 2012-08-09 18:06:12 -0700 Comment on attachment 157566 Patch for landing Clearing flags on attachment: 157566 Committed r125229: <http://trac.webkit.org/changeset/125229> 692058 24 webkit.review.bot 2012-08-09 18:06:17 -0700 All reviewed patches have been landed. Closing bug. 152033 2012-07-12 12:59:40 -0700 2012-07-12 12:59:40 -0700 Reproduction - the 2 boxes should be aligned baseline.html text/html 435 jchaffraix PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHN0eWxlPgoud3JhcHBlciB7CiAgICBoZWln aHQ6IDUwcHg7CiAgICB3aWR0aDogMTIwcHg7CiAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKfQouY2VsbCB7CiAgICBkaXNwbGF5OiB0YWJsZS1j ZWxsOwogICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKfQo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5 PgogIDxkaXYgY2xhc3M9IndyYXBwZXIiPgogICAgPGRpdiBjbGFzcz0iY2VsbCI+CiAgICAgIFRo ZSAyIGdyZWVuCiAgICA8L2Rpdj4KICA8L2Rpdj4KICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KICAg IDxkaXYgY2xhc3M9ImNlbGwiPgogICAgICBiYWNrZ3JvdW5kcyBzaG91bGQgYmUgYWxpZ25lZC4K ICAgIDwvZGl2PgogIDwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4K 152055 2012-07-12 14:10:20 -0700 2012-08-03 19:46:49 -0700 WIP patch: solves the issue, some testing but not much. Comments welcome. bug-91137-20120712141019.patch text/plain 7457 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZkNDc1MjJmZGI0NWJk MmRkNmQyNGEwMDUzY2VlMWFiOTljNThkYy4uNmM4ZjY2MTIxNmY4MjBmNjUwZWViNWEyZWMzMzRh MjRhNDA1OTczOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA3LTEyICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjExNzMzOSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFy ZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgaXNzdWUgd2FzIHRoYXQgd2Ugd291bGQgYWxp Z24gYWNjb3JkaW5nIHRvIHRoZSB0YWJsZXMnIGxhc3QgbGluZSBib3ggZm9yIGJsb2NrLWxldmVs CisgICAgICAgIHRhYmxlcywgd2hpY2ggZG9lc24ndCBtYXRjaCBvdGhlciBicm93c2Vycy4KKwor ICAgICAgICBUZXN0czogZmFzdC90YWJsZS9hbm9ueW1vdXMtdGFibGUtbm8tYmFzZWxpbmUtYWxp Z24uaHRtbAorICAgICAgICAgICAgICAgZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5l LWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjpsYXN0TGluZUJv eEJhc2VsaW5lKToKKyAgICAgICAgRG8gbm90IHJldHVybiBhIGxhc3RMaW5lQm94QmFzZWxpbmUg Zm9yIGJsb2NrLWxldmVsIHRhYmxlcy4KKwogMjAxMi0wNy0xMiAgQWxsYW4gU2FuZGZlbGQgSmVu c2VuICA8YWxsYW4uamVuc2VuQG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBCdWls ZCBmaXggZm9yIHIxMjI0NjIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNw cAppbmRleCA2NDMzN2JkNWViZjlhOWU1Y2NjMzVjNzdlOTFmMTA2NTNiNWU3MzBjLi45YjYxZjYx NTNjODEwMzBhNTM0NWM4ZmFiNWU1ZTM2ZjJkNDU4N2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZS5jcHAKQEAgLTEyNDgsNiArMTI0OCwxMCBAQCBzdGF0aWMgTGF5b3V0 VW5pdCBnZXRMaW5lQm94QmFzZWxpbmUoY29uc3QgUmVuZGVyVGFibGUqIHRhYmxlLCBMaW5lQm94 IGxpbmVCb3gpCiAKIExheW91dFVuaXQgUmVuZGVyVGFibGU6Omxhc3RMaW5lQm94QmFzZWxpbmUo KSBjb25zdAogeworICAgIC8vIEJsb2NrLWxldmVsIHRhYmxlcyBzaG91bGRuJ3QgYmUgYWxpZ25l ZCBhbG9uZyB0aGVpciBsYXN0IGxpbmUgYmxvY2suCisgICAgaWYgKCFpc0lubGluZSgpKQorICAg ICAgICByZXR1cm4gLTE7CisKICAgICByZXR1cm4gZ2V0TGluZUJveEJhc2VsaW5lKHRoaXMsIExh c3RMaW5lQm94KTsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI0MTM2NGU3NWNmY2RmODJiZWQyMzc3NGE0ZTU2NTVl MjBjOTA4ZTAuLmZjOGEzZmIwMTA3ZjU4YTg0M2I5N2M2ODZmMTY0OTRhYjA1ZTM0YTUgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNSBAQAorMjAxMi0wNy0xMiAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJh aXhAd2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIxMTczMzkpOiBjZWxsIGluIGJs b2NrLWxldmVsIHRhYmxlIGluIGlubGluZS1ibG9jayBhcmUgYWxpZ25lZCB3aXRoIHRoZWlyIGxh c3QgbGluZSBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkxMTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBmYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi1leHBlY3Rl ZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1i YXNlbGluZS1hbGlnbi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxlL2lubGluZS10 YWJsZS1pbi1pbmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxlL2lubGluZS10YWJsZS1pbi1pbmxpbmUtYmxvY2st bGFzdC1iYXNlbGluZS1hbGlnbi5odG1sOiBBZGRlZC4KKwogMjAxMi0wNy0xMiAgSm9zaHVhIEJl bGwgIDxqc2JlbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEluZGV4ZWREQjogVmVyaWZ5IGlu dGVybmFsICJkZWxldGUgcGVuZGluZyIgZmxhZyBvbiBkYXRhYmFzZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC90YWJsZS9hbm9ueW1vdXMtdGFibGUtbm8tYmFzZWxpbmUtYWxpZ24tZXhw ZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJh c2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNDE5NDdmOGRiZTcwNzdhMTA0 ZDM2NTg1ZGRmMGVlNjM3Y2RmODZmYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwK QEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxl PgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7CisgICAgd2lkdGg6IDEyMHB4OworICAg IGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30K Ky5jZWxsIHsKKyAgICBkaXNwbGF5OiB0YWJsZS1jZWxsOworICAgIHZlcnRpY2FsLWFsaWduOiBt aWRkbGU7CisgICAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5Pgor ICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTExMzciPjkxMTM3PC9hPjogUkVHUkVTU0lPTihyMTE3MzM5KTogY2VsbCBpbiBibG9jay1s ZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJlIGFsaWduZWQgd2l0aCB0aGVpciBsYXN0IGxp bmUgYm94PC9wPgorICAgIDxwPlRoaXMgdGVzdCBjaGVja3MgdGhhdCBhbiBhbm9ueW1vdXMgYmxv Y2stbGV2ZWwgdGFibGUgaXMgYmFzZWxpbmVkIGFsaWduZWQgaW4gYW4gaW5saW5lLWxldmVsIGJv eC48L3A+CisgICAgPHA+VGhlIDIgZ3JlZW4gc3F1YXJlcyBzaG91bGQgYmUgYWxpZ25lZCBiZWxv dy48L3A+CisgICAgPGRpdiBjbGFzcz0id3JhcHBlciI+CisgICAgICAgIDxkaXYgY2xhc3M9ImNl bGwiPlRoaXMgdGV4dCBzaG91bGQgYmUgb24gc2V2ZXJhbCBsaW5lcy48L2Rpdj4KKyAgICA8L2Rp dj4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2VsbCI+ U2hvcnQgdGV4dC48L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFs aWduLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1iYXNl bGluZS1hbGlnbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRiYTc2ZmUxNTZjZWUzYmQzMGE4NTVkZTgwMGJi MGJkMDJlZTg1NTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Fu b255bW91cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi5odG1sCkBAIC0wLDAgKzEsMjkgQEAKKzwh RE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy53cmFwcGVyIHsKKyAgICBo ZWlnaHQ6IDEwMHB4OworICAgIHdpZHRoOiAxMjBweDsKKyAgICBkaXNwbGF5OiBpbmxpbmUtYmxv Y2s7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9CisuY2VsbCB7CisgICAgZGlzcGxh eTogdGFibGUtY2VsbDsKKyAgICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOworICAgIGNvbG9yOiBn cmVlbjsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cD5CdWcgPGEgaHJlZj0i aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMTM3Ij45MTEzNzwvYT46 IFJFR1JFU1NJT04ocjExNzMzOSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5l LWJsb2NrIGFyZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveDwvcD4KKyAgICA8cD5U aGlzIHRlc3QgY2hlY2tzIHRoYXQgYW4gYW5vbnltb3VzIGJsb2NrLWxldmVsIHRhYmxlIGlzIGJh c2VsaW5lZCBhbGlnbmVkIGluIGFuIGlubGluZS1sZXZlbCBib3guPC9wPgorICAgIDxwPlRoZSAy IGdyZWVuIHNxdWFyZXMgc2hvdWxkIGJlIGFsaWduZWQgYmVsb3cuPC9wPgorICAgIDxkaXYgY2xh c3M9IndyYXBwZXIiPgorICAgICAgICA8ZGl2IGNsYXNzPSJjZWxsIj5TaG9ydCB0ZXh0LjwvZGl2 PgorICAgIDwvZGl2PgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPgorICAgICAgICA8ZGl2IGNs YXNzPSJjZWxsIj5UaGlzIHRleHQgc2hvdWxkIGJlIG9uIHNldmVyYWwgbGluZXMuLjwvZGl2Pgor ICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24t ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlu bGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NTQ2MzY4YWNkMzMyZjIzZjIwMjlmZmE4OWMwOTA5ZDQ3MGFlOTdhMgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1s YXN0LWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyMSBAQAorPCFET0NU WVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAgIGhlaWdo dDogMTAwcHg7CisgICAgd2lkdGg6IDEyMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsK KyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBjb2xvcjogZ3JlZW47Cit9Cis8L3N0 eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEzNyI+OTExMzc8L2E+OiBSRUdSRVNTSU9OKHIx MTczMzkpOiBjZWxsIGluIGJsb2NrLWxldmVsIHRhYmxlIGluIGlubGluZS1ibG9jayBhcmUgYWxp Z25lZCB3aXRoIHRoZWlyIGxhc3QgbGluZSBib3g8L3A+CisgICAgPHA+VGhpcyB0ZXN0IGNoZWNr cyB0aGF0IGlubGluZS10YWJsZXMgYXJlIGFsaWduZWQgYWNjb3JkaW5nIHRvIHRoZWlyIGxhc3Qg bGluZSBib3hlcy48L3A+CisgICAgPHA+VGhlIDIgZ3JlZW4gc3F1YXJlcyBzaG91bGQgbm90IGJl IGFsaWduZWQgYmVsb3cuPC9wPgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPlNob3J0IHRleHQu PC9kaXY+CisgICAgPGRpdiBjbGFzcz0id3JhcHBlciI+VGhpcyB0ZXh0IHNob3VsZCBiZSBvbiBz ZXZlcmFsIGxpbmVzLjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxp bmUtYWxpZ24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlu bGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTc4ZmI2Njkx YjgxMzBjMDEzNTdmMzU0MjU4NTg1YzVkMzFjOTVjMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2Vs aW5lLWFsaWduLmh0bWwKQEAgLTAsMCArMSwzOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7CisgICAgd2lk dGg6IDEyMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiBncmVlbjsKK30KKwordGFibGUgeworICAgIGRpc3BsYXk6IGlubGluZS10YWJsZTsKKyAg ICBib3JkZXItc3BhY2luZzogMHB4OworfQorCit0ZCB7CisgICAgcGFkZGluZzogMHB4OworICAg IHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7CisgICAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4K KzwvaGVhZD4KKzxib2R5PgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzciPjkxMTM3PC9hPjogUkVHUkVTU0lPTihyMTE3MzM5 KTogY2VsbCBpbiBibG9jay1sZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJlIGFsaWduZWQg d2l0aCB0aGVpciBsYXN0IGxpbmUgYm94PC9wPgorICAgIDxwPlRoaXMgdGVzdCBjaGVja3MgdGhh dCBpbmxpbmUtdGFibGVzIGFyZSBhbGlnbmVkIGFjY29yZGluZyB0byB0aGVpciBsYXN0IGxpbmUg Ym94ZXMuPC9wPgorICAgIDxwPlRoZSAyIGdyZWVuIHNxdWFyZXMgc2hvdWxkIG5vdCBiZSBhbGln bmVkIGJlbG93LjwvcD4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPHRhYmxl PgorICAgICAgICAgICAgPHRkPlNob3J0IHRleHQuPC90ZD4KKyAgICAgICAgPC90YWJsZT4KKyAg ICA8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPHRhYmxlPgorICAg ICAgICAgICAgPHRkPlRoaXMgdGV4dCBzaG91bGQgYmUgb24gc2V2ZXJhbCBsaW5lcy48L3RkPgor ICAgICAgICA8L3RhYmxlPgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 156508 2012-08-03 19:46:51 -0700 2012-08-06 12:09:39 -0700 WIP fix 2. Fix the code to do the right thing per the spec. bug-91137-20120803194631.patch text/plain 12497 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg2YTUxNzU2YzZkYjI4 NzJiNjFkNzQyOThiMDM1MzkxZWNlNGJhNy4uMTY5NWMyM2U1M2UzOWM4ZmQ1OWYzNGJlYzQ4NTBh NDlhMTA0NDc0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA4LTAzICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjExNzMzOSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFy ZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggdGhlIGNvZGUgdG8gcHJvcGVybHkgdXNlIHRo ZSBiYXNlbGluZVBvc2l0aW9uIGNvZGUgcGF0aC4KKworICAgICAgICBUZXN0czogZmFzdC90YWJs ZS9hbm9ueW1vdXMtdGFibGUtbm8tYmFzZWxpbmUtYWxpZ24uaHRtbAorICAgICAgICAgICAgICAg ZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxp Z24uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRhYmxlOjpiYXNlbGluZVBvc2l0aW9uKToKKyAgICAgICAgT3ZlcnJv ZGUgdGhpcyBmdW5jdGlvbjogdGhpcyBpcyBuZWVkZWQgYXMgUmVuZGVyQmxvY2sgYXNzdW1lcyB0 aGF0IGlzUmVwbGFjZWQoKQorICAgICAgICBtZWFucyBpdCBpcyBoYW5kbGluZyBhbiBpbmxpbmUt YmxvY2ssIG5vdCBhIHRhYmxlLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6bGFz dExpbmVCb3hCYXNlbGluZSk6CisgICAgICAgIFRhYmxlIGFyZSBpZ25vcmUgZm9yIHRoZSBwdXJw b3NlIG9mIGlubGluZS1ibG9jayBiYXNlbGluZSBkZXRlcm1pbmF0aW9uLgorCisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUYWJsZTo6Zmlyc3RMaW5lQm94QmFzZWxpbmUpOgorICAgICAgICBJbmxp bmVkIHRoZSBjb2RlIGZyb20gZ2V0TGluZUJveEJhc2VsaW5lLgorCisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclRhYmxlLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZVNlY3Rpb246OmNhbGNSb3dMb2dp Y2FsSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6Zmlyc3RM aW5lQm94QmFzZWxpbmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24u aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6Um93U3RydWN0OjpSb3dT dHJ1Y3QpOgorICAgICAgICBQcm9wZXJseSBwYXRjaGVkIHRoaXMgbG9naWMgKEZJWE1FOiBpcyB0 aGlzIHJlYWxseSByaWdodD8pIHRvIHJldHVybiAtMQorICAgICAgICBpZiB0aGVyZSBpcyBubyBi YXNlbGluZS4KKwogMjAxMi0wOC0wMyAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgW1Y4XSBBZGQgYW4gSXNFeGVjdXRpb25UZXJtaW5hdGluZygpIGNoZWNr IHRvIHNldERPTUV4Y2VwdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl LmNwcAppbmRleCBlOTM5MDA0ZGI4ZDY5Mzg3NGVjNmIyNGM5YTk0ZDI3Zjc5MzEzNThjLi41ZmM4 NWY5NzQ2Y2E4YWVjOTZmYmQzMzQxMDI3MTY3ZWYwYmE3YTAzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKQEAgLTEyMDYsMTYgKzEyMDYsMjkgQEAgdm9pZCBSZW5k ZXJUYWJsZTo6dXBkYXRlRmlyc3RMZXR0ZXIoKQogewogfQogCi1lbnVtIExpbmVCb3ggeyBGaXJz dExpbmVCb3gsIExhc3RMaW5lQm94IH07CitMYXlvdXRVbml0IFJlbmRlclRhYmxlOjpiYXNlbGlu ZVBvc2l0aW9uKEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGJvb2wgZmlyc3RMaW5lLCBMaW5l RGlyZWN0aW9uTW9kZSBkaXJlY3Rpb24sIExpbmVQb3NpdGlvbk1vZGUgbGluZVBvc2l0aW9uTW9k ZSkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0IGJhc2VsaW5lID0gZmlyc3RMaW5lQm94QmFzZWxp bmUoKTsKKyAgICBpZiAoYmFzZWxpbmUgIT0gLTEpCisgICAgICAgIHJldHVybiBiYXNlbGluZTsK KworICAgIHJldHVybiBSZW5kZXJCb3g6OmJhc2VsaW5lUG9zaXRpb24oYmFzZWxpbmVUeXBlLCBm aXJzdExpbmUsIGRpcmVjdGlvbiwgbGluZVBvc2l0aW9uTW9kZSk7Cit9CisKK0xheW91dFVuaXQg UmVuZGVyVGFibGU6Omxhc3RMaW5lQm94QmFzZWxpbmUoKSBjb25zdAoreworICAgIC8vIFRhYmxl IGRvbid0IGNvbnRyaWJ1dGUgdGhlaXIgYmFzZWxpbmUgdG93YXJkIHRoZSBjb21wdXRhdGlvbiBv ZiBhbiBpbmxpbmUtYmxvY2sncyBiYXNlbGluZS4KKyAgICByZXR1cm4gLTE7Cit9CiAKLXN0YXRp YyBMYXlvdXRVbml0IGdldExpbmVCb3hCYXNlbGluZShjb25zdCBSZW5kZXJUYWJsZSogdGFibGUs IExpbmVCb3ggbGluZUJveCkKK0xheW91dFVuaXQgUmVuZGVyVGFibGU6OmZpcnN0TGluZUJveEJh c2VsaW5lKCkgY29uc3QKIHsKLSAgICBpZiAodGFibGUtPmlzV3JpdGluZ01vZGVSb290KCkpCisg ICAgaWYgKGlzV3JpdGluZ01vZGVSb290KCkpCiAgICAgICAgIHJldHVybiAtMTsKIAotICAgIHRh YmxlLT5yZWNhbGNTZWN0aW9uc0lmTmVlZGVkKCk7CisgICAgcmVjYWxjU2VjdGlvbnNJZk5lZWRl ZCgpOwogCi0gICAgY29uc3QgUmVuZGVyVGFibGVTZWN0aW9uKiB0b3BOb25FbXB0eVNlY3Rpb24g PSB0YWJsZS0+dG9wTm9uRW1wdHlTZWN0aW9uKCk7CisgICAgY29uc3QgUmVuZGVyVGFibGVTZWN0 aW9uKiB0b3BOb25FbXB0eVNlY3Rpb24gPSB0aGlzLT50b3BOb25FbXB0eVNlY3Rpb24oKTsKICAg ICBpZiAoIXRvcE5vbkVtcHR5U2VjdGlvbikKICAgICAgICAgcmV0dXJuIC0xOwogCkBAIC0xMjIz LDI2ICsxMjM2LDEwIEBAIHN0YXRpYyBMYXlvdXRVbml0IGdldExpbmVCb3hCYXNlbGluZShjb25z dCBSZW5kZXJUYWJsZSogdGFibGUsIExpbmVCb3ggbGluZUJveCkKICAgICBpZiAoYmFzZWxpbmUg PiAwKQogICAgICAgICByZXR1cm4gdG9wTm9uRW1wdHlTZWN0aW9uLT5sb2dpY2FsVG9wKCkgKyBi YXNlbGluZTsKIAotICAgIC8vIFRoZSAnZmlyc3QnIGxpbmVib3ggYmFzZWxpbmUgaW4gYSB0YWJs ZSBpbiB0aGUgYWJzZW5jZSBvZiBhbnkgdGV4dCBpbiB0aGUgZmlyc3Qgc2VjdGlvbgotICAgIC8v IGlzIHRoZSB0b3Agb2YgdGhlIHRhYmxlLgotICAgIGlmIChsaW5lQm94ID09IEZpcnN0TGluZUJv eCkKLSAgICAgICAgcmV0dXJuIHRvcE5vbkVtcHR5U2VjdGlvbi0+bG9naWNhbFRvcCgpOwotCi0g ICAgLy8gVGhlICdsYXN0JyBsaW5lYm94IGJhc2VsaW5lIGluIGEgdGFibGUgaXMgdGhlIGJhc2Vs aW5lIG9mIHRleHQgaW4gdGhlIGZpcnN0Ci0gICAgLy8gY2VsbCBpbiB0aGUgZmlyc3Qgcm93L3Nl Y3Rpb24sIHNvIGlmIHRoZXJlIGlzIG5vIHRleHQgZG8gbm90IHJldHVybiBhIGJhc2VsaW5lLgor ICAgIC8vIEZJWE1FOiBUaGlzIGlzIHByb2JhYmx5IHdyb25nIGFzIHRoZSByb3cgYWx3YXlzIGhh cyBhIGJhc2VsaW5lIHBlciBDU1MgMi4xLgogICAgIHJldHVybiAtMTsKIH0KIAotTGF5b3V0VW5p dCBSZW5kZXJUYWJsZTo6bGFzdExpbmVCb3hCYXNlbGluZSgpIGNvbnN0Ci17Ci0gICAgcmV0dXJu IGdldExpbmVCb3hCYXNlbGluZSh0aGlzLCBMYXN0TGluZUJveCk7Ci19Ci0KLUxheW91dFVuaXQg UmVuZGVyVGFibGU6OmZpcnN0TGluZUJveEJhc2VsaW5lKCkgY29uc3QKLXsKLSAgICByZXR1cm4g Z2V0TGluZUJveEJhc2VsaW5lKHRoaXMsIEZpcnN0TGluZUJveCk7Ci19Ci0KIExheW91dFJlY3Qg UmVuZGVyVGFibGU6Om92ZXJmbG93Q2xpcFJlY3QoY29uc3QgTGF5b3V0UG9pbnQmIGxvY2F0aW9u LCBSZW5kZXJSZWdpb24qIHJlZ2lvbiwgT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kgcmVs ZXZhbmN5KQogewogICAgIExheW91dFJlY3QgcmVjdCA9IFJlbmRlckJsb2NrOjpvdmVyZmxvd0Ns aXBSZWN0KGxvY2F0aW9uLCByZWdpb24sIHJlbGV2YW5jeSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZS5oCmluZGV4IDg3NDE4ZjA2OGM2MDhjNWMxODQ1YjdlZTIzMjEwNjFmYTkz M2UxY2YuLmRhMjUzOTZkMjdjZWE0NjkxZDkwNWQ0MTFlNTVjNGY4ZGNlYmVjMTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCkBAIC0yNTEsNiArMjUxLDcgQEAgcHJpdmF0 ZToKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKTsKICAg ICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0 UmVzdWx0JiwgY29uc3QgSGl0VGVzdFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBMYXlv dXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pIE9WRVJSSURFOwogCisg ICAgdmlydHVhbCBMYXlvdXRVbml0IGJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5lLCBib29s LCBMaW5lRGlyZWN0aW9uTW9kZSwgTGluZVBvc2l0aW9uTW9kZSkgY29uc3QgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCBMYXlvdXRVbml0IGZpcnN0TGluZUJveEJhc2VsaW5lKCkgY29uc3QgT1ZFUlJJ REU7CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IGxhc3RMaW5lQm94QmFzZWxpbmUoKSBjb25zdCBP VkVSUklERTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlU2VjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0 aW9uLmNwcAppbmRleCA3NTYzODM1MmQ5YWRhN2QyMTM1N2U3NWY0MzE5YTE1NTZiNWYwYTQzLi5i MTI3Mjc3YTFhNjc2NGMyYTgxN2EzYzdkZDY0ZDBlZWQ3ZGM3ZDRkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcApAQCAtMzI5LDcgKzMyOSw3 IEBAIGludCBSZW5kZXJUYWJsZVNlY3Rpb246OmNhbGNSb3dMb2dpY2FsSGVpZ2h0KCkKICAgICBt X3Jvd1Bvc1swXSA9IHNwYWNpbmc7CiAKICAgICBmb3IgKHVuc2lnbmVkIHIgPSAwOyByIDwgbV9n cmlkLnNpemUoKTsgcisrKSB7Ci0gICAgICAgIG1fZ3JpZFtyXS5iYXNlbGluZSA9IDA7CisgICAg ICAgIG1fZ3JpZFtyXS5iYXNlbGluZSA9IC0xOwogICAgICAgICBMYXlvdXRVbml0IGJhc2VsaW5l RGVzY2VudCA9IDA7CiAKICAgICAgICAgLy8gT3VyIGJhc2Ugc2l6ZSBpcyB0aGUgYmlnZ2VzdCBs b2dpY2FsIGhlaWdodCBmcm9tIG91ciBjZWxscycgc3R5bGVzIChleGNsdWRpbmcgcm93IHNwYW5u aW5nIGNlbGxzKS4KQEAgLTk0OSwxMCArOTQ5LDkgQEAgTGF5b3V0VW5pdCBSZW5kZXJUYWJsZVNl Y3Rpb246OmZpcnN0TGluZUJveEJhc2VsaW5lKCkgY29uc3QKICAgICAgICAgcmV0dXJuIC0xOwog CiAgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVCYXNlbGluZSA9IG1fZ3JpZFswXS5iYXNlbGluZTsK LSAgICBpZiAoZmlyc3RMaW5lQmFzZWxpbmUpCisgICAgaWYgKGZpcnN0TGluZUJhc2VsaW5lICE9 IC0xKQogICAgICAgICByZXR1cm4gZmlyc3RMaW5lQmFzZWxpbmUgKyBtX3Jvd1Bvc1swXTsKIAot ICAgIGZpcnN0TGluZUJhc2VsaW5lID0gLTE7CiAgICAgY29uc3QgUm93JiBmaXJzdFJvdyA9IG1f Z3JpZFswXS5yb3c7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBmaXJzdFJvdy5zaXplKCk7 ICsraSkgewogICAgICAgICBjb25zdCBDZWxsU3RydWN0JiBjcyA9IGZpcnN0Um93LmF0KGkpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5oCmluZGV4IDg5 MTAzOGUxNDg0NDI2ZmE3OTJlYjE5ODUyMTcyYmFmZDcwOWY3OTcuLjkyNjk3N2QwY2JmN2JkYzRk MmM4ODQ0YTFjNTQyMGQ1OGY0ZTRhODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVTZWN0aW9uLmgKQEAgLTEwNyw3ICsxMDcsNyBAQCBwdWJsaWM6CiAgICAgc3Ry dWN0IFJvd1N0cnVjdCB7CiAgICAgICAgIFJvd1N0cnVjdCgpCiAgICAgICAgICAgICA6IHJvd1Jl bmRlcmVyKDApCi0gICAgICAgICAgICAsIGJhc2VsaW5lKCkKKyAgICAgICAgICAgICwgYmFzZWxp bmUoLTEpCiAgICAgICAgIHsKICAgICAgICAgfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDMxODI3MTljZjM4OTg3NmJi OTNiZTJkOWYyZDVkMTQ4MTQ1ZmM0Ny4uZjBkMGVlOWZiNmQ2MTgwNzVjNzFjMTk5NjUyNTA1ODgy ZGQ1Yjc4MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTAzICBKdWxpZW4gQ2hhZmZy YWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjExNzMz OSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFyZSBhbGlnbmVk IHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGZhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5l LWFsaWduLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGFibGUvYW5vbnlt b3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv dGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLWV4 cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGFibGUvaW5saW5lLXRhYmxlLWlu LWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA4 LTAzICBTdGVwaGVuIENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg Q3Jhc2ggd2hlbiBhIGNsaXAgcGF0aCByZWZlcmVuY2luZyBhIGNsaXAgcGF0aCBjaGFuZ2VzIGRv Y3VtZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9hbm9ueW1vdXMtdGFi bGUtbm8tYmFzZWxpbmUtYWxpZ24tZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGFi bGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNDE5NDdmOGRiZTcwNzdhMTA0ZDM2NTg1ZGRmMGVlNjM3Y2RmODZmYgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2Vs aW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7 CisgICAgd2lkdGg6IDEyMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNr Z3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKy5jZWxsIHsKKyAgICBkaXNwbGF5OiB0YWJsZS1jZWxs OworICAgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7CisgICAgY29sb3I6IGdyZWVuOworfQorPC9z dHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzciPjkxMTM3PC9hPjogUkVHUkVTU0lPTihy MTE3MzM5KTogY2VsbCBpbiBibG9jay1sZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJlIGFs aWduZWQgd2l0aCB0aGVpciBsYXN0IGxpbmUgYm94PC9wPgorICAgIDxwPlRoaXMgdGVzdCBjaGVj a3MgdGhhdCBhbiBhbm9ueW1vdXMgYmxvY2stbGV2ZWwgdGFibGUgaXMgYmFzZWxpbmVkIGFsaWdu ZWQgaW4gYW4gaW5saW5lLWxldmVsIGJveC48L3A+CisgICAgPHA+VGhlIDIgZ3JlZW4gc3F1YXJl cyBzaG91bGQgYmUgYWxpZ25lZCBiZWxvdy48L3A+CisgICAgPGRpdiBjbGFzcz0id3JhcHBlciI+ CisgICAgICAgIDxkaXYgY2xhc3M9ImNlbGwiPlRoaXMgdGV4dCBzaG91bGQgYmUgb24gc2V2ZXJh bCBsaW5lcy48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAg ICAgICAgPGRpdiBjbGFzcz0iY2VsbCI+U2hvcnQgdGV4dC48L2Rpdj4KKyAgICA8L2Rpdj4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnlt b3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxl L2Fub255bW91cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NzU1CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmRiYTc2 ZmUxNTZjZWUzYmQzMGE4NTVkZTgwMGJiMGJkMDJlZTg1NTEKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi5o dG1sCkBAIC0wLDAgKzEsMjkgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxz dHlsZT4KKy53cmFwcGVyIHsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIHdpZHRoOiAxMjBweDsK KyAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47 Cit9CisuY2VsbCB7CisgICAgZGlzcGxheTogdGFibGUtY2VsbDsKKyAgICB2ZXJ0aWNhbC1hbGln bjogbWlkZGxlOworICAgIGNvbG9yOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9k eT4KKyAgICA8cD5CdWcgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkxMTM3Ij45MTEzNzwvYT46IFJFR1JFU1NJT04ocjExNzMzOSk6IGNlbGwgaW4gYmxv Y2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFyZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFz dCBsaW5lIGJveDwvcD4KKyAgICA8cD5UaGlzIHRlc3QgY2hlY2tzIHRoYXQgYW4gYW5vbnltb3Vz IGJsb2NrLWxldmVsIHRhYmxlIGlzIGJhc2VsaW5lZCBhbGlnbmVkIGluIGFuIGlubGluZS1sZXZl bCBib3guPC9wPgorICAgIDxwPlRoZSAyIGdyZWVuIHNxdWFyZXMgc2hvdWxkIGJlIGFsaWduZWQg YmVsb3cuPC9wPgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPgorICAgICAgICA8ZGl2IGNsYXNz PSJjZWxsIj5TaG9ydCB0ZXh0LjwvZGl2PgorICAgIDwvZGl2PgorICAgIDxkaXYgY2xhc3M9Indy YXBwZXIiPgorICAgICAgICA8ZGl2IGNsYXNzPSJjZWxsIj5UaGlzIHRleHQgc2hvdWxkIGJlIG9u IHNldmVyYWwgbGluZXMuLjwvZGl2PgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJs b2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24tZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv dGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLWV4 cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNTQ2MzY4YWNkMzMyZjIzZjIwMjlmZmE4OWMwOTA5ZDQ3 MGFlOTdhMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5l LXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwK QEAgLTAsMCArMSwyMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxl PgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7CisgICAgd2lkdGg6IDEyMHB4OworICAg IGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAg ICBjb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHA+QnVn IDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEzNyI+ OTExMzc8L2E+OiBSRUdSRVNTSU9OKHIxMTczMzkpOiBjZWxsIGluIGJsb2NrLWxldmVsIHRhYmxl IGluIGlubGluZS1ibG9jayBhcmUgYWxpZ25lZCB3aXRoIHRoZWlyIGxhc3QgbGluZSBib3g8L3A+ CisgICAgPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGlubGluZS10YWJsZXMgYXJlIGFsaWduZWQg YWNjb3JkaW5nIHRvIHRoZWlyIGxhc3QgbGluZSBib3hlcy48L3A+CisgICAgPHA+VGhlIDIgZ3Jl ZW4gc3F1YXJlcyBzaG91bGQgbm90IGJlIGFsaWduZWQgYmVsb3cuPC9wPgorICAgIDxkaXYgY2xh c3M9IndyYXBwZXIiPlNob3J0IHRleHQuPC9kaXY+CisgICAgPGRpdiBjbGFzcz0id3JhcHBlciI+ VGhpcyB0ZXh0IHNob3VsZCBiZSBvbiBzZXZlcmFsIGxpbmVzLjwvZGl2PgorPC9ib2R5PgorPC9o dG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4t aW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv dGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uYTc4ZmI2NjkxYjgxMzBjMDEzNTdmMzU0MjU4NTg1YzVkMzFjOTVjMgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWlu LWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLmh0bWwKQEAgLTAsMCArMSwzOSBAQAor PCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAg IGhlaWdodDogMTAwcHg7CisgICAgd2lkdGg6IDEyMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1i bG9jazsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKwordGFibGUgeworICAgIGRp c3BsYXk6IGlubGluZS10YWJsZTsKKyAgICBib3JkZXItc3BhY2luZzogMHB4OworfQorCit0ZCB7 CisgICAgcGFkZGluZzogMHB4OworICAgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7CisgICAgY29s b3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxwPkJ1ZyA8YSBo cmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzciPjkxMTM3 PC9hPjogUkVHUkVTU0lPTihyMTE3MzM5KTogY2VsbCBpbiBibG9jay1sZXZlbCB0YWJsZSBpbiBp bmxpbmUtYmxvY2sgYXJlIGFsaWduZWQgd2l0aCB0aGVpciBsYXN0IGxpbmUgYm94PC9wPgorICAg IDxwPlRoaXMgdGVzdCBjaGVja3MgdGhhdCBpbmxpbmUtdGFibGVzIGFyZSBhbGlnbmVkIGFjY29y ZGluZyB0byB0aGVpciBsYXN0IGxpbmUgYm94ZXMuPC9wPgorICAgIDxwPlRoZSAyIGdyZWVuIHNx dWFyZXMgc2hvdWxkIG5vdCBiZSBhbGlnbmVkIGJlbG93LjwvcD4KKyAgICA8ZGl2IGNsYXNzPSJ3 cmFwcGVyIj4KKyAgICAgICAgPHRhYmxlPgorICAgICAgICAgICAgPHRkPlNob3J0IHRleHQuPC90 ZD4KKyAgICAgICAgPC90YWJsZT4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVy Ij4KKyAgICAgICAgPHRhYmxlPgorICAgICAgICAgICAgPHRkPlRoaXMgdGV4dCBzaG91bGQgYmUg b24gc2V2ZXJhbCBsaW5lcy48L3RkPgorICAgICAgICA8L3RhYmxlPgorICAgIDwvZGl2PgorPC9i b2R5PgorPC9odG1sPgo= 156740 2012-08-06 12:09:42 -0700 2012-08-09 15:48:36 -0700 Proposed fix 1: Fix the baseline table logic to match the discussion on www-style. bug-91137-20120806120918.patch text/plain 11174 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDg2YTUxNzU2YzZkYjI4 NzJiNjFkNzQyOThiMDM1MzkxZWNlNGJhNy4uNTYxZDM1YWFlN2M4ZjMwNGIyYjY2ZjY1NjUxMDMx ODdjODVhNWMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTA2ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjExNzMzOSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFy ZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlZCB0aGUgY29kZSB0byBwcm9wZXJseSBpZ25v cmUgYW55IGlubGluZS10YWJsZSdzIGJhc2VsaW5lIGZvciB0aGUgcHVycG9zZSBvZiAnaW5saW5l LWJsb2NrJyBiYXNlbGluZSBjb21wdXRhdGlvbi4KKyAgICAgICAgU2VlIGh0dHA6Ly9saXN0cy53 My5vcmcvQXJjaGl2ZXMvUHVibGljL3d3dy1zdHlsZS8yMDEySnVsLzA3MjEuaHRtbCBhYm91dCB0 aGUgZGlzY3Vzc2lvbi4KKworICAgICAgICBXaGlsZSB0b3VjaGluZyB0aGUgY29kZSwgcHJvcGVy bHkgZml4ZWQgdGhlIHRhYmxlIGJhc2VsaW5lIGxvZ2ljIHRoYXQgd2FzIHdyb25nIGJlY2F1c2Ug aXQgd3JvbmdseSBwaWdneS1iYWNrZWQKKyAgICAgICAgb24gdGhlIGlubGluZS1ibG9jayBiYXNl bGluZSBsb2dpYy4KKworICAgICAgICBUZXN0czogZmFzdC90YWJsZS9hbm9ueW1vdXMtdGFibGUt bm8tYmFzZWxpbmUtYWxpZ24uaHRtbAorICAgICAgICAgICAgICAgZmFzdC90YWJsZS9pbmxpbmUt dGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24uaHRtbAorCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRh YmxlOjpiYXNlbGluZVBvc2l0aW9uKToKKyAgICAgICAgT3ZlcnJvZGUgdGhpcyBmdW5jdGlvbjog dGhpcyBpcyBuZWVkZWQgYXMgUmVuZGVyQmxvY2sgYXNzdW1lcyB0aGF0IGlzUmVwbGFjZWQoKSA9 PSB0cnVlCisgICAgICAgIG1lYW5zIGl0IGlzIGhhbmRsaW5nIGFuIGlubGluZS1ibG9jaywgbm90 IGEgdGFibGUuCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjpsYXN0TGluZUJveEJh c2VsaW5lKToKKyAgICAgICAgVGFibGUgYXJlIGlnbm9yZWQgZm9yIHRoZSBwdXJwb3NlIG9mIGlu bGluZS1ibG9jayBiYXNlbGluZSBkZXRlcm1pbmF0aW9uLgorCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUYWJsZTo6Zmlyc3RMaW5lQm94QmFzZWxpbmUpOgorICAgICAgICBJbmxpbmVkIHRoZSBj b2RlIGZyb20gZ2V0TGluZUJveEJhc2VsaW5lLiBBZGRlZCBzb21lIGNvbW1lbnRzIHRvIGV4cGxh aW4KKyAgICAgICAgd2h5IHRoaXMgY29kZSB3b3JrcyBhcyBleHBlY3RlZCBpbiB0aGUgJ3RhYmxl JyBjYXNlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmg6CisgICAgICAgIEFk ZGVkIGJhc2VsaW5lUG9zaXRpb24uCisKIDIwMTItMDgtMDMgIEtlbnRhcm8gSGFyYSAgPGhhcmFr ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtWOF0gQWRkIGFuIElzRXhlY3V0aW9uVGVybWlu YXRpbmcoKSBjaGVjayB0byBzZXRET01FeGNlcHRpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZS5jcHAKaW5kZXggZTkzOTAwNGRiOGQ2OTM4NzRlYzZiMjRjOWE5NGQyN2Y3 OTMxMzU4Yy4uMmNkYThkY2M3MzNiNDVmNWMwNzg0N2U1NTc2NTVkNmQzYzkzZTE4ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCkBAIC0xMjA2LDE2ICsxMjA2LDMz IEBAIHZvaWQgUmVuZGVyVGFibGU6OnVwZGF0ZUZpcnN0TGV0dGVyKCkKIHsKIH0KIAotZW51bSBM aW5lQm94IHsgRmlyc3RMaW5lQm94LCBMYXN0TGluZUJveCB9OworTGF5b3V0VW5pdCBSZW5kZXJU YWJsZTo6YmFzZWxpbmVQb3NpdGlvbihGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBib29sIGZp cnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUgZGlyZWN0aW9uLCBMaW5lUG9zaXRpb25Nb2RlIGxp bmVQb3NpdGlvbk1vZGUpIGNvbnN0Cit7CisgICAgTGF5b3V0VW5pdCBiYXNlbGluZSA9IGZpcnN0 TGluZUJveEJhc2VsaW5lKCk7CisgICAgaWYgKGJhc2VsaW5lICE9IC0xKQorICAgICAgICByZXR1 cm4gYmFzZWxpbmU7CisKKyAgICByZXR1cm4gUmVuZGVyQm94OjpiYXNlbGluZVBvc2l0aW9uKGJh c2VsaW5lVHlwZSwgZmlyc3RMaW5lLCBkaXJlY3Rpb24sIGxpbmVQb3NpdGlvbk1vZGUpOworfQor CitMYXlvdXRVbml0IFJlbmRlclRhYmxlOjpsYXN0TGluZUJveEJhc2VsaW5lKCkgY29uc3QKK3sK KyAgICAvLyBUYWJsZXMgZG9uJ3QgY29udHJpYnV0ZSB0aGVpciBiYXNlbGluZSB0b3dhcmRzIHRo ZSBjb21wdXRhdGlvbiBvZiBhbiBpbmxpbmUtYmxvY2sncyBiYXNlbGluZS4KKyAgICByZXR1cm4g LTE7Cit9CiAKLXN0YXRpYyBMYXlvdXRVbml0IGdldExpbmVCb3hCYXNlbGluZShjb25zdCBSZW5k ZXJUYWJsZSogdGFibGUsIExpbmVCb3ggbGluZUJveCkKK0xheW91dFVuaXQgUmVuZGVyVGFibGU6 OmZpcnN0TGluZUJveEJhc2VsaW5lKCkgY29uc3QKIHsKLSAgICBpZiAodGFibGUtPmlzV3JpdGlu Z01vZGVSb290KCkpCisgICAgLy8gVGhlIGJhc2VsaW5lIG9mIGEgJ3RhYmxlJyBpcyB0aGUgc2Ft ZSBhcyB0aGUgJ2lubGluZS10YWJsZScgYmFzZWxpbmUgcGVyIENTUyAzIEZsZXhib3ggKENTUyAy LjEKKyAgICAvLyBkb2Vzbid0IGRlZmluZSB0aGUgYmFzZWxpbmUgb2YgYSAndGFibGUnIG9ubHkg YW4gJ2lubGluZS10YWJsZScpLgorICAgIC8vIFRoaXMgaXMgYWxzbyBuZWVkZWQgdG8gcHJvcGVy bHkgZGV0ZXJtaW5lIHRoZSBiYXNlbGluZSBvZiBhIGNlbGwgaWYgaXQgaGFzIGEgdGFibGUgY2hp bGQuCisKKyAgICBpZiAoaXNXcml0aW5nTW9kZVJvb3QoKSkKICAgICAgICAgcmV0dXJuIC0xOwog Ci0gICAgdGFibGUtPnJlY2FsY1NlY3Rpb25zSWZOZWVkZWQoKTsKKyAgICByZWNhbGNTZWN0aW9u c0lmTmVlZGVkKCk7CiAKLSAgICBjb25zdCBSZW5kZXJUYWJsZVNlY3Rpb24qIHRvcE5vbkVtcHR5 U2VjdGlvbiA9IHRhYmxlLT50b3BOb25FbXB0eVNlY3Rpb24oKTsKKyAgICBjb25zdCBSZW5kZXJU YWJsZVNlY3Rpb24qIHRvcE5vbkVtcHR5U2VjdGlvbiA9IHRoaXMtPnRvcE5vbkVtcHR5U2VjdGlv bigpOwogICAgIGlmICghdG9wTm9uRW1wdHlTZWN0aW9uKQogICAgICAgICByZXR1cm4gLTE7CiAK QEAgLTEyMjMsMjYgKzEyNDAsMTAgQEAgc3RhdGljIExheW91dFVuaXQgZ2V0TGluZUJveEJhc2Vs aW5lKGNvbnN0IFJlbmRlclRhYmxlKiB0YWJsZSwgTGluZUJveCBsaW5lQm94KQogICAgIGlmIChi YXNlbGluZSA+IDApCiAgICAgICAgIHJldHVybiB0b3BOb25FbXB0eVNlY3Rpb24tPmxvZ2ljYWxU b3AoKSArIGJhc2VsaW5lOwogCi0gICAgLy8gVGhlICdmaXJzdCcgbGluZWJveCBiYXNlbGluZSBp biBhIHRhYmxlIGluIHRoZSBhYnNlbmNlIG9mIGFueSB0ZXh0IGluIHRoZSBmaXJzdCBzZWN0aW9u Ci0gICAgLy8gaXMgdGhlIHRvcCBvZiB0aGUgdGFibGUuCi0gICAgaWYgKGxpbmVCb3ggPT0gRmly c3RMaW5lQm94KQotICAgICAgICByZXR1cm4gdG9wTm9uRW1wdHlTZWN0aW9uLT5sb2dpY2FsVG9w KCk7Ci0KLSAgICAvLyBUaGUgJ2xhc3QnIGxpbmVib3ggYmFzZWxpbmUgaW4gYSB0YWJsZSBpcyB0 aGUgYmFzZWxpbmUgb2YgdGV4dCBpbiB0aGUgZmlyc3QKLSAgICAvLyBjZWxsIGluIHRoZSBmaXJz dCByb3cvc2VjdGlvbiwgc28gaWYgdGhlcmUgaXMgbm8gdGV4dCBkbyBub3QgcmV0dXJuIGEgYmFz ZWxpbmUuCisgICAgLy8gRklYTUU6IEEgdGFibGUgcm93IGFsd2F5cyBoYXMgYSBiYXNlbGluZSBw ZXIgQ1NTIDIuMS4gV2lsbCB0aGlzIHJldHVybiB0aGUgcmlnaHQgdmFsdWU/CiAgICAgcmV0dXJu IC0xOwogfQogCi1MYXlvdXRVbml0IFJlbmRlclRhYmxlOjpsYXN0TGluZUJveEJhc2VsaW5lKCkg Y29uc3QKLXsKLSAgICByZXR1cm4gZ2V0TGluZUJveEJhc2VsaW5lKHRoaXMsIExhc3RMaW5lQm94 KTsKLX0KLQotTGF5b3V0VW5pdCBSZW5kZXJUYWJsZTo6Zmlyc3RMaW5lQm94QmFzZWxpbmUoKSBj b25zdAotewotICAgIHJldHVybiBnZXRMaW5lQm94QmFzZWxpbmUodGhpcywgRmlyc3RMaW5lQm94 KTsKLX0KLQogTGF5b3V0UmVjdCBSZW5kZXJUYWJsZTo6b3ZlcmZsb3dDbGlwUmVjdChjb25zdCBM YXlvdXRQb2ludCYgbG9jYXRpb24sIFJlbmRlclJlZ2lvbiogcmVnaW9uLCBPdmVybGF5U2Nyb2xs YmFyU2l6ZVJlbGV2YW5jeSByZWxldmFuY3kpCiB7CiAgICAgTGF5b3V0UmVjdCByZWN0ID0gUmVu ZGVyQmxvY2s6Om92ZXJmbG93Q2xpcFJlY3QobG9jYXRpb24sIHJlZ2lvbiwgcmVsZXZhbmN5KTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmgKaW5kZXggODc0MThmMDY4YzYwOGM1 YzE4NDViN2VlMjMyMTA2MWZhOTMzZTFjZi4uZGEyNTM5NmQyN2NlYTQ2OTFkOTA1ZDQxMWU1NWM0 ZjhkY2ViZWMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmgKQEAgLTI1 MSw2ICsyNTEsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlUHJlZmVycmVk TG9naWNhbFdpZHRocygpOwogICAgIHZpcnR1YWwgYm9vbCBub2RlQXRQb2ludChjb25zdCBIaXRU ZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBIaXRUZXN0UG9pbnQmIHBvaW50SW5D b250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVzdEFj dGlvbikgT1ZFUlJJREU7CiAKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgYmFzZWxpbmVQb3NpdGlv bihGb250QmFzZWxpbmUsIGJvb2wsIExpbmVEaXJlY3Rpb25Nb2RlLCBMaW5lUG9zaXRpb25Nb2Rl KSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIExheW91dFVuaXQgZmlyc3RMaW5lQm94QmFz ZWxpbmUoKSBjb25zdCBPVkVSUklERTsKICAgICB2aXJ0dWFsIExheW91dFVuaXQgbGFzdExpbmVC b3hCYXNlbGluZSgpIGNvbnN0IE9WRVJSSURFOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDMxODI3MTljZjM4OTg3NmJi OTNiZTJkOWYyZDVkMTQ4MTQ1ZmM0Ny4uYWNjMGZhZjRjMmM0OTA1ZDk3N2MxNzUxODAzZmEyNDUz OWJjZDNjOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA4LTA2ICBKdWxpZW4gQ2hhZmZy YWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjExNzMz OSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFyZSBhbGlnbmVk IHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGZhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5l LWFsaWduLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGFibGUvYW5vbnlt b3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv dGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLWV4 cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGFibGUvaW5saW5lLXRhYmxlLWlu LWlubGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA4 LTAzICBTdGVwaGVuIENoZW5uZXkgIDxzY2hlbm5leUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg Q3Jhc2ggd2hlbiBhIGNsaXAgcGF0aCByZWZlcmVuY2luZyBhIGNsaXAgcGF0aCBjaGFuZ2VzIGRv Y3VtZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9hbm9ueW1vdXMtdGFi bGUtbm8tYmFzZWxpbmUtYWxpZ24tZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGFi bGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYTU2OWM5MjBhNDI2YzUwMGI1M2QzZDAwNDA4MmUxYTViY2QwMzA1YQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2Vs aW5lLWFsaWduLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7 CisgICAgd2lkdGg6IDEyMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNr Z3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKy5jZWxsIHsKKyAgICBkaXNwbGF5OiB0YWJsZS1jZWxs OworICAgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7CisgICAgY29sb3I6IGdyZWVuOworfQorPC9z dHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzciPjkxMTM3PC9hPjogUkVHUkVTU0lPTihy MTE3MzM5KTogY2VsbCBpbiBibG9jay1sZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJlIGFs aWduZWQgd2l0aCB0aGVpciBsYXN0IGxpbmUgYm94PC9wPgorICAgIDxwPlRoaXMgdGVzdCBjaGVj a3MgdGhhdCBhbiBhbm9ueW1vdXMgJ3RhYmxlJyBkb2Vzbid0IGNvbnRyaWJ1dGUgaXRzIGJhc2Vs aW5lIHdoZW4gZGV0ZXJtaW5pbmcgYW4gaW5saW5lLWJsb2NrIGJhc2VsaW5lLjwvcD4KKyAgICA8 cD5UaGUgMiBncmVlbiBzcXVhcmVzIHNob3VsZCBiZSBhbGlnbmVkIGJlbG93LjwvcD4KKyAgICA8 ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2VsbCI+Jm5ic3A7PGJy PiZuYnNwOzxicj48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4K KyAgICAgICAgPGRpdiBjbGFzcz0iY2VsbCI+Jm5ic3A7PC9kaXY+CisgICAgPC9kaXY+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Fub255bW91 cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9h bm9ueW1vdXMtdGFibGUtbm8tYmFzZWxpbmUtYWxpZ24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDc1 NQppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hYzFhYTI1 ZTVhMTJiZDcxMTJmNzFlZGIyYTFmMzk3YTdmMzYyZWRlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC90YWJsZS9hbm9ueW1vdXMtdGFibGUtbm8tYmFzZWxpbmUtYWxpZ24uaHRt bApAQCAtMCwwICsxLDI5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5 bGU+Cisud3JhcHBlciB7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICB3aWR0aDogMTIwcHg7Cisg ICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOwor fQorLmNlbGwgeworICAgIGRpc3BsYXk6IHRhYmxlLWNlbGw7CisgICAgdmVydGljYWwtYWxpZ246 IG1pZGRsZTsKKyAgICBjb2xvcjogZ3JlZW47Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ CisgICAgPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTEzNyI+OTExMzc8L2E+OiBSRUdSRVNTSU9OKHIxMTczMzkpOiBjZWxsIGluIGJsb2Nr LWxldmVsIHRhYmxlIGluIGlubGluZS1ibG9jayBhcmUgYWxpZ25lZCB3aXRoIHRoZWlyIGxhc3Qg bGluZSBib3g8L3A+CisgICAgPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGFuIGFub255bW91cyAn dGFibGUnIGRvZXNuJ3QgY29udHJpYnV0ZSBpdHMgYmFzZWxpbmUgd2hlbiBkZXRlcm1pbmluZyBh biBpbmxpbmUtYmxvY2sgYmFzZWxpbmUuPC9wPgorICAgIDxwPlRoZSAyIGdyZWVuIHNxdWFyZXMg c2hvdWxkIGJlIGFsaWduZWQgYmVsb3cuPC9wPgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPgor ICAgICAgICA8ZGl2IGNsYXNzPSJjZWxsIj4mbmJzcDs8L2Rpdj4KKyAgICA8L2Rpdj4KKyAgICA8 ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2VsbCI+Jm5ic3A7PGJy PiZuYnNwOzxicj48L2Rpdj4KKyAgICA8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1s YXN0LWJhc2VsaW5lLWFsaWduLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxl L2lubGluZS10YWJsZS1pbi1pbmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi1leHBlY3Rl ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjk5MWQ2MWM1NWY5OTk2N2YwNmVlOTBlMmMyYzQ5ODhmZGJiNTZl ZmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2lubGluZS10YWJs ZS1pbi1pbmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1sCkBAIC0w LDAgKzEsMjAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy53 cmFwcGVyIHsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsK KyAgICBjb2xvcjogYmx1ZTsKKyAgICBmb250OiAxNnB4IEFoZW07Cit9Cis8L3N0eWxlPgorPC9o ZWFkPgorPGJvZHk+CisgICAgPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05MTEzNyI+OTExMzc8L2E+OiBSRUdSRVNTSU9OKHIxMTczMzkpOiBj ZWxsIGluIGJsb2NrLWxldmVsIHRhYmxlIGluIGlubGluZS1ibG9jayBhcmUgYWxpZ25lZCB3aXRo IHRoZWlyIGxhc3QgbGluZSBib3g8L3A+CisgICAgPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGFu ICdpbmxpbmUtdGFibGUnIGNvbnRyaWJ1dGVzIGl0cyBiYXNlbGluZSB0byBkZXRlcm1pbmUgYW4g aW5saW5lLWJsb2NrIGJhc2VsaW5lLjwvcD4KKyAgICA8cD5UaGUgMiBibHVlIHRleHRzIHNob3Vs ZCBiZSBhbGlnbmVkIGJlbG93LjwvcD4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj5GaXJzdDwv ZGl2PgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPiZuYnNwOzxicj4mbmJzcDs8YnI+U2Vjb25k PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Rh YmxlL2lubGluZS10YWJsZS1pbi1pbmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxh c3QtYmFzZWxpbmUtYWxpZ24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ZTA0ZDRiN2E5YmMxNWRlODc0ZGI4 NzYwZWIzZGM1NmU2YTkyZmM2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90 YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24uaHRt bApAQCAtMCwwICsxLDM4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5 bGU+Cisud3JhcHBlciB7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICBkaXNwbGF5OiBpbmxpbmUt YmxvY2s7CisgICAgZm9udDogMTZweCBBaGVtOworfQorCit0YWJsZSB7CisgICAgZGlzcGxheTog aW5saW5lLXRhYmxlOworICAgIGJvcmRlci1zcGFjaW5nOiAwcHg7Cit9CisKK3RkIHsKKyAgICBw YWRkaW5nOiAwcHg7CisgICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKKyAgICBjb2xvcjogYmx1 ZTsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cD5CdWcgPGEgaHJlZj0iaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxMTM3Ij45MTEzNzwvYT46IFJF R1JFU1NJT04ocjExNzMzOSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJs b2NrIGFyZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveDwvcD4KKyAgICA8cD5UaGlz IHRlc3QgY2hlY2tzIHRoYXQgYW4gJ2lubGluZS10YWJsZScgY29udHJpYnV0ZXMgaXRzIGJhc2Vs aW5lIHRvIGRldGVybWluZSBhbiBpbmxpbmUtYmxvY2sgYmFzZWxpbmUuPC9wPgorICAgIDxwPlRo ZSAyIGJsdWUgdGV4dHMgc2hvdWxkIGJlIGFsaWduZWQgYmVsb3cuPC9wPgorICAgIDxkaXYgY2xh c3M9IndyYXBwZXIiPgorICAgICAgICA8dGFibGU+CisgICAgICAgICAgICA8dGQ+Rmlyc3Q8L3Rk PgorICAgICAgICA8L3RhYmxlPgorICAgIDwvZGl2PgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIi PgorICAgICAgICA8dGFibGU+CisgICAgICAgICAgICA8dGQ+Jm5ic3A7PGJyPiZuYnNwOzxicj5T ZWNvbmQ8L3RkPgorICAgICAgICA8L3RhYmxlPgorICAgIDwvZGl2PgorPC9ib2R5PgorPC9odG1s Pgo= 157566 2012-08-09 15:48:40 -0700 2012-08-09 18:06:12 -0700 Patch for landing bug-91137-20120809154813.patch text/plain 11016 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQxODQ5ZDU0OTMwZGIy MWZjZjVmOTM0NjkwNThkYWJlYWEyYWY4My4uMzVhNjk4MzJmMzZiYzVmYzlkYjhiOTMwMGE0Y2Zl NDA2YmVlODFiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA4LTA5ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJ T04ocjExNzMzOSk6IGNlbGwgaW4gYmxvY2stbGV2ZWwgdGFibGUgaW4gaW5saW5lLWJsb2NrIGFy ZSBhbGlnbmVkIHdpdGggdGhlaXIgbGFzdCBsaW5lIGJveAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzcKKworICAgICAgICBSZXZpZXdlZCBieSBU b255IENoYW5nLgorCisgICAgICAgIEZpeGVkIHRoZSBjb2RlIHRvIHByb3Blcmx5IGlnbm9yZSBh bnkgaW5saW5lLXRhYmxlJ3MgYmFzZWxpbmUgZm9yIHRoZSBwdXJwb3NlIG9mICdpbmxpbmUtYmxv Y2snIGJhc2VsaW5lIGNvbXB1dGF0aW9uLgorICAgICAgICBTZWUgaHR0cDovL2xpc3RzLnczLm9y Zy9BcmNoaXZlcy9QdWJsaWMvd3d3LXN0eWxlLzIwMTJKdWwvMDcyMS5odG1sIGFib3V0IHRoZSBk aXNjdXNzaW9uLgorCisgICAgICAgIFdoaWxlIHRvdWNoaW5nIHRoZSBjb2RlLCBwcm9wZXJseSBm aXhlZCB0aGUgdGFibGUgYmFzZWxpbmUgbG9naWMgdGhhdCB3YXMgd3JvbmcgYmVjYXVzZSBpdCB3 cm9uZ2x5IHBpZ2d5LWJhY2tlZAorICAgICAgICBvbiB0aGUgaW5saW5lLWJsb2NrIGJhc2VsaW5l IGxvZ2ljLgorCisgICAgICAgIFRlc3RzOiBmYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1i YXNlbGluZS1hbGlnbi5odG1sCisgICAgICAgICAgICAgICBmYXN0L3RhYmxlL2lubGluZS10YWJs ZS1pbi1pbmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi5odG1sCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6 OmJhc2VsaW5lUG9zaXRpb24pOgorICAgICAgICBPdmVycm9kZSB0aGlzIGZ1bmN0aW9uOiB0aGlz IGlzIG5lZWRlZCBhcyBSZW5kZXJCbG9jayBhc3N1bWVzIHRoYXQgaXNSZXBsYWNlZCgpID09IHRy dWUKKyAgICAgICAgbWVhbnMgaXQgaXMgaGFuZGxpbmcgYW4gaW5saW5lLWJsb2NrLCBub3QgYSB0 YWJsZS4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6Omxhc3RMaW5lQm94QmFzZWxp bmUpOgorICAgICAgICBUYWJsZSBhcmUgaWdub3JlZCBmb3IgdGhlIHB1cnBvc2Ugb2YgaW5saW5l LWJsb2NrIGJhc2VsaW5lIGRldGVybWluYXRpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRhYmxlOjpmaXJzdExpbmVCb3hCYXNlbGluZSk6CisgICAgICAgIElubGluZWQgdGhlIGNvZGUg ZnJvbSBnZXRMaW5lQm94QmFzZWxpbmUuIEFkZGVkIHNvbWUgY29tbWVudHMgdG8gZXhwbGFpbgor ICAgICAgICB3aHkgdGhpcyBjb2RlIHdvcmtzIGFzIGV4cGVjdGVkIGluIHRoZSAndGFibGUnIGNh c2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuaDoKKyAgICAgICAgQWRkZWQg YmFzZWxpbmVQb3NpdGlvbi4KKwogMjAxMi0wOC0wOSAgTWlrZSBXZXN0ICA8bWt3c3RAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIEludmFsaWQgQ29udGVudCBTZWN1cml0eSBQb2xpY3kgc291cmNl cyBzaG91bGQgZ2VuZXJhdGUgY29uc29sZSB3YXJuaW5ncy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwCmluZGV4IGU5MzkwMDRkYjhkNjkzODc0ZWM2YjI0YzlhOTRkMjdm NzkzMTM1OGMuLjJjZGE4ZGNjNzMzYjQ1ZjVjMDc4NDdlNTU3NjU1ZDZkM2M5M2UxOGYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcApAQCAtMTIwNiwxNiArMTIwNiwz MyBAQCB2b2lkIFJlbmRlclRhYmxlOjp1cGRhdGVGaXJzdExldHRlcigpCiB7CiB9CiAKLWVudW0g TGluZUJveCB7IEZpcnN0TGluZUJveCwgTGFzdExpbmVCb3ggfTsKK0xheW91dFVuaXQgUmVuZGVy VGFibGU6OmJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5lIGJhc2VsaW5lVHlwZSwgYm9vbCBm aXJzdExpbmUsIExpbmVEaXJlY3Rpb25Nb2RlIGRpcmVjdGlvbiwgTGluZVBvc2l0aW9uTW9kZSBs aW5lUG9zaXRpb25Nb2RlKSBjb25zdAoreworICAgIExheW91dFVuaXQgYmFzZWxpbmUgPSBmaXJz dExpbmVCb3hCYXNlbGluZSgpOworICAgIGlmIChiYXNlbGluZSAhPSAtMSkKKyAgICAgICAgcmV0 dXJuIGJhc2VsaW5lOworCisgICAgcmV0dXJuIFJlbmRlckJveDo6YmFzZWxpbmVQb3NpdGlvbihi YXNlbGluZVR5cGUsIGZpcnN0TGluZSwgZGlyZWN0aW9uLCBsaW5lUG9zaXRpb25Nb2RlKTsKK30K KworTGF5b3V0VW5pdCBSZW5kZXJUYWJsZTo6bGFzdExpbmVCb3hCYXNlbGluZSgpIGNvbnN0Cit7 CisgICAgLy8gVGFibGVzIGRvbid0IGNvbnRyaWJ1dGUgdGhlaXIgYmFzZWxpbmUgdG93YXJkcyB0 aGUgY29tcHV0YXRpb24gb2YgYW4gaW5saW5lLWJsb2NrJ3MgYmFzZWxpbmUuCisgICAgcmV0dXJu IC0xOworfQogCi1zdGF0aWMgTGF5b3V0VW5pdCBnZXRMaW5lQm94QmFzZWxpbmUoY29uc3QgUmVu ZGVyVGFibGUqIHRhYmxlLCBMaW5lQm94IGxpbmVCb3gpCitMYXlvdXRVbml0IFJlbmRlclRhYmxl OjpmaXJzdExpbmVCb3hCYXNlbGluZSgpIGNvbnN0CiB7Ci0gICAgaWYgKHRhYmxlLT5pc1dyaXRp bmdNb2RlUm9vdCgpKQorICAgIC8vIFRoZSBiYXNlbGluZSBvZiBhICd0YWJsZScgaXMgdGhlIHNh bWUgYXMgdGhlICdpbmxpbmUtdGFibGUnIGJhc2VsaW5lIHBlciBDU1MgMyBGbGV4Ym94IChDU1Mg Mi4xCisgICAgLy8gZG9lc24ndCBkZWZpbmUgdGhlIGJhc2VsaW5lIG9mIGEgJ3RhYmxlJyBvbmx5 IGFuICdpbmxpbmUtdGFibGUnKS4KKyAgICAvLyBUaGlzIGlzIGFsc28gbmVlZGVkIHRvIHByb3Bl cmx5IGRldGVybWluZSB0aGUgYmFzZWxpbmUgb2YgYSBjZWxsIGlmIGl0IGhhcyBhIHRhYmxlIGNo aWxkLgorCisgICAgaWYgKGlzV3JpdGluZ01vZGVSb290KCkpCiAgICAgICAgIHJldHVybiAtMTsK IAotICAgIHRhYmxlLT5yZWNhbGNTZWN0aW9uc0lmTmVlZGVkKCk7CisgICAgcmVjYWxjU2VjdGlv bnNJZk5lZWRlZCgpOwogCi0gICAgY29uc3QgUmVuZGVyVGFibGVTZWN0aW9uKiB0b3BOb25FbXB0 eVNlY3Rpb24gPSB0YWJsZS0+dG9wTm9uRW1wdHlTZWN0aW9uKCk7CisgICAgY29uc3QgUmVuZGVy VGFibGVTZWN0aW9uKiB0b3BOb25FbXB0eVNlY3Rpb24gPSB0aGlzLT50b3BOb25FbXB0eVNlY3Rp b24oKTsKICAgICBpZiAoIXRvcE5vbkVtcHR5U2VjdGlvbikKICAgICAgICAgcmV0dXJuIC0xOwog CkBAIC0xMjIzLDI2ICsxMjQwLDEwIEBAIHN0YXRpYyBMYXlvdXRVbml0IGdldExpbmVCb3hCYXNl bGluZShjb25zdCBSZW5kZXJUYWJsZSogdGFibGUsIExpbmVCb3ggbGluZUJveCkKICAgICBpZiAo YmFzZWxpbmUgPiAwKQogICAgICAgICByZXR1cm4gdG9wTm9uRW1wdHlTZWN0aW9uLT5sb2dpY2Fs VG9wKCkgKyBiYXNlbGluZTsKIAotICAgIC8vIFRoZSAnZmlyc3QnIGxpbmVib3ggYmFzZWxpbmUg aW4gYSB0YWJsZSBpbiB0aGUgYWJzZW5jZSBvZiBhbnkgdGV4dCBpbiB0aGUgZmlyc3Qgc2VjdGlv bgotICAgIC8vIGlzIHRoZSB0b3Agb2YgdGhlIHRhYmxlLgotICAgIGlmIChsaW5lQm94ID09IEZp cnN0TGluZUJveCkKLSAgICAgICAgcmV0dXJuIHRvcE5vbkVtcHR5U2VjdGlvbi0+bG9naWNhbFRv cCgpOwotCi0gICAgLy8gVGhlICdsYXN0JyBsaW5lYm94IGJhc2VsaW5lIGluIGEgdGFibGUgaXMg dGhlIGJhc2VsaW5lIG9mIHRleHQgaW4gdGhlIGZpcnN0Ci0gICAgLy8gY2VsbCBpbiB0aGUgZmly c3Qgcm93L3NlY3Rpb24sIHNvIGlmIHRoZXJlIGlzIG5vIHRleHQgZG8gbm90IHJldHVybiBhIGJh c2VsaW5lLgorICAgIC8vIEZJWE1FOiBBIHRhYmxlIHJvdyBhbHdheXMgaGFzIGEgYmFzZWxpbmUg cGVyIENTUyAyLjEuIFdpbGwgdGhpcyByZXR1cm4gdGhlIHJpZ2h0IHZhbHVlPwogICAgIHJldHVy biAtMTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJUYWJsZTo6bGFzdExpbmVCb3hCYXNlbGluZSgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIGdldExpbmVCb3hCYXNlbGluZSh0aGlzLCBMYXN0TGluZUJv eCk7Ci19Ci0KLUxheW91dFVuaXQgUmVuZGVyVGFibGU6OmZpcnN0TGluZUJveEJhc2VsaW5lKCkg Y29uc3QKLXsKLSAgICByZXR1cm4gZ2V0TGluZUJveEJhc2VsaW5lKHRoaXMsIEZpcnN0TGluZUJv eCk7Ci19Ci0KIExheW91dFJlY3QgUmVuZGVyVGFibGU6Om92ZXJmbG93Q2xpcFJlY3QoY29uc3Qg TGF5b3V0UG9pbnQmIGxvY2F0aW9uLCBSZW5kZXJSZWdpb24qIHJlZ2lvbiwgT3ZlcmxheVNjcm9s bGJhclNpemVSZWxldmFuY3kgcmVsZXZhbmN5KQogewogICAgIExheW91dFJlY3QgcmVjdCA9IFJl bmRlckJsb2NrOjpvdmVyZmxvd0NsaXBSZWN0KGxvY2F0aW9uLCByZWdpb24sIHJlbGV2YW5jeSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCmluZGV4IDg3NDE4ZjA2OGM2MDhj NWMxODQ1YjdlZTIzMjEwNjFmYTkzM2UxY2YuLmU0YzcwZjQ3ZmM5ZDUxZjNhZjQzNWI0MWI5OWU0 NWE5MjBlNWY0YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCkBAIC0y NTEsNiArMjUxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJl ZExvZ2ljYWxXaWR0aHMoKTsKICAgICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0 VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgSGl0VGVzdFBvaW50JiBwb2ludElu Q29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RB Y3Rpb24pIE9WRVJSSURFOwogCisgICAgdmlydHVhbCBMYXlvdXRVbml0IGJhc2VsaW5lUG9zaXRp b24oRm9udEJhc2VsaW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUsIExpbmVQ b3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0IE9WRVJSSURFOwog ICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBmaXJzdExpbmVCb3hCYXNlbGluZSgpIGNvbnN0IE9WRVJS SURFOwogICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBsYXN0TGluZUJveEJhc2VsaW5lKCkgY29uc3Qg T1ZFUlJJREU7CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCAxMjEzNGZlZjkxYzk3YTMyYmFmNzliYzJjY2RjZjg4NmIxYjFl Zjc5Li5kMmIzZWQ4ZmYwZDcwN2NlZDdjZTUwZjkzZjRhYjZjNTI4Zjk4MDliIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTItMDgtMDkgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdl YmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMTE3MzM5KTogY2VsbCBpbiBibG9jay1s ZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJlIGFsaWduZWQgd2l0aCB0aGVpciBsYXN0IGxp bmUgYm94CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MTEzNworCisgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCisKKyAgICAgICAgKiBmYXN0 L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1iYXNlbGluZS1h bGlnbi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RhYmxlL2lubGluZS10YWJsZS1pbi1p bmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L3RhYmxlL2lubGluZS10YWJsZS1pbi1pbmxpbmUtYmxvY2stbGFzdC1iYXNl bGluZS1hbGlnbi5odG1sOiBBZGRlZC4KKwogMjAxMi0wOC0wOSAgTWlrZSBXZXN0ICA8bWt3c3RA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIEludmFsaWQgQ29udGVudCBTZWN1cml0eSBQb2xpY3kg c291cmNlcyBzaG91bGQgZ2VuZXJhdGUgY29uc29sZSB3YXJuaW5ncy4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLWV4 cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1i YXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNzU1CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM4YjZlODQ4MjlkN2M5MGY1 Y2YxZjc0ZDQzN2NmZjM0MmRhNTZkMTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3RhYmxlL2Fub255bW91cy10YWJsZS1uby1iYXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1s CkBAIC0wLDAgKzEsMjAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHls ZT4KKy53cmFwcGVyIHsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIHdpZHRoOiAxMjBweDsKKyAg ICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JlZW47Cit9 Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHA+QnVnIDxhIGhyZWY9Imh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEzNyI+OTExMzc8L2E+OiBSRUdSRVNT SU9OKHIxMTczMzkpOiBjZWxsIGluIGJsb2NrLWxldmVsIHRhYmxlIGluIGlubGluZS1ibG9jayBh cmUgYWxpZ25lZCB3aXRoIHRoZWlyIGxhc3QgbGluZSBib3g8L3A+CisgICAgPHA+VGhpcyB0ZXN0 IGNoZWNrcyB0aGF0IGFuIGFub255bW91cyAndGFibGUnIGRvZXNuJ3QgY29udHJpYnV0ZSBpdHMg YmFzZWxpbmUgd2hlbiBkZXRlcm1pbmluZyBhbiBpbmxpbmUtYmxvY2sgYmFzZWxpbmUuPC9wPgor ICAgIDxwPlRoZSAyIGdyZWVuIHNxdWFyZXMgc2hvdWxkIGJlIGFsaWduZWQgYmVsb3cuPC9wPgor ICAgIDxkaXYgY2xhc3M9IndyYXBwZXIiPjwvZGl2PgorICAgIDxkaXYgY2xhc3M9IndyYXBwZXIi PjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90 YWJsZS9hbm9ueW1vdXMtdGFibGUtbm8tYmFzZWxpbmUtYWxpZ24uaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2VsaW5lLWFsaWduLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYWMxYWEyNWU1YTEyYmQ3MTEyZjcxZWRiMmExZjM5N2E3ZjM2MmVkZQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvYW5vbnltb3VzLXRhYmxlLW5vLWJhc2Vs aW5lLWFsaWduLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7CisgICAgd2lk dGg6IDEyMHB4OworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBiYWNrZ3JvdW5kLWNv bG9yOiBncmVlbjsKK30KKy5jZWxsIHsKKyAgICBkaXNwbGF5OiB0YWJsZS1jZWxsOworICAgIHZl cnRpY2FsLWFsaWduOiBtaWRkbGU7CisgICAgY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzwv aGVhZD4KKzxib2R5PgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzciPjkxMTM3PC9hPjogUkVHUkVTU0lPTihyMTE3MzM5KTog Y2VsbCBpbiBibG9jay1sZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJlIGFsaWduZWQgd2l0 aCB0aGVpciBsYXN0IGxpbmUgYm94PC9wPgorICAgIDxwPlRoaXMgdGVzdCBjaGVja3MgdGhhdCBh biBhbm9ueW1vdXMgJ3RhYmxlJyBkb2Vzbid0IGNvbnRyaWJ1dGUgaXRzIGJhc2VsaW5lIHdoZW4g ZGV0ZXJtaW5pbmcgYW4gaW5saW5lLWJsb2NrIGJhc2VsaW5lLjwvcD4KKyAgICA8cD5UaGUgMiBn cmVlbiBzcXVhcmVzIHNob3VsZCBiZSBhbGlnbmVkIGJlbG93LjwvcD4KKyAgICA8ZGl2IGNsYXNz PSJ3cmFwcGVyIj4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2VsbCI+Jm5ic3A7PC9kaXY+CisgICAg PC9kaXY+CisgICAgPGRpdiBjbGFzcz0id3JhcHBlciI+CisgICAgICAgIDxkaXYgY2xhc3M9ImNl bGwiPiZuYnNwOzxicj4mbmJzcDs8YnI+PC9kaXY+CisgICAgPC9kaXY+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RhYmxlL2lubGluZS10YWJsZS1pbi1p bmxpbmUtYmxvY2stbGFzdC1iYXNlbGluZS1hbGlnbi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUt YWxpZ24tZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45OTFkNjFjNTVmOTk5NjdmMDZlZTkwZTJj MmM0OTg4ZmRiYjU2ZWZlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90YWJs ZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxpbmUtYWxpZ24tZXhwZWN0 ZWQuaHRtbApAQCAtMCwwICsxLDIwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+ Cis8c3R5bGU+Cisud3JhcHBlciB7CisgICAgaGVpZ2h0OiAxMDBweDsKKyAgICBkaXNwbGF5OiBp bmxpbmUtYmxvY2s7CisgICAgY29sb3I6IGJsdWU7CisgICAgZm9udDogMTZweCBBaGVtOworfQor PC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTExMzciPjkxMTM3PC9hPjogUkVHUkVTU0lP TihyMTE3MzM5KTogY2VsbCBpbiBibG9jay1sZXZlbCB0YWJsZSBpbiBpbmxpbmUtYmxvY2sgYXJl IGFsaWduZWQgd2l0aCB0aGVpciBsYXN0IGxpbmUgYm94PC9wPgorICAgIDxwPlRoaXMgdGVzdCBj aGVja3MgdGhhdCBhbiAnaW5saW5lLXRhYmxlJyBjb250cmlidXRlcyBpdHMgYmFzZWxpbmUgdG8g ZGV0ZXJtaW5lIGFuIGlubGluZS1ibG9jayBiYXNlbGluZS48L3A+CisgICAgPHA+VGhlIDIgYmx1 ZSB0ZXh0cyBzaG91bGQgYmUgYWxpZ25lZCBiZWxvdy48L3A+CisgICAgPGRpdiBjbGFzcz0id3Jh cHBlciI+Rmlyc3Q8L2Rpdj4KKyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4mbmJzcDs8YnI+Jm5i c3A7PGJyPlNlY29uZDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC90YWJsZS9pbmxpbmUtdGFibGUtaW4taW5saW5lLWJsb2NrLWxhc3QtYmFzZWxp bmUtYWxpZ24uaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlu bGluZS1ibG9jay1sYXN0LWJhc2VsaW5lLWFsaWduLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA3NTUK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWUwNGQ0Yjdh OWJjMTVkZTg3NGRiODc2MGViM2RjNTZlNmE5MmZjNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvdGFibGUvaW5saW5lLXRhYmxlLWluLWlubGluZS1ibG9jay1sYXN0LWJhc2Vs aW5lLWFsaWduLmh0bWwKQEAgLTAsMCArMSwzOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPHN0eWxlPgorLndyYXBwZXIgeworICAgIGhlaWdodDogMTAwcHg7CisgICAgZGlz cGxheTogaW5saW5lLWJsb2NrOworICAgIGZvbnQ6IDE2cHggQWhlbTsKK30KKwordGFibGUgewor ICAgIGRpc3BsYXk6IGlubGluZS10YWJsZTsKKyAgICBib3JkZXItc3BhY2luZzogMHB4OworfQor Cit0ZCB7CisgICAgcGFkZGluZzogMHB4OworICAgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7Cisg ICAgY29sb3I6IGJsdWU7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPHA+QnVn IDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTEzNyI+ OTExMzc8L2E+OiBSRUdSRVNTSU9OKHIxMTczMzkpOiBjZWxsIGluIGJsb2NrLWxldmVsIHRhYmxl IGluIGlubGluZS1ibG9jayBhcmUgYWxpZ25lZCB3aXRoIHRoZWlyIGxhc3QgbGluZSBib3g8L3A+ CisgICAgPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IGFuICdpbmxpbmUtdGFibGUnIGNvbnRyaWJ1 dGVzIGl0cyBiYXNlbGluZSB0byBkZXRlcm1pbmUgYW4gaW5saW5lLWJsb2NrIGJhc2VsaW5lLjwv cD4KKyAgICA8cD5UaGUgMiBibHVlIHRleHRzIHNob3VsZCBiZSBhbGlnbmVkIGJlbG93LjwvcD4K KyAgICA8ZGl2IGNsYXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPHRhYmxlPgorICAgICAgICAgICAg PHRkPkZpcnN0PC90ZD4KKyAgICAgICAgPC90YWJsZT4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGNs YXNzPSJ3cmFwcGVyIj4KKyAgICAgICAgPHRhYmxlPgorICAgICAgICAgICAgPHRkPiZuYnNwOzxi cj4mbmJzcDs8YnI+U2Vjb25kPC90ZD4KKyAgICAgICAgPC90YWJsZT4KKyAgICA8L2Rpdj4KKzwv Ym9keT4KKzwvaHRtbD4K