217273 2020-10-02 20:11:00 -0700 [LFC][IFC] Rename InlineContentBreaker::Result::Action::Push to Wrap 2020-10-03 09:52:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1694351 0 zalan 2020-10-02 20:11:00 -0700 'wrap' is more suitable in this context 1694352 1 410410 zalan 2020-10-02 20:13:54 -0700 Created attachment 410410 Patch 1694413 2 ews-feeder 2020-10-03 09:51:49 -0700 Committed r267927: <https://trac.webkit.org/changeset/267927> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410410. 1694414 3 webkit-bug-importer 2020-10-03 09:52:18 -0700 <rdar://problem/69916762> 410410 2020-10-02 20:13:54 -0700 2020-10-03 09:51:50 -0700 Patch bug-217273-20201002201353.patch text/plain 6966 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTc3OGI2NzlmZWU3MzUy ZTc4NzRjNjlkNzhkZGQzNDFlZmRmMWE2Ni4uNzk1Y2IxZTA4ODQyY2MzODNhZDg5YzFjZmYwZDc3 MDFjNzZlMDVlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTEwLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg SW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdDo6QWN0aW9uOjpQdXNoIHRvIFdyYXAKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNzI3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICJXcmFwIiBpcyBhIG1v cmUgc3VpdGFibGUgbmFtZSBpbiB0aGlzIGNvbnRleHQuCisKKyAgICAgICAgKiBsYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OmlzV3JhcHBpbmdBbGxvd2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0Nv bnRlbnQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNv bnRlbnRCcmVha2VyLmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 aGFuZGxlRmxvYXRzQW5kSW5saW5lQ29udGVudCk6CisKIDIwMjAtMTAtMDIgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdW1NvZnQgaHlwaGVuXSBS ZWJ1aWxkIHRoZSBsaW5lIHdoZW4gbmVlZCB0byByZXZlcnQgdG8gYSBwcmV2aW91cyB3cmFwIG9w cG9ydHVuaXR5IGR1ZSB0byBzb2Z0IGh5cGhlbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmNw cAppbmRleCA0OGMwOTJjYTYxMzBkYmM4YzY3ZTFhYWJkMDY1YWZjMjg3OWYzMjc4Li5iYzMzOWNm NzFiNGU5ZGIwODM1Y2RhMDc5YTY0YTIxNmFlNTU4MjEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJy ZWFrZXIuY3BwCkBAIC05OSw3ICs5OSw3IEBAIHN0YXRpYyBpbmxpbmUgT3B0aW9uYWw8c2l6ZV90 PiBsYXN0Q29udGVudFJ1bkluZGV4KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDCiAKIHN0 YXRpYyBpbmxpbmUgYm9vbCBpc1dyYXBwaW5nQWxsb3dlZChjb25zdCBSZW5kZXJTdHlsZSYgc3R5 bGUpCiB7Ci0gICAgLy8gRG8gbm90IHRyeSB0byBwdXNoIG92ZXJmbG93biAncHJlJyBhbmQgJ25v LXdyYXAnIGNvbnRlbnQgdG8gbmV4dCBsaW5lLgorICAgIC8vIERvIG5vdCB0cnkgdG8gd3JhcCBv dmVyZmxvd24gJ3ByZScgYW5kICduby13cmFwJyBjb250ZW50IHRvIG5leHQgbGluZS4KICAgICBy ZXR1cm4gc3R5bGUud2hpdGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6OlByZSAmJiBzdHlsZS53aGl0 ZVNwYWNlKCkgIT0gV2hpdGVTcGFjZTo6Tm9XcmFwOwogfQogCkBAIC0xNjksOCArMTY5LDggQEAg SW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJvY2Vz c0lubGluZUNvbnRlbnQoY29uc3QgQ28KICAgICAgICAgICAgICAgICBtX2hhc1dyYXBPcHBvcnR1 bml0eUF0UHJldmlvdXNQb3NpdGlvbiA9IHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0K LSAgICB9IGVsc2UgaWYgKHJlc3VsdC5hY3Rpb24gPT0gUmVzdWx0OjpBY3Rpb246OlB1c2ggJiYg bGluZVN0YXR1cy50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCkgewotICAgICAgICAvLyBBIHRyYWls aW5nIHNvZnQgaHlwaGVuIG1heSB0dXJuIGFjdGlvbiAiUHVzaCIgdG8gYWN0aW9uICJSZXZlcnQi LgorICAgIH0gZWxzZSBpZiAocmVzdWx0LmFjdGlvbiA9PSBSZXN1bHQ6OkFjdGlvbjo6V3JhcCAm JiBsaW5lU3RhdHVzLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKSB7CisgICAgICAgIC8vIEEgdHJh aWxpbmcgc29mdCBoeXBoZW4gbWF5IHR1cm4gYWN0aW9uICJXcmFwIiB0byBhY3Rpb24gIlJldmVy dCIuCiAgICAgICAgIGlmICgqbGluZVN0YXR1cy50cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA+IGxp bmVTdGF0dXMuYXZhaWxhYmxlV2lkdGggJiYgaXNUZXh0Q29udGVudE9ubHkoY2FuZGlkYXRlQ29u dGVudCkpCiAgICAgICAgICAgICByZXN1bHQgPSB7IFJlc3VsdDo6QWN0aW9uOjpSZXZlcnRUb0xh c3ROb25PdmVyZmxvd2luZ1dyYXBPcHBvcnR1bml0eSwgSXNFbmRPZkxpbmU6OlllcyB9OwogICAg IH0KQEAgLTIxNiwxMCArMjE2LDEwIEBAIElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQgSW5s aW5lQ29udGVudEJyZWFrZXI6OnByb2Nlc3NPdmVyZmxvd2luZ0NvbnRlbnQoY29uCiAgICAgICAg IGlmIChhdXRvIHRyYWlsaW5nQ29udGVudCA9IHByb2Nlc3NPdmVyZmxvd2luZ1RleHRDb250ZW50 KGNvbnRpbnVvdXNDb250ZW50LCBsaW5lU3RhdHVzKSkgewogICAgICAgICAgICAgaWYgKCF0cmFp bGluZ0NvbnRlbnQtPnJ1bkluZGV4ICYmIHRyYWlsaW5nQ29udGVudC0+aGFzT3ZlcmZsb3cpIHsK ICAgICAgICAgICAgICAgICAvLyBXZSB0cmllZCB0byBicmVhayB0aGUgY29udGVudCBidXQgdGhl IGF2YWlsYWJsZSBzcGFjZSBjYW4ndCBldmVuIGFjY29tbW9kYXRlIHRoZSBmaXJzdCBjaGFyYWN0 ZXIuCi0gICAgICAgICAgICAgICAgLy8gMS4gUHVzaCB0aGUgY29udGVudCBvdmVyIHRvIHRoZSBu ZXh0IGxpbmUgd2hlbiB3ZSd2ZSBnb3QgY29udGVudCBvbiB0aGUgbGluZSBhbHJlYWR5LgorICAg ICAgICAgICAgICAgIC8vIDEuIFdyYXAgdGhlIGNvbnRlbnQgb3ZlciB0byB0aGUgbmV4dCBsaW5l IHdoZW4gd2UndmUgZ290IGNvbnRlbnQgb24gdGhlIGxpbmUgYWxyZWFkeS4KICAgICAgICAgICAg ICAgICAvLyAyLiBLZWVwIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb24gdGhlIGVtcHR5IGxpbmUgKG9y IGtlZXAgdGhlIHdob2xlIHJ1biBpZiBpdCBoYXMgb25seSBvbmUgY2hhcmFjdGVyKS4KICAgICAg ICAgICAgICAgICBpZiAoIWxpbmVTdGF0dXMuaXNFbXB0eSkKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OlB1c2gsIElzRW5kT2ZMaW5lOjpZZXMgfTsKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZMaW5l OjpZZXMgfTsKICAgICAgICAgICAgICAgICBhdXRvIGxlYWRpbmdUZXh0UnVuSW5kZXggPSAqZmly c3RUZXh0UnVuSW5kZXgoY29udGludW91c0NvbnRlbnQpOwogICAgICAgICAgICAgICAgIGF1dG8m IGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGNvbnRpbnVvdXNDb250 ZW50LnJ1bnMoKVtsZWFkaW5nVGV4dFJ1bkluZGV4XS5pbmxpbmVJdGVtKTsKICAgICAgICAgICAg ICAgICBBU1NFUlQoaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkpOwpAQCAtMjMzLDE0ICsyMzMsMTQg QEAgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdCBJbmxpbmVDb250ZW50QnJlYWtlcjo6cHJv Y2Vzc092ZXJmbG93aW5nQ29udGVudChjb24KICAgICAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6 QWN0aW9uOjpCcmVhaywgSXNFbmRPZkxpbmU6OlllcywgdHJhaWxpbmdQYXJ0aWFsQ29udGVudCB9 OwogICAgICAgICB9CiAgICAgfQotICAgIC8vIElmIHdlIGFyZSBub3QgYWxsb3dlZCB0byBicmVh ayB0aGlzIG92ZXJmbG93aW5nIGNvbnRlbnQsIHdlIHN0aWxsIG5lZWQgdG8gZGVjaWRlIHdoZXRo ZXIga2VlcCBpdCBvciBwdXNoIGl0IHRvIHRoZSBuZXh0IGxpbmUuCisgICAgLy8gSWYgd2UgYXJl IG5vdCBhbGxvd2VkIHRvIGJyZWFrIHRoaXMgb3ZlcmZsb3dpbmcgY29udGVudCwgd2Ugc3RpbGwg bmVlZCB0byBkZWNpZGUgd2hldGhlciBrZWVwIGl0IG9yIHdyYXAgaXQgdG8gdGhlIG5leHQgbGlu ZS4KICAgICBpZiAobGluZVN0YXR1cy5pc0VtcHR5KSB7CiAgICAgICAgIEFTU0VSVCghbV9oYXNX cmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24pOwogICAgICAgICByZXR1cm4geyBSZXN1 bHQ6OkFjdGlvbjo6S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07CiAgICAgfQogICAgIC8vIE5vdyBl aXRoZXIgd3JhcCBoZXJlIG9yIGF0IGFuIGVhcmxpZXIgcG9zaXRpb24sIG9yIG5vdCB3cmFwIGF0 IGFsbC4KICAgICBpZiAoaXNDb250ZW50V3JhcHBpbmdBbGxvd2VkKGNvbnRpbnVvdXNDb250ZW50 KSkKLSAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OlB1c2gsIElzRW5kT2ZMaW5lOjpZ ZXMgfTsKKyAgICAgICAgcmV0dXJuIHsgUmVzdWx0OjpBY3Rpb246OldyYXAsIElzRW5kT2ZMaW5l OjpZZXMgfTsKICAgICBpZiAobV9oYXNXcmFwT3Bwb3J0dW5pdHlBdFByZXZpb3VzUG9zaXRpb24p CiAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpSZXZlcnRUb0xhc3RXcmFwT3Bwb3J0 dW5pdHksIElzRW5kT2ZMaW5lOjpZZXMgfTsKICAgICByZXR1cm4geyBSZXN1bHQ6OkFjdGlvbjo6 S2VlcCwgSXNFbmRPZkxpbmU6Ok5vIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lQ29udGVudEJyZWFrZXIuaAppbmRleCAy ZWU3MGEwYTYyMmE4MWQ5ZmIwNTI1YmE2Nzg1ZjVjMzExZjQwNDViLi5lODk3OGIwMDMzYWNiYjVj M2NlNzkyYzhhMWNjZGZhMjcyNGI3YTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVDb250ZW50QnJlYWtlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUNvbnRlbnRCcmVha2VyLmgKQEAg LTUwLDcgKzUwLDcgQEAgcHVibGljOgogICAgICAgICBlbnVtIGNsYXNzIEFjdGlvbiB7CiAgICAg ICAgICAgICBLZWVwLCAvLyBLZWVwIGNvbnRlbnQgb24gdGhlIGN1cnJlbnQgbGluZS4KICAgICAg ICAgICAgIEJyZWFrLCAvLyBQYXJ0aWFsIGNvbnRlbnQgaXMgb24gdGhlIGN1cnJlbnQgbGluZS4K LSAgICAgICAgICAgIFB1c2gsIC8vIENvbnRlbnQgaXMgcHVzaGVkIHRvIHRoZSBuZXh0IGxpbmUu CisgICAgICAgICAgICBXcmFwLCAvLyBDb250ZW50IGlzIHdyYXBwZWQgdG8gdGhlIG5leHQgbGlu ZS4KICAgICAgICAgICAgIC8vIFRoZSBjdXJyZW50IGNvbnRlbnQgb3ZlcmZsb3dzIGFuZCBjYW4n dCBnZXQgYnJva2VuIHVwIGludG8gc21hbGxlciBiaXRzLgogICAgICAgICAgICAgUmV2ZXJ0VG9M YXN0V3JhcE9wcG9ydHVuaXR5LCAvLyBUaGUgY29udGVudCBuZWVkcyB0byBiZSByZXZlcnRlZCBi YWNrIHRvIHRoZSBsYXN0IHdyYXAgb3Bwb3J0dW5pdHkuCiAgICAgICAgICAgICBSZXZlcnRUb0xh c3ROb25PdmVyZmxvd2luZ1dyYXBPcHBvcnR1bml0eSAvLyBUaGUgY29udGVudCBuZWVkcyB0byBi ZSByZXZlcnRlZCBiYWNrIHRvIGEgd3JhcCBvcHBvcnR1bml0eSB0aGF0IHN0aWxsIGZpdHMgdGhl IGxpbmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMWQyNGYzZDY4MDNmZDgyNWZmYzNm NTUxN2ZhZmE1YzliNjEwNzgxZC4uNmZjYmZlMGM5MGViN2ZiMDJiMTMwN2I2ZDEyY2E3NTg4Mjk1 MjEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtNjA0LDcgKzYwNCw3IEBAIExpbmVC dWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUZsb2F0c0FuZElubGluZUNvbnRlbnQo SW5saW5lQ29udGVudEJyZWFrCiAgICAgICAgIGNvbW1pdEZsb2F0cyhsaW5lQ2FuZGlkYXRlKTsK ICAgICAgICAgcmV0dXJuIHsgcmVzdWx0LmlzRW5kT2ZMaW5lLCB7IGNhbmRpZGF0ZVJ1bnMuc2l6 ZSgpLCBmYWxzZSB9IH07CiAgICAgfQotICAgIGlmIChyZXN1bHQuYWN0aW9uID09IElubGluZUNv bnRlbnRCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6UHVzaCkgeworICAgIGlmIChyZXN1bHQuYWN0 aW9uID09IElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6V3JhcCkgewogICAg ICAgICBBU1NFUlQocmVzdWx0LmlzRW5kT2ZMaW5lID09IElubGluZUNvbnRlbnRCcmVha2VyOjpJ c0VuZE9mTGluZTo6WWVzKTsKICAgICAgICAgLy8gVGhpcyBjb250aW51b3VzIGNvbnRlbnQgY2Fu J3QgYmUgcGxhY2VkIG9uIHRoZSBjdXJyZW50IGxpbmUuIE5vdGhpbmcgdG8gY29tbWl0IGF0IHRo aXMgdGltZS4KICAgICAgICAgcmV0dXJuIHsgSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZM aW5lOjpZZXMgfTsK