174295 2017-07-08 22:33:50 -0700 Block of text is missing in iBooks sample books. 2017-07-10 09:03:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser zalan oldest_to_newest 1326839 0 zalan 2017-07-08 22:33:50 -0700 rdar://problem/32955620 1326840 1 314938 zalan 2017-07-08 22:36:06 -0700 Created attachment 314938 Patch 1326905 2 314958 zalan 2017-07-09 16:33:32 -0700 Created attachment 314958 Patch 1326952 3 314958 koivisto 2017-07-10 01:48:20 -0700 Comment on attachment 314958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=314958&action=review > Source/WebCore/rendering/SimpleLineLayoutResolver.cpp:169 > + // Did we miss the line? > + if (y < bottom && !lastIndexCandidate) { > + ASSERT_NOT_REACHED(); > + return lineIndexCandidate; > } Should turn this into pure assert post-branch. 1327002 4 zalan 2017-07-10 08:05:27 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 314958 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=314958&action=review > > > Source/WebCore/rendering/SimpleLineLayoutResolver.cpp:169 > > + // Did we miss the line? > > + if (y < bottom && !lastIndexCandidate) { > > + ASSERT_NOT_REACHED(); > > + return lineIndexCandidate; > > } > > Should turn this into pure assert post-branch. Indeed. 1327006 5 314981 zalan 2017-07-10 08:25:31 -0700 Created attachment 314981 Patch 1327019 6 314981 commit-queue 2017-07-10 09:03:06 -0700 Comment on attachment 314981 Patch Clearing flags on attachment: 314981 Committed r219291: <http://trac.webkit.org/changeset/219291> 1327020 7 commit-queue 2017-07-10 09:03:08 -0700 All reviewed patches have been landed. Closing bug. 314938 2017-07-08 22:36:06 -0700 2017-07-09 16:33:30 -0700 Patch bug-174295-20170708223604.patch text/plain 2713 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU3OGNlZTRkZGI2MmQx MmY1MGZkNDJlOTZlNmVjYTY4NWM0YTBiZS4uZWEwYmJlZmIxMjNkMzNkMTA5MWFlMjgwNDc3NmIx MDJhZmY4ZGRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE3LTA3LTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQmxvY2sgb2YgdGV4dCBpcyBt aXNzaW5nIGluIGlCb29rcyBzYW1wbGUgYm9va3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQyOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6 OmFkanVzdExpbmVJbmRleEZvclN0cnV0cyk6CisKIDIwMTctMDctMDYgIENoYXJsaWUgVHVybmVy ICA8Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIHZpZC5tZSB2aWRl b3MgZG8gbm90IHBsYXkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1w bGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKaW5kZXggZjJmYmQ5YWEyMzE4NDc2MDg5YTQzODMxZDc3 ZWMzMTA3OWM1NDE0ZS4uZmZhZGZjNWU2MmQyMDUyNjlkZDJiMTRhYzkyYzcyODBlMmU4NmYwYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNv bHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRS ZXNvbHZlci5jcHAKQEAgLTE0MSwxOCArMTQxLDMxIEBAIHVuc2lnbmVkIFJ1blJlc29sdmVyOjph ZGp1c3RMaW5lSW5kZXhGb3JTdHJ1dHMoTGF5b3V0VW5pdCB5LCBJbmRleFR5cGUgdHlwZSwgdW5z CiAgICAgICAgIHJldHVybiBsaW5lSW5kZXhDYW5kaWRhdGU7CiAgICAgdW5zaWduZWQgc3RydXRJ bmRleCA9IDA7CiAgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gbGFzdEluZGV4Q2FuZGlkYXRl OwotICAgIGZsb2F0IHRvcFBvc2l0aW9uID0gc3RydXQubGluZUJyZWFrICogbV9saW5lSGVpZ2h0 ICsgKG1fYmFzZWxpbmUgLSBtX2FzY2VudCk7CisgICAgYXV0byB0b3AgPSBzdHJ1dC5saW5lQnJl YWsgKiBtX2xpbmVIZWlnaHQ7CisgICAgYXV0byBsaW5lSGVpZ2h0V2l0aE92ZXJmbG93ID0gbV9s aW5lSGVpZ2h0OworICAgIC8vIElmIGZvbnQgaXMgbGFyZ2VyIHRoYW4gdGhlIGxpbmUgaGVpZ2h0 IChnbHlwaHMgb3ZlcmZsb3cpLCB1c2UgdGhlIGZvbnQgc2l6ZSB3aGVuIGNoZWNraW5nIGxpbmUg Ym91bmRhcmllcy4KKyAgICBpZiAobV9hc2NlbnQgKyBtX2Rlc2NlbnQgPiBtX2xpbmVIZWlnaHQp IHsKKyAgICAgICAgbGluZUhlaWdodFdpdGhPdmVyZmxvdyA9IG1fYXNjZW50ICsgbV9kZXNjZW50 OworICAgICAgICB0b3AgKz0gbV9iYXNlbGluZSAtIG1fYXNjZW50OworICAgIH0KKyAgICBhdXRv IGJvdHRvbSA9IHRvcCArIGxpbmVIZWlnaHRXaXRoT3ZlcmZsb3c7CiAgICAgZm9yIChhdXRvIGxp bmVJbmRleCA9IHN0cnV0LmxpbmVCcmVhazsgbGluZUluZGV4IDwgbV9sYXlvdXQubGluZUNvdW50 KCk7ICsrbGluZUluZGV4KSB7CiAgICAgICAgIGZsb2F0IHN0cnV0T2Zmc2V0ID0gMDsKICAgICAg ICAgaWYgKHN0cnV0SW5kZXggPCBzdHJ1dHMuc2l6ZSgpICYmIHN0cnV0cy5hdChzdHJ1dEluZGV4 KS5saW5lQnJlYWsgPT0gbGluZUluZGV4KQogICAgICAgICAgICAgc3RydXRPZmZzZXQgPSBzdHJ1 dHMuYXQoc3RydXRJbmRleCsrKS5vZmZzZXQ7Ci0gICAgICAgIGlmICh5ID49IHRvcFBvc2l0aW9u ICYmIHkgPCAodG9wUG9zaXRpb24gKyBtX2FzY2VudCArIG1fZGVzY2VudCArIHN0cnV0T2Zmc2V0 KSkgeworICAgICAgICBib3R0b20gPSB0b3AgKyBzdHJ1dE9mZnNldCArIGxpbmVIZWlnaHRXaXRo T3ZlcmZsb3c7CisgICAgICAgIGlmICh5ID49IHRvcCAmJiB5IDwgYm90dG9tKSB7CiAgICAgICAg ICAgICBpZiAodHlwZSA9PSBJbmRleFR5cGU6OkZpcnN0KQogICAgICAgICAgICAgICAgIHJldHVy biBsaW5lSW5kZXg7CiAgICAgICAgICAgICBsYXN0SW5kZXhDYW5kaWRhdGUgPSBsaW5lSW5kZXg7 CiAgICAgICAgIH0gZWxzZSBpZiAobGFzdEluZGV4Q2FuZGlkYXRlKQogICAgICAgICAgICAgcmV0 dXJuICpsYXN0SW5kZXhDYW5kaWRhdGU7Ci0gICAgICAgIHRvcFBvc2l0aW9uICs9IG1fbGluZUhl aWdodCArIHN0cnV0T2Zmc2V0OworICAgICAgICB0b3AgKz0gbV9saW5lSGVpZ2h0ICsgc3RydXRP ZmZzZXQ7CisgICAgfQorICAgIC8vIERpZCB3ZSBtaXNzIHRoZSBsaW5lPworICAgIGlmICh5IDwg Ym90dG9tICYmICFsYXN0SW5kZXhDYW5kaWRhdGUpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgICAgIHJldHVybiBsaW5lSW5kZXhDYW5kaWRhdGU7CiAgICAgfQogICAgIHJl dHVybiBtX2xheW91dC5saW5lQ291bnQoKSAtIDE7CiB9Cg== 314958 2017-07-09 16:33:32 -0700 2017-07-10 08:25:30 -0700 Patch bug-174295-20170709163331.patch text/plain 6081 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzU3OGNlZTRkZGI2MmQx MmY1MGZkNDJlOTZlNmVjYTY4NWM0YTBiZS4uYWMyYmJkMzU2MDc0ZGJlOWIxMjk0MzdmNmU2ZjFh ZTAyNjQwYzU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA3LTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQmxvY2sgb2YgdGV4dCBpcyBt aXNzaW5nIGluIGlCb29rcyBzYW1wbGUgYm9va3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQyOTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMy OTU1NjIwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEluIHRoZSBzaW1wbGUgbGluZSBsYXlvdXQgY29udGV4dCwgdHJhbnNsYXRpbmcgeSBjb29yZGlu YXRlIHRvIGEgbGluZSBpbmRleCBpcworICAgICAgICBub3JtYWxseSBqdXN0IGEgKHkgLyBsaW5l IGhlaWdodCkgb3BlcmF0aW9uLiBIb3dldmVyIGluIGNhc2Ugb2Ygc3RydXQgb2Zmc2V0cyAocGFn aW5hdGlvbikKKyAgICAgICAgd2UgbmVlZCB0byB0YWtlIHRoZXNlIGV4dHJhIHBhZGRpbmdzIGlu dG8gYWNjb3VudCB3aGlsZSByZXNvbHZpbmcgdGhlIGxpbmUgaW5kZXguCisgICAgICAgIFRoaXMg cGF0Y2ggZml4ZXMgdGhlIGJvdW5kYXJ5IGNoZWNraW5nIGZvciBhIGdpdmVuIGxpbmUgYnkgdXNp bmcgdGhlIGZvbnQgc2l6ZSBvbmx5CisgICAgICAgIHdoZW4gdGhlIGZvbnQgaXMgdGFsbGVyIHRo YW4gdGhlIGxpbmUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29s dmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVy OjphZGp1c3RMaW5lSW5kZXhGb3JTdHJ1dHMpOgorCiAyMDE3LTA3LTA2ICBDaGFybGllIFR1cm5l ciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSB2aWQubWUgdmlk ZW9zIGRvIG5vdCBwbGF5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dFJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1w bGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCmluZGV4IGYyZmJkOWFhMjMxODQ3NjA4OWE0MzgzMWQ3 N2VjMzEwNzljNTQxNGUuLmZmYWRmYzVlNjJkMjA1MjY5ZGQyYjE0YWM5MmM3MjgwZTJlODZmMGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVz b2x2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 UmVzb2x2ZXIuY3BwCkBAIC0xNDEsMTggKzE0MSwzMSBAQCB1bnNpZ25lZCBSdW5SZXNvbHZlcjo6 YWRqdXN0TGluZUluZGV4Rm9yU3RydXRzKExheW91dFVuaXQgeSwgSW5kZXhUeXBlIHR5cGUsIHVu cwogICAgICAgICByZXR1cm4gbGluZUluZGV4Q2FuZGlkYXRlOwogICAgIHVuc2lnbmVkIHN0cnV0 SW5kZXggPSAwOwogICAgIHN0ZDo6b3B0aW9uYWw8dW5zaWduZWQ+IGxhc3RJbmRleENhbmRpZGF0 ZTsKLSAgICBmbG9hdCB0b3BQb3NpdGlvbiA9IHN0cnV0LmxpbmVCcmVhayAqIG1fbGluZUhlaWdo dCArIChtX2Jhc2VsaW5lIC0gbV9hc2NlbnQpOworICAgIGF1dG8gdG9wID0gc3RydXQubGluZUJy ZWFrICogbV9saW5lSGVpZ2h0OworICAgIGF1dG8gbGluZUhlaWdodFdpdGhPdmVyZmxvdyA9IG1f bGluZUhlaWdodDsKKyAgICAvLyBJZiBmb250IGlzIGxhcmdlciB0aGFuIHRoZSBsaW5lIGhlaWdo dCAoZ2x5cGhzIG92ZXJmbG93KSwgdXNlIHRoZSBmb250IHNpemUgd2hlbiBjaGVja2luZyBsaW5l IGJvdW5kYXJpZXMuCisgICAgaWYgKG1fYXNjZW50ICsgbV9kZXNjZW50ID4gbV9saW5lSGVpZ2h0 KSB7CisgICAgICAgIGxpbmVIZWlnaHRXaXRoT3ZlcmZsb3cgPSBtX2FzY2VudCArIG1fZGVzY2Vu dDsKKyAgICAgICAgdG9wICs9IG1fYmFzZWxpbmUgLSBtX2FzY2VudDsKKyAgICB9CisgICAgYXV0 byBib3R0b20gPSB0b3AgKyBsaW5lSGVpZ2h0V2l0aE92ZXJmbG93OwogICAgIGZvciAoYXV0byBs aW5lSW5kZXggPSBzdHJ1dC5saW5lQnJlYWs7IGxpbmVJbmRleCA8IG1fbGF5b3V0LmxpbmVDb3Vu dCgpOyArK2xpbmVJbmRleCkgewogICAgICAgICBmbG9hdCBzdHJ1dE9mZnNldCA9IDA7CiAgICAg ICAgIGlmIChzdHJ1dEluZGV4IDwgc3RydXRzLnNpemUoKSAmJiBzdHJ1dHMuYXQoc3RydXRJbmRl eCkubGluZUJyZWFrID09IGxpbmVJbmRleCkKICAgICAgICAgICAgIHN0cnV0T2Zmc2V0ID0gc3Ry dXRzLmF0KHN0cnV0SW5kZXgrKykub2Zmc2V0OwotICAgICAgICBpZiAoeSA+PSB0b3BQb3NpdGlv biAmJiB5IDwgKHRvcFBvc2l0aW9uICsgbV9hc2NlbnQgKyBtX2Rlc2NlbnQgKyBzdHJ1dE9mZnNl dCkpIHsKKyAgICAgICAgYm90dG9tID0gdG9wICsgc3RydXRPZmZzZXQgKyBsaW5lSGVpZ2h0V2l0 aE92ZXJmbG93OworICAgICAgICBpZiAoeSA+PSB0b3AgJiYgeSA8IGJvdHRvbSkgewogICAgICAg ICAgICAgaWYgKHR5cGUgPT0gSW5kZXhUeXBlOjpGaXJzdCkKICAgICAgICAgICAgICAgICByZXR1 cm4gbGluZUluZGV4OwogICAgICAgICAgICAgbGFzdEluZGV4Q2FuZGlkYXRlID0gbGluZUluZGV4 OwogICAgICAgICB9IGVsc2UgaWYgKGxhc3RJbmRleENhbmRpZGF0ZSkKICAgICAgICAgICAgIHJl dHVybiAqbGFzdEluZGV4Q2FuZGlkYXRlOwotICAgICAgICB0b3BQb3NpdGlvbiArPSBtX2xpbmVI ZWlnaHQgKyBzdHJ1dE9mZnNldDsKKyAgICAgICAgdG9wICs9IG1fbGluZUhlaWdodCArIHN0cnV0 T2Zmc2V0OworICAgIH0KKyAgICAvLyBEaWQgd2UgbWlzcyB0aGUgbGluZT8KKyAgICBpZiAoeSA8 IGJvdHRvbSAmJiAhbGFzdEluZGV4Q2FuZGlkYXRlKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOworICAgICAgICByZXR1cm4gbGluZUluZGV4Q2FuZGlkYXRlOwogICAgIH0KICAgICBy ZXR1cm4gbV9sYXlvdXQubGluZUNvdW50KCkgLSAxOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDQ3YTViMDdiZTBhOWEw YmFkNDEzNGUxZTU4ZjgwZWNhYzQ4NzcxMmIuLmJiYzVmY2Q5NjNlN2I0ZDU5MjAzYTFlZDYyMmFk MDNhY2M2Njc1M2MgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wNy0wOCAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIEJsb2NrIG9mIHRleHQgaXMgbWlzc2lu ZyBpbiBpQm9va3Mgc2FtcGxlIGJvb2tzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc0Mjk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjk1NTYy MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZh c3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LWxpbmUtaW5kZXgtYWZ0ZXItc3RydXQtMi1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29sL3NpbXBsZS1saW5l LWxheW91dC1saW5lLWluZGV4LWFmdGVyLXN0cnV0LTIuaHRtbDogQWRkZWQuCisKIDIwMTctMDct MDYgIENoYXJsaWUgVHVybmVyICA8Y3R1cm5lckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3Ry ZWFtZXJdIHZpZC5tZSB2aWRlb3MgZG8gbm90IHBsYXkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LWxpbmUtaW5kZXgtYWZ0ZXItc3RydXQt Mi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zaW1wbGUtbGluZS1s YXlvdXQtbGluZS1pbmRleC1hZnRlci1zdHJ1dC0yLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u YmExYTJlOWE0YjFlOTdmY2RjNTU2MmZkNGQwZDMxMjdjNjkwYjY4ZAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LWxpbmUtaW5k ZXgtYWZ0ZXItc3RydXQtMi1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMzIgQEAKKzwhRE9DVFlQ RSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5UaGlzIHRlc3RzIHRoYXQgcGFnaW5hdGVk IGxpbmVzIGFyZSBwYWludGluZyBwcm9wZXJseSB3aGVuIGxpbmUgaXMgdGFsbGVyIHRoYW4gdGhl IGZvbnQuPC90aXRsZT4KKzxzdHlsZT4KK2h0bWwgeworCW92ZXJmbG93OiBoaWRkZW47Cit9Citk aXYgeworICBmb250LXNpemU6IDIwcHg7CisgIGxpbmUtaGVpZ2h0OiA1MHB4OworICB3aWR0aDog NTBweDsKKyAgbWFyZ2luLXRvcDogLThweDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4K KzxkaXY+Citmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitm b29iYXIKKzwvZGl2PgorPHNjcmlwdD4KK2lmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIGludGVy bmFscy5zZXRQYWdpbmF0aW9uKCJMZWZ0VG9SaWdodFBhZ2luYXRlZCIsIDApOworPC9zY3JpcHQ+ Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29s L3NpbXBsZS1saW5lLWxheW91dC1saW5lLWluZGV4LWFmdGVyLXN0cnV0LTIuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LWxpbmUtaW5kZXgtYWZ0ZXIt c3RydXQtMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYyMThiZWJmNDM3YTI2NjM2YjU3YmY0MTIzOTZkNjY3 NzM2NjE0YjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3Np bXBsZS1saW5lLWxheW91dC1saW5lLWluZGV4LWFmdGVyLXN0cnV0LTIuaHRtbApAQCAtMCwwICsx LDY0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+VGhpcyB0ZXN0 cyB0aGF0IHBhZ2luYXRlZCBsaW5lcyBhcmUgcGFpbnRpbmcgcHJvcGVybHkgd2hlbiBsaW5lIGlz IHRhbGxlciB0aGFuIHRoZSBmb250LjwvdGl0bGU+Cis8c3R5bGU+CitodG1sIHsKKwlvdmVyZmxv dzogaGlkZGVuOworfQorZGl2IHsKKyAgY29sdW1uLWZpbGw6IGF1dG87CisgIGZvbnQtc2l6ZTog MjBweDsKKyAgbGluZS1oZWlnaHQ6IDUwcHg7CisgIHdpZHRoOiA1MHB4OworfQorPC9zdHlsZT4K KzwvaGVhZD4KKzxib2R5PgorPGRpdj4KK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2Jhcgor Zm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitm b29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zv b2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9v YmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKKzwvZGl2PgorPHNjcmlwdD4KK2lm ICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIGludGVybmFscy5zZXRQYWdpbmF0aW9uKCJMZWZ0VG9S aWdodFBhZ2luYXRlZCIsIDApOworaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5u ZXIud2FpdFVudGlsRG9uZSgpOworCitzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgIHdpbmRv dy5zY3JvbGxUbygxNjAwLCAwKTsKKyAgICBkb2N1bWVudC5ib2R5Lm9mZnNldEhlaWdodDsKKyAg ICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgp OworfSwgMCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 314981 2017-07-10 08:25:31 -0700 2017-07-10 09:03:06 -0700 Patch bug-174295-20170710082529.patch text/plain 6279 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk4OTBmZTI0YjAzOTVm ODQzMzhiZTQyYTg5MzNiZTMyNDJjYmRiNy4uZDJlNDA4ZmY2OGIzYmFhNGFhNGY0ZDhiYzk1ZTJm NDdiZGMwODZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA3LTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQmxvY2sgb2YgdGV4dCBpcyBt aXNzaW5nIGluIGlCb29rcyBzYW1wbGUgYm9va3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQyOTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMy OTU1NjIwPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAg IEluIHRoZSBzaW1wbGUgbGluZSBsYXlvdXQgY29udGV4dCwgdHJhbnNsYXRpbmcgeSBjb29yZGlu YXRlIHRvIGEgbGluZSBpbmRleCBpcworICAgICAgICBub3JtYWxseSBqdXN0IGEgKHkgLyBsaW5l IGhlaWdodCkgb3BlcmF0aW9uLiBIb3dldmVyIGluIGNhc2Ugb2Ygc3RydXQgb2Zmc2V0cyAocGFn aW5hdGlvbikKKyAgICAgICAgd2UgbmVlZCB0byB0YWtlIHRoZXNlIGV4dHJhIHBhZGRpbmdzIGlu dG8gYWNjb3VudCB3aGlsZSByZXNvbHZpbmcgdGhlIGxpbmUgaW5kZXguCisgICAgICAgIFRoaXMg cGF0Y2ggZml4ZXMgdGhlIGJvdW5kYXJ5IGNoZWNraW5nIGZvciBhIGdpdmVuIGxpbmUgYnkgdXNp bmcgdGhlIGZvbnQgc2l6ZSBvbmx5CisgICAgICAgIHdoZW4gdGhlIGZvbnQgaXMgdGFsbGVyIHRo YW4gdGhlIGxpbmUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29s dmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVy OjphZGp1c3RMaW5lSW5kZXhGb3JTdHJ1dHMpOgorCiAyMDE3LTA3LTEwICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbU09VUF0gU291cENvb2tp ZUphciBpcyBuZXZlciByZWxlYXNlZCAocmVzdWx0aW5nIGluIHNxbGl0ZSB0ZW1wIGZpbGVzIGx5 aW5nIGFyb3VuZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVM aW5lTGF5b3V0UmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxp bmVMYXlvdXRSZXNvbHZlci5jcHAKaW5kZXggZjJmYmQ5YWEyMzE4NDc2MDg5YTQzODMxZDc3ZWMz MTA3OWM1NDE0ZS4uMzMyM2E2OWQxOGNmZmM5Yzc0ZTVlY2FmMmJjOWJjMjNjNDI3N2IwMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNv bHZlci5jcHAKQEAgLTE0MSwyMCArMTQxLDMyIEBAIHVuc2lnbmVkIFJ1blJlc29sdmVyOjphZGp1 c3RMaW5lSW5kZXhGb3JTdHJ1dHMoTGF5b3V0VW5pdCB5LCBJbmRleFR5cGUgdHlwZSwgdW5zCiAg ICAgICAgIHJldHVybiBsaW5lSW5kZXhDYW5kaWRhdGU7CiAgICAgdW5zaWduZWQgc3RydXRJbmRl eCA9IDA7CiAgICAgc3RkOjpvcHRpb25hbDx1bnNpZ25lZD4gbGFzdEluZGV4Q2FuZGlkYXRlOwot ICAgIGZsb2F0IHRvcFBvc2l0aW9uID0gc3RydXQubGluZUJyZWFrICogbV9saW5lSGVpZ2h0ICsg KG1fYmFzZWxpbmUgLSBtX2FzY2VudCk7CisgICAgYXV0byB0b3AgPSBzdHJ1dC5saW5lQnJlYWsg KiBtX2xpbmVIZWlnaHQ7CisgICAgYXV0byBsaW5lSGVpZ2h0V2l0aE92ZXJmbG93ID0gbV9saW5l SGVpZ2h0OworICAgIC8vIElmIGZvbnQgaXMgbGFyZ2VyIHRoYW4gdGhlIGxpbmUgaGVpZ2h0IChn bHlwaHMgb3ZlcmZsb3cpLCB1c2UgdGhlIGZvbnQgc2l6ZSB3aGVuIGNoZWNraW5nIGxpbmUgYm91 bmRhcmllcy4KKyAgICBpZiAobV9hc2NlbnQgKyBtX2Rlc2NlbnQgPiBtX2xpbmVIZWlnaHQpIHsK KyAgICAgICAgbGluZUhlaWdodFdpdGhPdmVyZmxvdyA9IG1fYXNjZW50ICsgbV9kZXNjZW50Owor ICAgICAgICB0b3AgKz0gbV9iYXNlbGluZSAtIG1fYXNjZW50OworICAgIH0KKyAgICBhdXRvIGJv dHRvbSA9IHRvcCArIGxpbmVIZWlnaHRXaXRoT3ZlcmZsb3c7CiAgICAgZm9yIChhdXRvIGxpbmVJ bmRleCA9IHN0cnV0LmxpbmVCcmVhazsgbGluZUluZGV4IDwgbV9sYXlvdXQubGluZUNvdW50KCk7 ICsrbGluZUluZGV4KSB7CiAgICAgICAgIGZsb2F0IHN0cnV0T2Zmc2V0ID0gMDsKICAgICAgICAg aWYgKHN0cnV0SW5kZXggPCBzdHJ1dHMuc2l6ZSgpICYmIHN0cnV0cy5hdChzdHJ1dEluZGV4KS5s aW5lQnJlYWsgPT0gbGluZUluZGV4KQogICAgICAgICAgICAgc3RydXRPZmZzZXQgPSBzdHJ1dHMu YXQoc3RydXRJbmRleCsrKS5vZmZzZXQ7Ci0gICAgICAgIGlmICh5ID49IHRvcFBvc2l0aW9uICYm IHkgPCAodG9wUG9zaXRpb24gKyBtX2FzY2VudCArIG1fZGVzY2VudCArIHN0cnV0T2Zmc2V0KSkg eworICAgICAgICBib3R0b20gPSB0b3AgKyBzdHJ1dE9mZnNldCArIGxpbmVIZWlnaHRXaXRoT3Zl cmZsb3c7CisgICAgICAgIGlmICh5ID49IHRvcCAmJiB5IDwgYm90dG9tKSB7CiAgICAgICAgICAg ICBpZiAodHlwZSA9PSBJbmRleFR5cGU6OkZpcnN0KQogICAgICAgICAgICAgICAgIHJldHVybiBs aW5lSW5kZXg7CiAgICAgICAgICAgICBsYXN0SW5kZXhDYW5kaWRhdGUgPSBsaW5lSW5kZXg7CiAg ICAgICAgIH0gZWxzZSBpZiAobGFzdEluZGV4Q2FuZGlkYXRlKQogICAgICAgICAgICAgcmV0dXJu ICpsYXN0SW5kZXhDYW5kaWRhdGU7Ci0gICAgICAgIHRvcFBvc2l0aW9uICs9IG1fbGluZUhlaWdo dCArIHN0cnV0T2Zmc2V0OworICAgICAgICB0b3AgKz0gbV9saW5lSGVpZ2h0ICsgc3RydXRPZmZz ZXQ7CiAgICAgfQotICAgIHJldHVybiBtX2xheW91dC5saW5lQ291bnQoKSAtIDE7CisgICAgaWYg KGxhc3RJbmRleENhbmRpZGF0ZSB8fCB5ID49IGJvdHRvbSkKKyAgICAgICAgcmV0dXJuIG1fbGF5 b3V0LmxpbmVDb3VudCgpIC0gMTsKKyAgICAvLyBXZSBtaXNzZWQgdGhlIGxpbmUuCisgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGxpbmVJbmRleENhbmRpZGF0ZTsKIH0KIAog dW5zaWduZWQgUnVuUmVzb2x2ZXI6OmxpbmVJbmRleEZvckhlaWdodChMYXlvdXRVbml0IGhlaWdo dCwgSW5kZXhUeXBlIHR5cGUpIGNvbnN0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTUwYzdlNjNjMTc3YjAwOWI0NTE4ZjE1 NTY1NGQ1YWUwMDAyNGMzMC4uN2FiZmY3NDc0MjE3NzU2YmJlZmE1ZWUzNWRiYWEwZjkyNzI3YjI1 MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA3LTEwICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CisKKyAgICAgICAgQmxvY2sgb2YgdGV4dCBpcyBtaXNzaW5nIGluIGlCb29r cyBzYW1wbGUgYm9va3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzQyOTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMyOTU1NjIwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogZmFzdC9tdWx0aWNv bC9zaW1wbGUtbGluZS1sYXlvdXQtbGluZS1pbmRleC1hZnRlci1zdHJ1dC0yLWV4cGVjdGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LWxp bmUtaW5kZXgtYWZ0ZXItc3RydXQtMi5odG1sOiBBZGRlZC4KKwogMjAxNy0wNy0wOCAgSm9obiBX aWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXNvdXJjZSBMb2FkIFN0 YXRpc3RpY3M6IFVzZXIgaW50ZXJhY3Rpb24gc2hvdWxkIGFsd2F5cyBnbyB0byB0b3AgZG9jdW1l bnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5 b3V0LWxpbmUtaW5kZXgtYWZ0ZXItc3RydXQtMi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9tdWx0aWNvbC9zaW1wbGUtbGluZS1sYXlvdXQtbGluZS1pbmRleC1hZnRlci1zdHJ1dC0y LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmExYTJlOWE0YjFlOTdmY2RjNTU2MmZkNGQwZDMx MjdjNjkwYjY4ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wv c2ltcGxlLWxpbmUtbGF5b3V0LWxpbmUtaW5kZXgtYWZ0ZXItc3RydXQtMi1leHBlY3RlZC5odG1s CkBAIC0wLDAgKzEsMzIgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzx0aXRs ZT5UaGlzIHRlc3RzIHRoYXQgcGFnaW5hdGVkIGxpbmVzIGFyZSBwYWludGluZyBwcm9wZXJseSB3 aGVuIGxpbmUgaXMgdGFsbGVyIHRoYW4gdGhlIGZvbnQuPC90aXRsZT4KKzxzdHlsZT4KK2h0bWwg eworCW92ZXJmbG93OiBoaWRkZW47Cit9CitkaXYgeworICBmb250LXNpemU6IDIwcHg7CisgIGxp bmUtaGVpZ2h0OiA1MHB4OworICB3aWR0aDogNTBweDsKKyAgbWFyZ2luLXRvcDogLThweDsKK30K Kzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXY+Citmb29iYXIKK2Zvb2JhcgorZm9vYmFy Citmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKKzwvZGl2PgorPHNjcmlwdD4KK2lmICh3 aW5kb3cuaW50ZXJuYWxzKQorICAgIGludGVybmFscy5zZXRQYWdpbmF0aW9uKCJMZWZ0VG9SaWdo dFBhZ2luYXRlZCIsIDApOworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1saW5lLWluZGV4 LWFmdGVyLXN0cnV0LTIuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxp bmUtbGF5b3V0LWxpbmUtaW5kZXgtYWZ0ZXItc3RydXQtMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjYyMThi ZWJmNDM3YTI2NjM2YjU3YmY0MTIzOTZkNjY3NzM2NjE0YjkKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1saW5lLWluZGV4LWFm dGVyLXN0cnV0LTIuaHRtbApAQCAtMCwwICsxLDY0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8dGl0bGU+VGhpcyB0ZXN0cyB0aGF0IHBhZ2luYXRlZCBsaW5lcyBhcmUgcGFp bnRpbmcgcHJvcGVybHkgd2hlbiBsaW5lIGlzIHRhbGxlciB0aGFuIHRoZSBmb250LjwvdGl0bGU+ Cis8c3R5bGU+CitodG1sIHsKKwlvdmVyZmxvdzogaGlkZGVuOworfQorZGl2IHsKKyAgY29sdW1u LWZpbGw6IGF1dG87CisgIGZvbnQtc2l6ZTogMjBweDsKKyAgbGluZS1oZWlnaHQ6IDUwcHg7Cisg IHdpZHRoOiA1MHB4OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj4KK2Zvb2Jh cgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFy Citmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIK K2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2Jhcgor Zm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitmb29iYXIKK2Zvb2JhcgorZm9vYmFyCitm b29iYXIKKzwvZGl2PgorPHNjcmlwdD4KK2lmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgIGludGVy bmFscy5zZXRQYWdpbmF0aW9uKCJMZWZ0VG9SaWdodFBhZ2luYXRlZCIsIDApOworaWYgKHdpbmRv dy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworCitzZXRUaW1l b3V0KGZ1bmN0aW9uKCkgeworICAgIHdpbmRvdy5zY3JvbGxUbygxNjAwLCAwKTsKKyAgICBkb2N1 bWVudC5ib2R5Lm9mZnNldEhlaWdodDsKKyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAg ICAgIHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworfSwgMCk7Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4K