116363 2013-05-17 16:28:20 -0700 -webkit-text-underline-position should not be inherited 2013-05-29 18:26:12 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned bruno.abinader commit-queue dino esprehn+autocc glenn jchaffraix joepeck lamarque macpherson menard yuki.sekiguchi oldest_to_newest 890730 0 joepeck 2013-05-17 16:28:20 -0700 The spec for this property says that it should not be inherited: <http://www.w3.org/TR/2003/CR-css3-text-20030514/#text-underline-position> However it returns true from CSSProperty::isInheritedProperty. 890735 1 joepeck 2013-05-17 16:34:24 -0700 Should be easy to fix. Hard part is making a test case. I could look into this later on, but if someone familiar with this wants to take a look; then rock on. 890827 2 202189 lamarque 2013-05-17 22:04:15 -0700 Created attachment 202189 Patch Proposed patch 891179 3 202189 bruno.abinader 2013-05-20 06:30:28 -0700 Comment on attachment 202189 Patch >Subversion Revision: 150274 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index c3462a41eeba42daea64b3dd52e1cd5a2921f833..685c3d43ebf4ebd16dd619c4daf21bda767fe233 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,30 @@ >+2013-05-17 Lamarque V. Souza <Lamarque.Souza@basyskom.com> >+ >+ -webkit-text-underline-position should not be inherited >+ https://bugs.webkit.org/show_bug.cgi?id=116363 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Specification says text-underline-position should not be inherited. >+ >+ No new tests, this updates existing tests. >+ >+ * css/CSSProperty.cpp: >+ (WebCore::CSSProperty::isInheritedProperty): Make >+ CSSPropertyWebkitTextUnderlinePosition return false. >+ * rendering/style/RenderStyle.h: Treat TextUnderlinePosition as >+ non-inherited. >+ * rendering/style/StyleRareInheritedData.cpp: >+ (WebCore::StyleRareInheritedData::StyleRareInheritedData): >+ (WebCore::StyleRareInheritedData::operator==): Remove m_textUnderlinePosition. >+ * rendering/style/StyleRareInheritedData.h: >+ (StyleRareInheritedData): >+ * rendering/style/StyleRareNonInheritedData.cpp: >+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): >+ (WebCore::StyleRareNonInheritedData::operator==): Add m_textUnderlinePosition. >+ * rendering/style/StyleRareNonInheritedData.h: >+ (StyleRareNonInheritedData): >+ > 2013-05-17 Darin Adler <darin@apple.com> > > [EFL] Move EFL port off legacy clipboard >diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp >index bedf7d7e84b6cfb28aa2910912690ce5537507f9..b3fa626f54a231e25f973d6e455fe42dae946d93 100644 >--- a/Source/WebCore/css/CSSProperty.cpp >+++ b/Source/WebCore/css/CSSProperty.cpp >@@ -332,7 +332,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) > case CSSPropertyWebkitTextDecorationLine: > case CSSPropertyWebkitTextAlignLast: > case CSSPropertyWebkitTextJustify: >- case CSSPropertyWebkitTextUnderlinePosition: > #endif // CSS3_TEXT > case CSSPropertyWebkitTextDecorationsInEffect: > case CSSPropertyWebkitTextEmphasis: >@@ -648,6 +647,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) > #if ENABLE(CSS3_TEXT) > case CSSPropertyWebkitTextDecorationStyle: > case CSSPropertyWebkitTextDecorationColor: >+ case CSSPropertyWebkitTextUnderlinePosition: > #endif // CSS3_TEXT > case CSSPropertyWebkitTransform: > case CSSPropertyWebkitTransformOrigin: >diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h >index 908ec30ce32d6ad868752a986ff1d44e7125d16d..fb2a2732239d4d1cc2b6ced01bb5c6a91b5529a1 100644 >--- a/Source/WebCore/rendering/style/RenderStyle.h >+++ b/Source/WebCore/rendering/style/RenderStyle.h >@@ -580,7 +580,7 @@ public: > TextDecorationStyle textDecorationStyle() const { return static_cast<TextDecorationStyle>(rareNonInheritedData->m_textDecorationStyle); } > TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rareInheritedData->m_textAlignLast); } > TextJustify textJustify() const { return static_cast<TextJustify>(rareInheritedData->m_textJustify); } >- TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } >+ TextUnderlinePosition textUnderlinePosition() const { return static_cast<TextUnderlinePosition>(rareNonInheritedData->m_textUnderlinePosition); } > #else > TextDecorationStyle textDecorationStyle() const { return TextDecorationStyleSolid; } > #endif // CSS3_TEXT >@@ -1150,7 +1150,7 @@ public: > void setTextDecorationStyle(TextDecorationStyle v) { SET_VAR(rareNonInheritedData, m_textDecorationStyle, v); } > void setTextAlignLast(TextAlignLast v) { SET_VAR(rareInheritedData, m_textAlignLast, v); } > void setTextJustify(TextJustify v) { SET_VAR(rareInheritedData, m_textJustify, v); } >- void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareInheritedData, m_textUnderlinePosition, v); } >+ void setTextUnderlinePosition(TextUnderlinePosition v) { SET_VAR(rareNonInheritedData, m_textUnderlinePosition, v); } > #endif // CSS3_TEXT > void setDirection(TextDirection v) { inherited_flags._direction = v; } > void setLineHeight(Length specifiedLineHeight); >diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >index 2e1d9d0a6a3952d6995b0a5bdf3a5bf4062fafc1..b73a9baa1969fd52be4671aabc2390d4cc3febc5 100644 >--- a/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.cpp >@@ -106,7 +106,6 @@ StyleRareInheritedData::StyleRareInheritedData() > #if ENABLE(CSS3_TEXT) > , m_textAlignLast(RenderStyle::initialTextAlignLast()) > , m_textJustify(RenderStyle::initialTextJustify()) >- , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) > #endif // CSS3_TEXT > , m_rubyPosition(RenderStyle::initialRubyPosition()) > , hyphenationLimitBefore(-1) >@@ -181,7 +180,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o) > #if ENABLE(CSS3_TEXT) > , m_textAlignLast(o.m_textAlignLast) > , m_textJustify(o.m_textJustify) >- , m_textUnderlinePosition(o.m_textUnderlinePosition) > #endif // CSS3_TEXT > , m_rubyPosition(o.m_rubyPosition) > , hyphenationString(o.hyphenationString) >@@ -291,7 +289,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const > #if ENABLE(CSS3_TEXT) > && m_textAlignLast == o.m_textAlignLast > && m_textJustify == o.m_textJustify >- && m_textUnderlinePosition == o.m_textUnderlinePosition > #endif // CSS3_TEXT > && m_rubyPosition == o.m_rubyPosition > && m_lineSnap == o.m_lineSnap >diff --git a/Source/WebCore/rendering/style/StyleRareInheritedData.h b/Source/WebCore/rendering/style/StyleRareInheritedData.h >index 34b80ea525b47c53922699e270405c054e85e906..d8c0da0e84a15b343b4401c90298cb190f99360b 100644 >--- a/Source/WebCore/rendering/style/StyleRareInheritedData.h >+++ b/Source/WebCore/rendering/style/StyleRareInheritedData.h >@@ -120,7 +120,6 @@ public: > #if ENABLE(CSS3_TEXT) > unsigned m_textAlignLast : 3; // TextAlignLast > unsigned m_textJustify : 3; // TextJustify >- unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition > #endif // CSS3_TEXT > unsigned m_rubyPosition : 1; // RubyPosition > >diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp >index f5c6bb828b09e01050372fc3d8038ff5cb775c6c..556c3dd58fd4b0ebebfc6b13c6c8509855c0a342 100644 >--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp >+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp >@@ -75,6 +75,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() > , m_textCombine(RenderStyle::initialTextCombine()) > #if ENABLE(CSS3_TEXT) > , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle()) >+ , m_textUnderlinePosition(RenderStyle::initialTextUnderlinePosition()) > #endif // CSS3_TEXT > , m_wrapFlow(RenderStyle::initialWrapFlow()) > , m_wrapThrough(RenderStyle::initialWrapThrough()) >@@ -158,6 +159,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited > , m_textCombine(o.m_textCombine) > #if ENABLE(CSS3_TEXT) > , m_textDecorationStyle(o.m_textDecorationStyle) >+ , m_textUnderlinePosition(o.m_textUnderlinePosition) > #endif // CSS3_TEXT > , m_wrapFlow(o.m_wrapFlow) > , m_wrapThrough(o.m_wrapThrough) >@@ -247,6 +249,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c > && m_textCombine == o.m_textCombine > #if ENABLE(CSS3_TEXT) > && m_textDecorationStyle == o.m_textDecorationStyle >+ && m_textUnderlinePosition == o.m_textUnderlinePosition > #endif // CSS3_TEXT > && m_wrapFlow == o.m_wrapFlow > && m_wrapThrough == o.m_wrapThrough >diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h >index 0a3c7a8cac1bc20a0e445d9733d705a605bd11cc..8edf5216f96c9b8439aaee3eb7ff4dc0eb135a42 100644 >--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h >+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h >@@ -183,6 +183,7 @@ public: > > #if ENABLE(CSS3_TEXT) > unsigned m_textDecorationStyle : 3; // TextDecorationStyle >+ unsigned m_textUnderlinePosition : 3; // TextUnderlinePosition > #endif // CSS3_TEXT > unsigned m_wrapFlow: 3; // WrapFlow > unsigned m_wrapThrough: 1; // WrapThrough >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 8f6fbe4d411534539b133883d0dea6c067f34c74..c759ef4119c4c439a8333bfec3379d1ecc6a8955 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,15 @@ >+2013-05-17 Lamarque V. Souza <Lamarque.Souza@basyskom.com> >+ >+ -webkit-text-underline-position should not be inherited >+ https://bugs.webkit.org/show_bug.cgi?id=116363 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Update expected results. >+ >+ * fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt: >+ * fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js: >+ > 2013-05-17 Frédéric Wang <fred.wang@free.fr> > > Bad spacing inside MathML formulas when text-indent is specified >diff --git a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt >index 89c6f8ced66876f323b40e51738ab21c9a086919..e5b77ee2a4cedf070dc699295b731c5f9f4a9433 100644 >--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt >+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/getComputedStyle-text-underline-position-expected.txt >@@ -47,11 +47,11 @@ PASS computedStyle.webkitTextUnderlinePosition is 'under' > PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').toString() is '[object CSSPrimitiveValue]' > PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under' > >-Ancestor inherits values from parent: >+Ancestor does not inherit values from parent: > PASS e.style.getPropertyCSSValue('-webkit-text-underline-position') is null >-PASS computedStyle.webkitTextUnderlinePosition is 'under' >+PASS computedStyle.webkitTextUnderlinePosition is 'auto' > PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').toString() is '[object CSSPrimitiveValue]' >-PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'under' >+PASS computedStyle.getPropertyCSSValue('-webkit-text-underline-position').cssText is 'auto' > > Value 'auto alphabetic': > PASS e.style.getPropertyCSSValue('-webkit-text-underline-position') is null >diff --git a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js >index a9e1b15786698a20c995eff96dcf9bae1cf503fd..9bae5b7a11e1a85209ce2520411a138800474c7f 100644 >--- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js >+++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-underline-position.js >@@ -65,10 +65,10 @@ testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-positio > debug(''); > > testContainer.innerHTML = '<div id="test-parent" style="-webkit-text-underline-position: under;">hello <span id="test-ancestor">world</span></div>'; >-debug("Ancestor inherits values from parent:"); >+debug("Ancestor does not inherit values from parent:"); > e = document.getElementById('test-ancestor'); > testElementStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", null, ""); >-testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", "under"); >+testComputedStyle("webkitTextUnderlinePosition", "-webkit-text-underline-position", "[object CSSPrimitiveValue]", "auto"); > debug(''); > > debug("Value 'auto alphabetic':"); 891183 4 202189 commit-queue 2013-05-20 06:43:51 -0700 Comment on attachment 202189 Patch Clearing flags on attachment: 202189 Committed r150366: <http://trac.webkit.org/changeset/150366> 891184 5 commit-queue 2013-05-20 06:43:53 -0700 All reviewed patches have been landed. Closing bug. 894255 6 yuki.sekiguchi 2013-05-28 01:45:59 -0700 Hi Lamarque, Joseph and Dean, I think this should be reverted because the spec which Joseph quoted is very old and new spec says it should be inherited: Current Working Draft: http://www.w3.org/TR/2013/WD-css-text-decor-3-20130103/#text-underline-position-property Current Editor's Draft: http://dev.w3.org/csswg/css-text-decor-3/#text-underline-position-property If I am wrong, we should fix test cases. Please look at text-underline-position-under.html: http://trac.webkit.org/browser/trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under.html This patch make all "lorem ipsum"s -webkit-underline-position: auto, and underline doesn't align. 894455 7 joepeck 2013-05-28 12:18:22 -0700 (In reply to comment #6) > Hi Lamarque, Joseph and Dean, > > I think this should be reverted because the spec which Joseph quoted is very old and new spec says it should be inherited: > Current Working Draft: http://www.w3.org/TR/2013/WD-css-text-decor-3-20130103/#text-underline-position-property > Current Editor's Draft: http://dev.w3.org/csswg/css-text-decor-3/#text-underline-position-property > > If I am wrong, we should fix test cases. > Please look at text-underline-position-under.html: > http://trac.webkit.org/browser/trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under.html > This patch make all "lorem ipsum"s -webkit-underline-position: auto, and underline doesn't align. Doh, if that is the case then yes, this should be reverted. Navigating the different CSS specs is a mess. I had clicked the "Latest Version" link at the top of the spec thinking that would be enough. Apparently not. 895288 8 dino 2013-05-29 17:55:28 -0700 (In reply to comment #7) > Doh, if that is the case then yes, this should be reverted. Navigating the different CSS specs is a mess. I had clicked the "Latest Version" link at the top of the spec thinking that would be enough. Apparently not. Indeed. Reverting now. 895294 9 dino 2013-05-29 18:22:23 -0700 Committed r150941: <http://trac.webkit.org/changeset/150941> 895295 10 yuki.sekiguchi 2013-05-29 18:26:12 -0700 Thank you! 202189 2013-05-17 22:04:15 -0700 2013-05-20 06:43:51 -0700 Patch bug-116363-20130518020307.patch text/plain 12647 lamarque U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMjc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM0NjJhNDFlZWJhNDJk YWVhNjRiM2RkNTJlMWNkNWEyOTIxZjgzMy4uNjg1YzNkNDNlYmY0ZWJkMTZkZDYxOWM0ZGFmMjFi ZGE3NjdmZTIzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTA1LTE3ICBMYW1h cnF1ZSBWLiBTb3V6YSAgPExhbWFycXVlLlNvdXphQGJhc3lza29tLmNvbT4KKworICAgICAgICAt d2Via2l0LXRleHQtdW5kZXJsaW5lLXBvc2l0aW9uIHNob3VsZCBub3QgYmUgaW5oZXJpdGVkCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYzNjMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTcGVjaWZpY2F0 aW9uIHNheXMgdGV4dC11bmRlcmxpbmUtcG9zaXRpb24gc2hvdWxkIG5vdCBiZSBpbmhlcml0ZWQu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCB0aGlzIHVwZGF0ZXMgZXhpc3RpbmcgdGVzdHMuCisK KyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJv cGVydHk6OmlzSW5oZXJpdGVkUHJvcGVydHkpOiBNYWtlCisgICAgICAgIENTU1Byb3BlcnR5V2Vi a2l0VGV4dFVuZGVybGluZVBvc2l0aW9uIHJldHVybiBmYWxzZS4KKyAgICAgICAgKiByZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaDogVHJlYXQgVGV4dFVuZGVybGluZVBvc2l0aW9uIGFzCisg ICAgICAgIG5vbi1pbmhlcml0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFy ZUluaGVyaXRlZERhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSYXJlSW5oZXJpdGVk RGF0YTo6U3R5bGVSYXJlSW5oZXJpdGVkRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJh cmVJbmhlcml0ZWREYXRhOjpvcGVyYXRvcj09KTogUmVtb3ZlIG1fdGV4dFVuZGVybGluZVBvc2l0 aW9uLgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmg6 CisgICAgICAgIChTdHlsZVJhcmVJbmhlcml0ZWREYXRhKToKKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT dHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhKToKKyAg ICAgICAgKFdlYkNvcmU6OlN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6Om9wZXJhdG9yPT0pOiBB ZGQgbV90ZXh0VW5kZXJsaW5lUG9zaXRpb24uCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0 eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaDoKKyAgICAgICAgKFN0eWxlUmFyZU5vbkluaGVyaXRl ZERhdGEpOgorCiAyMDEzLTA1LTE3ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAog ICAgICAgICBbRUZMXSBNb3ZlIEVGTCBwb3J0IG9mZiBsZWdhY3kgY2xpcGJvYXJkCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1Byb3BlcnR5LmNwcAppbmRleCBiZWRmN2Q3ZTg0YjZjZmIyOGFhMjkxMDkxMjY5MGNl NTUzNzUwN2Y5Li5iM2ZhNjI2ZjU0YTIzMWUyNWY5NzNkNmU0NTVmZTQyZGFlOTQ2ZDkzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5jcHAKQEAgLTMzMiw3ICszMzIsNiBAQCBib29sIENTU1By b3BlcnR5Ojppc0luaGVyaXRlZFByb3BlcnR5KENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCkKICAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dERlY29yYXRpb25MaW5lOgogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRUZXh0QWxpZ25MYXN0OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRU ZXh0SnVzdGlmeToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dFVuZGVybGluZVBvc2l0 aW9uOgogI2VuZGlmIC8vIENTUzNfVEVYVAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0 RGVjb3JhdGlvbnNJbkVmZmVjdDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dEVtcGhh c2lzOgpAQCAtNjQ4LDYgKzY0Nyw3IEBAIGJvb2wgQ1NTUHJvcGVydHk6OmlzSW5oZXJpdGVkUHJv cGVydHkoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEKQogI2lmIEVOQUJMRShDU1MzX1RFWFQpCiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uU3R5bGU6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdFRleHREZWNvcmF0aW9uQ29sb3I6CisgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdFRleHRVbmRlcmxpbmVQb3NpdGlvbjoKICNlbmRpZiAvLyBDU1MzX1RFWFQKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0VHJhbnNmb3JtOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRUcmFuc2Zvcm1PcmlnaW46CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCmluZGV4IDkwOGVjMzBjZTMyZDZhZDg2ODc1MmE5ODZmZjFkNDRlNzEyNWQxNmQu LmZiMmEyNzMyMjM5ZDRkMWNjMmI2Y2VkMDFiYjVjNmE5MWI1NTI5YTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC01ODAsNyArNTgwLDcgQEAg cHVibGljOgogICAgIFRleHREZWNvcmF0aW9uU3R5bGUgdGV4dERlY29yYXRpb25TdHlsZSgpIGNv bnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFRleHREZWNvcmF0aW9uU3R5bGU+KHJhcmVOb25Jbmhl cml0ZWREYXRhLT5tX3RleHREZWNvcmF0aW9uU3R5bGUpOyB9CiAgICAgVGV4dEFsaWduTGFzdCB0 ZXh0QWxpZ25MYXN0KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8VGV4dEFsaWduTGFzdD4o cmFyZUluaGVyaXRlZERhdGEtPm1fdGV4dEFsaWduTGFzdCk7IH0KICAgICBUZXh0SnVzdGlmeSB0 ZXh0SnVzdGlmeSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFRleHRKdXN0aWZ5PihyYXJl SW5oZXJpdGVkRGF0YS0+bV90ZXh0SnVzdGlmeSk7IH0KLSAgICBUZXh0VW5kZXJsaW5lUG9zaXRp b24gdGV4dFVuZGVybGluZVBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8VGV4 dFVuZGVybGluZVBvc2l0aW9uPihyYXJlSW5oZXJpdGVkRGF0YS0+bV90ZXh0VW5kZXJsaW5lUG9z aXRpb24pOyB9CisgICAgVGV4dFVuZGVybGluZVBvc2l0aW9uIHRleHRVbmRlcmxpbmVQb3NpdGlv bigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFRleHRVbmRlcmxpbmVQb3NpdGlvbj4ocmFy ZU5vbkluaGVyaXRlZERhdGEtPm1fdGV4dFVuZGVybGluZVBvc2l0aW9uKTsgfQogI2Vsc2UKICAg ICBUZXh0RGVjb3JhdGlvblN0eWxlIHRleHREZWNvcmF0aW9uU3R5bGUoKSBjb25zdCB7IHJldHVy biBUZXh0RGVjb3JhdGlvblN0eWxlU29saWQ7IH0KICNlbmRpZiAvLyBDU1MzX1RFWFQKQEAgLTEx NTAsNyArMTE1MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFRleHREZWNvcmF0aW9uU3R5bGUo VGV4dERlY29yYXRpb25TdHlsZSB2KSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEsIG1f dGV4dERlY29yYXRpb25TdHlsZSwgdik7IH0KICAgICB2b2lkIHNldFRleHRBbGlnbkxhc3QoVGV4 dEFsaWduTGFzdCB2KSB7IFNFVF9WQVIocmFyZUluaGVyaXRlZERhdGEsIG1fdGV4dEFsaWduTGFz dCwgdik7IH0KICAgICB2b2lkIHNldFRleHRKdXN0aWZ5KFRleHRKdXN0aWZ5IHYpIHsgU0VUX1ZB UihyYXJlSW5oZXJpdGVkRGF0YSwgbV90ZXh0SnVzdGlmeSwgdik7IH0KLSAgICB2b2lkIHNldFRl eHRVbmRlcmxpbmVQb3NpdGlvbihUZXh0VW5kZXJsaW5lUG9zaXRpb24gdikgeyBTRVRfVkFSKHJh cmVJbmhlcml0ZWREYXRhLCBtX3RleHRVbmRlcmxpbmVQb3NpdGlvbiwgdik7IH0KKyAgICB2b2lk IHNldFRleHRVbmRlcmxpbmVQb3NpdGlvbihUZXh0VW5kZXJsaW5lUG9zaXRpb24gdikgeyBTRVRf VkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLCBtX3RleHRVbmRlcmxpbmVQb3NpdGlvbiwgdik7IH0K ICNlbmRpZiAvLyBDU1MzX1RFWFQKICAgICB2b2lkIHNldERpcmVjdGlvbihUZXh0RGlyZWN0aW9u IHYpIHsgaW5oZXJpdGVkX2ZsYWdzLl9kaXJlY3Rpb24gPSB2OyB9CiAgICAgdm9pZCBzZXRMaW5l SGVpZ2h0KExlbmd0aCBzcGVjaWZpZWRMaW5lSGVpZ2h0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmNwcAppbmRl eCAyZTFkOWQwYTZhMzk1MmQ2OTk1YjBhNWJkZjNhNWJmNDA2MmZhZmMxLi5iNzNhOWJhYTE5Njlm ZDUyYmU0NjcxYWFiYzIzOTBkNGNjM2ZlYmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuY3BwCkBAIC0xMDYs NyArMTA2LDYgQEAgU3R5bGVSYXJlSW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJlSW5oZXJpdGVkRGF0 YSgpCiAjaWYgRU5BQkxFKENTUzNfVEVYVCkKICAgICAsIG1fdGV4dEFsaWduTGFzdChSZW5kZXJT dHlsZTo6aW5pdGlhbFRleHRBbGlnbkxhc3QoKSkKICAgICAsIG1fdGV4dEp1c3RpZnkoUmVuZGVy U3R5bGU6OmluaXRpYWxUZXh0SnVzdGlmeSgpKQotICAgICwgbV90ZXh0VW5kZXJsaW5lUG9zaXRp b24oUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0VW5kZXJsaW5lUG9zaXRpb24oKSkKICNlbmRpZiAv LyBDU1MzX1RFWFQKICAgICAsIG1fcnVieVBvc2l0aW9uKFJlbmRlclN0eWxlOjppbml0aWFsUnVi eVBvc2l0aW9uKCkpCiAgICAgLCBoeXBoZW5hdGlvbkxpbWl0QmVmb3JlKC0xKQpAQCAtMTgxLDcg KzE4MCw2IEBAIFN0eWxlUmFyZUluaGVyaXRlZERhdGE6OlN0eWxlUmFyZUluaGVyaXRlZERhdGEo Y29uc3QgU3R5bGVSYXJlSW5oZXJpdGVkRGF0YSYgbykKICNpZiBFTkFCTEUoQ1NTM19URVhUKQog ICAgICwgbV90ZXh0QWxpZ25MYXN0KG8ubV90ZXh0QWxpZ25MYXN0KQogICAgICwgbV90ZXh0SnVz dGlmeShvLm1fdGV4dEp1c3RpZnkpCi0gICAgLCBtX3RleHRVbmRlcmxpbmVQb3NpdGlvbihvLm1f dGV4dFVuZGVybGluZVBvc2l0aW9uKQogI2VuZGlmIC8vIENTUzNfVEVYVAogICAgICwgbV9ydWJ5 UG9zaXRpb24oby5tX3J1YnlQb3NpdGlvbikKICAgICAsIGh5cGhlbmF0aW9uU3RyaW5nKG8uaHlw aGVuYXRpb25TdHJpbmcpCkBAIC0yOTEsNyArMjg5LDYgQEAgYm9vbCBTdHlsZVJhcmVJbmhlcml0 ZWREYXRhOjpvcGVyYXRvcj09KGNvbnN0IFN0eWxlUmFyZUluaGVyaXRlZERhdGEmIG8pIGNvbnN0 CiAjaWYgRU5BQkxFKENTUzNfVEVYVCkKICAgICAgICAgJiYgbV90ZXh0QWxpZ25MYXN0ID09IG8u bV90ZXh0QWxpZ25MYXN0CiAgICAgICAgICYmIG1fdGV4dEp1c3RpZnkgPT0gby5tX3RleHRKdXN0 aWZ5Ci0gICAgICAgICYmIG1fdGV4dFVuZGVybGluZVBvc2l0aW9uID09IG8ubV90ZXh0VW5kZXJs aW5lUG9zaXRpb24KICNlbmRpZiAvLyBDU1MzX1RFWFQKICAgICAgICAgJiYgbV9ydWJ5UG9zaXRp b24gPT0gby5tX3J1YnlQb3NpdGlvbgogICAgICAgICAmJiBtX2xpbmVTbmFwID09IG8ubV9saW5l U25hcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFy ZUluaGVyaXRlZERhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJh cmVJbmhlcml0ZWREYXRhLmgKaW5kZXggMzRiODBlYTUyNWI0N2M1MzkyMjY5OWUyNzA0MDVjMDU0 ZTg1ZTkwNi4uZDhjMGRhMGU4NGExNWIzNDNiNDQwMWM5MDI5OGNiMTkwZjk5MzYwYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERh dGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJp dGVkRGF0YS5oCkBAIC0xMjAsNyArMTIwLDYgQEAgcHVibGljOgogI2lmIEVOQUJMRShDU1MzX1RF WFQpCiAgICAgdW5zaWduZWQgbV90ZXh0QWxpZ25MYXN0IDogMzsgLy8gVGV4dEFsaWduTGFzdAog ICAgIHVuc2lnbmVkIG1fdGV4dEp1c3RpZnkgOiAzOyAvLyBUZXh0SnVzdGlmeQotICAgIHVuc2ln bmVkIG1fdGV4dFVuZGVybGluZVBvc2l0aW9uIDogMzsgLy8gVGV4dFVuZGVybGluZVBvc2l0aW9u CiAjZW5kaWYgLy8gQ1NTM19URVhUCiAgICAgdW5zaWduZWQgbV9ydWJ5UG9zaXRpb24gOiAxOyAv LyBSdWJ5UG9zaXRpb24KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwCmluZGV4IGY1YzZiYjgyOGIw OWUwMTA1MDM3MmZjM2Q4MDM4ZmY1Y2I3NzVjNmMuLjU1NmMzZGQ1OGZkNGIwZWJlYmZjNmIxM2M2 Yzg1MDk4NTVjMGEzNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5jcHAKQEAgLTc1LDYgKzc1LDcg QEAgU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YSgp CiAgICAgLCBtX3RleHRDb21iaW5lKFJlbmRlclN0eWxlOjppbml0aWFsVGV4dENvbWJpbmUoKSkK ICNpZiBFTkFCTEUoQ1NTM19URVhUKQogICAgICwgbV90ZXh0RGVjb3JhdGlvblN0eWxlKFJlbmRl clN0eWxlOjppbml0aWFsVGV4dERlY29yYXRpb25TdHlsZSgpKQorICAgICwgbV90ZXh0VW5kZXJs aW5lUG9zaXRpb24oUmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0VW5kZXJsaW5lUG9zaXRpb24oKSkK ICNlbmRpZiAvLyBDU1MzX1RFWFQKICAgICAsIG1fd3JhcEZsb3coUmVuZGVyU3R5bGU6OmluaXRp YWxXcmFwRmxvdygpKQogICAgICwgbV93cmFwVGhyb3VnaChSZW5kZXJTdHlsZTo6aW5pdGlhbFdy YXBUaHJvdWdoKCkpCkBAIC0xNTgsNiArMTU5LDcgQEAgU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0 YTo6U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YShjb25zdCBTdHlsZVJhcmVOb25Jbmhlcml0ZWQK ICAgICAsIG1fdGV4dENvbWJpbmUoby5tX3RleHRDb21iaW5lKQogI2lmIEVOQUJMRShDU1MzX1RF WFQpCiAgICAgLCBtX3RleHREZWNvcmF0aW9uU3R5bGUoby5tX3RleHREZWNvcmF0aW9uU3R5bGUp CisgICAgLCBtX3RleHRVbmRlcmxpbmVQb3NpdGlvbihvLm1fdGV4dFVuZGVybGluZVBvc2l0aW9u KQogI2VuZGlmIC8vIENTUzNfVEVYVAogICAgICwgbV93cmFwRmxvdyhvLm1fd3JhcEZsb3cpCiAg ICAgLCBtX3dyYXBUaHJvdWdoKG8ubV93cmFwVGhyb3VnaCkKQEAgLTI0Nyw2ICsyNDksNyBAQCBi b29sIFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6Om9wZXJhdG9yPT0oY29uc3QgU3R5bGVSYXJl Tm9uSW5oZXJpdGVkRGF0YSYgbykgYwogICAgICAgICAmJiBtX3RleHRDb21iaW5lID09IG8ubV90 ZXh0Q29tYmluZQogI2lmIEVOQUJMRShDU1MzX1RFWFQpCiAgICAgICAgICYmIG1fdGV4dERlY29y YXRpb25TdHlsZSA9PSBvLm1fdGV4dERlY29yYXRpb25TdHlsZQorICAgICAgICAmJiBtX3RleHRV bmRlcmxpbmVQb3NpdGlvbiA9PSBvLm1fdGV4dFVuZGVybGluZVBvc2l0aW9uCiAjZW5kaWYgLy8g Q1NTM19URVhUCiAgICAgICAgICYmIG1fd3JhcEZsb3cgPT0gby5tX3dyYXBGbG93CiAgICAgICAg ICYmIG1fd3JhcFRocm91Z2ggPT0gby5tX3dyYXBUaHJvdWdoCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaApp bmRleCAwYTNjN2E4Y2FjMWJjMjBhMGU0NDVkOTczM2Q3MDVhNjA1YmQxMWNjLi44ZWRmNTIxNmY5 NmM5Yjg0MzlhYWVlM2ViN2ZmNGRjMGViMTM1YTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKQEAg LTE4Myw2ICsxODMsNyBAQCBwdWJsaWM6CiAKICNpZiBFTkFCTEUoQ1NTM19URVhUKQogICAgIHVu c2lnbmVkIG1fdGV4dERlY29yYXRpb25TdHlsZSA6IDM7IC8vIFRleHREZWNvcmF0aW9uU3R5bGUK KyAgICB1bnNpZ25lZCBtX3RleHRVbmRlcmxpbmVQb3NpdGlvbiA6IDM7IC8vIFRleHRVbmRlcmxp bmVQb3NpdGlvbgogI2VuZGlmIC8vIENTUzNfVEVYVAogICAgIHVuc2lnbmVkIG1fd3JhcEZsb3c6 IDM7IC8vIFdyYXBGbG93CiAgICAgdW5zaWduZWQgbV93cmFwVGhyb3VnaDogMTsgLy8gV3JhcFRo cm91Z2gKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA4ZjZmYmU0ZDQxMTUzNDUzOWIxMzM4ODNkMGRlYTZjMDY3ZjM0Yzc0Li5j NzU5ZWY0MTE5YzRjNDM5YTgzMzNiZmVjMzM3OWQxZWNjNmE4OTU1IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTMtMDUtMTcgIExhbWFycXVlIFYuIFNvdXphICA8TGFtYXJxdWUuU291emFAYmFz eXNrb20uY29tPgorCisgICAgICAgIC13ZWJraXQtdGV4dC11bmRlcmxpbmUtcG9zaXRpb24gc2hv dWxkIG5vdCBiZSBpbmhlcml0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNjM2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSBleHBlY3RlZCByZXN1bHRzLgorCisgICAgICAgICogZmFzdC9j c3MzLXRleHQvY3NzMy10ZXh0LWRlY29yYXRpb24vZ2V0Q29tcHV0ZWRTdHlsZS9nZXRDb21wdXRl ZFN0eWxlLXRleHQtdW5kZXJsaW5lLXBvc2l0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBm YXN0L2NzczMtdGV4dC9jc3MzLXRleHQtZGVjb3JhdGlvbi9nZXRDb21wdXRlZFN0eWxlL3Njcmlw dC10ZXN0cy9nZXRDb21wdXRlZFN0eWxlLXRleHQtdW5kZXJsaW5lLXBvc2l0aW9uLmpzOgorCiAy MDEzLTA1LTE3ICBGcsOpZMOpcmljIFdhbmcgIDxmcmVkLndhbmdAZnJlZS5mcj4KIAogICAgICAg ICBCYWQgc3BhY2luZyBpbnNpZGUgTWF0aE1MIGZvcm11bGFzIHdoZW4gdGV4dC1pbmRlbnQgaXMg c3BlY2lmaWVkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRl eHQtZGVjb3JhdGlvbi9nZXRDb21wdXRlZFN0eWxlL2dldENvbXB1dGVkU3R5bGUtdGV4dC11bmRl cmxpbmUtcG9zaXRpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MzLXRleHQv Y3NzMy10ZXh0LWRlY29yYXRpb24vZ2V0Q29tcHV0ZWRTdHlsZS9nZXRDb21wdXRlZFN0eWxlLXRl eHQtdW5kZXJsaW5lLXBvc2l0aW9uLWV4cGVjdGVkLnR4dAppbmRleCA4OWM2ZjhjZWQ2Njg3NmYz MjNiNDBlNTE3MzhhYjIxYzlhMDg2OTE5Li5lNWI3N2VlMmE0Y2VkZjA3MGRjNjk5Mjk1YjczMWM1 ZjlmNGE5NDMzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRl eHQtZGVjb3JhdGlvbi9nZXRDb21wdXRlZFN0eWxlL2dldENvbXB1dGVkU3R5bGUtdGV4dC11bmRl cmxpbmUtcG9zaXRpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzMy10 ZXh0L2NzczMtdGV4dC1kZWNvcmF0aW9uL2dldENvbXB1dGVkU3R5bGUvZ2V0Q29tcHV0ZWRTdHls ZS10ZXh0LXVuZGVybGluZS1wb3NpdGlvbi1leHBlY3RlZC50eHQKQEAgLTQ3LDExICs0NywxMSBA QCBQQVNTIGNvbXB1dGVkU3R5bGUud2Via2l0VGV4dFVuZGVybGluZVBvc2l0aW9uIGlzICd1bmRl cicKIFBBU1MgY29tcHV0ZWRTdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCctd2Via2l0LXRleHQt dW5kZXJsaW5lLXBvc2l0aW9uJykudG9TdHJpbmcoKSBpcyAnW29iamVjdCBDU1NQcmltaXRpdmVW YWx1ZV0nCiBQQVNTIGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgnLXdlYmtpdC10 ZXh0LXVuZGVybGluZS1wb3NpdGlvbicpLmNzc1RleHQgaXMgJ3VuZGVyJwogCi1BbmNlc3RvciBp bmhlcml0cyB2YWx1ZXMgZnJvbSBwYXJlbnQ6CitBbmNlc3RvciBkb2VzIG5vdCBpbmhlcml0IHZh bHVlcyBmcm9tIHBhcmVudDoKIFBBU1MgZS5zdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCctd2Vi a2l0LXRleHQtdW5kZXJsaW5lLXBvc2l0aW9uJykgaXMgbnVsbAotUEFTUyBjb21wdXRlZFN0eWxl LndlYmtpdFRleHRVbmRlcmxpbmVQb3NpdGlvbiBpcyAndW5kZXInCitQQVNTIGNvbXB1dGVkU3R5 bGUud2Via2l0VGV4dFVuZGVybGluZVBvc2l0aW9uIGlzICdhdXRvJwogUEFTUyBjb21wdXRlZFN0 eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoJy13ZWJraXQtdGV4dC11bmRlcmxpbmUtcG9zaXRpb24n KS50b1N0cmluZygpIGlzICdbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXScKLVBBU1MgY29tcHV0 ZWRTdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKCctd2Via2l0LXRleHQtdW5kZXJsaW5lLXBvc2l0 aW9uJykuY3NzVGV4dCBpcyAndW5kZXInCitQQVNTIGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlD U1NWYWx1ZSgnLXdlYmtpdC10ZXh0LXVuZGVybGluZS1wb3NpdGlvbicpLmNzc1RleHQgaXMgJ2F1 dG8nCiAKIFZhbHVlICdhdXRvIGFscGhhYmV0aWMnOgogUEFTUyBlLnN0eWxlLmdldFByb3BlcnR5 Q1NTVmFsdWUoJy13ZWJraXQtdGV4dC11bmRlcmxpbmUtcG9zaXRpb24nKSBpcyBudWxsCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtZGVjb3JhdGlvbi9n ZXRDb21wdXRlZFN0eWxlL3NjcmlwdC10ZXN0cy9nZXRDb21wdXRlZFN0eWxlLXRleHQtdW5kZXJs aW5lLXBvc2l0aW9uLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MzLXRleHQvY3NzMy10ZXh0LWRl Y29yYXRpb24vZ2V0Q29tcHV0ZWRTdHlsZS9zY3JpcHQtdGVzdHMvZ2V0Q29tcHV0ZWRTdHlsZS10 ZXh0LXVuZGVybGluZS1wb3NpdGlvbi5qcwppbmRleCBhOWUxYjE1Nzg2Njk4YTIwYzk5NWVmZjk2 ZGNmOWJhZTFjZjUwM2ZkLi45YmFlNWI3YTExZTFhODUyMDljZTI1MjA0MTFhMTM4ODAwNDc0Yzdm IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtZGVjb3Jh dGlvbi9nZXRDb21wdXRlZFN0eWxlL3NjcmlwdC10ZXN0cy9nZXRDb21wdXRlZFN0eWxlLXRleHQt dW5kZXJsaW5lLXBvc2l0aW9uLmpzCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzMy10ZXh0L2Nz czMtdGV4dC1kZWNvcmF0aW9uL2dldENvbXB1dGVkU3R5bGUvc2NyaXB0LXRlc3RzL2dldENvbXB1 dGVkU3R5bGUtdGV4dC11bmRlcmxpbmUtcG9zaXRpb24uanMKQEAgLTY1LDEwICs2NSwxMCBAQCB0 ZXN0Q29tcHV0ZWRTdHlsZSgid2Via2l0VGV4dFVuZGVybGluZVBvc2l0aW9uIiwgIi13ZWJraXQt dGV4dC11bmRlcmxpbmUtcG9zaXRpbwogZGVidWcoJycpOwogCiB0ZXN0Q29udGFpbmVyLmlubmVy SFRNTCA9ICc8ZGl2IGlkPSJ0ZXN0LXBhcmVudCIgc3R5bGU9Ii13ZWJraXQtdGV4dC11bmRlcmxp bmUtcG9zaXRpb246IHVuZGVyOyI+aGVsbG8gPHNwYW4gaWQ9InRlc3QtYW5jZXN0b3IiPndvcmxk PC9zcGFuPjwvZGl2Pic7Ci1kZWJ1ZygiQW5jZXN0b3IgaW5oZXJpdHMgdmFsdWVzIGZyb20gcGFy ZW50OiIpOworZGVidWcoIkFuY2VzdG9yIGRvZXMgbm90IGluaGVyaXQgdmFsdWVzIGZyb20gcGFy ZW50OiIpOwogZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0LWFuY2VzdG9yJyk7CiB0 ZXN0RWxlbWVudFN0eWxlKCJ3ZWJraXRUZXh0VW5kZXJsaW5lUG9zaXRpb24iLCAiLXdlYmtpdC10 ZXh0LXVuZGVybGluZS1wb3NpdGlvbiIsIG51bGwsICIiKTsKLXRlc3RDb21wdXRlZFN0eWxlKCJ3 ZWJraXRUZXh0VW5kZXJsaW5lUG9zaXRpb24iLCAiLXdlYmtpdC10ZXh0LXVuZGVybGluZS1wb3Np dGlvbiIsICJbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXSIsICJ1bmRlciIpOwordGVzdENvbXB1 dGVkU3R5bGUoIndlYmtpdFRleHRVbmRlcmxpbmVQb3NpdGlvbiIsICItd2Via2l0LXRleHQtdW5k ZXJsaW5lLXBvc2l0aW9uIiwgIltvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdIiwgImF1dG8iKTsK IGRlYnVnKCcnKTsKIAogZGVidWcoIlZhbHVlICdhdXRvIGFscGhhYmV0aWMnOiIpOwo=