135349 2014-07-28 13:26:11 -0700 [CSS3-Text] Add rendering support for text-justify: none 2014-08-14 08:44:32 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED WebExposed P2 Normal --- 135940 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan mmaxfield simon.fraser oldest_to_newest 1025203 0 zoltan 2014-07-28 13:26:11 -0700 Add rendering support for the none value of text-justify property. Spec: http://dev.w3.org/csswg/css-text-3/#valdef-text-justify.none 1025280 1 235629 zoltan 2014-07-28 16:07:49 -0700 Created attachment 235629 Patch 1025405 2 235629 darin 2014-07-29 00:56:32 -0700 Comment on attachment 235629 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235629&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:681 > + if (textAlign == JUSTIFY && r != trailingSpaceRun > +#if ENABLE(CSS3_TEXT) > + && style().textJustify() != TextJustifyNone) { > +#else > + ) { > +#endif It’s better to not have repeated ) { characters to confuse code editors. How about this instead? if (textAlign == JUSTIFY && r != trailingSpaceRun #if ENABLE(CSS3_TEXT) && style().textJustify() != TextJustifyNone #endif ) { Does this really need to be done down here at such a low level? Can’t we change the textAlign value at some higher level instead? 1025468 3 zoltan 2014-07-29 07:32:09 -0700 I tried to satisfy the style-checker, that's why I did it this way. Probably the best would be to file a bug against it, and use the simpler version. Do you agree? > Does this really need to be done down here at such a low level? Can’t we change the textAlign value at some higher level instead? I'll take a look at this. 1025493 4 mmaxfield 2014-07-29 09:37:01 -0700 I agree with Darin, but other than that, unofficial r=me as well. 1025731 5 235749 zoltan 2014-07-30 10:25:48 -0700 Created attachment 235749 Patch 1025732 6 zoltan 2014-07-30 10:26:48 -0700 I moved the logic up into "RenderBlockFlow::textAlignmentForLine". 1028819 7 235749 hyatt 2014-08-13 10:25:04 -0700 Comment on attachment 235749 Patch r=me 1028824 8 235749 commit-queue 2014-08-13 11:00:48 -0700 Comment on attachment 235749 Patch Clearing flags on attachment: 235749 Committed r172524: <http://trac.webkit.org/changeset/172524> 1028825 9 commit-queue 2014-08-13 11:00:52 -0700 All reviewed patches have been landed. Closing bug. 1028830 10 235749 darin 2014-08-13 11:18:13 -0700 Comment on attachment 235749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235749&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:360 > -#if !ENABLE(CSS3_TEXT) > - return (alignment == JUSTIFY) ? TASTART : alignment; > -#else > +#if ENABLE(CSS3_TEXT) We intentionally put the short half of the #if first for easier readability, which is why the !CSS3_TEXT branch came before the #else instead of the other way around. I'm a little disappointed to see that changed in a patch that doesn't give any rationale for the change. 1028832 11 235749 darin 2014-08-13 11:18:30 -0700 Comment on attachment 235749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235749&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:353 > + if (alignment == JUSTIFY && textJustify == TextJustifyNone) Extra space here after the "&&". 1028841 12 zoltan 2014-08-13 11:47:42 -0700 (In reply to comment #10) > We intentionally put the short half of the #if first for easier readability, which is why the !CSS3_TEXT branch came before the #else instead of the other way around. I'm a little disappointed to see that changed in a patch that doesn't give any rationale for the change. It seemed easier my to read the other way. I'm going to update it in a follow up patch to be consistent with the rest of the code. I will CC you. (In reply to comment #11) > (From update of attachment 235749 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=235749&action=review > > > Source/WebCore/rendering/RenderBlockLineLayout.cpp:353 > > + if (alignment == JUSTIFY && textJustify == TextJustifyNone) > > Extra space here after the "&&". And will remove the extra space. 235629 2014-07-28 16:07:49 -0700 2014-07-30 10:25:44 -0700 Patch bug-135349-20140728160735.patch text/plain 5290 zoltan U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxNjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODM0M2M1M2E5YTUxYWNk MWYyMjg5MjRmYjRhMzM1NjBiYmFkZTAwNy4uMmI0ODE3NTU0MWU0MTM0MzE0MTI1YmVmMmM5YTc1 NjdkODY3ODUyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA3LTI4ICBab2x0 YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MzLVRleHRdIEFk ZCByZW5kZXJpbmcgc3VwcG9ydCBmb3IgdGhlIG5vbmUgdmFsdWUgb2YgdGV4dC1qdXN0aWZ5IHBy b3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzUzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT cGVjOiBodHRwOi8vZGV2LnczLm9yZy9jc3N3Zy9jc3MtdGV4dC0zLyN2YWxkZWYtdGV4dC1qdXN0 aWZ5Lm5vbmUKKworICAgICAgICBUZXN0OiBmYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtanVzdGlm eS90ZXh0LWp1c3RpZnktbm9uZS5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y29t cHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvclNlZ21lbnQpOgorCiAyMDE0LTA3LTI4ICBC cmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQg J21lcmdlJyBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCmluZGV4IDEzOTA0ZTczMDdhMTZhZjQ4NjBhNTQ2YjEwMzM0YjA0YjFl MzE4ZWYuLjExZjA2ZDJjOTNjZjEyMTNmMmM5ZWNmNTRmNTk1N2M0YjczN2I1NmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBA IC02NzMsNyArNjczLDEyIEBAIEJpZGlSdW4qIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGlu ZURpcmVjdGlvblBvc2l0aW9uc0ZvclNlZ21lbnQoUm9vdElubGluZUJvCiAgICAgICAgICAgICAg ICAgICAgICAgLy8gU2ltaWxhcmx5LCBsaW5lIGJyZWFrIGJveGVzIGhhdmUgbm8gZWZmZWN0IG9u IHRoZSB3aWR0aC4KICAgICAgICAgaWYgKHItPnJlbmRlcmVyKCkuaXNUZXh0KCkpIHsKICAgICAg ICAgICAgIFJlbmRlclRleHQmIHJ0ID0gdG9SZW5kZXJUZXh0KHItPnJlbmRlcmVyKCkpOwotICAg ICAgICAgICAgaWYgKHRleHRBbGlnbiA9PSBKVVNUSUZZICYmIHIgIT0gdHJhaWxpbmdTcGFjZVJ1 bikgeworICAgICAgICAgICAgaWYgKHRleHRBbGlnbiA9PSBKVVNUSUZZICYmIHIgIT0gdHJhaWxp bmdTcGFjZVJ1bgorI2lmIEVOQUJMRShDU1MzX1RFWFQpCisgICAgICAgICAgICAgICAgJiYgc3R5 bGUoKS50ZXh0SnVzdGlmeSgpICE9IFRleHRKdXN0aWZ5Tm9uZSkgeworI2Vsc2UKKyAgICAgICAg ICAgICkgeworI2VuZGlmCiAgICAgICAgICAgICAgICAgaWYgKCFpc0FmdGVyRXhwYW5zaW9uKQog ICAgICAgICAgICAgICAgICAgICB0b0lubGluZVRleHRCb3goci0+Ym94KCkpLT5zZXRDYW5IYXZl TGVhZGluZ0V4cGFuc2lvbih0cnVlKTsKICAgICAgICAgICAgICAgICB1bnNpZ25lZCBvcHBvcnR1 bml0aWVzSW5SdW47CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggZjU5YzhjZDlhNmRmZjM3ODVlYmQ4Y2U2ZGE2MzU3NzIwMGJm YWQxOC4uMTQ2ODEyMWUyYjZmY2Y4NDY0MjM2NTFlY2YyN2IwNmFkZWZmNmU4NSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSw1ICsxLDE1IEBACiAyMDE0LTA3LTI4ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQu b3JnPgogCisgICAgICAgIFtDU1MzLVRleHRdIEFkZCByZW5kZXJpbmcgc3VwcG9ydCBmb3IgdGhl IG5vbmUgdmFsdWUgb2YgdGV4dC1qdXN0aWZ5IHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzUzNDkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1q dXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAq IGZhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLmh0bWw6 IEFkZGVkLgorCisyMDE0LTA3LTI4ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3Jn PgorCiAgICAgICAgIFtDU1MzLVRleHRdIFVwZGF0ZSB0ZXh0LWV4cGVjdGF0aW9ucyBhZnRlciBy MTcxNjc3CiAKICAgICAgICAgVW5yZXZpZXdlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzMy10ZXh0L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLWV4cGVjdGVk Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtanVzdGlmeS90ZXh0 LWp1c3RpZnktbm9uZS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE1NmI2ZmU4NTI5OTBkNDhj MGFhOTM2NGMzNzlhN2U2YjNlN2U0MDYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2NzczMtdGV4dC9jc3MzLXRleHQtanVzdGlmeS90ZXh0LWp1c3RpZnktbm9uZS1leHBlY3Rl ZC5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBIVE1MPgorPGh0bWw+Cis8aGVhZD4K KzxzdHlsZT4KKy50ZXN0IHsKKyAgICB3aWR0aDogNDAwcHg7CisgICAgYm9yZGVyOiAxcHggc29s aWQgYmxhY2s7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisKKzxwPlRoaXMgdGVzdCBj aGVja3MgdGhhdCB0aGUgJ25vbmUnIHZhbHVlIGZvciB0ZXh0LWp1c3RpZnkgcHJvcGVydHkgd29y a3MgcHJvcGVybHkuPGJyPgorQWxsIG9mIHRoZSBsaW5lcyB3aXRoIHRoZSB2YWx1ZSBzaG91bGQg PGI+Tk9UPC9iPiBiZSBqdXN0aWZpZWQuPC9wPgorCis8cD50ZXh0LWFsaWduOiBqdXN0aWZ5PC9w PgorPGRpdiBjbGFzcz0ndGVzdCcgc3R5bGU9InRleHQtYWxpZ246IGp1c3RpZnk7Ij4KK1RoZSBD dWx0dXJlIGhhcyBhY2hpZXZlZCBhcnRpZmljaWFsIGludGVsbGlnZW5jZXMgd2hlcmUgZWFjaCBN aW5kIGhhcyB0aG91Z2h0IHByb2Nlc3NpbmcgY2FwYWJpbGl0aWVzIG1hbnkgb3JkZXJzIG9mIG1h Z25pdHVkZSBiZXlvbmQgdGhhdCBvZiBodW1hbiBiZWluZ3MsIGFuZCBkYXRhIHN0b3JhZ2UgZHJp dmVzIHdoaWNoLCBpZiB3cml0dGVuIG91dCBvbiBwYXBlciBhbmQgc3RvcmVkLi4uPC9kaXY+CisK KzxwPnRleHQtYWxpZ246IGp1c3RpZnksIHRleHQtanVzdGlmeTogbm9uZTwvcD4KKzxkaXYgY2xh c3M9J3Rlc3QnPgorVGhlIEN1bHR1cmUgaGFzIGFjaGlldmVkIGFydGlmaWNpYWwgaW50ZWxsaWdl bmNlcyB3aGVyZSBlYWNoIE1pbmQgaGFzIHRob3VnaHQgcHJvY2Vzc2luZyBjYXBhYmlsaXRpZXMg bWFueSBvcmRlcnMgb2YgbWFnbml0dWRlIGJleW9uZCB0aGF0IG9mIGh1bWFuIGJlaW5ncywgYW5k IGRhdGEgc3RvcmFnZSBkcml2ZXMgd2hpY2gsIGlmIHdyaXR0ZW4gb3V0IG9uIHBhcGVyIGFuZCBz dG9yZWQuLi48L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9jc3MzLXRleHQvY3NzMy10ZXh0LWp1c3RpZnkvdGV4dC1qdXN0aWZ5LW5vbmUuaHRt bCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVz dGlmeS1ub25lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWY0YzFiYWYxYjkwNzgxZmQ2YzJkZDEzNDJlMmE5 Yzc2OWExZTg0ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzMy10ZXh0 L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLmh0bWwKQEAgLTAsMCArMSwyNiBA QAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLnRlc3QgeworICAg IHdpZHRoOiA0MDBweDsKKyAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKKyAgICB0ZXh0LWFs aWduOiBqdXN0aWZ5OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorCis8cD5UaGlzIHRl c3QgY2hlY2tzIHRoYXQgdGhlICdub25lJyB2YWx1ZSBmb3IgdGV4dC1qdXN0aWZ5IHByb3BlcnR5 IHdvcmtzIHByb3Blcmx5Ljxicj4KK0FsbCBvZiB0aGUgbGluZXMgd2l0aCB0aGUgdmFsdWUgc2hv dWxkIDxiPk5PVDwvYj4gYmUganVzdGlmaWVkLjwvcD4KKworPHA+dGV4dC1hbGlnbjoganVzdGlm eTwvcD4KKzxkaXYgY2xhc3M9J3Rlc3QnPgorVGhlIEN1bHR1cmUgaGFzIGFjaGlldmVkIGFydGlm aWNpYWwgaW50ZWxsaWdlbmNlcyB3aGVyZSBlYWNoIE1pbmQgaGFzIHRob3VnaHQgcHJvY2Vzc2lu ZyBjYXBhYmlsaXRpZXMgbWFueSBvcmRlcnMgb2YgbWFnbml0dWRlIGJleW9uZCB0aGF0IG9mIGh1 bWFuIGJlaW5ncywgYW5kIGRhdGEgc3RvcmFnZSBkcml2ZXMgd2hpY2gsIGlmIHdyaXR0ZW4gb3V0 IG9uIHBhcGVyIGFuZCBzdG9yZWQuLi48L2Rpdj4KKworPHA+dGV4dC1hbGlnbjoganVzdGlmeSwg dGV4dC1qdXN0aWZ5OiBub25lPC9wPgorPGRpdiBjbGFzcz0ndGVzdCcgc3R5bGU9Jy13ZWJraXQt dGV4dC1qdXN0aWZ5OiBub25lOyc+CitUaGUgQ3VsdHVyZSBoYXMgYWNoaWV2ZWQgYXJ0aWZpY2lh bCBpbnRlbGxpZ2VuY2VzIHdoZXJlIGVhY2ggTWluZCBoYXMgdGhvdWdodCBwcm9jZXNzaW5nIGNh cGFiaWxpdGllcyBtYW55IG9yZGVycyBvZiBtYWduaXR1ZGUgYmV5b25kIHRoYXQgb2YgaHVtYW4g YmVpbmdzLCBhbmQgZGF0YSBzdG9yYWdlIGRyaXZlcyB3aGljaCwgaWYgd3JpdHRlbiBvdXQgb24g cGFwZXIgYW5kIHN0b3JlZC4uLjwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+Cg== 235749 2014-07-30 10:25:48 -0700 2014-08-13 11:18:30 -0700 Patch bug-135349-20140730102534.patch text/plain 6588 zoltan U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxNzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE2ZDliNWQzM2QzNDRl NTg0YjkzMGIwZjhiYzA2Zjg2YWQxYjAyNS4uOGFkN2JmYTZhNzcyYTkyZGQ3MDI5ZTZjYTBjZDUx MDAxYzkzY2U3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA3LTMwICBab2x0 YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MzLVRleHRdIEFk ZCByZW5kZXJpbmcgc3VwcG9ydCBmb3IgdGhlIG5vbmUgdmFsdWUgb2YgdGV4dC1qdXN0aWZ5IHBy b3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzUzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT cGVjOiBodHRwOi8vZGV2LnczLm9yZy9jc3N3Zy9jc3MtdGV4dC0zLyN2YWxkZWYtdGV4dC1qdXN0 aWZ5Lm5vbmUKKworICAgICAgICBUZXN0OiBmYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtanVzdGlm eS90ZXh0LWp1c3RpZnktbm9uZS5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y29t cHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvclNlZ21lbnQpOgorCiAyMDE0LTA3LTMwICBa YW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbVGV4TWFwXSBN b3ZlIFRleHR1cmVNYXBwZXJMYXllcjo6dGV4dHVyZU1hcHBlcigpIGRlZmluaXRpb24gaW50byB0 aGUgaGVhZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCmluZGV4IDEzOTA0ZTczMDdhMTZhZjQ4NjBhNTQ2YjEwMzM0YjA0YjFlMzE4 ZWYuLjRjNTIzMTQ1ZmUyYjMzMWRhOWI2NTE2ZDRjZmYxZjVmNDU1MzA0ZjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCkBAIC0z NDgsMTIgKzM0OCwxNiBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9ja0Zsb3c6OmNvbnN0cnVj dExpbmUoQmlkaVJ1bkxpc3Q8QmlkaVJ1bj4mIGJpZGlSdW5zLCBjbwogRVRleHRBbGlnbiBSZW5k ZXJCbG9ja0Zsb3c6OnRleHRBbGlnbm1lbnRGb3JMaW5lKGJvb2wgZW5kc1dpdGhTb2Z0QnJlYWsp IGNvbnN0CiB7CiAgICAgRVRleHRBbGlnbiBhbGlnbm1lbnQgPSBzdHlsZSgpLnRleHRBbGlnbigp OworI2lmIEVOQUJMRShDU1MzX1RFWFQpCisgICAgVGV4dEp1c3RpZnkgdGV4dEp1c3RpZnkgPSBz dHlsZSgpLnRleHRKdXN0aWZ5KCk7CisgICAgaWYgKGFsaWdubWVudCA9PSBKVVNUSUZZICYmICB0 ZXh0SnVzdGlmeSA9PSBUZXh0SnVzdGlmeU5vbmUpCisgICAgICAgIHJldHVybiBzdHlsZSgpLmRp cmVjdGlvbigpID09IExUUiA/IExFRlQgOiBSSUdIVDsKKyNlbmRpZgorCiAgICAgaWYgKGVuZHNX aXRoU29mdEJyZWFrKQogICAgICAgICByZXR1cm4gYWxpZ25tZW50OwogCi0jaWYgIUVOQUJMRShD U1MzX1RFWFQpCi0gICAgcmV0dXJuIChhbGlnbm1lbnQgPT0gSlVTVElGWSkgPyBUQVNUQVJUIDog YWxpZ25tZW50OwotI2Vsc2UKKyNpZiBFTkFCTEUoQ1NTM19URVhUKQogICAgIGlmIChhbGlnbm1l bnQgIT0gSlVTVElGWSkKICAgICAgICAgcmV0dXJuIGFsaWdubWVudDsKIApAQCAtMzcyLDExICsz NzYsMTMgQEAgRVRleHRBbGlnbiBSZW5kZXJCbG9ja0Zsb3c6OnRleHRBbGlnbm1lbnRGb3JMaW5l KGJvb2wgZW5kc1dpdGhTb2Z0QnJlYWspIGNvbnN0CiAgICAgY2FzZSBUZXh0QWxpZ25MYXN0SnVz dGlmeToKICAgICAgICAgcmV0dXJuIEpVU1RJRlk7CiAgICAgY2FzZSBUZXh0QWxpZ25MYXN0QXV0 bzoKLSAgICAgICAgaWYgKHN0eWxlKCkudGV4dEp1c3RpZnkoKSA9PSBUZXh0SnVzdGlmeURpc3Ry aWJ1dGUpCisgICAgICAgIGlmICh0ZXh0SnVzdGlmeSA9PSBUZXh0SnVzdGlmeURpc3RyaWJ1dGUp CiAgICAgICAgICAgICByZXR1cm4gSlVTVElGWTsKICAgICAgICAgcmV0dXJuIFRBU1RBUlQ7CiAg ICAgfQogICAgIHJldHVybiBhbGlnbm1lbnQ7CisjZWxzZQorICAgIHJldHVybiAoYWxpZ25tZW50 ID09IEpVU1RJRlkpID8gVEFTVEFSVCA6IGFsaWdubWVudDsKICNlbmRpZgogfQogCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZDIwODU5NDhjYjY4ZjE3NjM2OTUxY2RjZDZiYjM5OWQ2OTljZjJlYS4uYWY4NTlkZmUwZjA3ZTI5 ZjZjOTA3MTQ1NGIwMmYzNGM0YWEwYWE4ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE0LTA3 LTMwICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1Mz LVRleHRdIEFkZCByZW5kZXJpbmcgc3VwcG9ydCBmb3IgdGhlIG5vbmUgdmFsdWUgb2YgdGV4dC1q dXN0aWZ5IHByb3BlcnR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzUzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVzdGlmeS1u b25lLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzMy10ZXh0L2NzczMt dGV4dC1qdXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBs YXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE0LTA3LTI5ICBKaW53b28gU29uZyAg PGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBVbnJldmlld2VkIEVG TCBnYXJkZW5pbmcuIFJlYmFzZWxpbmUgdGVzdHMgYWZ0ZXIgcjE3MDQxOC4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVzdGlm eS1ub25lLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRl eHQtanVzdGlmeS90ZXh0LWp1c3RpZnktbm9uZS1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE1 NmI2ZmU4NTI5OTBkNDhjMGFhOTM2NGMzNzlhN2U2YjNlN2U0MDYKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtanVzdGlmeS90ZXh0LWp1c3Rp Znktbm9uZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBIVE1MPgor PGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy50ZXN0IHsKKyAgICB3aWR0aDogNDAwcHg7CisgICAg Ym9yZGVyOiAxcHggc29saWQgYmxhY2s7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisK KzxwPlRoaXMgdGVzdCBjaGVja3MgdGhhdCB0aGUgJ25vbmUnIHZhbHVlIGZvciB0ZXh0LWp1c3Rp ZnkgcHJvcGVydHkgd29ya3MgcHJvcGVybHkuPGJyPgorQWxsIG9mIHRoZSBsaW5lcyB3aXRoIHRo ZSB2YWx1ZSBzaG91bGQgPGI+Tk9UPC9iPiBiZSBqdXN0aWZpZWQuPC9wPgorCis8cD50ZXh0LWFs aWduOiBqdXN0aWZ5PC9wPgorPGRpdiBjbGFzcz0ndGVzdCcgc3R5bGU9InRleHQtYWxpZ246IGp1 c3RpZnk7Ij4KK1RoZSBDdWx0dXJlIGhhcyBhY2hpZXZlZCBhcnRpZmljaWFsIGludGVsbGlnZW5j ZXMgd2hlcmUgZWFjaCBNaW5kIGhhcyB0aG91Z2h0IHByb2Nlc3NpbmcgY2FwYWJpbGl0aWVzIG1h bnkgb3JkZXJzIG9mIG1hZ25pdHVkZSBiZXlvbmQgdGhhdCBvZiBodW1hbiBiZWluZ3MsIGFuZCBk YXRhIHN0b3JhZ2UgZHJpdmVzIHdoaWNoLCBpZiB3cml0dGVuIG91dCBvbiBwYXBlciBhbmQgc3Rv cmVkLi4uPC9kaXY+CisKKzxwPnRleHQtYWxpZ246IGp1c3RpZnksIHRleHQtanVzdGlmeTogbm9u ZTwvcD4KKzxkaXYgY2xhc3M9J3Rlc3QnPgorVGhlIEN1bHR1cmUgaGFzIGFjaGlldmVkIGFydGlm aWNpYWwgaW50ZWxsaWdlbmNlcyB3aGVyZSBlYWNoIE1pbmQgaGFzIHRob3VnaHQgcHJvY2Vzc2lu ZyBjYXBhYmlsaXRpZXMgbWFueSBvcmRlcnMgb2YgbWFnbml0dWRlIGJleW9uZCB0aGF0IG9mIGh1 bWFuIGJlaW5ncywgYW5kIGRhdGEgc3RvcmFnZSBkcml2ZXMgd2hpY2gsIGlmIHdyaXR0ZW4gb3V0 IG9uIHBhcGVyIGFuZCBzdG9yZWQuLi48L2Rpdj4KKworPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MzLXRleHQvY3NzMy10ZXh0LWp1c3RpZnkvdGV4dC1q dXN0aWZ5LW5vbmUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1q dXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMmUyYzMxZGI0YTE3MGVk YWU4NWE3ZTgxMzZmZWRlNzg4ZTJmOTc2OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvY3NzMy10ZXh0L2NzczMtdGV4dC1qdXN0aWZ5L3RleHQtanVzdGlmeS1ub25lLmh0bWwK QEAgLTAsMCArMSwyNyBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKzxoZWFkPgorPHN0eWxl PgorLnRlc3QgeworICAgIHdpZHRoOiA0MDBweDsKKyAgICBib3JkZXI6IDFweCBzb2xpZCBibGFj azsKKyAgICB0ZXh0LWFsaWduOiBqdXN0aWZ5OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5 PgorCis8cD5UaGlzIHRlc3QgY2hlY2tzIHRoYXQgdGhlICdub25lJyB2YWx1ZSBmb3IgdGV4dC1q dXN0aWZ5IHByb3BlcnR5IHdvcmtzIHByb3Blcmx5Ljxicj4KK0FsbCBvZiB0aGUgbGluZXMgd2l0 aCB0aGUgdmFsdWUgc2hvdWxkIDxiPk5PVDwvYj4gYmUganVzdGlmaWVkLjwvcD4KKworPHA+dGV4 dC1hbGlnbjoganVzdGlmeTwvcD4KKzxkaXYgY2xhc3M9J3Rlc3QnPgorVGhlIEN1bHR1cmUgaGFz IGFjaGlldmVkIGFydGlmaWNpYWwgaW50ZWxsaWdlbmNlcyB3aGVyZSBlYWNoIE1pbmQgaGFzIHRo b3VnaHQgcHJvY2Vzc2luZyBjYXBhYmlsaXRpZXMgbWFueSBvcmRlcnMgb2YgbWFnbml0dWRlIGJl eW9uZCB0aGF0IG9mIGh1bWFuIGJlaW5ncywgYW5kIGRhdGEgc3RvcmFnZSBkcml2ZXMgd2hpY2gs IGlmIHdyaXR0ZW4gb3V0IG9uIHBhcGVyIGFuZCBzdG9yZWQuLi4KKzwvZGl2PgorCis8cD50ZXh0 LWFsaWduOiBqdXN0aWZ5LCB0ZXh0LWp1c3RpZnk6IG5vbmU8L3A+Cis8ZGl2IGNsYXNzPSd0ZXN0 JyBzdHlsZT0nLXdlYmtpdC10ZXh0LWp1c3RpZnk6IG5vbmU7Jz4KK1RoZSBDdWx0dXJlIGhhcyBh Y2hpZXZlZCBhcnRpZmljaWFsIGludGVsbGlnZW5jZXMgd2hlcmUgZWFjaCBNaW5kIGhhcyB0aG91 Z2h0IHByb2Nlc3NpbmcgY2FwYWJpbGl0aWVzIG1hbnkgb3JkZXJzIG9mIG1hZ25pdHVkZSBiZXlv bmQgdGhhdCBvZiBodW1hbiBiZWluZ3MsIGFuZCBkYXRhIHN0b3JhZ2UgZHJpdmVzIHdoaWNoLCBp ZiB3cml0dGVuIG91dCBvbiBwYXBlciBhbmQgc3RvcmVkLi4uCis8L2Rpdj4KKzwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYmJh N2JlYWZlNmU0ZTEzMTQwNmVmMWViMGVjN2NlNDYxOTE3N2FlMS4uMTc5NTY1MjBmOGE0Y2M0ZTI3 N2Y3OWVjYmRiYzE3NjM2Nzg2OGNiOCAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTc0Nyw3ICs3NDcsNyBAQCB3ZWJraXQub3JnL2IvODkwNTIgZmFzdC9j c3MvaW1hZ2Utb3JpZW50YXRpb24KIAogIyBDU1MzIFRleHQgc3VwcG9ydCBpcyBub3QgeWV0IGVu YWJsZWQgKG5lZWRzIEVOQUJMRV9DU1MzX1RFWFQpLgogd2Via2l0Lm9yZy9iLzc2MTczIGZhc3Qv Y3NzMy10ZXh0L2NzczMtdGV4dC1hbGlnbi1sYXN0Ci13ZWJraXQub3JnL2IvOTk5NDUgZmFzdC9j c3MzLXRleHQvY3NzMy10ZXh0LWp1c3RpZnkgWyBGYWlsdXJlIF0KK3dlYmtpdC5vcmcvYi85OTk0 NSBmYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtanVzdGlmeSBbIFNraXAgXQogd2Via2l0Lm9yZy9i LzExMjc1NSBmYXN0L2NzczMtdGV4dC9jc3MzLXRleHQtaW5kZW50IFsgRmFpbHVyZSBJbWFnZU9u bHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi81ODQ5MSBlZGl0aW5nL3Bhc3RlYm9hcmQvaW5zZXJ0 LXRleHQtZGVjb3JhdGlvbi5odG1sIFsgU2tpcCBdCiAK