100742 2012-10-30 03:55:32 -0700 [subixel] Change LineWidth::shrinkAvailableWidthForNewFloatIfNeeded to not pixel snap 2012-10-30 06:36:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eae eae eric leviw webkit.review.bot oldest_to_newest 754182 0 eae 2012-10-30 03:55:32 -0700 As we no longer pixel snap values when computing the current width for a line we shouldn't do it in shrinkAvailableWidthForNewFloatIfNeeded either. 754195 1 171414 eae 2012-10-30 04:06:20 -0700 Created attachment 171414 Patch 754197 2 eae 2012-10-30 04:07:52 -0700 Downstream chromium bug: http://code.google.com/p/chromium/issues/detail?id=156971 754199 3 171414 eric 2012-10-30 04:15:28 -0700 Comment on attachment 171414 Patch OK. 754200 4 171416 eae 2012-10-30 04:17:31 -0700 Created attachment 171416 Patch 754202 5 171416 leviw 2012-10-30 04:23:17 -0700 Comment on attachment 171416 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171416&action=review > Source/WebCore/rendering/RenderBlockLineLayout.cpp:-103 > -#else > - bool fitsOnLine() const { return currentWidth() <= m_availableWidth; } > - bool fitsOnLine(float extra) const { return currentWidth() + extra <= m_availableWidth; } > -#endif Good catch. > Source/WebCore/rendering/RenderBlockLineLayout.cpp:175 > - float newLeft = m_block->pixelSnappedLogicalRightForFloat(newFloat); > + float newLeft = m_block->logicalRightForFloat(newFloat); Good to see more of these pixel snappings becoming unnecessary. 754207 6 leviw 2012-10-30 04:29:16 -0700 (In reply to comment #3) > (From update of attachment 171414 [details]) > OK. Eseidel doesn't sleep, he waits. 754301 7 171416 webkit.review.bot 2012-10-30 06:36:51 -0700 Comment on attachment 171416 Patch Clearing flags on attachment: 171416 Committed r132904: <http://trac.webkit.org/changeset/132904> 754302 8 webkit.review.bot 2012-10-30 06:36:55 -0700 All reviewed patches have been landed. Closing bug. 171414 2012-10-30 04:06:20 -0700 2012-10-30 04:17:27 -0700 Patch bug-100742-20121030040519.patch text/plain 5712 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMjg5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEwLTMwICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBbc3ViaXhlbF0gQ2hhbmdlIExp bmVXaWR0aDo6c2hyaW5rQXZhaWxhYmxlV2lkdGhGb3JOZXdGbG9hdElmTmVlZGVkIHRvIG5vdCBw aXhlbCBzbmFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDA3NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBcyB3ZSBubyBsb25nZXIgcGl4ZWwgc25hcCB2YWx1ZXMgd2hlbiBjb21wdXRpbmcgdGhlIGN1 cnJlbnQgd2lkdGggZm9yIGEKKyAgICAgICAgbGluZSB3ZSBzaG91bGQgbm90IGRvIGl0IGluIHNo cmlua0F2YWlsYWJsZVdpZHRoRm9yTmV3RmxvYXRJZk5lZWRlZAorICAgICAgICBlaXRoZXIuCisK KyAgICAgICAgVGVzdDogZmFzdC9zdWItcGl4ZWwvZmxvYXQtd3JhcC16b29tLmh0bWwKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGluZVdpZHRoOjpMaW5lV2lkdGgpOiBSZW1vdmUgdW5uZWNlc3NhcnkgaWZkZWYuCisg ICAgICAgIChXZWJDb3JlOjpMaW5lV2lkdGg6OnNocmlua0F2YWlsYWJsZVdpZHRoRm9yTmV3Rmxv YXRJZk5lZWRlZCk6IFVzZSBmbG9hdCB2YWx1ZXMgaW5zdGVhZCBvZiBwaXhlbCBzbmFwcGVkL2Zs b29yZWQgdmFsdWVzIGFzIHRoZSBsaW5lIHdpZHRoIGNhbGN1bGF0aW9ucyB1c2VzIGZsb2F0cy4K KwogMjAxMi0xMC0zMCAgR2Fib3IgUmFwY3NhbnlpICA8cmdhYm9yQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgT3B0aW1pemUgdmNsaXAgZm9yIE5FT04gaW4gVmVjdG9yTWF0aApJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAJKHJl dmlzaW9uIDEzMjY2MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCwxMyArOTQsOCBAQCBwdWJsaWM6CiAj ZW5kaWYKICAgICAgICAgdXBkYXRlQXZhaWxhYmxlV2lkdGgoKTsKICAgICB9Ci0jaWYgRU5BQkxF KFNVQlBJWEVMX0xBWU9VVCkKICAgICBib29sIGZpdHNPbkxpbmUoKSBjb25zdCB7IHJldHVybiBj dXJyZW50V2lkdGgoKSA8PSBtX2F2YWlsYWJsZVdpZHRoOyB9CiAgICAgYm9vbCBmaXRzT25MaW5l KGZsb2F0IGV4dHJhKSBjb25zdCB7IHJldHVybiBjdXJyZW50V2lkdGgoKSArIGV4dHJhIDw9IG1f YXZhaWxhYmxlV2lkdGg7IH0KLSNlbHNlCi0gICAgYm9vbCBmaXRzT25MaW5lKCkgY29uc3QgeyBy ZXR1cm4gY3VycmVudFdpZHRoKCkgPD0gbV9hdmFpbGFibGVXaWR0aDsgfQotICAgIGJvb2wgZml0 c09uTGluZShmbG9hdCBleHRyYSkgY29uc3QgeyByZXR1cm4gY3VycmVudFdpZHRoKCkgKyBleHRy YSA8PSBtX2F2YWlsYWJsZVdpZHRoOyB9Ci0jZW5kaWYKICAgICBmbG9hdCBjdXJyZW50V2lkdGgo KSBjb25zdCB7IHJldHVybiBtX2NvbW1pdHRlZFdpZHRoICsgbV91bmNvbW1pdHRlZFdpZHRoOyB9 CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGV2ZW50dWFsbHkgcmVwbGFjZSB0aGVzZSB0aHJl ZSBmdW5jdGlvbnMgYnkgb25lcyB0aGF0IHdvcmsgb24gYSBoaWdoZXIgYWJzdHJhY3Rpb24uCkBA IC0xNzcsMTQgKzE3MiwxNCBAQCBpbmxpbmUgdm9pZCBMaW5lV2lkdGg6OnNocmlua0F2YWlsYWJs ZVdpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChuZXdGbG9hdC0+dHlwZSgpID09IFJlbmRl ckJsb2NrOjpGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0KSB7Ci0gICAgICAgIGZsb2F0IG5ld0xl ZnQgPSBtX2Jsb2NrLT5waXhlbFNuYXBwZWRMb2dpY2FsUmlnaHRGb3JGbG9hdChuZXdGbG9hdCk7 CisgICAgICAgIGZsb2F0IG5ld0xlZnQgPSBtX2Jsb2NrLT5sb2dpY2FsUmlnaHRGb3JGbG9hdChu ZXdGbG9hdCk7CiAgICAgICAgIGlmIChtX2lzRmlyc3RMaW5lICYmIG1fYmxvY2stPnN0eWxlKCkt PmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKLSAgICAgICAgICAgIG5ld0xlZnQgKz0gZmxvb3JU b0ludChtX2Jsb2NrLT50ZXh0SW5kZW50T2Zmc2V0KCkpOworICAgICAgICAgICAgbmV3TGVmdCAr PSBtX2Jsb2NrLT50ZXh0SW5kZW50T2Zmc2V0KCk7CiAgICAgICAgIG1fbGVmdCA9IG1heDxmbG9h dD4obV9sZWZ0LCBuZXdMZWZ0KTsKICAgICB9IGVsc2UgewotICAgICAgICBmbG9hdCBuZXdSaWdo dCA9IG1fYmxvY2stPnBpeGVsU25hcHBlZExvZ2ljYWxMZWZ0Rm9yRmxvYXQobmV3RmxvYXQpOwor ICAgICAgICBmbG9hdCBuZXdSaWdodCA9IG1fYmxvY2stPmxvZ2ljYWxMZWZ0Rm9yRmxvYXQobmV3 RmxvYXQpOwogICAgICAgICBpZiAobV9pc0ZpcnN0TGluZSAmJiAhbV9ibG9jay0+c3R5bGUoKS0+ aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpKQotICAgICAgICAgICAgbmV3UmlnaHQgLT0gZmxvb3JU b0ludChtX2Jsb2NrLT50ZXh0SW5kZW50T2Zmc2V0KCkpOworICAgICAgICAgICAgbmV3UmlnaHQg LT0gbV9ibG9jay0+dGV4dEluZGVudE9mZnNldCgpOwogICAgICAgICBtX3JpZ2h0ID0gbWluPGZs b2F0PihtX3JpZ2h0LCBuZXdSaWdodCk7CiAgICAgfQogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMzI4 OTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NSBAQAorMjAxMi0xMC0zMCAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgW3N1Yml4ZWxdIENoYW5nZSBMaW5lV2lkdGg6OnNocmlua0F2YWlsYWJsZVdpZHRoRm9y TmV3RmxvYXRJZk5lZWRlZCB0byBub3QgcGl4ZWwgc25hcAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgZm9yIHdyYXBwaW5nIHdoZW4gY29t YmluaW5nIGZsb2F0IGFuZCBpbmxpbmUgZWxlbWVudHMuCisKKyAgICAgICAgKiBmYXN0L3N1Yi1w aXhlbC9mbG9hdC13cmFwLXpvb20tZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFz dC9zdWItcGl4ZWwvZmxvYXQtd3JhcC16b29tLmh0bWw6IEFkZGVkLgorCiAyMDEyLTEwLTMwICBa b2x0YW4gTnl1bCAgPHpvbHRhbi5ueXVsQGludGVsLmNvbT4KIAogICAgICAgICAzZCByb3RhdGlv biB3aXRoIFswLCAwLCAwXSBkaXJlY3Rpb24gdmVjdG9yIHNob3VsZCBub3QgYmUgYXBwbGllZApJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC9zdWItcGl4ZWwvZmxvYXQtd3JhcC16b29tLWV4cGVjdGVk Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9zdWItcGl4ZWwvZmxvYXQtd3Jh cC16b29tLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3N1 Yi1waXhlbC9mbG9hdC13cmFwLXpvb20tZXhwZWN0ZWQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSwzMSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAg PHN0eWxlPgorICAgICAgICAgICAgYm9keSB7CisgICAgICAgICAgICAgICAgem9vbTogMS4xOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBkaXYgeworICAgICAgICAgICAgICAgIGRpc3Bs YXk6IGlubGluZS1ibG9jazsKKyAgICAgICAgICAgICAgICBib3JkZXI6IDBweCBzb2xpZCBibGFj azsKKyAgICAgICAgICAgICAgICBmb250OiBsYXJnZSBzYW5zLXNlcmlmOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICBpIHsKKyAgICAgICAgICAgICAgICBkaXNwbGF5OiBpbmxpbmUtYmxv Y2s7CisgICAgICAgICAgICAgICAgd2lkdGg6IDE1cHg7CisgICAgICAgICAgICAgICAgaGVpZ2h0 OiAxMHB4OworICAgICAgICAgICAgICAgIG1hcmdpbjogMDsKKyAgICAgICAgICAgICAgICBiYWNr Z3JvdW5kOiBibGFjazsKKyAgICAgICAgICAgICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOworICAg ICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAg ICAgICAgPGRpdj48aT48L2k+VGVzdDwvZGl2PgorICAgICAgICA8cD4KKyAgICAgICAgICAgIExp c3QgaXRlbSBhYm92ZSBzaG91bGQgYmUgb24gc2FtZSBsaW5lIGFzIHRoZSB3b3JkICdUZXN0Jy4K KyAgICAgICAgPC9wPgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2Zh c3Qvc3ViLXBpeGVsL2Zsb2F0LXdyYXAtem9vbS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2Zhc3Qvc3ViLXBpeGVsL2Zsb2F0LXdyYXAtem9vbS5odG1sCShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvZmFzdC9zdWItcGl4ZWwvZmxvYXQtd3JhcC16b29tLmh0bWwJKHJldmlzaW9u IDApCkBAIC0wLDAgKzEsMzIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDxzdHlsZT4KKyAgICAgICAgICAgIGJvZHkgeworICAgICAgICAgICAgICAgIHpv b206IDEuMTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZGl2IHsKKyAgICAgICAgICAg ICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CisgICAgICAgICAgICAgICAgYm9yZGVyOiAwcHgg c29saWQgYmxhY2s7CisgICAgICAgICAgICAgICAgZm9udDogbGFyZ2Ugc2Fucy1zZXJpZjsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgaSB7CisgICAgICAgICAgICAgICAgZGlzcGxheTog YmxvY2s7CisgICAgICAgICAgICAgICAgZmxvYXQ6IGxlZnQ7CisgICAgICAgICAgICAgICAgd2lk dGg6IDE1cHg7CisgICAgICAgICAgICAgICAgaGVpZ2h0OiAxMHB4OworICAgICAgICAgICAgICAg IG1hcmdpbjogMDsKKyAgICAgICAgICAgICAgICBiYWNrZ3JvdW5kOiBibGFjazsKKyAgICAgICAg ICAgICAgICB2ZXJ0aWNhbC1hbGlnbjogdG9wOworICAgICAgICAgICAgfQorICAgICAgICA8L3N0 eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPGRpdj48aT48L2k+VGVzdDwv ZGl2PgorICAgICAgICA8cD4KKyAgICAgICAgICAgIExpc3QgaXRlbSBhYm92ZSBzaG91bGQgYmUg b24gc2FtZSBsaW5lIGFzIHRoZSB3b3JkICdUZXN0Jy4KKyAgICAgICAgPC9wPgorICAgIDwvYm9k eT4KKzwvaHRtbD4K 171416 2012-10-30 04:17:31 -0700 2012-10-30 06:36:51 -0700 Patch bug-100742-20121030041632.patch text/plain 5596 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMjg5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEwLTMwICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBbc3ViaXhlbF0gQ2hhbmdlIExp bmVXaWR0aDo6c2hyaW5rQXZhaWxhYmxlV2lkdGhGb3JOZXdGbG9hdElmTmVlZGVkIHRvIG5vdCBw aXhlbCBzbmFwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMDA3NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBcyB3ZSBubyBsb25nZXIgcGl4ZWwgc25hcCB2YWx1ZXMgd2hlbiBjb21wdXRpbmcgdGhlIGN1 cnJlbnQgd2lkdGggZm9yIGEKKyAgICAgICAgbGluZSB3ZSBzaG91bGQgbm90IGRvIGl0IGluIHNo cmlua0F2YWlsYWJsZVdpZHRoRm9yTmV3RmxvYXRJZk5lZWRlZAorICAgICAgICBlaXRoZXIuCisK KyAgICAgICAgVGVzdDogZmFzdC9zdWItcGl4ZWwvZmxvYXQtd3JhcC16b29tLmh0bWwKKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGluZVdpZHRoOjpMaW5lV2lkdGgpOiBSZW1vdmUgdW5uZWNlc3NhcnkgaWZkZWYuCisg ICAgICAgIChXZWJDb3JlOjpMaW5lV2lkdGg6OnNocmlua0F2YWlsYWJsZVdpZHRoRm9yTmV3Rmxv YXRJZk5lZWRlZCk6IFVzZSBmbG9hdCB2YWx1ZXMgaW5zdGVhZCBvZiBwaXhlbCBzbmFwcGVkL2Zs b29yZWQgdmFsdWVzIGFzIHRoZSBsaW5lIHdpZHRoIGNhbGN1bGF0aW9ucyB1c2VzIGZsb2F0cy4K KwogMjAxMi0xMC0zMCAgR2Fib3IgUmFwY3NhbnlpICA8cmdhYm9yQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgT3B0aW1pemUgdmNsaXAgZm9yIE5FT04gaW4gVmVjdG9yTWF0aApJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAJKHJl dmlzaW9uIDEzMjY2MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NCwxMyArOTQsOCBAQCBwdWJsaWM6CiAj ZW5kaWYKICAgICAgICAgdXBkYXRlQXZhaWxhYmxlV2lkdGgoKTsKICAgICB9Ci0jaWYgRU5BQkxF KFNVQlBJWEVMX0xBWU9VVCkKICAgICBib29sIGZpdHNPbkxpbmUoKSBjb25zdCB7IHJldHVybiBj dXJyZW50V2lkdGgoKSA8PSBtX2F2YWlsYWJsZVdpZHRoOyB9CiAgICAgYm9vbCBmaXRzT25MaW5l KGZsb2F0IGV4dHJhKSBjb25zdCB7IHJldHVybiBjdXJyZW50V2lkdGgoKSArIGV4dHJhIDw9IG1f YXZhaWxhYmxlV2lkdGg7IH0KLSNlbHNlCi0gICAgYm9vbCBmaXRzT25MaW5lKCkgY29uc3QgeyBy ZXR1cm4gY3VycmVudFdpZHRoKCkgPD0gbV9hdmFpbGFibGVXaWR0aDsgfQotICAgIGJvb2wgZml0 c09uTGluZShmbG9hdCBleHRyYSkgY29uc3QgeyByZXR1cm4gY3VycmVudFdpZHRoKCkgKyBleHRy YSA8PSBtX2F2YWlsYWJsZVdpZHRoOyB9Ci0jZW5kaWYKICAgICBmbG9hdCBjdXJyZW50V2lkdGgo KSBjb25zdCB7IHJldHVybiBtX2NvbW1pdHRlZFdpZHRoICsgbV91bmNvbW1pdHRlZFdpZHRoOyB9 CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGV2ZW50dWFsbHkgcmVwbGFjZSB0aGVzZSB0aHJl ZSBmdW5jdGlvbnMgYnkgb25lcyB0aGF0IHdvcmsgb24gYSBoaWdoZXIgYWJzdHJhY3Rpb24uCkBA IC0xNzcsMTIgKzE3MiwxMiBAQCBpbmxpbmUgdm9pZCBMaW5lV2lkdGg6OnNocmlua0F2YWlsYWJs ZVdpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChuZXdGbG9hdC0+dHlwZSgpID09IFJlbmRl ckJsb2NrOjpGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0KSB7Ci0gICAgICAgIGZsb2F0IG5ld0xl ZnQgPSBtX2Jsb2NrLT5waXhlbFNuYXBwZWRMb2dpY2FsUmlnaHRGb3JGbG9hdChuZXdGbG9hdCk7 CisgICAgICAgIGZsb2F0IG5ld0xlZnQgPSBtX2Jsb2NrLT5sb2dpY2FsUmlnaHRGb3JGbG9hdChu ZXdGbG9hdCk7CiAgICAgICAgIGlmIChtX2lzRmlyc3RMaW5lICYmIG1fYmxvY2stPnN0eWxlKCkt PmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKICAgICAgICAgICAgIG5ld0xlZnQgKz0gZmxvb3JU b0ludChtX2Jsb2NrLT50ZXh0SW5kZW50T2Zmc2V0KCkpOwogICAgICAgICBtX2xlZnQgPSBtYXg8 ZmxvYXQ+KG1fbGVmdCwgbmV3TGVmdCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgZmxvYXQgbmV3 UmlnaHQgPSBtX2Jsb2NrLT5waXhlbFNuYXBwZWRMb2dpY2FsTGVmdEZvckZsb2F0KG5ld0Zsb2F0 KTsKKyAgICAgICAgZmxvYXQgbmV3UmlnaHQgPSBtX2Jsb2NrLT5sb2dpY2FsTGVmdEZvckZsb2F0 KG5ld0Zsb2F0KTsKICAgICAgICAgaWYgKG1faXNGaXJzdExpbmUgJiYgIW1fYmxvY2stPnN0eWxl KCktPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkKICAgICAgICAgICAgIG5ld1JpZ2h0IC09IGZs b29yVG9JbnQobV9ibG9jay0+dGV4dEluZGVudE9mZnNldCgpKTsKICAgICAgICAgbV9yaWdodCA9 IG1pbjxmbG9hdD4obV9yaWdodCwgbmV3UmlnaHQpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTMyODkw KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTItMTAtMzAgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFtzdWJpeGVsXSBDaGFuZ2UgTGluZVdpZHRoOjpzaHJpbmtBdmFpbGFibGVXaWR0aEZvck5l d0Zsb2F0SWZOZWVkZWQgdG8gbm90IHBpeGVsIHNuYXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDc0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IGZvciB3cmFwcGluZyB3aGVuIGNvbWJp bmluZyBmbG9hdCBhbmQgaW5saW5lIGVsZW1lbnRzLgorCisgICAgICAgICogZmFzdC9zdWItcGl4 ZWwvZmxvYXQtd3JhcC16b29tLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3Qv c3ViLXBpeGVsL2Zsb2F0LXdyYXAtem9vbS5odG1sOiBBZGRlZC4KKwogMjAxMi0xMC0zMCAgWm9s dGFuIE55dWwgIDx6b2x0YW4ubnl1bEBpbnRlbC5jb20+CiAKICAgICAgICAgM2Qgcm90YXRpb24g d2l0aCBbMCwgMCwgMF0gZGlyZWN0aW9uIHZlY3RvciBzaG91bGQgbm90IGJlIGFwcGxpZWQKSW5k ZXg6IExheW91dFRlc3RzL2Zhc3Qvc3ViLXBpeGVsL2Zsb2F0LXdyYXAtem9vbS1leHBlY3RlZC5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvc3ViLXBpeGVsL2Zsb2F0LXdyYXAt em9vbS1leHBlY3RlZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9zdWIt cGl4ZWwvZmxvYXQtd3JhcC16b29tLWV4cGVjdGVkLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMzEgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+CisgICAgICAgIDxz dHlsZT4KKyAgICAgICAgICAgIGJvZHkgeworICAgICAgICAgICAgICAgIHpvb206IDEuMTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgZGl2IHsKKyAgICAgICAgICAgICAgICBkaXNwbGF5 OiBpbmxpbmUtYmxvY2s7CisgICAgICAgICAgICAgICAgYm9yZGVyOiAwcHggc29saWQgYmxhY2s7 CisgICAgICAgICAgICAgICAgZm9udDogbGFyZ2Ugc2Fucy1zZXJpZjsKKyAgICAgICAgICAgIH0K KworICAgICAgICAgICAgaSB7CisgICAgICAgICAgICAgICAgZGlzcGxheTogaW5saW5lLWJsb2Nr OworICAgICAgICAgICAgICAgIHdpZHRoOiAxNXB4OworICAgICAgICAgICAgICAgIGhlaWdodDog MTBweDsKKyAgICAgICAgICAgICAgICBtYXJnaW46IDA7CisgICAgICAgICAgICAgICAgYmFja2dy b3VuZDogYmxhY2s7CisgICAgICAgICAgICAgICAgdmVydGljYWwtYWxpZ246IHRvcDsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAg ICAgIDxkaXY+PGk+PC9pPlRlc3Q8L2Rpdj4KKyAgICAgICAgPHA+CisgICAgICAgICAgICBMaXN0 IGl0ZW0gYWJvdmUgc2hvdWxkIGJlIG9uIHNhbWUgbGluZSBhcyB0aGUgd29yZCAnVGVzdCcuCisg ICAgICAgIDwvcD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L3N1Yi1waXhlbC9mbG9hdC13cmFwLXpvb20uaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L3N1Yi1waXhlbC9mbG9hdC13cmFwLXpvb20uaHRtbAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2Zhc3Qvc3ViLXBpeGVsL2Zsb2F0LXdyYXAtem9vbS5odG1sCShyZXZpc2lvbiAw KQpAQCAtMCwwICsxLDMyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgor ICAgICAgICA8c3R5bGU+CisgICAgICAgICAgICBib2R5IHsKKyAgICAgICAgICAgICAgICB6b29t OiAxLjE7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGRpdiB7CisgICAgICAgICAgICAg ICAgZGlzcGxheTogaW5saW5lLWJsb2NrOworICAgICAgICAgICAgICAgIGJvcmRlcjogMHB4IHNv bGlkIGJsYWNrOworICAgICAgICAgICAgICAgIGZvbnQ6IGxhcmdlIHNhbnMtc2VyaWY7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIGkgeworICAgICAgICAgICAgICAgIGRpc3BsYXk6IGJs b2NrOworICAgICAgICAgICAgICAgIGZsb2F0OiBsZWZ0OworICAgICAgICAgICAgICAgIHdpZHRo OiAxNXB4OworICAgICAgICAgICAgICAgIGhlaWdodDogMTBweDsKKyAgICAgICAgICAgICAgICBt YXJnaW46IDA7CisgICAgICAgICAgICAgICAgYmFja2dyb3VuZDogYmxhY2s7CisgICAgICAgICAg ICAgICAgdmVydGljYWwtYWxpZ246IHRvcDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zdHls ZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHk+CisgICAgICAgIDxkaXY+PGk+PC9pPlRlc3Q8L2Rp dj4KKyAgICAgICAgPHA+CisgICAgICAgICAgICBMaXN0IGl0ZW0gYWJvdmUgc2hvdWxkIGJlIG9u IHNhbWUgbGluZSBhcyB0aGUgd29yZCAnVGVzdCcuCisgICAgICAgIDwvcD4KKyAgICA8L2JvZHk+ Cis8L2h0bWw+Cg==