159102 2016-06-24 14:39:18 -0700 Include enclosingListType in EditorState 2016-06-24 15:25:58 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin enrica sam thorton oldest_to_newest 1205210 0 bdakin 2016-06-24 14:39:18 -0700 Include enclosingListType in EditorState rdar://problem/26932490 1205211 1 282016 bdakin 2016-06-24 14:46:19 -0700 Created attachment 282016 Patch 1205218 2 282016 enrica 2016-06-24 15:12:47 -0700 Comment on attachment 282016 Patch Looks good to me. 1205225 3 bdakin 2016-06-24 15:25:58 -0700 Thanks Enrica! http://trac.webkit.org/changeset/202454 282016 2016-06-24 14:46:19 -0700 2016-06-24 15:12:47 -0700 Patch for-review.txt text/plain 7446 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMjQ0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA2LTI0ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNsdWRlIGVuY2xvc2luZ0xpc3RU eXBlIGluIEVkaXRvclN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTkxMDIKKyAgICAgICAgLWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICBy ZGFyOi8vcHJvYmxlbS8yNjkzMjQ5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ha2UgSFRNTE9MaXN0RWxlbWVudC5oIGFuZCBIVE1MVUxpc3RFbGVt ZW50LmggUHJpdmF0ZSBpbnN0ZWFkIG9mIFByb2plY3QuCisgICAgICAgICogV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCisgICAgICAgIEV4cG9ydCBlbmNsb3NpbmdMaXN0KE5v ZGUqKQorICAgICAgICAqIGVkaXRpbmcvaHRtbGVkaXRpbmcuaDoKKwogMjAxNi0wNi0yNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFllYXQgYW5vdGhl ciBXaW5kb3dzIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDIwMjQyMikKKysrIFNvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpA QCAtNDY0OCw4ICs0NjQ4LDggQEAKIAkJQThERjRBRjEwOTgwQzQyQzAwNTI5ODFCIC8qIFJlbmRl clRhYmxlQ29sLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYg PSBBOERGNEFFNzA5ODBDNDJDMDA1Mjk4MUIgLyogUmVuZGVyVGFibGVDb2wuaCAqLzsgfTsKIAkJ QThFQTczQzMwQTE5MDBFMzAwQThFRjVGIC8qIFJlbmRlckZpZWxkc2V0LmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4RUE3M0FGMEExOTAwRTMwMEE4 RUY1RiAvKiBSZW5kZXJGaWVsZHNldC5jcHAgKi87IH07CiAJCUE4RUE3M0M0MEExOTAwRTMwMEE4 RUY1RiAvKiBSZW5kZXJGaWVsZHNldC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQThFQTczQjAwQTE5MDBFMzAwQThFRjVGIC8qIFJlbmRlckZpZWxkc2V0 LmggKi87IH07Ci0JCUE4RUE3OUYxMEExOTE2REYwMEE4RUY1RiAvKiBIVE1MT0xpc3RFbGVtZW50 LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOEVBNzlF NTBBMTkxNkRGMDBBOEVGNUYgLyogSFRNTE9MaXN0RWxlbWVudC5oICovOyB9OwotCQlBOEVBNzlG MjBBMTkxNkRGMDBBOEVGNUYgLyogSFRNTFVMaXN0RWxlbWVudC5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThFQTc5RTYwQTE5MTZERjAwQThFRjVGIC8q IEhUTUxVTGlzdEVsZW1lbnQuaCAqLzsgfTsKKwkJQThFQTc5RjEwQTE5MTZERjAwQThFRjVGIC8q IEhUTUxPTGlzdEVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IEE4RUE3OUU1MEExOTE2REYwMEE4RUY1RiAvKiBIVE1MT0xpc3RFbGVtZW50Lmgg Ki87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJQThFQTc5 RjIwQTE5MTZERjAwQThFRjVGIC8qIEhUTUxVTGlzdEVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4RUE3OUU2MEExOTE2REYwMEE4RUY1RiAv KiBIVE1MVUxpc3RFbGVtZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKIAkJQThFQTc5RjMwQTE5MTZERjAwQThFRjVGIC8qIEhUTUxVTGlzdEVsZW1l bnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQThF QTc5RTcwQTE5MTZERjAwQThFRjVGIC8qIEhUTUxVTGlzdEVsZW1lbnQuY3BwICovOyB9OwogCQlB OEVBNzlGNDBBMTkxNkRGMDBBOEVGNUYgLyogSFRNTE1lbnVFbGVtZW50LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOEVBNzlFODBBMTkxNkRGMDBBOEVG NUYgLyogSFRNTE1lbnVFbGVtZW50LmggKi87IH07CiAJCUE4RUE3OUY1MEExOTE2REYwMEE4RUY1 RiAvKiBIVE1MRExpc3RFbGVtZW50LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IEE4RUE3OUU5MEExOTE2REYwMEE4RUY1RiAvKiBIVE1MRExpc3RFbGVt ZW50LmNwcCAqLzsgfTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmgJKHJl dmlzaW9uIDIwMjQyMikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuaAko d29ya2luZyBjb3B5KQpAQCAtMTU4LDcgKzE1OCw3IEBAIFdFQkNPUkVfRVhQT1JUIFJlZjxIVE1M RWxlbWVudD4gY3JlYXRlRGUKIFJlZjxIVE1MRWxlbWVudD4gY3JlYXRlSFRNTEVsZW1lbnQoRG9j dW1lbnQmLCBjb25zdCBRdWFsaWZpZWROYW1lJik7CiBSZWY8SFRNTEVsZW1lbnQ+IGNyZWF0ZUhU TUxFbGVtZW50KERvY3VtZW50JiwgY29uc3QgQXRvbWljU3RyaW5nJik7CiAKLUhUTUxFbGVtZW50 KiBlbmNsb3NpbmdMaXN0KE5vZGUqKTsKK1dFQkNPUkVfRVhQT1JUIEhUTUxFbGVtZW50KiBlbmNs b3NpbmdMaXN0KE5vZGUqKTsKIEhUTUxFbGVtZW50KiBvdXRlcm1vc3RFbmNsb3NpbmdMaXN0KE5v ZGUqLCBOb2RlKiByb290TGlzdCA9IG51bGxwdHIpOwogTm9kZSogZW5jbG9zaW5nTGlzdENoaWxk KE5vZGUqKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMjAyNDQ4KQorKysgU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTYtMDYt MjQgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIEluY2x1ZGUgZW5j bG9zaW5nTGlzdFR5cGUgaW4gRWRpdG9yU3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTEwMgorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmct CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI2OTMyNDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvRWRpdG9yU3RhdGUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpFZGl0b3JTdGF0ZTo6UG9zdExheW91dERhdGE6OmVuY29kZSk6CisgICAg ICAgIChXZWJLaXQ6OkVkaXRvclN0YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZGVjb2RlKToKKyAgICAg ICAgKiBTaGFyZWQvRWRpdG9yU3RhdGUuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVkaXRvclN0YXRlKToKKwog MjAxNi0wNi0yNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIElubGluZSBtb3JlIG9mIHRoZSBBcHBsZSBQYXkgc291cmNlIGNvZGUKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAkocmV2aXNpb24gMjAyNDIyKQorKysgU291cmNl L1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYg KzExNSw3IEBAIHZvaWQgRWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRhOjplbmNvZGUKICAgICBl bmNvZGVyIDw8IHNlbGVjdGVkVGV4dExlbmd0aDsKICAgICBlbmNvZGVyIDw8IHRleHRBbGlnbm1l bnQ7CiAgICAgZW5jb2RlciA8PCB0ZXh0Q29sb3I7CisgICAgZW5jb2RlciA8PCBlbmNsb3NpbmdM aXN0VHlwZTsKICNlbmRpZgogI2lmIFBMQVRGT1JNKElPUykKICAgICBlbmNvZGVyIDw8IGNhcmV0 UmVjdEF0RW5kOwpAQCAtMTUwLDYgKzE1MSw4IEBAIGJvb2wgRWRpdG9yU3RhdGU6OlBvc3RMYXlv dXREYXRhOjpkZWNvZGUKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocmVzdWx0LnRleHRDb2xvcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHJlc3VsdC5lbmNsb3NpbmdMaXN0VHlwZSkpCisgICAgICAgIHJldHVy biBmYWxzZTsKICNlbmRpZgogI2lmIFBMQVRGT1JNKElPUykKICAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC5jYXJldFJlY3RBdEVuZCkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv RWRpdG9yU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9y U3RhdGUuaAkocmV2aXNpb24gMjAyNDIyKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRv clN0YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzLDYgKzUzLDEyIEBAIGVudW0gVGV4dEFsaWdu bWVudCB7CiAgICAgSnVzdGlmaWVkQWxpZ25tZW50ID0gNCwKIH07CiAKK2VudW0gTGlzdFR5cGUg eworICAgIE5vTGlzdCA9IDAsCisgICAgT3JkZXJlZExpc3QsCisgICAgVW5vcmRlcmVkTGlzdAor fTsKKwogc3RydWN0IEVkaXRvclN0YXRlIHsKICAgICBib29sIHNob3VsZElnbm9yZUNvbXBvc2l0 aW9uU2VsZWN0aW9uQ2hhbmdlIHsgZmFsc2UgfTsKIApAQCAtODIsNiArODgsNyBAQCBzdHJ1Y3Qg RWRpdG9yU3RhdGUgewogICAgICAgICB1aW50NjRfdCBzZWxlY3RlZFRleHRMZW5ndGggeyAwIH07 CiAgICAgICAgIHVpbnQzMl90IHRleHRBbGlnbm1lbnQgeyBOb0FsaWdubWVudCB9OwogICAgICAg ICBXZWJDb3JlOjpDb2xvciB0ZXh0Q29sb3IgeyBXZWJDb3JlOjpDb2xvcjo6YmxhY2sgfTsKKyAg ICAgICAgdWludDMyX3QgZW5jbG9zaW5nTGlzdFR5cGUgeyBOb0xpc3QgfTsKICNlbmRpZgogI2lm IFBMQVRGT1JNKElPUykKICAgICAgICAgV2ViQ29yZTo6SW50UmVjdCBjYXJldFJlY3RBdEVuZDsK SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJ KHJldmlzaW9uIDIwMjQyMikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI5LDggKzEyOSwxMCBAQAogI2luY2x1ZGUg PFdlYkNvcmUvSFRNTEZvcm1FbGVtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MSW1hZ2VF bGVtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MSW5wdXRFbGVtZW50Lmg+CisjaW5jbHVk ZSA8V2ViQ29yZS9IVE1MT0xpc3RFbGVtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9IVE1MUGx1 Z0luRWxlbWVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5o PgorI2luY2x1ZGUgPFdlYkNvcmUvSFRNTFVMaXN0RWxlbWVudC5oPgogI2luY2x1ZGUgPFdlYkNv cmUvSGlzdG9yeUNvbnRyb2xsZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0hpc3RvcnlJdGVtLmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9IaXRUZXN0UmVzdWx0Lmg+CkBAIC0xNjgsNiArMTcwLDcgQEAK ICNpbmNsdWRlIDxXZWJDb3JlL1VzZXJTdHlsZVNoZWV0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9W aXNpYmxlUG9zaXRpb24uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Zpc2libGVVbml0cy5oPgorI2lu Y2x1ZGUgPFdlYkNvcmUvaHRtbGVkaXRpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL21hcmt1cC5o PgogI2luY2x1ZGUgPGJpbmRpbmdzL1NjcmlwdFZhbHVlLmg+CiAjaW5jbHVkZSA8cHJvZmlsZXIv UHJvZmlsZXJEYXRhYmFzZS5oPgpAQCAtODcwLDYgKzg3MywxNSBAQCBFZGl0b3JTdGF0ZSBXZWJQ YWdlOjplZGl0b3JTdGF0ZShJbmNsdWRlCiAgICAgICAgICAgICAgICAgICAgIHBvc3RMYXlvdXRE YXRhLnRleHRBbGlnbm1lbnQgPSBzdHlsZS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gUmln aHRBbGlnbm1lbnQgOiBMZWZ0QWxpZ25tZW50OwogICAgICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgSFRN TEVsZW1lbnQqIGVuY2xvc2luZ0xpc3RFbGVtZW50ID0gZW5jbG9zaW5nTGlzdChzZWxlY3Rpb24u c3RhcnQoKS5kZXByZWNhdGVkTm9kZSgpKTsKKyAgICAgICAgICAgICAgICBpZiAoZW5jbG9zaW5n TGlzdEVsZW1lbnQpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlzPEhUTUxVTGlzdEVsZW1l bnQ+KCplbmNsb3NpbmdMaXN0RWxlbWVudCkpCisgICAgICAgICAgICAgICAgICAgICAgICBwb3N0 TGF5b3V0RGF0YS5lbmNsb3NpbmdMaXN0VHlwZSA9IFVub3JkZXJlZExpc3Q7CisgICAgICAgICAg ICAgICAgICAgIGlmIChpczxIVE1MT0xpc3RFbGVtZW50PigqZW5jbG9zaW5nTGlzdEVsZW1lbnQp KQorICAgICAgICAgICAgICAgICAgICAgICAgcG9zdExheW91dERhdGEuZW5jbG9zaW5nTGlzdFR5 cGUgPSBPcmRlcmVkTGlzdDsKKyAgICAgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgcG9zdExheW91dERhdGEuZW5jbG9zaW5nTGlzdFR5cGUgPSBOb0xpc3Q7CiAKICAgICAg ICAgICAgICAgICBpZiAobm9kZVRvUmVtb3ZlKQogICAgICAgICAgICAgICAgICAgICBub2RlVG9S ZW1vdmUtPnJlbW92ZShBU1NFUlRfTk9fRVhDRVBUSU9OKTsK