123871 2013-11-05 22:19:18 -0800 Fix out-of-date offset in selection range code in range.surroundContents 2013-11-06 02:53:16 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate, InRadar P2 Normal --- 1 rniwa rniwa ap commit-queue darin esprehn+autocc kangil.han kling webkit-bug-importer oldest_to_newest 947542 0 rniwa 2013-11-05 22:19:18 -0800 Merge https://chromium.googlesource.com/chromium/blink/+/c89b413ff0fc4aafa0c71d180b0b1e131bb37707 Code in Range::insertNode assumes that the start offset of the selection range within its container does not change across a call to insertBefore on the container, which is not true. This patch recomputes the start offset when it is used after the insertBefore call. 947543 1 webkit-bug-importer 2013-11-05 22:19:36 -0800 <rdar://problem/15401410> 947544 2 216135 rniwa 2013-11-05 22:25:50 -0800 Created attachment 216135 Merges the fix 947639 3 216135 commit-queue 2013-11-06 02:53:14 -0800 Comment on attachment 216135 Merges the fix Clearing flags on attachment: 216135 Committed r158738: <http://trac.webkit.org/changeset/158738> 947640 4 commit-queue 2013-11-06 02:53:16 -0800 All reviewed patches have been landed. Closing bug. 216135 2013-11-05 22:25:50 -0800 2013-11-06 02:53:14 -0800 Merges the fix bug-123871-20131105222549.patch text/plain 4850 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODcyMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTExLTA1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBvdXQtb2YtZGF0ZSBvZmZz ZXQgaW4gc2VsZWN0aW9uIHJhbmdlIGNvZGUgaW4gcmFuZ2Uuc3Vycm91bmRDb250ZW50cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzODcxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBNZXJn ZSBodHRwczovL2Nocm9taXVtLmdvb2dsZXNvdXJjZS5jb20vY2hyb21pdW0vYmxpbmsvKy9jODli NDEzZmYwZmM0YWFmYTBjNzFkMTgwYjBiMWUxMzFiYjM3NzA3CisKKyAgICAgICAgVGhlIGNvZGUg aW4gUmFuZ2U6Omluc2VydE5vZGUgYXNzdW1lZWQgdGhhdCB0aGUgc3RhcnQgb2Zmc2V0IG9mIHRo ZSBzZWxlY3Rpb24gcmFuZ2Ugd2l0aGluIGl0cyBjb250YWluZXIKKyAgICAgICAgZG9lc24ndCBj aGFuZ2UgYWNyb3NzIGEgY2FsbCB0byBpbnNlcnRCZWZvcmUgb24gdGhlIGNvbnRhaW5lciBidXQg dGhpcyBpcyB3cm9uZy4gVGhpcyBwYXRjaCByZWNvbXB1dGVzCisgICAgICAgIHRoZSBzdGFydCBv ZmZzZXQgd2hlbiBpdCBpcyB1c2VkIGFmdGVyIHRoZSBpbnNlcnRCZWZvcmUgY2FsbC4KKworICAg ICAgICBUZXN0OiBlZGl0aW5nL3NlbGVjdGlvbi9yYW5nZS1zdXJyb3VuZENvbnRlbnRzLXdpdGgt cHJlY2VkaW5nLW5vZGUuaHRtbAorCisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJhbmdlOjppbnNlcnROb2RlKToKKwogMjAxMy0xMS0wNSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBDaGFuZ2UgdGhlIG9yZGVyIG9mIGNvbmRp dGlvbnMgdG8gYXZvaWQgY29tcHV0aW5nIHJlbmRlcmVySXNFZGl0YWJsZSgpCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Rv bS9SYW5nZS5jcHAJKHJldmlzaW9uIDE1ODcyMikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5n ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNDEsMTQgKzEwNDEsMTMgQEAgdm9pZCBSYW5nZTo6 aW5zZXJ0Tm9kZShQYXNzUmVmUHRyPE5vZGU+IAogICAgICAgICBpZiAoY29sbGFwc2VkKQogICAg ICAgICAgICAgbGFzdENoaWxkID0gKG5ld05vZGVUeXBlID09IE5vZGU6OkRPQ1VNRU5UX0ZSQUdN RU5UX05PREUpID8gbmV3Tm9kZS0+bGFzdENoaWxkKCkgOiBuZXdOb2RlOwogCi0gICAgICAgIGlu dCBzdGFydE9mZnNldCA9IG1fc3RhcnQub2Zmc2V0KCk7CiAgICAgICAgIGNvbnRhaW5lciA9IG1f c3RhcnQuY29udGFpbmVyKCk7Ci0gICAgICAgIGNvbnRhaW5lci0+aW5zZXJ0QmVmb3JlKG5ld05v ZGUucmVsZWFzZSgpLCBjb250YWluZXItPmNoaWxkTm9kZShzdGFydE9mZnNldCksIGVjKTsKKyAg ICAgICAgY29udGFpbmVyLT5pbnNlcnRCZWZvcmUobmV3Tm9kZS5yZWxlYXNlKCksIGNvbnRhaW5l ci0+Y2hpbGROb2RlKG1fc3RhcnQub2Zmc2V0KCkpLCBlYyk7CiAgICAgICAgIGlmIChlYykKICAg ICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoY29sbGFwc2VkICYmIG51bU5ld0NoaWxk cmVuKQotICAgICAgICAgICAgbV9lbmQuc2V0KG1fc3RhcnQuY29udGFpbmVyKCksIHN0YXJ0T2Zm c2V0ICsgbnVtTmV3Q2hpbGRyZW4sIGxhc3RDaGlsZC5nZXQoKSk7CisgICAgICAgICAgICBtX2Vu ZC5zZXQobV9zdGFydC5jb250YWluZXIoKSwgbV9zdGFydC5vZmZzZXQoKSArIG51bU5ld0NoaWxk cmVuLCBsYXN0Q2hpbGQuZ2V0KCkpOwogICAgIH0KIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTU4 NzIzKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTMtMTEtMDUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgRml4IG91dC1vZi1kYXRlIG9mZnNldCBpbiBzZWxlY3Rpb24gcmFuZ2UgY29kZSBpbiBy YW5nZS5zdXJyb3VuZENvbnRlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjM4NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGVkaXRpbmcvc2VsZWN0aW9uL3JhbmdlLXN1cnJvdW5kQ29udGVudHMt d2l0aC1wcmVjZWRpbmctbm9kZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGVkaXRp bmcvc2VsZWN0aW9uL3JhbmdlLXN1cnJvdW5kQ29udGVudHMtd2l0aC1wcmVjZWRpbmctbm9kZS5o dG1sOiBBZGRlZC4KKwogMjAxMy0xMS0wNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICB2YWx1ZUZvckJvcmRlclJhZGl1c1Nob3J0aGFuZCByZXR1cm5zIHdyb25n IHZhbHVlcyBpbiBzb21lIGNhc2UKSW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9u L3JhbmdlLXN1cnJvdW5kQ29udGVudHMtd2l0aC1wcmVjZWRpbmctbm9kZS1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vcmFuZ2Utc3Vycm91 bmRDb250ZW50cy13aXRoLXByZWNlZGluZy1ub2RlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkK KysrIExheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3JhbmdlLXN1cnJvdW5kQ29udGVudHMt d2l0aC1wcmVjZWRpbmctbm9kZS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCAr MSw5IEBACitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUK K1BBU1Mgcm9vdCBpcyByb290CitQQVNTIDMgaXMgMworUEFTUyByb290IGlzIHJvb3QKK1BBU1Mg MyBpcyAzCitUZXN0IHRoYXQgdGhlcmUgaXMgbm8gY3Jhc2ggd2hlbiBzdXJyb3VuZENvbnRlbnRz IGlzIGNhbGxlZCB3aXRoIGEgbm9kZSBwcmVjZWRpbmcgdGhlIGN1cnJlbnQgc2VsZWN0aW9uLgor CkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9yYW5nZS1zdXJyb3VuZENvbnRl bnRzLXdpdGgtcHJlY2VkaW5nLW5vZGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL3NlbGVjdGlvbi9yYW5nZS1zdXJyb3VuZENvbnRlbnRzLXdpdGgtcHJlY2VkaW5nLW5v ZGUuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3Jh bmdlLXN1cnJvdW5kQ29udGVudHMtd2l0aC1wcmVjZWRpbmctbm9kZS5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+CisgIDxib2R5Pgor ICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0 PgorICAgIDxzY3JpcHQ+CisgICAgICAgIHdpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbigpeworICAg ICAgICAgICAgdmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKyAgICAgICAgICAg IHZhciByb290Tm9kZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyb290Iik7CisgICAgICAg ICAgICByYW5nZS5zZXRTdGFydChyb290Tm9kZSwgNCk7CisgICAgICAgICAgICByYW5nZS5zZXRF bmQocm9vdE5vZGUsIDYpOworICAgICAgICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgidGFyZ2V0Rm9yU3Vycm91bmQiKTsKKyAgICAgICAgICAgIHJhbmdl LnN1cnJvdW5kQ29udGVudHMocGFyZW50RWxlbWVudCk7CisKKyAgICAgICAgICAgIHNob3VsZEJl KHJhbmdlLnN0YXJ0Q29udGFpbmVyLmlkLCByb290Tm9kZS5pZCk7CisgICAgICAgICAgICBzaG91 bGRCZShyYW5nZS5zdGFydE9mZnNldC50b1N0cmluZygpLCAiMyIpOworICAgICAgICAgICAgc2hv dWxkQmUocmFuZ2UuZW5kQ29udGFpbmVyLmlkLCByb290Tm9kZS5pZCk7CisgICAgICAgICAgICBz aG91bGRCZShyYW5nZS5zdGFydE9mZnNldC50b1N0cmluZygpLCAiMyIpOworICAgICAgICB9Owor ICAgIDwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1w b3N0LmpzIj48L3NjcmlwdD4KKyAgICA8ZGl2IGlkPSJyb290Ij4KKyAgICAgIDxkaXYgaWQ9InRh cmdldEZvclN1cnJvdW5kIj48L2Rpdj4KKyAgICAgIDxkaXYgaWQ9ImRlc2NyaXB0aW9uIj5UZXN0 IHRoYXQgdGhlcmUgaXMgbm8gY3Jhc2ggd2hlbiBzdXJyb3VuZENvbnRlbnRzIGlzIGNhbGxlZCB3 aXRoIGEgbm9kZSBwcmVjZWRpbmcgdGhlIGN1cnJlbnQgc2VsZWN0aW9uLjwvZGl2PgorICAgICAg PGRpdiBpZD0idHJhaWxpbmdOb2RlIj48L2Rpdj4KKyAgICA8L2Rpdj4KKyAgPC9ib2R5PgorPC9o dG1sPgo=