51219 2010-12-16 16:15:51 -0800 queryCommandValue("FormatBlock") does not respect editing boundaries 2010-12-23 18:34:01 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P3 Enhancement --- 1 rniwa rniwa commit-queue darin enrica eric jparent justin.garcia ojan oldest_to_newest 323497 0 rniwa 2010-12-16 16:15:51 -0800 document.queryCommandValue("FormatBlock") does not respect the editing boundary. It returns the name of block even if the block was an ancestor of the editable root or the editable root itself. Firefox doesn't this do. 323519 1 76828 rniwa 2010-12-16 16:56:28 -0800 Created attachment 76828 fixes the bug 323522 2 76828 rniwa 2010-12-16 16:58:55 -0800 Comment on attachment 76828 fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=76828&action=review > WebCore/editing/FormatBlockCommand.cpp:111 > if (!commonAncestor) > return 0; > > + Element* rootEditableElement = range->startContainer()->rootEditableElement(); > + if (!rootEditableElement || commonAncestor->contains(rootEditableElement)) > + return 0; > + I could combine these two if statements in practice but I was concerned that there could be a case where startContainer() is null. While we DO check this condition in valueFormatBlock, I didn't want to make the precondition of this function tighter. 326419 3 76828 commit-queue 2010-12-23 18:33:55 -0800 Comment on attachment 76828 fixes the bug Clearing flags on attachment: 76828 Committed r74603: <http://trac.webkit.org/changeset/74603> 326420 4 commit-queue 2010-12-23 18:34:01 -0800 All reviewed patches have been landed. Closing bug. 76828 2010-12-16 16:56:28 -0800 2010-12-23 18:33:55 -0800 fixes the bug bug-51219-20101216165626.patch text/plain 5093 rniwa ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4NWJhYzdlYmUxMGZmMzJhODZkY2U0OTgzYjZmZDIxNjkyNWIzNzNhLi4zNDUyMWRk ODFmODExZjk2ODg3MDA0NjMxZWVlNTZkOTM2NDRkZTFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTItMTYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcXVlcnlDb21tYW5kVmFsdWUo IkZvcm1hdEJsb2NrIikgZG9lcyBub3QgcmVzcGVjdCBlZGl0aW5nIGJvdW5kYXJpZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMjE5CisKKyAgICAg ICAgQWRkZWQgdGVzdCBjYXNlcyB0byBlbnN1cmUgcXVlcnlDb21tYW5kVmFsdWUoIkZvcm1hdEJs b2NrIikgcmVzcGVjdHMgZWRpdGluZyBib3VuZGFyaWVzLgorCisgICAgICAgICogZWRpdGluZy9l eGVjQ29tbWFuZC9xdWVyeS1mb3JtYXQtYmxvY2stZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGVk aXRpbmcvZXhlY0NvbW1hbmQvc2NyaXB0LXRlc3RzL3F1ZXJ5LWZvcm1hdC1ibG9jay5qczoKKwog MjAxMC0xMi0xNSAgSmlhbiBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZC4gTWFyayBhIGZhaWxlZCB0ZXN0IGluIGNocm9taXVtIHRlc3QgZXhwZWN0YXRpb25z LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9xdWVyeS1mb3Jt YXQtYmxvY2stZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9x dWVyeS1mb3JtYXQtYmxvY2stZXhwZWN0ZWQudHh0CmluZGV4IGRhYjlmZDU4MTg1Y2MzODJkYmIz NzViMzk3ZjkzZGEzMWZhZmI5YzkuLjQ1MDg1MGFmNjdiNTBlNmVkM2IzYWI0MGQzMGFiOTFhNDA2 YmVkNzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvcXVlcnkt Zm9ybWF0LWJsb2NrLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWND b21tYW5kL3F1ZXJ5LWZvcm1hdC1ibG9jay1leHBlY3RlZC50eHQKQEAgLTYsNiArNiwxMCBAQCBP biBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xs b3dlZCBieSAiVEVTVCBDT01QTEVURQogQmFzaWMgY2FzZXMKIFBBU1MgcXVlcnlDb21tYW5kKCdm b3JtYXRCbG9jaycpIHJldHVybmVkICIiIHNlbGVjdGluZyBub25lIG9mICJoZWxsbyIKIFBBU1Mg cXVlcnlDb21tYW5kKCdmb3JtYXRCbG9jaycpIHJldHVybmVkICIiIHNlbGVjdGluZyBmaXJzdCBw b3NpdGlvbiBvZiAiaGVsbG8iCitQQVNTIHF1ZXJ5Q29tbWFuZCgnZm9ybWF0QmxvY2snKSByZXR1 cm5lZCAiIiBzZWxlY3RpbmcgZmlyc3QgcG9zaXRpb24gb2YgIjxkaXYgY29udGVudGVkaXRhYmxl PSJmYWxzZSI+PGgxIGNvbnRlbnRlZGl0YWJsZT5oZWxsbzwvaDE+PC9kaXY+IgorUEFTUyBxdWVy eUNvbW1hbmQoJ2Zvcm1hdEJsb2NrJykgcmV0dXJuZWQgIiIgc2VsZWN0aW5nIGZpcnN0IHBvc2l0 aW9uIG9mICI8aDEgY29udGVudGVkaXRhYmxlPSJmYWxzZSI+PHNwYW4gY29udGVudGVkaXRhYmxl PmhlbGxvPC9zcGFuPjwvaDE+IgorUEFTUyBxdWVyeUNvbW1hbmQoJ2Zvcm1hdEJsb2NrJykgcmV0 dXJuZWQgIiIgc2VsZWN0aW5nIGZpcnN0IHBvc2l0aW9uIG9mICI8ZGl2PjxoMSBjb250ZW50ZWRp dGFibGU9ImZhbHNlIj48c3BhbiBjb250ZW50ZWRpdGFibGU+aGVsbG88L3NwYW4+PC9oMT48L2Rp dj4iCitQQVNTIHF1ZXJ5Q29tbWFuZCgnZm9ybWF0QmxvY2snKSByZXR1cm5lZCAiIiBzZWxlY3Rp bmcgZmlyc3QgcG9zaXRpb24gb2YgIjxkaXY+PGhlYWRlciBjb250ZW50ZWRpdGFibGU9ImZhbHNl Ij48aDEgY29udGVudGVkaXRhYmxlPmhlbGxvPC9oMT48L2hlYWRlcj48L2Rpdj4iCiBQQVNTIHF1 ZXJ5Q29tbWFuZCgnZm9ybWF0QmxvY2snKSByZXR1cm5lZCAiIiBzZWxlY3RpbmcgZmlyc3QgcG9z aXRpb24gb2YgIjxhPmhlbGxvPC9hPiIKIFBBU1MgcXVlcnlDb21tYW5kKCdmb3JtYXRCbG9jaycp IHJldHVybmVkICIiIHNlbGVjdGluZyBmaXJzdCBwb3NpdGlvbiBvZiAiPGFiYnI+aGVsbG88L2Fi YnI+IgogUEFTUyBxdWVyeUNvbW1hbmQoJ2Zvcm1hdEJsb2NrJykgcmV0dXJuZWQgIiIgc2VsZWN0 aW5nIGZpcnN0IHBvc2l0aW9uIG9mICI8YWNyb255bT5oZWxsbzwvYWNyb255bT4iCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3NjcmlwdC10ZXN0cy9xdWVyeS1m b3JtYXQtYmxvY2suanMgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3NjcmlwdC10 ZXN0cy9xdWVyeS1mb3JtYXQtYmxvY2suanMKaW5kZXggZTkxMjNhMTUxMzAwNGQ1NjRmZTQ4OGU5 N2Y2YWFmMTBiZmJkZWEzZi4uNWFkYWI2NjRhMTdhNjJjNjcyMmE4ZDQxNTY1NWNlZTI2NzU3NzRl YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9zY3JpcHQtdGVz dHMvcXVlcnktZm9ybWF0LWJsb2NrLmpzCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZXhlY0Nv bW1hbmQvc2NyaXB0LXRlc3RzL3F1ZXJ5LWZvcm1hdC1ibG9jay5qcwpAQCAtMzcsNiArMzcsMTAg QEAgZnVuY3Rpb24gc2VsZWN0TWlkZGxlT2ZIZWxsb1dvcmxkKGNvbnRhaW5lcikgewogZGVidWco J0Jhc2ljIGNhc2VzJyk7CiBxdWVyeUZvcm1hdEJsb2NrKGZ1bmN0aW9uICgpIHtyZXR1cm4gJ25v bmUnIH0sICdoZWxsbycsICcnKTsKIHF1ZXJ5Rm9ybWF0QmxvY2soc2VsZWN0Rmlyc3RQb3NpdGlv biwgJ2hlbGxvJywgJycpOworcXVlcnlGb3JtYXRCbG9jayhzZWxlY3RGaXJzdFBvc2l0aW9uLCAn PGRpdiBjb250ZW50ZWRpdGFibGU9ImZhbHNlIj48aDEgY29udGVudGVkaXRhYmxlPmhlbGxvPC9o MT48L2Rpdj4nLCAnJyk7CitxdWVyeUZvcm1hdEJsb2NrKHNlbGVjdEZpcnN0UG9zaXRpb24sICc8 aDEgY29udGVudGVkaXRhYmxlPSJmYWxzZSI+PHNwYW4gY29udGVudGVkaXRhYmxlPmhlbGxvPC9z cGFuPjwvaDE+JywgJycpOworcXVlcnlGb3JtYXRCbG9jayhzZWxlY3RGaXJzdFBvc2l0aW9uLCAn PGRpdj48aDEgY29udGVudGVkaXRhYmxlPSJmYWxzZSI+PHNwYW4gY29udGVudGVkaXRhYmxlPmhl bGxvPC9zcGFuPjwvaDE+PC9kaXY+JywgJycpOworcXVlcnlGb3JtYXRCbG9jayhzZWxlY3RGaXJz dFBvc2l0aW9uLCAnPGRpdj48aGVhZGVyIGNvbnRlbnRlZGl0YWJsZT0iZmFsc2UiPjxoMSBjb250 ZW50ZWRpdGFibGU+aGVsbG88L2gxPjwvaGVhZGVyPjwvZGl2PicsICcnKTsKIHF1ZXJ5Rm9ybWF0 QmxvY2soc2VsZWN0Rmlyc3RQb3NpdGlvbiwgJzxhPmhlbGxvPC9hPicsICcnKTsKIHF1ZXJ5Rm9y bWF0QmxvY2soc2VsZWN0Rmlyc3RQb3NpdGlvbiwgJzxhYmJyPmhlbGxvPC9hYmJyPicsICcnKTsK IHF1ZXJ5Rm9ybWF0QmxvY2soc2VsZWN0Rmlyc3RQb3NpdGlvbiwgJzxhY3JvbnltPmhlbGxvPC9h Y3JvbnltPicsICcnKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggZTE2YzJjNTY5NzQ0MDNlNmM4Yjc4ZTc0NTk1YjY1YjhmZTA5ZDFhYi4u ZTc4MzNlMWZkOThmNTY1NzEyZDAyMGNhN2M2ZDZiNjg3YTZiYTE0MSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxMC0xMi0xNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBxdWVyeUNvbW1hbmRWYWx1ZSgi Rm9ybWF0QmxvY2siKSBkb2VzIG5vdCByZXNwZWN0IGVkaXRpbmcgYm91bmRhcmllcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEyMTkKKworICAgICAg ICBGaXhlZCB0aGUgYnVnIGJ5IGNoZWNraW5nIHRoZSBlbGVtZW50IHdlIGZvdW5kIGluIGVsZW1l bnRGb3JGb3JtYXRCbG9ja0NvbW1hbmQKKyAgICAgICAgZG9lcyBub3QgY29udGFpbiB0aGUgZWRp dGFibGUgcm9vdC4KKworICAgICAgICAqIGVkaXRpbmcvRm9ybWF0QmxvY2tDb21tYW5kLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkZvcm1hdEJsb2NrQ29tbWFuZDo6ZWxlbWVudEZvckZvcm1hdEJs b2NrQ29tbWFuZCk6CisKIDIwMTAtMTItMTUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBp Z2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEd1c3Rhdm8gTm9yb25oYSBTaWx2YS4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwIGIvV2Vi Q29yZS9lZGl0aW5nL0Zvcm1hdEJsb2NrQ29tbWFuZC5jcHAKaW5kZXggYzQwZWFhMGMwMTkwYzgy MmYwMWZiODAwZDM3YmFlZjViMGI2NmQ3NS4uZTQzZjMzMDgxOWY1MjRkOTY1NTRiZmM1NDMxMzVk ODU5NmI4YjkwOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9lZGl0aW5nL0Zvcm1hdEJsb2NrQ29tbWFu ZC5jcHAKKysrIGIvV2ViQ29yZS9lZGl0aW5nL0Zvcm1hdEJsb2NrQ29tbWFuZC5jcHAKQEAgLTEw NSw2ICsxMDUsMTAgQEAgRWxlbWVudCogRm9ybWF0QmxvY2tDb21tYW5kOjplbGVtZW50Rm9yRm9y bWF0QmxvY2tDb21tYW5kKFJhbmdlKiByYW5nZSkKICAgICBpZiAoIWNvbW1vbkFuY2VzdG9yKQog ICAgICAgICByZXR1cm4gMDsKIAorICAgIEVsZW1lbnQqIHJvb3RFZGl0YWJsZUVsZW1lbnQgPSBy YW5nZS0+c3RhcnRDb250YWluZXIoKS0+cm9vdEVkaXRhYmxlRWxlbWVudCgpOworICAgIGlmICgh cm9vdEVkaXRhYmxlRWxlbWVudCB8fCBjb21tb25BbmNlc3Rvci0+Y29udGFpbnMocm9vdEVkaXRh YmxlRWxlbWVudCkpCisgICAgICAgIHJldHVybiAwOworCiAgICAgQVNTRVJUKGNvbW1vbkFuY2Vz dG9yLT5pc0VsZW1lbnROb2RlKCkpOwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxFbGVtZW50Kj4o Y29tbW9uQW5jZXN0b3IpOwogfQo=