100739 2012-10-30 03:42:53 -0700 [CSS] Expand -webkit-line-break value space 2012-10-30 13:31:33 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Enhancement --- 89235 1 glenn glenn cmarcelo eric macpherson menard mitz seikwon.kim webkit.review.bot oldest_to_newest 754166 0 glenn 2012-10-30 03:42:53 -0700 (1) expand -webkit-line-break to include new values defined by CSS3 Text [1], i.e., 'auto', 'strict', 'loose'; (2) change default (initial) value for -webkit-line-break to 'auto' to match CSS3 Text; (3) rename enum EKHTMLLineBreak to LineBreak, renaming enum values appropriately; this bug is a sub-division of bug 89235, and prepares the way for committing a patch thereto [1] http://dev.w3.org/csswg/css3-text/#line-break 754208 1 171418 glenn 2012-10-30 04:29:46 -0700 Created attachment 171418 Patch 754514 2 171418 eric 2012-10-30 11:00:32 -0700 Comment on attachment 171418 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171418&action=review > Source/WebCore/rendering/style/StyleRareInheritedData.cpp:74 > - , khtmlLineBreak(LBNORMAL) > + , lineBreak(LineBreakAuto) Do we need to change the code which depends on this value? Is our linebreaking still correct? 754602 3 glenn 2012-10-30 12:49:08 -0700 (In reply to comment #2) > (From update of attachment 171418 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=171418&action=review > > > Source/WebCore/rendering/style/StyleRareInheritedData.cpp:74 > > - , khtmlLineBreak(LBNORMAL) > > + , lineBreak(LineBreakAuto) > > Do we need to change the code which depends on this value? Is our linebreaking still correct? No change needed. There is actually no code that explicitly refers to LBNORMAL (now LineBreakAuto). I believe we're safe to c+ this. 754609 4 171418 eric 2012-10-30 12:56:57 -0700 Comment on attachment 171418 Patch OK. THanks. I really appreciate you breaking this up, it makes it easier to handle the reviews. Please feel encouraged to CC me on future patches. 754623 5 171418 webkit.review.bot 2012-10-30 13:31:29 -0700 Comment on attachment 171418 Patch Clearing flags on attachment: 171418 Committed r132942: <http://trac.webkit.org/changeset/132942> 754624 6 webkit.review.bot 2012-10-30 13:31:33 -0700 All reviewed patches have been landed. Closing bug. 171418 2012-10-30 04:29:46 -0700 2012-10-30 13:31:29 -0700 Patch bug-100739-20121030122810.patch text/plain 20454 glenn U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc5Nzg3MzJhZGVlNWMz NmFjZmVjZjFkYjgxYmU3MDVkOThmNzE2Yi4uM2FkMDA4ZWQ5YzBjOTcxODA3M2QxNjMxNDRlNmUz ODU0YWM1NWJmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYzIEBACisyMDEyLTEwLTMwICBHbGVu biBBZGFtcyAgPGdsZW5uQHNreW5hdi5jb20+CisKKyAgICAgICAgW0NTU10gRXhwYW5kIC13ZWJr aXQtbGluZS1icmVhayB2YWx1ZSBzcGFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNzM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKDEpIGV4cGFuZCAtd2Via2l0LWxpbmUtYnJlYWsgdG8gaW5jbHVk ZSBuZXcgdmFsdWVzIGRlZmluZWQgYnkgQ1NTMyBUZXh0IFsxXSwgaS5lLiwgJ2F1dG8nLCAnc3Ry aWN0JywgJ2xvb3NlJzsKKyAgICAgICAgKDIpIGNoYW5nZSBkZWZhdWx0IChpbml0aWFsKSB2YWx1 ZSBmb3IgLXdlYmtpdC1saW5lLWJyZWFrIHRvICdhdXRvJyB0byBtYXRjaCBDU1MzIFRleHQ7Cisg ICAgICAgICgzKSByZW5hbWUgZW51bSBFS0hUTUxMaW5lQnJlYWsgdG8gTGluZUJyZWFrLCByZW5h bWluZyBlbnVtIHZhbHVlcyBhcHByb3ByaWF0ZWx5OworCisgICAgICAgIE5ldyB0ZXN0cyB0byBi ZSBhZGRlZCB3aGVuIGZ1bmN0aW9uYWxpdHkgb2YgbmV3IHZhbHVlcyBpcyBhZGRlZC4gTm8gcmVu ZGVyaW5nIGJlaGF2aW9yIGNoYW5nZSBhdCB0aGlzIHRpbWUuCisgICAgICAgIE9ubHkgZXh0ZXJu YWxseSB2aXNpYmxlIGNoYW5nZSBpcyBkZWZhdWx0IChpbml0aWFsKSB2YWx1ZSByZXR1cm5pbmcg J2F1dG8nIHJhdGhlciB0aGFuICdub3JtYWwnLCBmb3Igd2hpY2ggMyBleGlzdGluZworICAgICAg ICB0ZXN0cyB0aGF0IHdlcmUgc2Vuc2l0aXZlIHRvIHRoaXMgdmFsdWUgaGF2ZSBiZWVuIHVwZGF0 ZWQuIE5vdGUgdGhhdCB1bnRpbCB0aGUgZnVuY3Rpb25hbGl0eSBmb3IgdGhlIG5ldyB2YWx1ZXMg aXMKKyAgICAgICAgYWRkZWQsIGFueSBhY3R1YWwgdXNlIG9mIHRoZSBuZXcgdmFsdWVzIHdpbGwg YmUgdHJlYXRlZCBhcyB0aGUgc2FtZSBhcyB0aGUgcHJlLWV4aXN0aW5nICdub3JtYWwnIHZhbHVl LCBpLmUuLCB0aGUKKyAgICAgICAgZGVmYXVsdCBzZW1hbnRpY3MuCisKKyAgICAgICAgKiBjc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Nv bXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZSk6CisgICAgICAgIFVw ZGF0ZSBmcm9tIGt0aG1sTGluZUJyZWFrKCkgdG8gbGluZUJyZWFrKCkuCisKKyAgICAgICAgKiBj c3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzVmFsaWRLZXl3b3JkUHJvcGVy dHlBbmRWYWx1ZSk6CisgICAgICAgIFVwZGF0ZSB2YWx1ZXMgc3VwcG9ydGVkIGZvciBDU1NQcm9w ZXJ0eVdlYmtpdExpbmVCcmVhay4KKworICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1h cHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0 aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9y IExpbmVCcmVhayk6CisgICAgICAgIFVwZGF0ZSBMaW5lQnJlYWsgZW51bWVyYXRpb24gdmFsdWVz IChwcmV2aW91c2x5IEVLSFRNTExpbmVCcmVhaykuCisKKyAgICAgICAgKiBjc3MvQ1NTVmFsdWVL ZXl3b3Jkcy5pbjoKKyAgICAgICAgVXBkYXRlIGtleXdvcmRzIHVzZWQgZm9yIC13ZWJraXQtbGlu ZS1icmVhay4KKworICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGVCdWlsZGVyOjpTdHlsZUJ1aWxkZXIpOgorICAgICAgICBVcGRhdGUgbmFtZXMg Zm9yIGxpbmUgYnJlYWsgc3R5bGUgZ2V0dGVyL3NldHRlci4KKworICAgICAgICAqIHJlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 ZGlmZik6CisgICAgICAgIFJlbW92ZSBraHRtbCBwcmVmaXggb24gbGluZSBicmVhayByZWxhdGVk IHN0YXRlLgorCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAg ICAgIFJlbW92ZSBraHRtbCBwcmVmaXggb24gbGluZSBicmVhayByZWxhdGVkIG1ldGhvZHMuIFVw ZGF0ZSB0byByZWRlZmluZWQgTGluZUJyZWFrCisgICAgICAgIGVudW1lcmF0aW9uIHR5cGUuCisK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaDoKKyAgICAg ICAgUmVuYW1lIEVLSFRNTExpbmVCcmVhayBlbnVtZXJhdGlvbiB0byBMaW5lQnJlYWsuCisgICAg ICAgIFJlZGVmaW5lIExpbmVCcmVhayBlbnVtZXJhdGlvbiB0byBpbmNsdWRlIG5ldyBDU1MzIFRl eHQgbW9kZXMgKGF1dG8sIGxvb3NlLCBzdHJpY3QpIGFuZAorICAgICAgICB1c2UgYmV0dGVyIG5h bWVzLgorCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSYXJlSW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJl SW5oZXJpdGVkRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRh OjpvcGVyYXRvcj09KToKKyAgICAgICAgUmVtb3ZlIGtodG1sIHByZWZpeCBvbiBsaW5lIGJyZWFr IHJlbGF0ZWQgc3RhdGUgcmVmZXJlbmNlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9T dHlsZVJhcmVJbmhlcml0ZWREYXRhLmg6CisgICAgICAgIChTdHlsZVJhcmVJbmhlcml0ZWREYXRh KToKKyAgICAgICAgUmVtb3ZlIGtodG1sIHByZWZpeCBvbiBsaW5lIGJyZWFrIHJlbGF0ZWQgc3Rh dGUuIFdpZGVuIGZpZWxkIHRvIDMgYml0cyB0byBzdXBwb3J0IDggdmFsdWVzLAorICAgICAgICBv ZiB3aGljaCA1IGFyZSBub3cgdXNlZC4KKwogMjAxMi0xMC0yOSAgU2hpbnlhIEthd2FuYWthICA8 c2hpbnlha0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1JlZmF0b3JpbmddIFJlbW92ZSBFbGVt ZW50U2hhZG93OjppbnNlcnRpb25Qb2ludEZvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCBiM2E3ZTUyN2MyMzk4M2VkN2Vk NTQxZmYyNDRlNDdlNjBhODM5OTgzLi5iZjg1NjUyZTFkYzUyZTU0M2U5ZTI2OThmMWRkMzhjNzU5 YzNhOTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURl Y2xhcmF0aW9uLmNwcApAQCAtMjEzMiw3ICsyMTMyLDcgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4g Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKENTU1Byb3Bl cnQKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdvcmRXcmFwOgogICAgICAgICAgICAgcmV0dXJu IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5vdmVyZmxvd1dyYXAoKSk7CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lQnJlYWs6Ci0gICAgICAgICAgICByZXR1cm4g Y3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPmtodG1sTGluZUJyZWFrKCkpOworICAg ICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5saW5lQnJl YWsoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXROYnNwTW9kZToKICAgICAgICAg ICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+bmJzcE1vZGUoKSk7 CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlSZXNpemU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3Bw CmluZGV4IDMwOTRmNDBmNzkyN2Y0OGMwMTkwOGFhNzQ3NjMxNTI1N2VmYmNjNTUuLjg2MjAwOTMy ZjI3MjI3YmMwYmMwYTM4YzdiYjhiZGZkYzExNTA4ZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCkBAIC04MjcsOCArODI3LDggQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRLZXl3b3Jk UHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQsIGludAogICAgICAgICBp ZiAodmFsdWVJRCA9PSBDU1NWYWx1ZU5vbmUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUVkZ2VzKQog ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRMaW5lQnJlYWs6IC8vIG5vcm1hbCB8IGFmdGVyLXdoaXRlLXNwYWNlCi0gICAg ICAgIGlmICh2YWx1ZUlEID09IENTU1ZhbHVlTm9ybWFsIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVB ZnRlcldoaXRlU3BhY2UpCisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVCcmVhazogLy8g YXV0byB8IGxvb3NlIHwgbm9ybWFsIHwgc3RyaWN0IHwgYWZ0ZXItd2hpdGUtc3BhY2UKKyAgICAg ICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVMb29z ZSB8fCB2YWx1ZUlEID09IENTU1ZhbHVlTm9ybWFsIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVTdHJp Y3QgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUFmdGVyV2hpdGVTcGFjZSkKICAgICAgICAgICAgIHJl dHVybiB0cnVlOwogICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TGlu ZVNuYXA6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVN YXBwaW5ncy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3Mu aAppbmRleCA5ODRjMDgyNmUwNGYyZWM5MjA0MTNkZDgyYmU1YzUzYWI4NjQ2MDlmLi42YmU4ZTNh YzFiZmViNGViODNkOTM0ZGJlMWVmNDQ0YzZlN2U4NjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKQEAgLTE0NDAsMzEgKzE0NDAsNDYgQEAg dGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEVGbG9hdCgpIGNv bnN0CiAgICAgcmV0dXJuIE5vRmxvYXQ7CiB9CiAKLXRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1p dGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShFS0hUTUxMaW5lQnJlYWsgZSkKK3RlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShMaW5lQnJlYWsg ZSkKICAgICA6IENTU1ZhbHVlKFByaW1pdGl2ZUNsYXNzKQogewogICAgIG1fcHJpbWl0aXZlVW5p dFR5cGUgPSBDU1NfSURFTlQ7CiAgICAgc3dpdGNoIChlKSB7Ci0gICAgICAgIGNhc2UgTEJOT1JN QUw6Ci0gICAgICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVOb3JtYWw7Ci0gICAgICAg ICAgICBicmVhazsKLSAgICAgICAgY2FzZSBBRlRFUl9XSElURV9TUEFDRToKLSAgICAgICAgICAg IG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZUFmdGVyV2hpdGVTcGFjZTsKLSAgICAgICAgICAgIGJy ZWFrOworICAgIGNhc2UgTGluZUJyZWFrQXV0bzoKKyAgICAgICAgbV92YWx1ZS5pZGVudCA9IENT U1ZhbHVlQXV0bzsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMaW5lQnJlYWtMb29zZToKKyAg ICAgICAgbV92YWx1ZS5pZGVudCA9IENTU1ZhbHVlTG9vc2U7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgTGluZUJyZWFrTm9ybWFsOgorICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVO b3JtYWw7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTGluZUJyZWFrU3RyaWN0OgorICAgICAg ICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVTdHJpY3Q7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgTGluZUJyZWFrQWZ0ZXJXaGl0ZVNwYWNlOgorICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NT VmFsdWVBZnRlcldoaXRlU3BhY2U7CisgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIAotdGVtcGxh dGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEVLSFRNTExpbmVCcmVhaygp IGNvbnN0Cit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgTGlu ZUJyZWFrKCkgY29uc3QKIHsKICAgICBzd2l0Y2ggKG1fdmFsdWUuaWRlbnQpIHsKLSAgICAgICAg Y2FzZSBDU1NWYWx1ZUFmdGVyV2hpdGVTcGFjZToKLSAgICAgICAgICAgIHJldHVybiBBRlRFUl9X SElURV9TUEFDRTsKLSAgICAgICAgY2FzZSBDU1NWYWx1ZU5vcm1hbDoKLSAgICAgICAgICAgIHJl dHVybiBMQk5PUk1BTDsKKyAgICBjYXNlIENTU1ZhbHVlQXV0bzoKKyAgICAgICAgcmV0dXJuIExp bmVCcmVha0F1dG87CisgICAgY2FzZSBDU1NWYWx1ZUxvb3NlOgorICAgICAgICByZXR1cm4gTGlu ZUJyZWFrTG9vc2U7CisgICAgY2FzZSBDU1NWYWx1ZU5vcm1hbDoKKyAgICAgICAgcmV0dXJuIExp bmVCcmVha05vcm1hbDsKKyAgICBjYXNlIENTU1ZhbHVlU3RyaWN0OgorICAgICAgICByZXR1cm4g TGluZUJyZWFrU3RyaWN0OworICAgIGNhc2UgQ1NTVmFsdWVBZnRlcldoaXRlU3BhY2U6CisgICAg ICAgIHJldHVybiBMaW5lQnJlYWtBZnRlcldoaXRlU3BhY2U7CiAgICAgfQogCiAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIExCTk9STUFMOworICAgIHJldHVybiBMaW5lQnJl YWtBdXRvOwogfQogCiB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJp bWl0aXZlVmFsdWUoRUxpc3RTdHlsZVBvc2l0aW9uIGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTVmFsdWVLZXl3b3Jkcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1 ZUtleXdvcmRzLmluCmluZGV4IGM2MGFhNTg2ZGFlYzVlMTc5ODZjY2NhNmI1MTY4ZjJjNzVlNTE2 ZDAuLjJjMTcwMmE4YmU5Y2U0YTc5MGQxOTRiMTQ2ZjBmNDE0MmEyYTdhYWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCkBAIC02MjEsNiArNjIxLDEwIEBAIHNwYWNlCiAv LwogLy8gQ1NTX1BST1BfX0tIVE1MX0xJTkVfQlJFQUsKIC8vCisvLyBhdXRvCitsb29zZQorLy8g bm9ybWFsCitzdHJpY3QKIGFmdGVyLXdoaXRlLXNwYWNlCiAKIC8vIC13ZWJraXQtYXBwZWFyYW5j ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAppbmRleCA1Nzk1ZGVmYzQ1MGExMGRlOTE4 NTgxMzAxMTFiZDVkNDNmZjRlOTU2Li4wNTAxZGM5ZDEzMzJiNzY4YmM3YjEzYzRjOTBmZmIwOThh ODU0ZTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyLmNwcApAQCAtMjAwMiw3ICsyMDAy LDcgQEAgU3R5bGVCdWlsZGVyOjpTdHlsZUJ1aWxkZXIoKQogICAgIHNldFByb3BlcnR5SGFuZGxl cihDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUxpbWl0TGluZXMsIEFwcGx5UHJvcGVydHlOdW1i ZXI8c2hvcnQsICZSZW5kZXJTdHlsZTo6aHlwaGVuYXRpb25MaW1pdExpbmVzLCAmUmVuZGVyU3R5 bGU6OnNldEh5cGhlbmF0aW9uTGltaXRMaW5lcywgJlJlbmRlclN0eWxlOjppbml0aWFsSHlwaGVu YXRpb25MaW1pdExpbmVzLCBDU1NWYWx1ZU5vTGltaXQ+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAg IHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbnMsIEFwcGx5UHJvcGVy dHlEZWZhdWx0PEh5cGhlbnMsICZSZW5kZXJTdHlsZTo6aHlwaGVucywgSHlwaGVucywgJlJlbmRl clN0eWxlOjpzZXRIeXBoZW5zLCBIeXBoZW5zLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxIeXBoZW5z Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlX ZWJraXRMaW5lQWxpZ24sIEFwcGx5UHJvcGVydHlEZWZhdWx0PExpbmVBbGlnbiwgJlJlbmRlclN0 eWxlOjpsaW5lQWxpZ24sIExpbmVBbGlnbiwgJlJlbmRlclN0eWxlOjpzZXRMaW5lQWxpZ24sIExp bmVBbGlnbiwgJlJlbmRlclN0eWxlOjppbml0aWFsTGluZUFsaWduPjo6Y3JlYXRlSGFuZGxlcigp KTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRMaW5lQnJlYWssIEFw cGx5UHJvcGVydHlEZWZhdWx0PEVLSFRNTExpbmVCcmVhaywgJlJlbmRlclN0eWxlOjpraHRtbExp bmVCcmVhaywgRUtIVE1MTGluZUJyZWFrLCAmUmVuZGVyU3R5bGU6OnNldEtIVE1MTGluZUJyZWFr LCBFS0hUTUxMaW5lQnJlYWssICZSZW5kZXJTdHlsZTo6aW5pdGlhbEtIVE1MTGluZUJyZWFrPjo6 Y3JlYXRlSGFuZGxlcigpKTsKKyAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJr aXRMaW5lQnJlYWssIEFwcGx5UHJvcGVydHlEZWZhdWx0PExpbmVCcmVhaywgJlJlbmRlclN0eWxl OjpsaW5lQnJlYWssIExpbmVCcmVhaywgJlJlbmRlclN0eWxlOjpzZXRMaW5lQnJlYWssIExpbmVC cmVhaywgJlJlbmRlclN0eWxlOjppbml0aWFsTGluZUJyZWFrPjo6Y3JlYXRlSGFuZGxlcigpKTsK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRMaW5lQ2xhbXAsIEFwcGx5 UHJvcGVydHlEZWZhdWx0PGNvbnN0IExpbmVDbGFtcFZhbHVlJiwgJlJlbmRlclN0eWxlOjpsaW5l Q2xhbXAsIExpbmVDbGFtcFZhbHVlLCAmUmVuZGVyU3R5bGU6OnNldExpbmVDbGFtcCwgTGluZUNs YW1wVmFsdWUsICZSZW5kZXJTdHlsZTo6aW5pdGlhbExpbmVDbGFtcD46OmNyZWF0ZUhhbmRsZXIo KSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TGluZUdyaWQsIEFw cGx5UHJvcGVydHlTdHJpbmc8TWFwTm9uZVRvTnVsbCwgJlJlbmRlclN0eWxlOjpsaW5lR3JpZCwg JlJlbmRlclN0eWxlOjpzZXRMaW5lR3JpZCwgJlJlbmRlclN0eWxlOjppbml0aWFsTGluZUdyaWQ+ OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdl YmtpdExpbmVTbmFwLCBBcHBseVByb3BlcnR5RGVmYXVsdDxMaW5lU25hcCwgJlJlbmRlclN0eWxl OjpsaW5lU25hcCwgTGluZVNuYXAsICZSZW5kZXJTdHlsZTo6c2V0TGluZVNuYXAsIExpbmVTbmFw LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lU25hcD46OmNyZWF0ZUhhbmRsZXIoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCA2ZGI0 YmI5MWM3YTk1ZDdmMWJhNTU2ZmRmZDE1Y2ZmOGI1YzQ3NWE1Li4xNzlkMzI1NDk1MjZkNzRmNjZm OGJiNWZkOGFhYzZhZWFjOWQ5MmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHAKQEAgLTQ3MSw3ICs0NzEsNyBAQCBTdHlsZURpZmZlcmVuY2Ug UmVuZGVyU3R5bGU6OmRpZmYoY29uc3QgUmVuZGVyU3R5bGUqIG90aGVyLCB1bnNpZ25lZCYgY2hh bmdlZENvbgogICAgICAgICAgICAgfHwgcmFyZUluaGVyaXRlZERhdGEtPndvcmRCcmVhayAhPSBv dGhlci0+cmFyZUluaGVyaXRlZERhdGEtPndvcmRCcmVhawogICAgICAgICAgICAgfHwgcmFyZUlu aGVyaXRlZERhdGEtPm92ZXJmbG93V3JhcCAhPSBvdGhlci0+cmFyZUluaGVyaXRlZERhdGEtPm92 ZXJmbG93V3JhcAogICAgICAgICAgICAgfHwgcmFyZUluaGVyaXRlZERhdGEtPm5ic3BNb2RlICE9 IG90aGVyLT5yYXJlSW5oZXJpdGVkRGF0YS0+bmJzcE1vZGUKLSAgICAgICAgICAgIHx8IHJhcmVJ bmhlcml0ZWREYXRhLT5raHRtbExpbmVCcmVhayAhPSBvdGhlci0+cmFyZUluaGVyaXRlZERhdGEt PmtodG1sTGluZUJyZWFrCisgICAgICAgICAgICB8fCByYXJlSW5oZXJpdGVkRGF0YS0+bGluZUJy ZWFrICE9IG90aGVyLT5yYXJlSW5oZXJpdGVkRGF0YS0+bGluZUJyZWFrCiAgICAgICAgICAgICB8 fCByYXJlSW5oZXJpdGVkRGF0YS0+dGV4dFNlY3VyaXR5ICE9IG90aGVyLT5yYXJlSW5oZXJpdGVk RGF0YS0+dGV4dFNlY3VyaXR5CiAgICAgICAgICAgICB8fCByYXJlSW5oZXJpdGVkRGF0YS0+aHlw aGVucyAhPSBvdGhlci0+cmFyZUluaGVyaXRlZERhdGEtPmh5cGhlbnMKICAgICAgICAgICAgIHx8 IHJhcmVJbmhlcml0ZWREYXRhLT5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlICE9IG90aGVyLT5yYXJl SW5oZXJpdGVkRGF0YS0+aHlwaGVuYXRpb25MaW1pdEJlZm9yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCBkMWZkMTNlNWUyYTIyZGQ5OTdmMzhi MmNlNjdlYTVmOGZkM2MwOWRmLi5lYmU5MWI0MjdkMWFkM2YzYzYzMjY2NDQxMjgxNDU2MDUwYWFj OGRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApA QCAtNjgzLDcgKzY4Myw3IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgYnJlYWtPbmx5QWZ0ZXJXaGl0 ZVNwYWNlKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiB3aGl0ZVNwYWNlKCkgPT0gUFJF X1dSQVAgfHwga2h0bWxMaW5lQnJlYWsoKSA9PSBBRlRFUl9XSElURV9TUEFDRTsKKyAgICAgICAg cmV0dXJuIHdoaXRlU3BhY2UoKSA9PSBQUkVfV1JBUCB8fCBsaW5lQnJlYWsoKSA9PSBMaW5lQnJl YWtBZnRlcldoaXRlU3BhY2U7CiAgICAgfQogCiAgICAgYm9vbCBicmVha1dvcmRzKCkgY29uc3QK QEAgLTg0Niw3ICs4NDYsNyBAQCBwdWJsaWM6CiAgICAgRVdvcmRCcmVhayB3b3JkQnJlYWsoKSBj b25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFV29yZEJyZWFrPihyYXJlSW5oZXJpdGVkRGF0YS0+ d29yZEJyZWFrKTsgfQogICAgIEVPdmVyZmxvd1dyYXAgb3ZlcmZsb3dXcmFwKCkgY29uc3QgeyBy ZXR1cm4gc3RhdGljX2Nhc3Q8RU92ZXJmbG93V3JhcD4ocmFyZUluaGVyaXRlZERhdGEtPm92ZXJm bG93V3JhcCk7IH0KICAgICBFTkJTUE1vZGUgbmJzcE1vZGUoKSBjb25zdCB7IHJldHVybiBzdGF0 aWNfY2FzdDxFTkJTUE1vZGU+KHJhcmVJbmhlcml0ZWREYXRhLT5uYnNwTW9kZSk7IH0KLSAgICBF S0hUTUxMaW5lQnJlYWsga2h0bWxMaW5lQnJlYWsoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2Fz dDxFS0hUTUxMaW5lQnJlYWs+KHJhcmVJbmhlcml0ZWREYXRhLT5raHRtbExpbmVCcmVhayk7IH0K KyAgICBMaW5lQnJlYWsgbGluZUJyZWFrKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8TGlu ZUJyZWFrPihyYXJlSW5oZXJpdGVkRGF0YS0+bGluZUJyZWFrKTsgfQogICAgIGNvbnN0IEF0b21p Y1N0cmluZyYgaGlnaGxpZ2h0KCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPmhp Z2hsaWdodDsgfQogICAgIEh5cGhlbnMgaHlwaGVucygpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PEh5cGhlbnM+KHJhcmVJbmhlcml0ZWREYXRhLT5oeXBoZW5zKTsgfQogICAgIHNob3J0IGh5 cGhlbmF0aW9uTGltaXRCZWZvcmUoKSBjb25zdCB7IHJldHVybiByYXJlSW5oZXJpdGVkRGF0YS0+ aHlwaGVuYXRpb25MaW1pdEJlZm9yZTsgfQpAQCAtMTMxMSw3ICsxMzExLDcgQEAgcHVibGljOgog ICAgIHZvaWQgc2V0V29yZEJyZWFrKEVXb3JkQnJlYWsgYikgeyBTRVRfVkFSKHJhcmVJbmhlcml0 ZWREYXRhLCB3b3JkQnJlYWssIGIpOyB9CiAgICAgdm9pZCBzZXRPdmVyZmxvd1dyYXAoRU92ZXJm bG93V3JhcCBiKSB7IFNFVF9WQVIocmFyZUluaGVyaXRlZERhdGEsIG92ZXJmbG93V3JhcCwgYik7 IH0KICAgICB2b2lkIHNldE5CU1BNb2RlKEVOQlNQTW9kZSBiKSB7IFNFVF9WQVIocmFyZUluaGVy aXRlZERhdGEsIG5ic3BNb2RlLCBiKTsgfQotICAgIHZvaWQgc2V0S0hUTUxMaW5lQnJlYWsoRUtI VE1MTGluZUJyZWFrIGIpIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwga2h0bWxMaW5lQnJl YWssIGIpOyB9CisgICAgdm9pZCBzZXRMaW5lQnJlYWsoTGluZUJyZWFrIGIpIHsgU0VUX1ZBUihy YXJlSW5oZXJpdGVkRGF0YSwgbGluZUJyZWFrLCBiKTsgfQogICAgIHZvaWQgc2V0SGlnaGxpZ2h0 KGNvbnN0IEF0b21pY1N0cmluZyYgaCkgeyBTRVRfVkFSKHJhcmVJbmhlcml0ZWREYXRhLCBoaWdo bGlnaHQsIGgpOyB9CiAgICAgdm9pZCBzZXRIeXBoZW5zKEh5cGhlbnMgaCkgeyBTRVRfVkFSKHJh cmVJbmhlcml0ZWREYXRhLCBoeXBoZW5zLCBoKTsgfQogICAgIHZvaWQgc2V0SHlwaGVuYXRpb25M aW1pdEJlZm9yZShzaG9ydCBsaW1pdCkgeyBTRVRfVkFSKHJhcmVJbmhlcml0ZWREYXRhLCBoeXBo ZW5hdGlvbkxpbWl0QmVmb3JlLCBsaW1pdCk7IH0KQEAgLTE2NTAsNyArMTY1MCw3IEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgRVdvcmRCcmVhayBpbml0aWFsV29yZEJyZWFrKCkgeyByZXR1cm4gTm9y bWFsV29yZEJyZWFrOyB9CiAgICAgc3RhdGljIEVPdmVyZmxvd1dyYXAgaW5pdGlhbE92ZXJmbG93 V3JhcCgpIHsgcmV0dXJuIE5vcm1hbE92ZXJmbG93V3JhcDsgfQogICAgIHN0YXRpYyBFTkJTUE1v ZGUgaW5pdGlhbE5CU1BNb2RlKCkgeyByZXR1cm4gTkJOT1JNQUw7IH0KLSAgICBzdGF0aWMgRUtI VE1MTGluZUJyZWFrIGluaXRpYWxLSFRNTExpbmVCcmVhaygpIHsgcmV0dXJuIExCTk9STUFMOyB9 CisgICAgc3RhdGljIExpbmVCcmVhayBpbml0aWFsTGluZUJyZWFrKCkgeyByZXR1cm4gTGluZUJy ZWFrQXV0bzsgfQogICAgIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGluaXRpYWxIaWdobGln aHQoKSB7IHJldHVybiBudWxsQXRvbTsgfQogICAgIHN0YXRpYyBFU3BlYWsgaW5pdGlhbFNwZWFr KCkgeyByZXR1cm4gU3BlYWtOb3JtYWw7IH0KICAgICBzdGF0aWMgSHlwaGVucyBpbml0aWFsSHlw aGVucygpIHsgcmV0dXJuIEh5cGhlbnNNYW51YWw7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKaW5kZXggZDNkMzRlNWI0 OWI3MWEzNDVhZmMyOWNjYmU0NjU2M2IyNzc1MmExMi4uZjlmMzIwOTk2YmY0ODhjMTliOTQzNGU5 Yzk3NzBmMzFiNDcxMTk3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKQEAgLTIxMCw4ICsyMTAsOCBAQCBlbnVtIEVO QlNQTW9kZSB7CiAgICAgTkJOT1JNQUwsIFNQQUNFCiB9OwogCi1lbnVtIEVLSFRNTExpbmVCcmVh ayB7Ci0gICAgTEJOT1JNQUwsIEFGVEVSX1dISVRFX1NQQUNFCitlbnVtIExpbmVCcmVhayB7Cisg ICAgTGluZUJyZWFrQXV0bywgTGluZUJyZWFrTG9vc2UsIExpbmVCcmVha05vcm1hbCwgTGluZUJy ZWFrU3RyaWN0LCBMaW5lQnJlYWtBZnRlcldoaXRlU3BhY2UKIH07CiAKIGVudW0gRVJlc2l6ZSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5o ZXJpdGVkRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJl SW5oZXJpdGVkRGF0YS5jcHAKaW5kZXggMzk2MmU3ZjZhMjJkNzY3YmJhMjg1MGM0NWM1MDEzYTM5 MmQ3YmY0Mi4uMTY4MDIyMTQzMWFlMjY2Yzg1OTc2ZmIyZmEyOTFjMzViMzA4NjkxZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERh dGEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhl cml0ZWREYXRhLmNwcApAQCAtNzEsNyArNzEsNyBAQCBTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpT dHlsZVJhcmVJbmhlcml0ZWREYXRhKCkKICAgICAsIHdvcmRCcmVhayhSZW5kZXJTdHlsZTo6aW5p dGlhbFdvcmRCcmVhaygpKQogICAgICwgb3ZlcmZsb3dXcmFwKFJlbmRlclN0eWxlOjppbml0aWFs T3ZlcmZsb3dXcmFwKCkpCiAgICAgLCBuYnNwTW9kZShOQk5PUk1BTCkKLSAgICAsIGtodG1sTGlu ZUJyZWFrKExCTk9STUFMKQorICAgICwgbGluZUJyZWFrKExpbmVCcmVha0F1dG8pCiAgICAgLCB0 ZXh0U2l6ZUFkanVzdChSZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRTaXplQWRqdXN0KCkpCiAgICAg LCByZXNpemUoUmVuZGVyU3R5bGU6OmluaXRpYWxSZXNpemUoKSkKICAgICAsIHVzZXJTZWxlY3Qo UmVuZGVyU3R5bGU6OmluaXRpYWxVc2VyU2VsZWN0KCkpCkBAIC0xMzMsNyArMTMzLDcgQEAgU3R5 bGVSYXJlSW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJlSW5oZXJpdGVkRGF0YShjb25zdCBTdHlsZVJh cmVJbmhlcml0ZWREYXRhJiBvKQogICAgICwgd29yZEJyZWFrKG8ud29yZEJyZWFrKQogICAgICwg b3ZlcmZsb3dXcmFwKG8ub3ZlcmZsb3dXcmFwKQogICAgICwgbmJzcE1vZGUoby5uYnNwTW9kZSkK LSAgICAsIGtodG1sTGluZUJyZWFrKG8ua2h0bWxMaW5lQnJlYWspCisgICAgLCBsaW5lQnJlYWso by5saW5lQnJlYWspCiAgICAgLCB0ZXh0U2l6ZUFkanVzdChvLnRleHRTaXplQWRqdXN0KQogICAg ICwgcmVzaXplKG8ucmVzaXplKQogICAgICwgdXNlclNlbGVjdChvLnVzZXJTZWxlY3QpCkBAIC0y MTQsNyArMjE0LDcgQEAgYm9vbCBTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpvcGVyYXRvcj09KGNv bnN0IFN0eWxlUmFyZUluaGVyaXRlZERhdGEmIG8pIGNvbnN0CiAgICAgICAgICYmIHdvcmRCcmVh ayA9PSBvLndvcmRCcmVhawogICAgICAgICAmJiBvdmVyZmxvd1dyYXAgPT0gby5vdmVyZmxvd1dy YXAKICAgICAgICAgJiYgbmJzcE1vZGUgPT0gby5uYnNwTW9kZQotICAgICAgICAmJiBraHRtbExp bmVCcmVhayA9PSBvLmtodG1sTGluZUJyZWFrCisgICAgICAgICYmIGxpbmVCcmVhayA9PSBvLmxp bmVCcmVhawogI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF9PVkVSRkxPV19TQ1JPTExJTkcpCiAgICAg ICAgICYmIHVzZVRvdWNoT3ZlcmZsb3dTY3JvbGxpbmcgPT0gby51c2VUb3VjaE92ZXJmbG93U2Ny b2xsaW5nCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5oCmluZGV4IDI3ZDVjOWFjZTc4MzU3NTQ5M2Q2NTI3 MzYyZjI2Mzk0NDU1MGEyYjguLmEzNGRmYjJhMzlmYTQ0OTJkNDZiMTQxNzJjYTk2YWM5Y2QwN2Q1 NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJ bmhlcml0ZWREYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxl UmFyZUluaGVyaXRlZERhdGEuaApAQCAtODUsNyArODUsNyBAQCBwdWJsaWM6CiAgICAgdW5zaWdu ZWQgd29yZEJyZWFrIDogMjsgLy8gRVdvcmRCcmVhawogICAgIHVuc2lnbmVkIG92ZXJmbG93V3Jh cCA6IDE7IC8vIEVPdmVyZmxvd1dyYXAKICAgICB1bnNpZ25lZCBuYnNwTW9kZSA6IDE7IC8vIEVO QlNQTW9kZQotICAgIHVuc2lnbmVkIGtodG1sTGluZUJyZWFrIDogMTsgLy8gRUtIVE1MTGluZUJy ZWFrCisgICAgdW5zaWduZWQgbGluZUJyZWFrIDogMzsgLy8gTGluZUJyZWFrCiAgICAgdW5zaWdu ZWQgdGV4dFNpemVBZGp1c3QgOiAxOyAvLyBBbiBBcHBsZSBleHRlbnNpb24uCiAgICAgdW5zaWdu ZWQgcmVzaXplIDogMjsgLy8gRVJlc2l6ZQogICAgIHVuc2lnbmVkIHVzZXJTZWxlY3QgOiAyOyAv LyBFVXNlclNlbGVjdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRhMWY2ZjhlMzRhM2Y5YjZmNTU5NDliZmNjMzEwNzRmNmY3 NWUxNDQuLmRjY2VlMjZjYzBhM2E1YjM0ZjUzNTlkNzA0NTc5MjI1ZjYzNjMwYzggMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxMi0xMC0zMCAgR2xlbm4gQWRhbXMgIDxnbGVubkBza3luYXYuY29t PgorCisgICAgICAgIFtDU1NdIEV4cGFuZCAtd2Via2l0LWxpbmUtYnJlYWsgdmFsdWUgc3BhY2UK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDczOQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBk ZWZhdWx0IChpbml0aWFsKSB2YWx1ZSBmb3IgLXdlYmtpdC1saW5lLWJyZWFrIHRvICdhdXRvJyB0 byBtYXRjaCBDU1MzIFRleHQuCisKKyAgICAgICAgKiBmYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxl L2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgRml4IGZvciBjaGFuZ2Ugb2Yg aW5pdGlhbCAoZGVmYXVsdCkgdmFsdWUgb24gLXdlYmtpdC1saW5lLWJyZWFrIGZyb20gJ25vcm1h bCcgdG8gJ2F1dG8nLgorCisgICAgICAgICogZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21w dXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgRml4IGZv ciBjaGFuZ2Ugb2YgaW5pdGlhbCAoZGVmYXVsdCkgdmFsdWUgb24gLXdlYmtpdC1saW5lLWJyZWFr IGZyb20gJ25vcm1hbCcgdG8gJ2F1dG8nLgorCisgICAgICAgICogc3ZnL2Nzcy9nZXRDb21wdXRl ZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgRml4IGZvciBjaGFuZ2Ugb2YgaW5p dGlhbCAoZGVmYXVsdCkgdmFsdWUgb24gLXdlYmtpdC1saW5lLWJyZWFrIGZyb20gJ25vcm1hbCcg dG8gJ2F1dG8nLgorCiAyMDEyLTEwLTMwICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBBZGQgYSB0ZXN0IGZvciByZWFkaW5nIGV4aWYgb3JpZW50YXRpb24gb2Zm IGltYWdlIGRvY3VtZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29t cHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAppbmRleCA1 ZTdkMWViNGQxYmZjMGQxZDAzMzc0YzE2OWY5MmYyNjM3ODlhNDMxLi5jZTA3MDYzOWY0MzNlMjM3 YmZhMDZiYTQ5Y2JlYzhhYTg2OWQyZWRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLWV4cGVjdGVk LnR4dApAQCAtMTYyLDcgKzE2Miw3IEBAIHpvb206IDE7CiAtd2Via2l0LWh5cGhlbnM6IG1hbnVh bDsKIC13ZWJraXQtbGluZS1hbGlnbjogbm9uZTsKIC13ZWJraXQtbGluZS1ib3gtY29udGFpbjog YmxvY2sgaW5saW5lIHJlcGxhY2VkOwotLXdlYmtpdC1saW5lLWJyZWFrOiBub3JtYWw7Cistd2Vi a2l0LWxpbmUtYnJlYWs6IGF1dG87CiAtd2Via2l0LWxpbmUtY2xhbXA6IG5vbmU7CiAtd2Via2l0 LWxpbmUtZ3JpZDogbm9uZTsKIC13ZWJraXQtbGluZS1zbmFwOiBub25lOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRo b3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2dldENvbXB1 dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1leHBlY3RlZC50eHQKaW5k ZXggNjE5NDYyMDVhNzk1OTM4MjA0OTAzNDQ0ZDU3ODc1ZDc3MzI1NTRjYi4uNTVkMjhmZWRhODZk NTM3Y2UwYjQ0OGFmMzdiYzQ5MTA4ZDdhYzY2MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2Nv bXB1dGVkLXN0eWxlLXdpdGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0CkBAIC0xNjEsNyArMTYx LDcgQEAgem9vbTogMQogLXdlYmtpdC1oeXBoZW5zOiBtYW51YWwKIC13ZWJraXQtbGluZS1hbGln bjogbm9uZQogLXdlYmtpdC1saW5lLWJveC1jb250YWluOiBibG9jayBpbmxpbmUgcmVwbGFjZWQK LS13ZWJraXQtbGluZS1icmVhazogbm9ybWFsCistd2Via2l0LWxpbmUtYnJlYWs6IGF1dG8KIC13 ZWJraXQtbGluZS1jbGFtcDogbm9uZQogLXdlYmtpdC1saW5lLWdyaWQ6IG5vbmUKIC13ZWJraXQt bGluZS1zbmFwOiBub25lCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1 dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21w dXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dAppbmRleCBjZDI0ZGRlY2RhOGIwMTBhMGJjNzM3 MjY1NjhlN2E3NGI5ZWUzMjkxLi5lNGVmYjlmY2FkZjI3YWFhMDlhZDBiNTBjYmE5ZDRmNGU5NGEw ZTg4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFz aWMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHls ZS1iYXNpYy1leHBlY3RlZC50eHQKQEAgLTMyMiw3ICszMjIsNyBAQCByZWN0OiBzdHlsZS5nZXRQ cm9wZXJ0eVZhbHVlKC13ZWJraXQtbGluZS1hbGlnbikgOiBub25lCiByZWN0OiBzdHlsZS5nZXRQ cm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1hbGlnbikgOiBbb2JqZWN0IENTU1ByaW1pdGl2 ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWxpbmUtYm94LWNv bnRhaW4pIDogYmxvY2sgaW5saW5lIHJlcGxhY2VkCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNT U1ZhbHVlKC13ZWJraXQtbGluZS1ib3gtY29udGFpbikgOiBbb2JqZWN0IENTU1ZhbHVlXQotcmVj dDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWxpbmUtYnJlYWspIDogbm9ybWFsCity ZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtbGluZS1icmVhaykgOiBhdXRvCiBy ZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1icmVhaykgOiBbb2Jq ZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Vi a2l0LWxpbmUtY2xhbXApIDogbm9uZQogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgt d2Via2l0LWxpbmUtY2xhbXApIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KQEAgLTgyNCw3 ICs4MjQsNyBAQCBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtbGluZS1hbGlnbikg OiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1hbGlnbikg OiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgt d2Via2l0LWxpbmUtYm94LWNvbnRhaW4pIDogYmxvY2sgaW5saW5lIHJlcGxhY2VkCiBnOiBzdHls ZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1ib3gtY29udGFpbikgOiBbb2JqZWN0 IENTU1ZhbHVlXQotZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWxpbmUtYnJlYWsp IDogbm9ybWFsCitnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtbGluZS1icmVhaykg OiBhdXRvCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1icmVhaykg OiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgt d2Via2l0LWxpbmUtY2xhbXApIDogbm9uZQogZzogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgt d2Via2l0LWxpbmUtY2xhbXApIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0K