25489 2009-04-30 12:47:23 -0700 background-position not shown 2009-09-04 00:15:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 26541 0 ash.searle yaar dglazkov eric yaar oldest_to_newest 119505 0 ash.searle 2009-04-30 12:47:23 -0700 The web inspector never shows background-position as part of the background shorthand property. (Bug #20264 is probably a consequence of this.) Minimal HTML to recreate: <title>Web Inspector background-position test</title> <style>p{background:url(#) no-repeat 2px -3px}</style> <p>inspect this element</p> 142435 1 38503 yaar 2009-08-24 16:09:18 -0700 Created attachment 38503 A Fix The patch depends on the patch for https://bugs.webkit.org/show_bug.cgi?id=26541 CSS property "background-position" was not serialized into the shorthand string value of "style.background". This is because position is stored into two (non-standard?) properties background-position-x and background-position-y. Since "style.backgroundPosition" does serialize as "position-x, position-y", (e.g. 50% 50%) it made sense that the shorthand value of style.background will do the same. I fixed the layout test fast/dom/background-shorthand-csstext.html and fast/dom/background-shorthand-expected.txt as the later was accepting a FAIL. 142472 2 38503 eric 2009-08-24 17:34:08 -0700 Comment on attachment 38503 A Fix Do we have a specific section of the spec which talks about this? Ideally we'd have a link to that section in the bug or the ChangeLog. 142473 3 38503 eric 2009-08-24 17:34:44 -0700 Comment on attachment 38503 A Fix Rejecting patch 38503 from commit-queue. This patch will require manual commit. Patch https://bugs.webkit.org/attachment.cgi?id=38503 from bug 25489 failed to download and apply. 142474 4 38503 eric 2009-08-24 17:35:04 -0700 Comment on attachment 38503 A Fix patching file LayoutTests/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file LayoutTests/fast/dom/background-shorthand-csstext-expected.txt Hunk #1 FAILED at 2. 1 out of 1 hunk FAILED -- saving rejects to file LayoutTests/fast/dom/background-shorthand-csstext-expected.txt.rej patch -p0 "LayoutTests/fast/dom/background-shorthand-csstext-expected.txt" returned 1. Pass --force to ignore patch failures. 142483 5 38503 yaar 2009-08-24 17:46:43 -0700 Comment on attachment 38503 A Fix http://www.w3.org/TR/2008/WD-css3-background-20080910/#the-background-position According to the spec's examples, background-position should indeed serialize as two numbers. In WebKit, these numbers are stored in background-position-x and background-position-y, but the user will never know. > diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog > index fa3b8ef..b8674a2 100644 > --- a/LayoutTests/ChangeLog > +++ b/LayoutTests/ChangeLog > @@ -1,3 +1,16 @@ > +2009-08-24 Yaar Schnitman <yaar@google.com> > + > + Reviewed by NOBODY (OOPS!). > + > + This patch depends on the patch for bug #26541. > + > + CSS property background-position was not serialized in shorthand string. The layout test accepted that failure, so I fixed them too. > + > + https://bugs.webkit.org/show_bug.cgi?id=25489 > + > + * fast/dom/background-shorthand-csstext-expected.txt: > + * fast/dom/background-shorthand-csstext.html: > + > 2009-08-24 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> > > Unreviewed. Skip again tests that we enabled, since they are > diff --git a/LayoutTests/fast/dom/background-shorthand-csstext-expected.txt b/LayoutTests/fast/dom/background-shorthand-csstext-expected.txt > index cc4b3f2..13a79d1 100644 > --- a/LayoutTests/fast/dom/background-shorthand-csstext-expected.txt > +++ b/LayoutTests/fast/dom/background-shorthand-csstext-expected.txt > @@ -2,4 +2,4 @@ This page tests whether or not the background shorthand properly omits initial v > > PASS: document.body.style.background == 'green' should be true and is. > PASS: document.getElementById('div1').style.background == 'repeat-x, white repeat-y' should be true and is. > -FAIL: document.getElementById('div2').style.background == '50% 50% blue' should be true but instead is false. > +PASS: document.getElementById('div2').style.background == 'blue 50% 50%' should be true and is. > diff --git a/LayoutTests/fast/dom/background-shorthand-csstext.html b/LayoutTests/fast/dom/background-shorthand-csstext.html > index f633742..7f1d638 100644 > --- a/LayoutTests/fast/dom/background-shorthand-csstext.html > +++ b/LayoutTests/fast/dom/background-shorthand-csstext.html > @@ -33,7 +33,7 @@ function test() > > shouldBe("document.body.style.background == 'green'", true); > shouldBe("document.getElementById('div1').style.background == 'repeat-x, white repeat-y'", true); > - shouldBe("document.getElementById('div2').style.background == '50% 50% blue'", true); > + shouldBe("document.getElementById('div2').style.background == 'blue 50% 50%'", true); > } > </script> > </head> > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index a42b457..cfc5b87 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog > @@ -1,3 +1,16 @@ > +2009-08-24 Yaar Schnitman <yaar@google.com> > + > + Reviewed by NOBODY (OOPS!). > + > + This patch depends on the patch for bug #26541. > + > + CSS property background-position was not serialized in shorthand string. The layout test accepted that failure, so I fixed them too. > + > + https://bugs.webkit.org/show_bug.cgi?id=25489 > + > + * css/CSSMutableStyleDeclaration.cpp: > + (WebCore::CSSMutableStyleDeclaration::getPropertyValue): > + > 2009-08-24 Nate Chapin <japhet@chromium.org> > > Reviewed by Eric Seidel. > diff --git a/WebCore/css/CSSMutableStyleDeclaration.cpp b/WebCore/css/CSSMutableStyleDeclaration.cpp > index 85ff5e0..0d0235e 100644 > --- a/WebCore/css/CSSMutableStyleDeclaration.cpp > +++ b/WebCore/css/CSSMutableStyleDeclaration.cpp > @@ -115,10 +115,15 @@ String CSSMutableStyleDeclaration::getPropertyValue(int propertyID) const > return getLayeredShorthandValue(properties, 2); > } > case CSSPropertyBackground: { > - const int properties[7] = { CSSPropertyBackgroundColor, CSSPropertyBackgroundImage, CSSPropertyBackgroundRepeat, > - CSSPropertyBackgroundAttachment, CSSPropertyBackgroundPosition, CSSPropertyBackgroundClip, > + const int properties[8] = { CSSPropertyBackgroundColor, > + CSSPropertyBackgroundImage, > + CSSPropertyBackgroundRepeat, > + CSSPropertyBackgroundAttachment, > + CSSPropertyBackgroundPositionX, > + CSSPropertyBackgroundPositionY, > + CSSPropertyBackgroundClip, > CSSPropertyBackgroundOrigin }; > - return getLayeredShorthandValue(properties, 7); > + return getLayeredShorthandValue(properties, 8); > } > case CSSPropertyBorder: { > const int properties[3][4] = {{ CSSPropertyBorderTopWidth, 143823 6 eric 2009-09-01 03:13:45 -0700 My understanding of the status of this bug is that the patch has rotted and thus cannot easily be landed as-is. If someone could post an updated patch we can get this r+'d and cq+'d again. 144587 7 39006 yaar 2009-09-03 13:46:57 -0700 Created attachment 39006 fixes .../dom/background-shorthand-csstext-expected.txt | 4 ++-- .../fast/dom/background-shorthand-csstext.html | 4 ++-- WebCore/css/CSSMutableStyleDeclaration.cpp | 14 ++++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) 144590 8 39006 yaar 2009-09-03 13:49:06 -0700 Comment on attachment 39006 fixes Ignore. git-send-bugzilla failed to upload this right 144592 9 39007 yaar 2009-09-03 13:51:21 -0700 Created attachment 39007 Fixes this bug and 26541 as well 144611 10 eric 2009-09-03 15:48:12 -0700 FYI, "bugzilla-tool post-commits" is a drop-in replacement for git-send-bugzilla. Two things to note: 1. post-commits marks review by default, pass --no-review to disable 2. post-commits cherry-picks by default, if you want to attach a range of patches you have to specify it. "HEAD~3" will just attach one patch, not 3. :) 144612 11 39007 eric 2009-09-03 15:50:16 -0700 Comment on attachment 39007 Fixes this bug and 26541 as well LGTM. 144622 12 39007 eric 2009-09-03 16:01:30 -0700 Comment on attachment 39007 Fixes this bug and 26541 as well Rejecting patch 39007 from commit-queue. This patch will require manual commit. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 cwd: None 144646 13 yaar 2009-09-03 17:03:15 -0700 What's wrong with the patch? 144699 14 39007 eric 2009-09-03 23:56:09 -0700 Comment on attachment 39007 Fixes this bug and 26541 as well Race condition during commit. ChangeLog was out of date by the time it went to commit. Trying again. 144713 15 39007 eric 2009-09-04 00:15:43 -0700 Comment on attachment 39007 Fixes this bug and 26541 as well Clearing flags on attachment: 39007 Committed r48040: <http://trac.webkit.org/changeset/48040> 144714 16 eric 2009-09-04 00:15:48 -0700 All reviewed patches have been landed. Closing bug. 38503 2009-08-24 16:09:18 -0700 2009-09-03 13:51:21 -0700 A Fix CSSBackgroundPositionFix.txt text/plain 4451 yaar ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYTNiOGVmLi5iODY3NGEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDgt MjQgIFlhYXIgU2Nobml0bWFuICA8eWFhckBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZGVwZW5kcyBvbiB0aGUg cGF0Y2ggZm9yIGJ1ZyAjMjY1NDEuCisKKwlDU1MgcHJvcGVydHkgYmFja2dyb3VuZC1wb3NpdGlv biB3YXMgbm90IHNlcmlhbGl6ZWQgaW4gc2hvcnRoYW5kIHN0cmluZy4gVGhlIGxheW91dCB0ZXN0 IGFjY2VwdGVkIHRoYXQgZmFpbHVyZSwgc28gSSBmaXhlZCB0aGVtIHRvby4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU0ODkKKworICAgICAgICAq IGZhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQtZXhwZWN0ZWQudHh0OgorICAg ICAgICAqIGZhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQuaHRtbDoKKwogMjAw OS0wOC0yNCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9y YS5jby51az4KIAogICAgICAgICBVbnJldmlld2VkLiBTa2lwIGFnYWluIHRlc3RzIHRoYXQgd2Ug ZW5hYmxlZCwgc2luY2UgdGhleSBhcmUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9t L2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZmFzdC9kb20vYmFja2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC1leHBlY3RlZC50eHQKaW5kZXgg Y2M0YjNmMi4uMTNhNzlkMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vYmFja2dy b3VuZC1zaG9ydGhhbmQtY3NzdGV4dC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9kb20vYmFja2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC1leHBlY3RlZC50eHQKQEAgLTIsNCAr Miw0IEBAIFRoaXMgcGFnZSB0ZXN0cyB3aGV0aGVyIG9yIG5vdCB0aGUgYmFja2dyb3VuZCBzaG9y dGhhbmQgcHJvcGVybHkgb21pdHMgaW5pdGlhbCB2CiAKIFBBU1M6IGRvY3VtZW50LmJvZHkuc3R5 bGUuYmFja2dyb3VuZCA9PSAnZ3JlZW4nIHNob3VsZCBiZSB0cnVlIGFuZCBpcy4KIFBBU1M6IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaXYxJykuc3R5bGUuYmFja2dyb3VuZCA9PSAncmVwZWF0 LXgsIHdoaXRlIHJlcGVhdC15JyBzaG91bGQgYmUgdHJ1ZSBhbmQgaXMuCi1GQUlMOiBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnZGl2MicpLnN0eWxlLmJhY2tncm91bmQgPT0gJzUwJSA1MCUgYmx1 ZScgc2hvdWxkIGJlIHRydWUgYnV0IGluc3RlYWQgaXMgZmFsc2UuCitQQVNTOiBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgnZGl2MicpLnN0eWxlLmJhY2tncm91bmQgPT0gJ2JsdWUgNTAlIDUwJScg c2hvdWxkIGJlIHRydWUgYW5kIGlzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20v YmFja2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20v YmFja2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC5odG1sCmluZGV4IGY2MzM3NDIuLjdmMWQ2Mzgg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNz c3RleHQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFu ZC1jc3N0ZXh0Lmh0bWwKQEAgLTMzLDcgKzMzLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgCiAg ICAgc2hvdWxkQmUoImRvY3VtZW50LmJvZHkuc3R5bGUuYmFja2dyb3VuZCA9PSAnZ3JlZW4nIiwg dHJ1ZSk7CiAgICAgc2hvdWxkQmUoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaXYxJykuc3R5 bGUuYmFja2dyb3VuZCA9PSAncmVwZWF0LXgsIHdoaXRlIHJlcGVhdC15JyIsIHRydWUpOwotICAg IHNob3VsZEJlKCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2MicpLnN0eWxlLmJhY2tncm91 bmQgPT0gJzUwJSA1MCUgYmx1ZSciLCB0cnVlKTsKKyAgICBzaG91bGRCZSgiZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ2RpdjInKS5zdHlsZS5iYWNrZ3JvdW5kID09ICdibHVlIDUwJSA1MCUnIiwg dHJ1ZSk7CiB9CiA8L3NjcmlwdD4KIDwvaGVhZD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQyYjQ1Ny4uY2ZjNWI4NyAxMDA2NDQKLS0t IGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAwOS0wOC0yNCAgWWFhciBTY2huaXRtYW4gIDx5YWFyQGdvb2dsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBk ZXBlbmRzIG9uIHRoZSBwYXRjaCBmb3IgYnVnICMyNjU0MS4KKworCUNTUyBwcm9wZXJ0eSBiYWNr Z3JvdW5kLXBvc2l0aW9uIHdhcyBub3Qgc2VyaWFsaXplZCBpbiBzaG9ydGhhbmQgc3RyaW5nLiBU aGUgbGF5b3V0IHRlc3QgYWNjZXB0ZWQgdGhhdCBmYWlsdXJlLCBzbyBJIGZpeGVkIHRoZW0gdG9v LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTQ4 OQorICAgICAKKyAgICAgICAgKiBjc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5 VmFsdWUpOgorCiAyMDA5LTA4LTI0ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggODVmZjVlMC4uMGQwMjM1ZSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1dlYkNv cmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMTE1LDEwICsxMTUsMTUg QEAgU3RyaW5nIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eVZhbHVlKGlu dCBwcm9wZXJ0eUlEKSBjb25zdAogICAgICAgICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhh bmRWYWx1ZShwcm9wZXJ0aWVzLCAyKTsKICAgICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3Bl cnR5QmFja2dyb3VuZDogewotICAgICAgICAgICAgY29uc3QgaW50IHByb3BlcnRpZXNbN10gPSB7 IENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLCBDU1NQcm9wZXJ0eUJhY2tncm91bmRJbWFnZSwg Q1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVwZWF0LCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRBdHRhY2htZW50LCBDU1NQcm9wZXJ0 eUJhY2tncm91bmRQb3NpdGlvbiwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ2xpcCwKKyAgICAgICAg ICAgIGNvbnN0IGludCBwcm9wZXJ0aWVzWzhdID0geyBDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xv ciwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlC YWNrZ3JvdW5kSW1hZ2UsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IENTU1Byb3BlcnR5QmFja2dyb3VuZFJlcGVhdCwgCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQXR0YWNobWVudCwgCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUG9z aXRpb25YLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3Bl cnR5QmFja2dyb3VuZFBvc2l0aW9uWSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRDbGlwLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5QmFja2dyb3VuZE9yaWdpbiB9OwotICAgICAg ICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9wZXJ0aWVzLCA3KTsKKyAg ICAgICAgICAgIHJldHVybiBnZXRMYXllcmVkU2hvcnRoYW5kVmFsdWUocHJvcGVydGllcywgOCk7 CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUJvcmRlcjogewogICAgICAgICAg ICAgY29uc3QgaW50IHByb3BlcnRpZXNbM11bNF0gPSB7eyBDU1NQcm9wZXJ0eUJvcmRlclRvcFdp ZHRoLAo= 39006 2009-09-03 13:46:57 -0700 2009-09-03 13:49:06 -0700 fixes fixes.patch text/plain 3477 yaar OTgzNGUxYWM4Zjc1Yjg1NDE1ZmQ5ZjE2YzZlZThhZjVhOTc1NzU4MQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9kb20vYmFja2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0LWV4 cGVjdGVkLnR4dAppbmRleCBjNjY2OWYzLi4xM2E3OWQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0LWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0LWV4cGVj dGVkLnR4dApAQCAtMSw1ICsxLDUgQEAKIFRoaXMgcGFnZSB0ZXN0cyB3aGV0aGVyIG9yIG5vdCB0 aGUgYmFja2dyb3VuZCBzaG9ydGhhbmQgcHJvcGVybHkgb21pdHMgaW5pdGlhbCB2YWx1ZXMuCiAK IFBBU1M6IGRvY3VtZW50LmJvZHkuc3R5bGUuYmFja2dyb3VuZCA9PSAnZ3JlZW4nIHNob3VsZCBi ZSB0cnVlIGFuZCBpcy4KLVBBU1M6IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaXYxJykuc3R5 bGUuYmFja2dyb3VuZCA9PSAncmVwZWF0LXgsIHJlcGVhdC15IHdoaXRlJyBzaG91bGQgYmUgdHJ1 ZSBhbmQgaXMuCi1GQUlMOiBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2MicpLnN0eWxlLmJh Y2tncm91bmQgPT0gJzUwJSA1MCUgYmx1ZScgc2hvdWxkIGJlIHRydWUgYnV0IGluc3RlYWQgaXMg ZmFsc2UuCitQQVNTOiBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2MScpLnN0eWxlLmJhY2tn cm91bmQgPT0gJ3JlcGVhdC14LCB3aGl0ZSByZXBlYXQteScgc2hvdWxkIGJlIHRydWUgYW5kIGlz LgorUEFTUzogZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2RpdjInKS5zdHlsZS5iYWNrZ3JvdW5k ID09ICdibHVlIDUwJSA1MCUnIHNob3VsZCBiZSB0cnVlIGFuZCBpcy4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQuaHRtbAppbmRl eCA5ZjY4ZDM4Li43ZjFkNjM4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9iYWNr Z3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20v YmFja2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC5odG1sCkBAIC0zMiw4ICszMiw4IEBAIGZ1bmN0 aW9uIHRlc3QoKQogICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CiAg ICAgCiAgICAgc2hvdWxkQmUoImRvY3VtZW50LmJvZHkuc3R5bGUuYmFja2dyb3VuZCA9PSAnZ3Jl ZW4nIiwgdHJ1ZSk7Ci0gICAgc2hvdWxkQmUoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaXYx Jykuc3R5bGUuYmFja2dyb3VuZCA9PSAncmVwZWF0LXgsIHJlcGVhdC15IHdoaXRlJyIsIHRydWUp OwotICAgIHNob3VsZEJlKCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2MicpLnN0eWxlLmJh Y2tncm91bmQgPT0gJzUwJSA1MCUgYmx1ZSciLCB0cnVlKTsKKyAgICBzaG91bGRCZSgiZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2RpdjEnKS5zdHlsZS5iYWNrZ3JvdW5kID09ICdyZXBlYXQteCwg d2hpdGUgcmVwZWF0LXknIiwgdHJ1ZSk7CisgICAgc2hvdWxkQmUoImRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdkaXYyJykuc3R5bGUuYmFja2dyb3VuZCA9PSAnYmx1ZSA1MCUgNTAlJyIsIHRydWUp OwogfQogPC9zY3JpcHQ+CiA8L2hlYWQ+CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNs YXJhdGlvbi5jcHAKaW5kZXggZjQyY2ZmOC4uMmRkMmY1ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9j c3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU011 dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMTE5LDEwICsxMTksMTYgQEAgU3RyaW5nIENT U011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eVZhbHVlKGludCBwcm9wZXJ0eUlE KSBjb25zdAogICAgICAgICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9w ZXJ0aWVzLCAyKTsKICAgICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5QmFja2dyb3Vu ZDogewotICAgICAgICAgICAgY29uc3QgaW50IHByb3BlcnRpZXNbOF0gPSB7IENTU1Byb3BlcnR5 QmFja2dyb3VuZEltYWdlLCBDU1NQcm9wZXJ0eUJhY2tncm91bmRSZXBlYXRYLCBDU1NQcm9wZXJ0 eUJhY2tncm91bmRSZXBlYXRZLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRBdHRhY2htZW50LCBDU1NQcm9wZXJ0eUJhY2tncm91 bmRQb3NpdGlvbiwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ2xpcCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRPcmlnaW4sIENTU1By b3BlcnR5QmFja2dyb3VuZENvbG9yIH07Ci0gICAgICAgICAgICByZXR1cm4gZ2V0TGF5ZXJlZFNo b3J0aGFuZFZhbHVlKHByb3BlcnRpZXMsIDgpOworICAgICAgICAgICAgY29uc3QgaW50IHByb3Bl cnRpZXNbOV0gPSB7IENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5QmFja2dyb3VuZEltYWdlLCAKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91 bmRSZXBlYXRYLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQ cm9wZXJ0eUJhY2tncm91bmRSZXBlYXRZLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRBdHRhY2htZW50LCAKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRQb3NpdGlv blgsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5 QmFja2dyb3VuZFBvc2l0aW9uWSwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ2xpcCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRPcmlnaW4gfTsgCisgICAgICAg ICAgICByZXR1cm4gZ2V0TGF5ZXJlZFNob3J0aGFuZFZhbHVlKHByb3BlcnRpZXMsIDkpOwogICAg ICAgICB9CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXI6IHsKICAgICAgICAgICAgIGNv bnN0IGludCBwcm9wZXJ0aWVzWzNdWzRdID0ge3sgQ1NTUHJvcGVydHlCb3JkZXJUb3BXaWR0aCwK 39007 2009-09-03 13:51:21 -0700 2009-09-04 00:15:43 -0700 Fixes this bug and 26541 as well 25489.diff text/plain 6352 yaar ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyNzk4OTk5Li4wNWE1ZGNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMDktMDkt MDMgIFlhYXIgU2Nobml0bWFuICA8eWFhckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHdvIGJ1Z3M6CisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NDg5CisgICAgICAgIENTUyBw cm9wZXJ0eSBiYWNrZ3JvdW5kLXBvc2l0aW9uIGlzIG5vdyBzZXJpYWxpemVkIGluIHNob3J0aGFu ZCBzdHJpbmcgYXMKKyAgICAgICAgYmFja2dyb3VuZC1wb3NpdGlvbi14IGJhY2tncm91bmQtcG9z aXRpb24teSwgYXMgdGhlIHNwZWNpZmljYXRpb24gcmVxdWlyZXMKKyAgICAgICAgKFNlZSBodHRw Oi8vd3d3LnczLm9yZy9UUi8yMDA4L1dELWNzczMtYmFja2dyb3VuZC0yMDA4MDkxMC8jdGhlLWJh Y2tncm91bmQtcG9zaXRpb24pLgorICAgICAgICAKKworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY1NDEKKyAgICAgICAgQ1NTIGJhY2tncm91bmQtY29s b3IgaXMgbm93IGJlIHNlcmlhbGl6ZWQgYmVmb3JlIG90aGVyIGJhY2tncm91bmQgcHJvcGVydGll cywgCisgICAgICAgIGFzIENTUyBzcGVjaWZpY2F0aW9uIHJlcXVpcmVzIChTZWUgaHR0cDovL2Rl di53My5vcmcvY3Nzd2cvY3Nzb20vI2Nzcy12YWx1ZSkuICAKKworICAgICAgICBBbiBleGlzdGlu ZyBsYXlvdXQgdGVzdCB0aGF0IGFjY2VwdGVkIHdyb25nIG9yZGVyIGFuZCBza2lwcGVkIHBvc2l0 aW9uIHRlc3QgCisgICAgICAgIGhhZCB0byBiZSBtb2RpZmllZC4KKworICAgICAgICAqIGZhc3Qv ZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGZhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQuaHRtbDoKKwogMjAwOS0wOS0w MyAgUmVuYXRhIEhvZG92YW4gIDxob2RvdmFuLnJlbmF0YUBzdHVkLnUtc3plZ2VkLmh1PgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0LWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQtZXhwZWN0ZWQu dHh0CmluZGV4IGM2NjY5ZjMuLmY5ZDEwMTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvZG9tL2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQtZXhwZWN0ZWQudHh0 CkBAIC0xLDUgKzEsNiBAQAogVGhpcyBwYWdlIHRlc3RzIHdoZXRoZXIgb3Igbm90IHRoZSBiYWNr Z3JvdW5kIHNob3J0aGFuZCBwcm9wZXJseSBvbWl0cyBpbml0aWFsIHZhbHVlcy4KIAogUEFTUzog ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kID09ICdncmVlbicgc2hvdWxkIGJlIHRydWUg YW5kIGlzLgotUEFTUzogZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2RpdjEnKS5zdHlsZS5iYWNr Z3JvdW5kID09ICdyZXBlYXQteCwgcmVwZWF0LXkgd2hpdGUnIHNob3VsZCBiZSB0cnVlIGFuZCBp cy4KLUZBSUw6IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaXYyJykuc3R5bGUuYmFja2dyb3Vu ZCA9PSAnNTAlIDUwJSBibHVlJyBzaG91bGQgYmUgdHJ1ZSBidXQgaW5zdGVhZCBpcyBmYWxzZS4K K1BBU1M6IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdkaXYxJykuc3R5bGUuYmFja2dyb3VuZCA9 PSAncmVwZWF0LXgsIHdoaXRlIHJlcGVhdC15JyBzaG91bGQgYmUgdHJ1ZSBhbmQgaXMuCitQQVNT OiBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2MicpLnN0eWxlLmJhY2tncm91bmQgPT0gJ2Js dWUgNTAlIDUwJScgc2hvdWxkIGJlIHRydWUgYW5kIGlzLgorUEFTUzogZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ2RpdjMnKS5zdHlsZS5iYWNrZ3JvdW5kID09ICdyZ2IoMjU1LCAyNTUsIDI1NSkg bm9uZSByZXBlYXQgc2Nyb2xsJyBzaG91bGQgYmUgdHJ1ZSBhbmQgaXMuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0Lmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L2RvbS9iYWNrZ3JvdW5kLXNob3J0aGFuZC1jc3N0ZXh0Lmh0bWwKaW5k ZXggOWY2OGQzOC4uODRmODdlYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vYmFj a2dyb3VuZC1zaG9ydGhhbmQtY3NzdGV4dC5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9t L2JhY2tncm91bmQtc2hvcnRoYW5kLWNzc3RleHQuaHRtbApAQCAtMzIsOCArMzIsOSBAQCBmdW5j dGlvbiB0ZXN0KCkKICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOwog ICAgIAogICAgIHNob3VsZEJlKCJkb2N1bWVudC5ib2R5LnN0eWxlLmJhY2tncm91bmQgPT0gJ2dy ZWVuJyIsIHRydWUpOwotICAgIHNob3VsZEJlKCJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZGl2 MScpLnN0eWxlLmJhY2tncm91bmQgPT0gJ3JlcGVhdC14LCByZXBlYXQteSB3aGl0ZSciLCB0cnVl KTsKLSAgICBzaG91bGRCZSgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2RpdjInKS5zdHlsZS5i YWNrZ3JvdW5kID09ICc1MCUgNTAlIGJsdWUnIiwgdHJ1ZSk7CisgICAgc2hvdWxkQmUoImRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCdkaXYxJykuc3R5bGUuYmFja2dyb3VuZCA9PSAncmVwZWF0LXgs IHdoaXRlIHJlcGVhdC15JyIsIHRydWUpOworICAgIHNob3VsZEJlKCJkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgnZGl2MicpLnN0eWxlLmJhY2tncm91bmQgPT0gJ2JsdWUgNTAlIDUwJSciLCB0cnVl KTsKKyAgICBzaG91bGRCZSgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2RpdjMnKS5zdHlsZS5i YWNrZ3JvdW5kID09ICdyZ2IoMjU1LCAyNTUsIDI1NSkgbm9uZSByZXBlYXQgc2Nyb2xsJyIsIHRy dWUpOwogfQogPC9zY3JpcHQ+CiA8L2hlYWQ+CkBAIC00Miw2ICs0Myw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogCiA8ZGl2IGlkPSJkaXYxIiBzdHlsZT0iYmFja2dyb3VuZC1yZXBlYXQ6IHJlcGVhdC14 LCByZXBlYXQteTsgYmFja2dyb3VuZC1jb2xvcjp3aGl0ZSI+PC9kaXY+CiA8ZGl2IGlkPSJkaXYy IiBzdHlsZT0iYmFja2dyb3VuZDogNTAlIDUwJSBibHVlIj48L2Rpdj4KKzxkaXYgaWQ9ImRpdjMi IHN0eWxlPSJiYWNrZ3JvdW5kOiByZ2IoMjU1LCAyNTUsIDI1NSkgbm9uZSByZXBlYXQgc2Nyb2xs Ij48L2Rpdj4KIAogPHA+VGhpcyBwYWdlIHRlc3RzIHdoZXRoZXIgb3Igbm90IHRoZSBiYWNrZ3Jv dW5kIHNob3J0aGFuZCBwcm9wZXJseSBvbWl0cwogaW5pdGlhbCB2YWx1ZXMuCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDAwNGE0NmEuLjll NGE2MzcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMDktMDktMDMgIFlhYXIgU2Nobml0bWFuICA8eWFhckBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVHdvIGJ1Z3M6CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI1NDg5CisgICAgICAgIENTUyBwcm9wZXJ0eSBiYWNrZ3JvdW5kLXBvc2l0aW9u IGlzIG5vdyBzZXJpYWxpemVkIGluIHNob3J0aGFuZCBzdHJpbmcgYXMKKyAgICAgICAgYmFja2dy b3VuZC1wb3NpdGlvbi14IGJhY2tncm91bmQtcG9zaXRpb24teSwgYXMgdGhlIHNwZWNpZmljYXRp b24gcmVxdWlyZXMKKyAgICAgICAgKFNlZSBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDA4L1dELWNz czMtYmFja2dyb3VuZC0yMDA4MDkxMC8jdGhlLWJhY2tncm91bmQtcG9zaXRpb24pLgorICAgICAg ICAKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY1 NDEKKyAgICAgICAgQ1NTIGJhY2tncm91bmQtY29sb3IgaXMgbm93IGJlIHNlcmlhbGl6ZWQgYmVm b3JlIG90aGVyIGJhY2tncm91bmQgcHJvcGVydGllcywgCisgICAgICAgIGFzIENTUyBzcGVjaWZp Y2F0aW9uIHJlcXVpcmVzIChTZWUgaHR0cDovL2Rldi53My5vcmcvY3Nzd2cvY3Nzb20vI2Nzcy12 YWx1ZSkuICAKKworICAgICAgICBBbiBleGlzdGluZyBsYXlvdXQgdGVzdCB0aGF0IGFjY2VwdGVk IHdyb25nIG9yZGVyIGFuZCBza2lwcGVkIHBvc2l0aW9uIHRlc3QgCisgICAgICAgIGhhZCB0byBi ZSBtb2RpZmllZC4KKworICAgICAgICAqIGNzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJv cGVydHlWYWx1ZSk6CisKIDIwMDktMDktMDMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwIGIvV2ViQ29y ZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4IGY0MmNmZjguLjJkZDJm NWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNw cAorKysgYi9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTEx OSwxMCArMTE5LDE2IEBAIFN0cmluZyBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJv cGVydHlWYWx1ZShpbnQgcHJvcGVydHlJRCkgY29uc3QKICAgICAgICAgICAgIHJldHVybiBnZXRM YXllcmVkU2hvcnRoYW5kVmFsdWUocHJvcGVydGllcywgMik7CiAgICAgICAgIH0KICAgICAgICAg Y2FzZSBDU1NQcm9wZXJ0eUJhY2tncm91bmQ6IHsKLSAgICAgICAgICAgIGNvbnN0IGludCBwcm9w ZXJ0aWVzWzhdID0geyBDU1NQcm9wZXJ0eUJhY2tncm91bmRJbWFnZSwgQ1NTUHJvcGVydHlCYWNr Z3JvdW5kUmVwZWF0WCwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVwZWF0WSwgCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQXR0YWNo bWVudCwgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUG9zaXRpb24sIENTU1Byb3BlcnR5QmFja2dyb3Vu ZENsaXAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVy dHlCYWNrZ3JvdW5kT3JpZ2luLCBDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvciB9OwotICAgICAg ICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRWYWx1ZShwcm9wZXJ0aWVzLCA4KTsKKyAg ICAgICAgICAgIGNvbnN0IGludCBwcm9wZXJ0aWVzWzldID0geyBDU1NQcm9wZXJ0eUJhY2tncm91 bmRDb2xvciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDU1NQcm9w ZXJ0eUJhY2tncm91bmRJbWFnZSwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVwZWF0WCwgCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kUmVwZWF0WSwgCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5k QXR0YWNobWVudCwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NT UHJvcGVydHlCYWNrZ3JvdW5kUG9zaXRpb25YLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRQb3NpdGlvblksIAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1Byb3BlcnR5QmFja2dyb3VuZENsaXAs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJvcGVydHlCYWNr Z3JvdW5kT3JpZ2luIH07IAorICAgICAgICAgICAgcmV0dXJuIGdldExheWVyZWRTaG9ydGhhbmRW YWx1ZShwcm9wZXJ0aWVzLCA5KTsKICAgICAgICAgfQogICAgICAgICBjYXNlIENTU1Byb3BlcnR5 Qm9yZGVyOiB7CiAgICAgICAgICAgICBjb25zdCBpbnQgcHJvcGVydGllc1szXVs0XSA9IHt7IENT U1Byb3BlcnR5Qm9yZGVyVG9wV2lkdGgsCg==