117305 2013-06-06 09:07:58 -0700 MathML line fraction needs to parse number values 2014-03-10 12:26:01 -0700 1 1 1 Unclassified WebKit MathML 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED WebExposed P2 Normal --- 118053 1 cfleizach cfleizach aboxhall apinheiro commit-queue dbarton dmazzoni esprehn+autocc fred.wang glenn jdiggs mario oldest_to_newest 897801 0 cfleizach 2013-06-06 09:07:58 -0700 If the line thickness of a <mfrac> object is missing, accessibility is not returning the correct default value. 897811 1 cfleizach 2013-06-06 09:28:00 -0700 This started off as an accessibility bug, but I noticed it would be better to pull the line thickness from the RenderMathMLFraction object. Then I saw that line thickness is not handling integer values like it should 897995 2 203987 cfleizach 2013-06-06 18:03:48 -0700 Created attachment 203987 patch 898160 3 203987 darin 2013-06-07 07:12:32 -0700 Comment on attachment 203987 patch OK 898196 4 cfleizach 2013-06-07 08:57:39 -0700 http://trac.webkit.org/changeset/151323 901906 5 fred.wang 2013-06-19 13:42:12 -0700 The correct syntax for MathML length is given here: http://www.w3.org/TR/MathML/chapter2.html#type.length Note that "A number without a unit is intepreted as a multiple of the default value. This form is primarily for backward compatibility and should be avoided, prefering explicit units for clarity." so strictly speaking your code should really do m_lineThickness = thicknessIntValue * gLineMedium; (it turns out that gLineMedium = 1.f so that does not change anything). Anyway, I would have preferred that WebKit does not implement the deprecated unitless syntax for length or at least not before the recommended syntax with explicit unit is implemented. Parsing of MathML lengths is implemented in bug 115610. I'm wondering why this patch took two days to be approved while my review request on bug 115610 has been ignored so far. Does the WebKit project require to ask explicit review on IRC or something in addition to the review flag? 901910 6 cfleizach 2013-06-19 13:48:16 -0700 (In reply to comment #5) > The correct syntax for MathML length is given here: > http://www.w3.org/TR/MathML/chapter2.html#type.length > > Note that > > "A number without a unit is intepreted as a multiple of the default value. This form is primarily for backward compatibility and should be avoided, prefering explicit units for clarity." > http://www.w3.org/TR/REC-MathML/chap3_3.html#sec3.3.2 The examples all use unit less values and there is scant talk of deprecating that mode in that section. Anyone looking to set this is going to look at those examples first > so strictly speaking your code should really do > > m_lineThickness = thicknessIntValue * gLineMedium; > Yes it would appear that is correct. Feel free to submit a patch > (it turns out that gLineMedium = 1.f so that does not change anything). > > Anyway, I would have preferred that WebKit does not implement the deprecated unitless syntax for length or at least not before the recommended syntax with explicit unit is implemented. From the same paragraph In general, the value of linethickness can be a number, as a multiplier of the default thickness of the fraction bar (the default thickness is not specified by MathML), or a number with a unit of vertical length (see Section 2.3.3), or one of the keywords medium (same as 1), thin (thinner than 1, otherwise up to the renderer), or thick (thicker than 1, otherwise up to the renderer). -- There's no talk of deprecating unit less values. > > Parsing of MathML lengths is implemented in bug 115610. I'm wondering why this patch took two days to be approved while my review request on bug 115610 has been ignored so far. Does the WebKit project require to ask explicit review on IRC or something in addition to the review flag? Perhaps you have CC'd the wrong reviewers 901912 7 fred.wang 2013-06-19 14:09:08 -0700 > http://www.w3.org/TR/REC-MathML/chap3_3.html#sec3.3.2 > The examples all use unit less values and there is scant talk of deprecating > that mode in that section. Anyone looking to set this is going to look at > those examples first > From the same paragraph > In general, the value of linethickness can be a number, as a multiplier of the default thickness of the fraction bar (the default thickness is not specified by MathML), or a number with a unit of vertical length (see Section 2.3.3), or one of the keywords medium (same as 1), thin (thinner than 1, otherwise up to the renderer), or thick (thicker than 1, otherwise up to the renderer). > -- There's no talk of deprecating unit less values. This is the MathML 1 REC from 1998, the MathML 3 version does not have this paragraph (although it's true they kept the examples from the MathML 1 spec). The sentence I quoted is from the MathML 3 version: "This form is primarily for backward compatibility and should be avoided, prefering explicit units for clarity." > Perhaps you have CC'd the wrong reviewers It seems that Google people used to review the MathML patches last year. I asked elsewhere clarification about who is in charge of reviewing the MathML code after the Blink fork, but didn't get any reply. Thanks for having looked at my patch. 901913 8 cfleizach 2013-06-19 14:14:56 -0700 (In reply to comment #7) > > http://www.w3.org/TR/REC-MathML/chap3_3.html#sec3.3.2 > > > The examples all use unit less values and there is scant talk of deprecating > that mode in that section. Anyone looking to set this is going to look at > those examples first > > > From the same paragraph > > > In general, the value of linethickness can be a number, as a multiplier of the default thickness of the fraction bar (the default thickness is not specified by MathML), or a number with a unit of vertical length (see Section 2.3.3), or one of the keywords medium (same as 1), thin (thinner than 1, otherwise up to the renderer), or thick (thicker than 1, otherwise up to the renderer). > > > -- There's no talk of deprecating unit less values. > > This is the MathML 1 REC from 1998, the MathML 3 version does not have this paragraph (although it's true they kept the examples from the MathML 1 spec). The sentence I quoted is from the MathML 3 version: "This form is primarily for backward compatibility and should be avoided, prefering explicit units for clarity." Right you are. Well let's try to get this resolved with your patch > > > Perhaps you have CC'd the wrong reviewers > > It seems that Google people used to review the MathML patches last year. I asked elsewhere clarification about who is in charge of reviewing the MathML code after the Blink fork, but didn't get any reply. Thanks for having looked at my patch. I'm not sure either but I'm willing to look at MathML patches 989014 9 fred.wang 2014-03-10 12:26:01 -0700 Mass change: add WebExposed keyword to help MDN documentation. 203987 2013-06-06 18:03:48 -0700 2013-06-07 07:12:31 -0700 patch patch text/plain 12193 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTMwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA2LTA2ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgTWF0aE1MIGxpbmUgZnJh Y3Rpb24gbmVlZHMgdG8gcGFyc2UgbnVtYmVyIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGxpbmUgZnJhY3Rpb24gdGhpY2tuZXNzIHdh cyBub3QgaGFuZGxpbmcgYXJiaXRyYXJ5IHRoaWNrbmVzcyBudW1iZXJzLgorICAgICAgICBUaGUg YWNjZXNzaWJpbGl0eSBjb2RlIHdhcyBub3QgaGFuZGxpbmcgZGVmYXVsdCB2YWx1ZXMgZm9yIGxp bmUgdGhpY2tuZXNzLCBzbworICAgICAgICBpdCBtYWRlIHNlbnNlIHRvIGhhdmUgQVggcmVseSBv biB0aGUgUmVuZGVyRnJhY3Rpb24gb2JqZWN0IHRvIHJldHJpdmUgdGhlIHRoaWNrbmVzcy4KKwor ICAgICAgICBNb2RpZmllZCBleGlzdGluZyB0ZXN0cyB0byBjb3ZlciBuZXcgYmVoYXZpb3IuCisK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6bWF0aExpbmVUaGlj a25lc3MpOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MRnJhY3Rpb246OnVwZGF0ZUZyb21F bGVtZW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTEZyYWN0aW9u Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxGcmFjdGlvbjo6bGluZVRoaWNrbmVz cyk6CisgICAgICAgIChXZWJDb3JlOjp0b1JlbmRlck1hdGhNTEZyYWN0aW9uKToKKwogMjAxMy0w Ni0wNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXN0cmlj dCBXZWJBdWRpbyBmcm9tIHBsYXlpbmcgd2hlbiBkaXNhbGxvd2VkIGJ5IHBhZ2UuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHAJKHJldmlzaW9uIDE1MTI4OSkKKysrIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTc0LDYgKzc0LDcgQEAKICNpbmNsdWRlICJSZW5kZXJMaXN0Qm94LmgiCiAjaW5jbHVkZSAi UmVuZGVyTGlzdE1hcmtlci5oIgogI2luY2x1ZGUgIlJlbmRlck1hdGhNTEJsb2NrLmgiCisjaW5j bHVkZSAiUmVuZGVyTWF0aE1MRnJhY3Rpb24uaCIKICNpbmNsdWRlICJSZW5kZXJNYXRoTUxPcGVy YXRvci5oIgogI2luY2x1ZGUgIlJlbmRlck1lbnVMaXN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyU1ZH U2hhcGUuaCIKQEAgLTM3ODcsNyArMzc4OCwxMCBAQAogCiBpbnQgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdDo6bWF0aExpbmVUaGlja25lc3MoKSBjb25zdAogewotICAgIHJldHVybiBnZXRBdHRy aWJ1dGUoTWF0aE1MTmFtZXM6OmxpbmV0aGlja25lc3NBdHRyKS50b0ludCgpOworICAgIGlmICgh aXNNYXRoRnJhY3Rpb24oKSkKKyAgICAgICAgcmV0dXJuIC0xOworICAgIAorICAgIHJldHVybiB0 b1JlbmRlck1hdGhNTEZyYWN0aW9uKG1fcmVuZGVyZXIpLT5saW5lVGhpY2tuZXNzKCk7CiB9CiAK ICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRo TUxGcmFjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21h dGhtbC9SZW5kZXJNYXRoTUxGcmFjdGlvbi5jcHAJKHJldmlzaW9uIDE1MTI4OSkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03MCw3ICs3MCw2IEBACiAgICAgaWYgKCFkZW5vbWluYXRvcldyYXBwZXIp CiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICAvLyBGSVhNRTogcGFyc2UgdW5pdHMKICAgICBT dHJpbmcgdGhpY2tuZXNzID0gZnJhY3Rpb24tPmdldEF0dHJpYnV0ZShNYXRoTUxOYW1lczo6bGlu ZXRoaWNrbmVzc0F0dHIpOwogICAgIG1fbGluZVRoaWNrbmVzcyA9IGdMaW5lTWVkaXVtOwogICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZSh0aGlja25lc3MsICJ0aGluIikpCkBAIC03OSw4ICs3OCwx MiBAQAogICAgICAgICBtX2xpbmVUaGlja25lc3MgPSBnTGluZU1lZGl1bTsKICAgICBlbHNlIGlm IChlcXVhbElnbm9yaW5nQ2FzZSh0aGlja25lc3MsICJ0aGljayIpKQogICAgICAgICBtX2xpbmVU aGlja25lc3MgPSBnTGluZVRoaWNrOwotICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHRo aWNrbmVzcywgIjAiKSkKLSAgICAgICAgbV9saW5lVGhpY2tuZXNzID0gMDsKKyAgICBlbHNlIHsK KyAgICAgICAgYm9vbCBjb252ZXJ0ZWQgPSBmYWxzZTsKKyAgICAgICAgaW50IHRoaWNrbmVzc0lu dFZhbHVlID0gdGhpY2tuZXNzLnRvSW50U3RyaWN0KCZjb252ZXJ0ZWQpOworICAgICAgICBpZiAo Y29udmVydGVkKQorICAgICAgICAgICAgbV9saW5lVGhpY2tuZXNzID0gdGhpY2tuZXNzSW50VmFs dWU7CisgICAgfQogCiAgICAgLy8gVXBkYXRlIHRoZSBzdHlsZSBmb3IgdGhlIHBhZGRpbmcgb2Yg dGhlIGRlbm9taW5hdG9yIGZvciB0aGUgbGluZSB0aGlja25lc3MKICAgICBsYXN0Q2hpbGQoKS0+ c3R5bGUoKS0+c2V0UGFkZGluZ1RvcChMZW5ndGgoc3RhdGljX2Nhc3Q8aW50PihtX2xpbmVUaGlj a25lc3MpLCBGaXhlZCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9S ZW5kZXJNYXRoTUxGcmFjdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24uaAkocmV2aXNpb24gMTUxMjg5KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxGcmFjdGlvbi5oCSh3 b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBACiAgICAgdmlydHVhbCBSZW5kZXJNYXRoTUxP cGVyYXRvciogdW5lbWJlbGxpc2hlZE9wZXJhdG9yKCk7CiAgICAgCiAgICAgdmlydHVhbCBpbnQg Zmlyc3RMaW5lQm94QmFzZWxpbmUoKSBjb25zdCBPVkVSUklERTsKKyAgICBmbG9hdCBsaW5lVGhp Y2tuZXNzKCkgY29uc3QgeyByZXR1cm4gbV9saW5lVGhpY2tuZXNzOyB9CiAgICAgdmlydHVhbCB2 b2lkIHBhaW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50Jik7CiBwcm90ZWN0ZWQ6CiAg ICAgdmlydHVhbCB2b2lkIGxheW91dCgpOwpAQCAtNTUsOSArNTYsMjEgQEAKICAgICAKICAgICBm bG9hdCBtX2xpbmVUaGlja25lc3M7CiB9OworICAgIAoraW5saW5lIFJlbmRlck1hdGhNTEZyYWN0 aW9uKiB0b1JlbmRlck1hdGhNTEZyYWN0aW9uKFJlbmRlck9iamVjdCogb2JqZWN0KQoreworICAg IEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFvYmplY3QgfHwgKG9iamVjdC0+aXNS ZW5kZXJNYXRoTUxCbG9jaygpICYmIHRvUmVuZGVyTWF0aE1MQmxvY2sob2JqZWN0KS0+aXNSZW5k ZXJNYXRoTUxGcmFjdGlvbigpKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRlck1hdGhN TEZyYWN0aW9uKj4ob2JqZWN0KTsKK30KIAoraW5saW5lIGNvbnN0IFJlbmRlck1hdGhNTEZyYWN0 aW9uKiB0b1JlbmRlck1hdGhNTEZyYWN0aW9uKGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0KQor eworICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCFvYmplY3QgfHwgKG9iamVj dC0+aXNSZW5kZXJNYXRoTUxCbG9jaygpICYmIHRvUmVuZGVyTWF0aE1MQmxvY2sob2JqZWN0KS0+ aXNSZW5kZXJNYXRoTUxGcmFjdGlvbigpKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGNvbnN0 IFJlbmRlck1hdGhNTEZyYWN0aW9uKj4ob2JqZWN0KTsKIH0KIAorfQorCiAjZW5kaWYgLy8gRU5B QkxFKE1BVEhNTCkKIAogI2VuZGlmIC8vIFJlbmRlck1hdGhNTEZyYWN0aW9uX2gKSW5kZXg6IExh eW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDE1MTMwNCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA2LTA2ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFj aEBhcHBsZS5jb20+CisKKyAgICAgICAgTWF0aE1MIGxpbmUgZnJhY3Rpb24gbmVlZHMgdG8gcGFy c2UgbnVtYmVyIHZhbHVlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE3MzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTWF0aCBmcmFjdGlvbnMgdGVzdCBub3cgZW5jb2RlcyBmb3IgYW4gYXJiaXRyYXJ5 IHRoaWNrbmVzcyBudW1iZXIuCisgICAgICAgIEFjY2Vzc2liaWxpdHkgdGVzdCBoYW5kbGVzIHRo ZSBkZWZhdWx0IGxpbmUgdGhpY2tuZXNzLgorCisgICAgICAgICogbWF0aG1sL3ByZXNlbnRhdGlv bi9mcmFjdGlvbnMueGh0bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkv bWF0aG1sLWxpbmUtZnJhY3Rpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL21h Yy9hY2Nlc3NpYmlsaXR5L21hdGhtbC1saW5lLWZyYWN0aW9uLmh0bWw6CisgICAgICAgICogcGxh dGZvcm0vbWFjL21hdGhtbC9wcmVzZW50YXRpb24vZnJhY3Rpb25zLWV4cGVjdGVkLnBuZzoKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvbWF0aG1sL3ByZXNlbnRhdGlvbi9mcmFjdGlvbnMtZXhwZWN0 ZWQudHh0OgorCiAyMDEzLTA2LTA2ICBSdXRoIEZvbmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgog CiAgICAgICAgIEV4cG9zZSBIVE1MQ2FudmFzRWxlbWVudCBzdXBwb3J0c0NvbnRleHQKSW5kZXg6 IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L21hdGhtbC1saW5lLWZyYWN0 aW9uLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv YWNjZXNzaWJpbGl0eS9tYXRobWwtbGluZS1mcmFjdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9u IDE1MTI4OSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L21hdGht bC1saW5lLWZyYWN0aW9uLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTIsNiArMTIs OSBAQAogUEFTUyBmcmFjdGlvbjIuc3Vicm9sZSBpcyAnQVhTdWJyb2xlOiBBWE1hdGhGcmFjdGlv bicKIFBBU1MgZnJhY3Rpb24yLmlzQXR0cmlidXRlU3VwcG9ydGVkKCdBWE1hdGhMaW5lVGhpY2tu ZXNzJykgaXMgdHJ1ZQogUEFTUyBmcmFjdGlvbjIubnVtYmVyQXR0cmlidXRlVmFsdWUoJ0FYTWF0 aExpbmVUaGlja25lc3MnKSBpcyA0CisKK1ZlcmlmeSBtaXNzaW5nIGxpbmUgdGhpY2tuZXNzIHJl dHVybnMgZGVmYXVsdCBvZiAxIGlzIHJlcG9ydGVkIGNvcnJlY3RseS4KK1BBU1MgZnJhY3Rpb24z Lm51bWJlckF0dHJpYnV0ZVZhbHVlKCdBWE1hdGhMaW5lVGhpY2tuZXNzJykgaXMgMQogUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCiBURVNUIENPTVBMRVRFCkluZGV4OiBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9tYXRobWwtbGluZS1mcmFjdGlvbi5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L21h dGhtbC1saW5lLWZyYWN0aW9uLmh0bWwJKHJldmlzaW9uIDE1MTI4OSkKKysrIExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L21hdGhtbC1saW5lLWZyYWN0aW9uLmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTE5LDYgKzE5LDEzIEBACiA8L21mcmFjPgogPC9tYXRoPgogCis8bWF0 aCBpZD0ibWF0aDMiPgorPG1mcmFjPgorICAgIDxtaT5uPC9taT4KKyAgICA8bWk+azwvbWk+Cis8 L21mcmFjPgorPC9tYXRoPgorCiA8L2Rpdj4KIAogPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CkBA IC00MCw2ICs0NywxMCBAQAogICAgc2hvdWxkQmVUcnVlKCJmcmFjdGlvbjIuaXNBdHRyaWJ1dGVT dXBwb3J0ZWQoJ0FYTWF0aExpbmVUaGlja25lc3MnKSIpOwogICAgc2hvdWxkQmUoImZyYWN0aW9u Mi5udW1iZXJBdHRyaWJ1dGVWYWx1ZSgnQVhNYXRoTGluZVRoaWNrbmVzcycpIiwgIjQiKTsKIAor ICAgZGVidWcoIlxuVmVyaWZ5IG1pc3NpbmcgbGluZSB0aGlja25lc3MgcmV0dXJucyBkZWZhdWx0 IG9mIDEgaXMgcmVwb3J0ZWQgY29ycmVjdGx5LiIpOworICAgdmFyIGZyYWN0aW9uMyA9IGFjY2Vz c2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgibWF0aDMiKS5jaGlsZEF0 SW5kZXgoMCk7CisgICBzaG91bGRCZSgiZnJhY3Rpb24zLm51bWJlckF0dHJpYnV0ZVZhbHVlKCdB WE1hdGhMaW5lVGhpY2tuZXNzJykiLCAiMSIpOworCiAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgiY29udGVudCIpLnN0eWxlLnZpc2liaWxpdHkgPSAnaGlkZGVuJzsKIH0KIApJbmRleDogTGF5 b3V0VGVzdHMvbWF0aG1sL3ByZXNlbnRhdGlvbi9mcmFjdGlvbnMueGh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvbWF0aG1sL3ByZXNlbnRhdGlvbi9mcmFjdGlvbnMueGh0bWwJKHJldmlz aW9uIDE1MTI4OSkKKysrIExheW91dFRlc3RzL21hdGhtbC9wcmVzZW50YXRpb24vZnJhY3Rpb25z LnhodG1sCSh3b3JraW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAgICAgPG1mcmFjIGxpbmV0 aGlja25lc3M9J3RoaW4nPjxtbj4xPC9tbj48bW4+MjwvbW4+PC9tZnJhYz4KICAgICA8bWZyYWMg bGluZXRoaWNrbmVzcz0nbWVkaXVtJz48bW4+MTwvbW4+PG1uPjI8L21uPjwvbWZyYWM+CiAgICAg PG1mcmFjIGxpbmV0aGlja25lc3M9J3RoaWNrJz48bW4+MTwvbW4+PG1uPjI8L21uPjwvbWZyYWM+ CisgICAgPG1mcmFjIGxpbmV0aGlja25lc3M9JzUnPjxtbj4xPC9tbj48bW4+MjwvbW4+PC9tZnJh Yz4KIDwvbWF0aD4KIDwvcD4KIDxwIGlkPSd0NSc+bnVtZXJhdG9yIGFsaWdubWVudDoKSW5kZXg6 IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9tYXRobWwvcHJlc2VudGF0aW9uL2ZyYWN0aW9ucy1l eHBlY3RlZC5wbmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQpDYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQgYXMgYSBi aW5hcnkgdHlwZS4Kc3ZuOm1pbWUtdHlwZSA9IGltYWdlL3BuZwpJbmRleDogTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL21hdGhtbC9wcmVzZW50YXRpb24vZnJhY3Rpb25zLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvbWF0aG1sL3ByZXNlbnRhdGlv bi9mcmFjdGlvbnMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxNTEyODkpCisrKyBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvbWF0aG1sL3ByZXNlbnRhdGlvbi9mcmFjdGlvbnMtZXhwZWN0ZWQudHh0 CSh3b3JraW5nIGNvcHkpCkBAIC0xLDggKzEsOCBAQAogbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCiAgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCi1sYXllciBhdCAoMCwwKSBz aXplIDgwMHgzMzAKLSAgUmVuZGVyQmxvY2sge2h0bWx9IGF0ICgwLDApIHNpemUgODAweDMzMAot ICAgIFJlbmRlckJvZHkge2JvZHl9IGF0ICg4LDE2KSBzaXplIDc4NHgyOTgKK2xheWVyIGF0ICgw LDApIHNpemUgODAweDMzMgorICBSZW5kZXJCbG9jayB7aHRtbH0gYXQgKDAsMCkgc2l6ZSA4MDB4 MzMyCisgICAgUmVuZGVyQm9keSB7Ym9keX0gYXQgKDgsMTYpIHNpemUgNzg0eDMwMAogICAgICAg UmVuZGVyQmxvY2sge3B9IGF0ICgwLDApIHNpemUgNzg0eDMxCiAgICAgICAgIFJlbmRlclRleHQg eyN0ZXh0fSBhdCAoMCw1KSBzaXplIDQ5eDE4CiAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsNSkg d2lkdGggNDk6ICJzaW1wbGU6ICIKQEAgLTYyLDExICs2MiwxMSBAQAogICAgICAgICAgICAgICAg IFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwtNikgc2l6ZSAxMjB4MjQKICAgICAgICAgICAgICAg ICAgIHRleHQgcnVuIGF0ICgwLC02KSB3aWR0aCAxMjA6ICJudW1iZXIgb2YgY2hhbmdlcyIKICAg ICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCi0gICAgICBSZW5kZXJC bG9jayB7cH0gYXQgKDAsMTQ3KSBzaXplIDc4NHg2MQotICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDAsMjUpIHNpemUgMTczeDE4Ci0gICAgICAgICAgdGV4dCBydW4gYXQgKDAsMjUpIHdp ZHRoIDE3MzogImxpbmUgdGhpY2tuZXNzIGJ5IGtleXdvcmQ6ICIKLSAgICAgICAgUmVuZGVyTWF0 aE1MTWF0aCB7bWF0aH0gYXQgKDE3MywwKSBzaXplIDU2eDYxIFtwYWRkaW5nOiAwIDEgMCAxXQot ICAgICAgICAgIFJlbmRlck1hdGhNTEZyYWN0aW9uIHttZnJhY30gYXQgKDIsMikgc2l6ZSAxNng1 OAorICAgICAgUmVuZGVyQmxvY2sge3B9IGF0ICgwLDE0Nykgc2l6ZSA3ODR4NjMKKyAgICAgICAg UmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDI3KSBzaXplIDE3M3gxOAorICAgICAgICAgIHRleHQg cnVuIGF0ICgwLDI3KSB3aWR0aCAxNzM6ICJsaW5lIHRoaWNrbmVzcyBieSBrZXl3b3JkOiAiCisg ICAgICAgIFJlbmRlck1hdGhNTE1hdGgge21hdGh9IGF0ICgxNzMsMCkgc2l6ZSA3NHg2MyBbcGFk ZGluZzogMCAxIDAgMV0KKyAgICAgICAgICBSZW5kZXJNYXRoTUxGcmFjdGlvbiB7bWZyYWN9IGF0 ICgyLDQpIHNpemUgMTZ4NTgKICAgICAgICAgICAgIFJlbmRlck1hdGhNTEJsb2NrIChhbm9ueW1v dXMsIGZsZXgpIGF0ICgwLDApIHNpemUgMTZ4MjkKICAgICAgICAgICAgICAgUmVuZGVyQmxvY2sg e21ufSBhdCAoMCwwKSBzaXplIDE2eDIzCiAgICAgICAgICAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgwLC0xMikgc2l6ZSAxNng0OQpAQCAtNzUsNyArNzUsNyBAQAogICAgICAgICAgICAg ICBSZW5kZXJCbG9jayB7bW59IGF0ICgwLDYpIHNpemUgMTZ4MjMKICAgICAgICAgICAgICAgICBS ZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsLTEyKSBzaXplIDE2eDQ5CiAgICAgICAgICAgICAgICAg ICB0ZXh0IHJ1biBhdCAoMCwtMTIpIHdpZHRoIDE2OiAiMiIKLSAgICAgICAgICBSZW5kZXJNYXRo TUxGcmFjdGlvbiB7bWZyYWN9IGF0ICgyMCwyKSBzaXplIDE2eDU5CisgICAgICAgICAgUmVuZGVy TWF0aE1MRnJhY3Rpb24ge21mcmFjfSBhdCAoMjAsNCkgc2l6ZSAxNng1OQogICAgICAgICAgICAg UmVuZGVyTWF0aE1MQmxvY2sgKGFub255bW91cywgZmxleCkgYXQgKDAsMCkgc2l6ZSAxNngyOQog ICAgICAgICAgICAgICBSZW5kZXJCbG9jayB7bW59IGF0ICgwLDApIHNpemUgMTZ4MjMKICAgICAg ICAgICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsLTEyKSBzaXplIDE2eDQ5CkBAIC04 NCw3ICs4NCw3IEBACiAgICAgICAgICAgICAgIFJlbmRlckJsb2NrIHttbn0gYXQgKDAsNykgc2l6 ZSAxNngyMwogICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwtMTIpIHNp emUgMTZ4NDkKICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLC0xMikgd2lkdGggMTY6 ICIyIgotICAgICAgICAgIFJlbmRlck1hdGhNTEZyYWN0aW9uIHttZnJhY30gYXQgKDM4LDApIHNp emUgMTZ4NjEKKyAgICAgICAgICBSZW5kZXJNYXRoTUxGcmFjdGlvbiB7bWZyYWN9IGF0ICgzOCwy KSBzaXplIDE2eDYxCiAgICAgICAgICAgICBSZW5kZXJNYXRoTUxCbG9jayAoYW5vbnltb3VzLCBm bGV4KSBhdCAoMCwwKSBzaXplIDE2eDI5CiAgICAgICAgICAgICAgIFJlbmRlckJsb2NrIHttbn0g YXQgKDAsMCkgc2l6ZSAxNngyMwogICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBh dCAoMCwtMTIpIHNpemUgMTZ4NDkKQEAgLTkzLDggKzkzLDE3IEBACiAgICAgICAgICAgICAgIFJl bmRlckJsb2NrIHttbn0gYXQgKDAsOSkgc2l6ZSAxNngyMwogICAgICAgICAgICAgICAgIFJlbmRl clRleHQgeyN0ZXh0fSBhdCAoMCwtMTIpIHNpemUgMTZ4NDkKICAgICAgICAgICAgICAgICAgIHRl eHQgcnVuIGF0ICgwLC0xMikgd2lkdGggMTY6ICIyIgorICAgICAgICAgIFJlbmRlck1hdGhNTEZy YWN0aW9uIHttZnJhY30gYXQgKDU2LDApIHNpemUgMTZ4NjMKKyAgICAgICAgICAgIFJlbmRlck1h dGhNTEJsb2NrIChhbm9ueW1vdXMsIGZsZXgpIGF0ICgwLDApIHNpemUgMTZ4MjkKKyAgICAgICAg ICAgICAgUmVuZGVyQmxvY2sge21ufSBhdCAoMCwwKSBzaXplIDE2eDIzCisgICAgICAgICAgICAg ICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLC0xMikgc2l6ZSAxNng0OQorICAgICAgICAgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsLTEyKSB3aWR0aCAxNjogIjEiCisgICAgICAgICAgICBSZW5k ZXJNYXRoTUxCbG9jayAoYW5vbnltb3VzLCBmbGV4KSBhdCAoMCwyOSkgc2l6ZSAxNngzNCBbcGFk ZGluZzogNSAwIDAgMF0KKyAgICAgICAgICAgICAgUmVuZGVyQmxvY2sge21ufSBhdCAoMCwxMSkg c2l6ZSAxNngyMworICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwtMTIp IHNpemUgMTZ4NDkKKyAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLC0xMikgd2lkdGgg MTY6ICIyIgogICAgICAgICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKLSAg ICAgIFJlbmRlckJsb2NrIHtwfSBhdCAoMCwyMjQpIHNpemUgNzg0eDI5CisgICAgICBSZW5kZXJC bG9jayB7cH0gYXQgKDAsMjI2KSBzaXplIDc4NHgyOQogICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDAsMikgc2l6ZSAxMzh4MTgKICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwyKSB3aWR0 aCAxMzg6ICJudW1lcmF0b3IgYWxpZ25tZW50OiAiCiAgICAgICAgIFJlbmRlck1hdGhNTE1hdGgg e21hdGh9IGF0ICgxMzgsMCkgc2l6ZSAxMTJ4MjkgW3BhZGRpbmc6IDAgMSAwIDFdCkBAIC0yMzEs NyArMjQwLDcgQEAKICAgICAgICAgICAgICAgICAgIFJlbmRlclRleHQgeyN0ZXh0fSBhdCAoMCwt NSkgc2l6ZSA4eDI0CiAgICAgICAgICAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLC01KSB3aWR0 aCA4OiAiNSIKICAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCi0g ICAgICBSZW5kZXJCbG9jayB7cH0gYXQgKDAsMjY5KSBzaXplIDc4NHgyOQorICAgICAgUmVuZGVy QmxvY2sge3B9IGF0ICgwLDI3MSkgc2l6ZSA3ODR4MjkKICAgICAgICAgUmVuZGVyVGV4dCB7I3Rl eHR9IGF0ICgwLDYpIHNpemUgMTUzeDE4CiAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsNikgd2lk dGggMTUzOiAiZGVub21pbmF0b3IgYWxpZ25tZW50OiAiCiAgICAgICAgIFJlbmRlck1hdGhNTE1h dGgge21hdGh9IGF0ICgxNTMsMCkgc2l6ZSAxMTJ4MjkgW3BhZGRpbmc6IDAgMSAwIDFdCg==