130673 2014-03-24 09:09:12 -0700 Text autosizing does not determine line count correctly for simple line layout 2014-03-24 09:31:53 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue dbates ddkilzer esprehn+autocc glenn kondapallykalyan oldest_to_newest 993823 0 koivisto 2014-03-24 09:09:12 -0700 Nope 993825 1 227651 koivisto 2014-03-24 09:12:26 -0700 Created attachment 227651 patch 993826 2 koivisto 2014-03-24 09:13:00 -0700 <rdar://problem/15965114> 993828 3 commit-queue 2014-03-24 09:14:59 -0700 Attachment 227651 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 993833 4 227655 koivisto 2014-03-24 09:21:15 -0700 Created attachment 227655 better patch 993834 5 227655 dbates 2014-03-24 09:24:11 -0700 Comment on attachment 227655 better patch View in context: https://bugs.webkit.org/attachment.cgi?id=227655&action=review > Source/WebCore/ChangeLog:8 > + We don't count lines correctly in simple line layout case. I'm unclear if we have DRT for iOS working. It would be great if we could write a test for this. 993839 6 koivisto 2014-03-24 09:31:53 -0700 https://trac.webkit.org/r166171 227651 2014-03-24 09:12:26 -0700 2014-03-24 09:21:15 -0700 patch text-autosizing-simple-lines-2.patch text/plain 5314 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjE2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTAzLTI0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IGF1dG9zaXppbmcgZG9l cyBub3QgZGV0ZXJtaW5lIGxpbmUgY291bnQgY29ycmVjdGx5IGZvciBzaW1wbGUgbGluZSBsYXlv dXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDY3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZTo6dGV4dEF1dG9zaXppbmdXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZTo6c2V0VGV4dEF1dG9zaXppbmdXaWR0aCk6CisgICAgICAgICogcGFnZS9pb3MvRnJhbWVJ T1MubW06CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6dGV4dEF1dG9zaXppbmdXaWR0aCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6c2V0VGV4dEF1dG9zaXppbmdXaWR0aCk6 IERlbGV0ZWQuCisgICAgICAgIAorICAgICAgICAgICAgTW92ZSB0byBGcmFtZS5jcHAgdG8gbWFr ZSBlbmFibGluZyBvbiBub24taU9TIGJ1aWxkIGVhc2llci4KKworICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93 OjpsaW5lQ291bnQpOgorICAgICAgICAKKyAgICAgICAgICAgIEhhbmRsZSBzaW1wbGUgbGluZSBs YXlvdXQgY2FzZS4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsaW5lQ291 bnRGb3JUZXh0QXV0b3NpemluZyk6CisgICAgICAgICAgICAKKyAgICAgICAgICAgIENhbGwgbGlu ZUNvdW50KCkgaWYgY2hpbGRyZW4gYXJlIGlubGluZS4KKyAgICAgICAgICAgIFJlbmFtZSBmb3Ig Y2xhcml0eS4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjphZGp1c3RDb21w dXRlZEZvbnRTaXplcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmltbWVk aWF0ZUxpbmVDb3VudCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2Nr Rmxvdy5oOgorCiAyMDE0LTAzLTI0ICBNYXJ0aW4gSG9kb3ZhbiAgPG1ob2RvdmFuQGluZi51LXN6 ZWdlZC5odT4KIAogICAgICAgICBFTkFCTEUoVklERU9fVFJBQ0spIGd1YXJkIGZvciBDU1NQYXJz ZXJTZWxlY3Rvcjo6cGFyc2VQc2V1ZG9DdWVGdW5jdGlvblNlbGVjdG9yCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lLmNwcAkocmV2aXNpb24gMTY2MTYxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ4Niw2ICs0ODYsMTggQEAgU3RyaW5nIEZyYW1lOjpt YXRjaExhYmVsc0FnYWluc3RFbGVtZW50KAogICAgIHJldHVybiBtYXRjaExhYmVsc0FnYWluc3RT dHJpbmcobGFiZWxzLCBlbGVtZW50LT5nZXRBdHRyaWJ1dGUoaWRBdHRyKSk7CiB9CiAKKyNpZiBF TkFCTEUoSU9TX1RFWFRfQVVUT1NJWklORykKK2Zsb2F0IEZyYW1lOjp0ZXh0QXV0b3NpemluZ1dp ZHRoKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV90ZXh0QXV0b3NpemluZ1dpZHRoOworfQorCit2 b2lkIEZyYW1lOjpzZXRUZXh0QXV0b3NpemluZ1dpZHRoKGZsb2F0IHdpZHRoKQoreworICAgIG1f dGV4dEF1dG9zaXppbmdXaWR0aCA9IHdpZHRoOworfQorI2VuZGlmCisKICNpZiBQTEFURk9STShJ T1MpCiB2b2lkIEZyYW1lOjpzY3JvbGxPdmVyZmxvd0xheWVyKFJlbmRlckxheWVyKiBsYXllciwg Y29uc3QgSW50UmVjdCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlY3QmIGV4cG9zZVJlY3QpCiB7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQkocmV2aXNpb24gMTY2MTYxKQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0JKHdvcmtpbmcgY29weSkKQEAg LTg3MiwxNyArODcyLDUgQEAgdm9pZCBGcmFtZTo6cmVzZXRBbGxHZW9sb2NhdGlvblBlcm1pc3Np bwogICAgICAgICBjaGlsZC0+cmVzZXRBbGxHZW9sb2NhdGlvblBlcm1pc3Npb24oKTsKIH0KIAot I2lmIEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQotZmxvYXQgRnJhbWU6OnRleHRBdXRvc2l6 aW5nV2lkdGgoKSBjb25zdAotewotICAgIHJldHVybiBtX3RleHRBdXRvc2l6aW5nV2lkdGg7Ci19 Ci0KLXZvaWQgRnJhbWU6OnNldFRleHRBdXRvc2l6aW5nV2lkdGgoZmxvYXQgd2lkdGgpCi17Ci0g ICAgbV90ZXh0QXV0b3NpemluZ1dpZHRoID0gd2lkdGg7Ci19Ci0jZW5kaWYKLQogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCShyZXZpc2lvbiAxNjYxNjEpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjk3Niw2ICsyOTc2LDEwIEBAIGludCBSZW5kZXJCbG9ja0Zsb3c6OmxpbmVDb3Vu dChjb25zdCBSb28KICAgICBpbnQgY291bnQgPSAwOwogCiAgICAgaWYgKGNoaWxkcmVuSW5saW5l KCkpIHsKKyAgICAgICAgaWYgKG1fc2ltcGxlTGluZUxheW91dCkgeworICAgICAgICAgICAgQVNT RVJUKCFzdG9wUm9vdElubGluZUJveCk7CisgICAgICAgICAgICByZXR1cm4gbV9zaW1wbGVMaW5l TGF5b3V0LT5saW5lQ291bnQoKTsKKyAgICAgICAgfQogICAgICAgICBmb3IgKGF1dG8gYm94ID0g Zmlyc3RSb290Qm94KCk7IGJveDsgYm94ID0gYm94LT5uZXh0Um9vdEJveCgpKSB7CiAgICAgICAg ICAgICBjb3VudCsrOwogICAgICAgICAgICAgaWYgKGJveCA9PSBzdG9wUm9vdElubGluZUJveCkg ewpAQCAtMzQwMywyMSArMzQwNywxNyBAQCBpbmxpbmUgc3RhdGljIGJvb2wgcmVzaXplVGV4dFBl cm1pdHRlZChSCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWludCBSZW5kZXJCbG9ja0Zsb3c6Omlt bWVkaWF0ZUxpbmVDb3VudCgpCitpbnQgUmVuZGVyQmxvY2tGbG93OjpsaW5lQ291bnRGb3JUZXh0 QXV0b3NpemluZygpCiB7Ci0gICAgLy8gQ29waWVkIGFuZCBtb2RpZmllZCBmcm9tIFJlbmRlckJs b2NrOjpsaW5lQ291bnQuCisgICAgaWYgKHN0eWxlKCkudmlzaWJpbGl0eSgpICE9IFZJU0lCTEUp CisgICAgICAgIHJldHVybiAwOworICAgIGlmIChjaGlsZHJlbklubGluZSgpKQorICAgICAgICBy ZXR1cm4gbGluZUNvdW50KCk7CiAgICAgLy8gT25seSBkZXNjZW5kIGludG8gbGlzdCBpdGVtcy4K ICAgICBpbnQgY291bnQgPSAwOwotICAgIGlmIChzdHlsZSgpLnZpc2liaWxpdHkoKSA9PSBWSVNJ QkxFKSB7Ci0gICAgICAgIGlmIChjaGlsZHJlbklubGluZSgpKSB7Ci0gICAgICAgICAgICBmb3Ig KFJvb3RJbmxpbmVCb3gqIGJveCA9IGZpcnN0Um9vdEJveCgpOyBib3g7IGJveCA9IGJveC0+bmV4 dFJvb3RCb3goKSkKLSAgICAgICAgICAgICAgICBjb3VudCsrOwotICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgZm9yIChSZW5kZXJPYmplY3QqIG9iaiA9IGZpcnN0Q2hpbGQoKTsgb2JqOyBv YmogPSBvYmotPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAob2JqLT5pc0xp c3RJdGVtKCkpCi0gICAgICAgICAgICAgICAgICAgIGNvdW50ICs9IHRvUmVuZGVyQmxvY2tGbG93 KG9iaiktPmxpbmVDb3VudCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgZm9yIChS ZW5kZXJPYmplY3QqIG9iaiA9IGZpcnN0Q2hpbGQoKTsgb2JqOyBvYmogPSBvYmotPm5leHRTaWJs aW5nKCkpIHsKKyAgICAgICAgaWYgKG9iai0+aXNMaXN0SXRlbSgpKQorICAgICAgICAgICAgY291 bnQgKz0gdG9SZW5kZXJCbG9ja0Zsb3cob2JqKS0+bGluZUNvdW50KCk7CiAgICAgfQogICAgIHJl dHVybiBjb3VudDsKIH0KQEAgLTM0NTEsNyArMzQ1MSw3IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93 OjphZGp1c3RDb21wdXRlZEZvbnQKICAgICAKICAgICB1bnNpZ25lZCBsaW5lQ291bnQ7CiAgICAg aWYgKG1fbGluZUNvdW50Rm9yVGV4dEF1dG9zaXppbmcgPT0gTk9UX1NFVCkgewotICAgICAgICBp bnQgY291bnQgPSBpbW1lZGlhdGVMaW5lQ291bnQoKTsKKyAgICAgICAgaW50IGNvdW50ID0gbGlu ZUNvdW50Rm9yVGV4dEF1dG9zaXppbmcoKTsKICAgICAgICAgaWYgKCFjb3VudCkKICAgICAgICAg ICAgIGxpbmVDb3VudCA9IE5PX0xJTkU7CiAgICAgICAgIGVsc2UgaWYgKGNvdW50ID09IDEpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oCShyZXZpc2lv biAxNjYxNjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgJ KHdvcmtpbmcgY29weSkKQEAgLTU4Nyw3ICs1ODcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBtYXRl cmlhbGl6ZVJhcmVCbG9ja0Zsb3dEYXRhKCk7CiAKICNpZiBFTkFCTEUoSU9TX1RFWFRfQVVUT1NJ WklORykKLSAgICBpbnQgaW1tZWRpYXRlTGluZUNvdW50KCk7CisgICAgaW50IGxpbmVDb3VudEZv clRleHRBdXRvc2l6aW5nKCk7CiAgICAgdm9pZCBhZGp1c3RDb21wdXRlZEZvbnRTaXplcyhmbG9h dCBzaXplLCBmbG9hdCB2aXNpYmxlV2lkdGgpOwogICAgIHZvaWQgcmVzZXRDb21wdXRlZEZvbnRT aXplKCkKICAgICB7Cg== 227655 2014-03-24 09:21:15 -0700 2014-03-24 09:24:10 -0700 better patch text-autosizing-simple-lines-3.patch text/plain 5547 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjE2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTAzLTI0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IGF1dG9zaXppbmcgZG9l cyBub3QgZGV0ZXJtaW5lIGxpbmUgY291bnQgY29ycmVjdGx5IGZvciBzaW1wbGUgbGluZSBsYXlv dXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDY3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAg ICAgV2UgZG9uJ3QgY291bnQgbGluZXMgY29ycmVjdGx5IGluIHNpbXBsZSBsaW5lIGxheW91dCBj YXNlLgorCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZTo6dGV4dEF1dG9zaXppbmdXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6c2V0VGV4 dEF1dG9zaXppbmdXaWR0aCk6CisgICAgICAgICogcGFnZS9pb3MvRnJhbWVJT1MubW06CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZTo6dGV4dEF1dG9zaXppbmdXaWR0aCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZTo6c2V0VGV4dEF1dG9zaXppbmdXaWR0aCk6IERlbGV0ZWQuCisg ICAgICAgIAorICAgICAgICAgICAgTW92ZSB0byBGcmFtZS5jcHAgdG8gbWFrZSBlbmFibGluZyBv biBub24taU9TIGJ1aWxkIGVhc2llci4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j a0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsaW5lQ291bnQp OgorICAgICAgICAKKyAgICAgICAgICAgIEhhbmRsZSBzaW1wbGUgbGluZSBsYXlvdXQgY2FzZS4K KworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsaW5lQ291bnRGb3JUZXh0QXV0 b3NpemluZyk6CisgICAgICAgICAgICAKKyAgICAgICAgICAgIENhbGwgbGluZUNvdW50KCkgaWYg Y2hpbGRyZW4gYXJlIGlubGluZS4KKyAgICAgICAgICAgIFJlbmFtZSBmb3IgY2xhcml0eS4KKwor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjphZGp1c3RDb21wdXRlZEZvbnRTaXpl cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmltbWVkaWF0ZUxpbmVDb3Vu dCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5oOgorCiAy MDE0LTAzLTI0ICBNYXJ0aW4gSG9kb3ZhbiAgPG1ob2RvdmFuQGluZi51LXN6ZWdlZC5odT4KIAog ICAgICAgICBFTkFCTEUoVklERU9fVFJBQ0spIGd1YXJkIGZvciBDU1NQYXJzZXJTZWxlY3Rvcjo6 cGFyc2VQc2V1ZG9DdWVGdW5jdGlvblNlbGVjdG9yCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAko cmV2aXNpb24gMTY2MTYxKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ4Niw2ICs0ODYsMTggQEAgU3RyaW5nIEZyYW1lOjptYXRjaExhYmVsc0Fn YWluc3RFbGVtZW50KAogICAgIHJldHVybiBtYXRjaExhYmVsc0FnYWluc3RTdHJpbmcobGFiZWxz LCBlbGVtZW50LT5nZXRBdHRyaWJ1dGUoaWRBdHRyKSk7CiB9CiAKKyNpZiBFTkFCTEUoSU9TX1RF WFRfQVVUT1NJWklORykKK2Zsb2F0IEZyYW1lOjp0ZXh0QXV0b3NpemluZ1dpZHRoKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV90ZXh0QXV0b3NpemluZ1dpZHRoOworfQorCit2b2lkIEZyYW1lOjpz ZXRUZXh0QXV0b3NpemluZ1dpZHRoKGZsb2F0IHdpZHRoKQoreworICAgIG1fdGV4dEF1dG9zaXpp bmdXaWR0aCA9IHdpZHRoOworfQorI2VuZGlmCisKICNpZiBQTEFURk9STShJT1MpCiB2b2lkIEZy YW1lOjpzY3JvbGxPdmVyZmxvd0xheWVyKFJlbmRlckxheWVyKiBsYXllciwgY29uc3QgSW50UmVj dCYgdmlzaWJsZVJlY3QsIGNvbnN0IEludFJlY3QmIGV4cG9zZVJlY3QpCiB7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQkocmV2aXNpb24gMTY2MTYxKQorKysgU291cmNlL1dl YkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTg3MiwxNyArODcy LDUgQEAgdm9pZCBGcmFtZTo6cmVzZXRBbGxHZW9sb2NhdGlvblBlcm1pc3NpbwogICAgICAgICBj aGlsZC0+cmVzZXRBbGxHZW9sb2NhdGlvblBlcm1pc3Npb24oKTsKIH0KIAotI2lmIEVOQUJMRShJ T1NfVEVYVF9BVVRPU0laSU5HKQotZmxvYXQgRnJhbWU6OnRleHRBdXRvc2l6aW5nV2lkdGgoKSBj b25zdAotewotICAgIHJldHVybiBtX3RleHRBdXRvc2l6aW5nV2lkdGg7Ci19Ci0KLXZvaWQgRnJh bWU6OnNldFRleHRBdXRvc2l6aW5nV2lkdGgoZmxvYXQgd2lkdGgpCi17Ci0gICAgbV90ZXh0QXV0 b3NpemluZ1dpZHRoID0gd2lkdGg7Ci19Ci0jZW5kaWYKLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0Zsb3cuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCShyZXZpc2lvbiAxNjYxNjEpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQs NiArMzQsNyBAQAogI2luY2x1ZGUgIlJlbmRlckZsb3dUaHJlYWQuaCIKICNpbmNsdWRlICJSZW5k ZXJJdGVyYXRvci5oIgogI2luY2x1ZGUgIlJlbmRlckxheWVyLmgiCisjaW5jbHVkZSAiUmVuZGVy TGlzdEl0ZW0uaCIKICNpbmNsdWRlICJSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaCIKICNp bmNsdWRlICJSZW5kZXJNdWx0aUNvbHVtblNldC5oIgogI2luY2x1ZGUgIlJlbmRlck5hbWVkRmxv d0ZyYWdtZW50LmgiCkBAIC0yOTc2LDYgKzI5NzcsMTAgQEAgaW50IFJlbmRlckJsb2NrRmxvdzo6 bGluZUNvdW50KGNvbnN0IFJvbwogICAgIGludCBjb3VudCA9IDA7CiAKICAgICBpZiAoY2hpbGRy ZW5JbmxpbmUoKSkgeworICAgICAgICBpZiAobV9zaW1wbGVMaW5lTGF5b3V0KSB7CisgICAgICAg ICAgICBBU1NFUlQoIXN0b3BSb290SW5saW5lQm94KTsKKyAgICAgICAgICAgIHJldHVybiBtX3Np bXBsZUxpbmVMYXlvdXQtPmxpbmVDb3VudCgpOworICAgICAgICB9CiAgICAgICAgIGZvciAoYXV0 byBib3ggPSBmaXJzdFJvb3RCb3goKTsgYm94OyBib3ggPSBib3gtPm5leHRSb290Qm94KCkpIHsK ICAgICAgICAgICAgIGNvdW50Kys7CiAgICAgICAgICAgICBpZiAoYm94ID09IHN0b3BSb290SW5s aW5lQm94KSB7CkBAIC0zNDAzLDIyICszNDA4LDE2IEBAIGlubGluZSBzdGF0aWMgYm9vbCByZXNp emVUZXh0UGVybWl0dGVkKFIKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotaW50IFJlbmRlckJsb2Nr Rmxvdzo6aW1tZWRpYXRlTGluZUNvdW50KCkKK2ludCBSZW5kZXJCbG9ja0Zsb3c6OmxpbmVDb3Vu dEZvclRleHRBdXRvc2l6aW5nKCkKIHsKLSAgICAvLyBDb3BpZWQgYW5kIG1vZGlmaWVkIGZyb20g UmVuZGVyQmxvY2s6OmxpbmVDb3VudC4KKyAgICBpZiAoc3R5bGUoKS52aXNpYmlsaXR5KCkgIT0g VklTSUJMRSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkpCisg ICAgICAgIHJldHVybiBsaW5lQ291bnQoKTsKICAgICAvLyBPbmx5IGRlc2NlbmQgaW50byBsaXN0 IGl0ZW1zLgogICAgIGludCBjb3VudCA9IDA7Ci0gICAgaWYgKHN0eWxlKCkudmlzaWJpbGl0eSgp ID09IFZJU0lCTEUpIHsKLSAgICAgICAgaWYgKGNoaWxkcmVuSW5saW5lKCkpIHsKLSAgICAgICAg ICAgIGZvciAoUm9vdElubGluZUJveCogYm94ID0gZmlyc3RSb290Qm94KCk7IGJveDsgYm94ID0g Ym94LT5uZXh0Um9vdEJveCgpKQotICAgICAgICAgICAgICAgIGNvdW50Kys7Ci0gICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICBmb3IgKFJlbmRlck9iamVjdCogb2JqID0gZmlyc3RDaGlsZCgp OyBvYmo7IG9iaiA9IG9iai0+bmV4dFNpYmxpbmcoKSkgewotICAgICAgICAgICAgICAgIGlmIChv YmotPmlzTGlzdEl0ZW0oKSkKLSAgICAgICAgICAgICAgICAgICAgY291bnQgKz0gdG9SZW5kZXJC bG9ja0Zsb3cob2JqKS0+bGluZUNvdW50KCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAg ICB9CisgICAgZm9yIChhdXRvJiBsaXN0SXRlbSA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlckxpc3RJ dGVtPigqdGhpcykpCisgICAgICAgIGNvdW50ICs9IGxpc3RJdGVtLmxpbmVDb3VudCgpOwogICAg IHJldHVybiBjb3VudDsKIH0KIApAQCAtMzQ1MSw3ICszNDUwLDcgQEAgdm9pZCBSZW5kZXJCbG9j a0Zsb3c6OmFkanVzdENvbXB1dGVkRm9udAogICAgIAogICAgIHVuc2lnbmVkIGxpbmVDb3VudDsK ICAgICBpZiAobV9saW5lQ291bnRGb3JUZXh0QXV0b3NpemluZyA9PSBOT1RfU0VUKSB7Ci0gICAg ICAgIGludCBjb3VudCA9IGltbWVkaWF0ZUxpbmVDb3VudCgpOworICAgICAgICBpbnQgY291bnQg PSBsaW5lQ291bnRGb3JUZXh0QXV0b3NpemluZygpOwogICAgICAgICBpZiAoIWNvdW50KQogICAg ICAgICAgICAgbGluZUNvdW50ID0gTk9fTElORTsKICAgICAgICAgZWxzZSBpZiAoY291bnQgPT0g MSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgJKHJl dmlzaW9uIDE2NjE2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuaAkod29ya2luZyBjb3B5KQpAQCAtNTg3LDcgKzU4Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lk IG1hdGVyaWFsaXplUmFyZUJsb2NrRmxvd0RhdGEoKTsKIAogI2lmIEVOQUJMRShJT1NfVEVYVF9B VVRPU0laSU5HKQotICAgIGludCBpbW1lZGlhdGVMaW5lQ291bnQoKTsKKyAgICBpbnQgbGluZUNv dW50Rm9yVGV4dEF1dG9zaXppbmcoKTsKICAgICB2b2lkIGFkanVzdENvbXB1dGVkRm9udFNpemVz KGZsb2F0IHNpemUsIGZsb2F0IHZpc2libGVXaWR0aCk7CiAgICAgdm9pZCByZXNldENvbXB1dGVk Rm9udFNpemUoKQogICAgIHsK