Changeset 219914 in webkit


Ignore:
Timestamp:
Jul 26, 2017 2:48:37 AM (7 years ago)
Author:
jfernandez@igalia.com
Message:

InsertOrderedList command applied to table cells inserts an extra BR before the table
​https://bugs.webkit.org/show_bug.cgi?id=174593

Reviewed by Darin Adler.

Source/WebCore:

Don't add BR when pruning empty blocks if it's the start of a paragraph.

The function MoveParagraph is used for several operations and editing
commands, like 'insertOrderedList'. When moving paragraphs we check out
whether we should add a 'br' element to avoid undesired block collapse.

However, we shouldn't do this when destination is the start of a
paragraph.

Tests: editing/inserting/insert-list-in-table-cell-01.html

editing/inserting/insert-list-in-table-cell-02.html
editing/inserting/insert-list-in-table-cell-03.html
editing/inserting/insert-list-in-table-cell-04.html
editing/inserting/insert-list-in-table-cell-05.html
editing/inserting/insert-list-in-table-cell-06.html
editing/inserting/insert-list-in-table-cell-07.html
editing/inserting/insert-list-in-table-cell-08.html

  • editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::moveParagraphs):

LayoutTests:

Tests to verify that the insertOrderedList command works as expected when applied
in table cells.

  • editing/inserting/insert-list-in-table-cell-01.html: Added.
  • editing/inserting/insert-list-in-table-cell-01-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-02.html: Added.
  • editing/inserting/insert-list-in-table-cell-02-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-03.html: Added.
  • editing/inserting/insert-list-in-table-cell-03-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-04.html: Added.
  • editing/inserting/insert-list-in-table-cell-04-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-05.html: Added.
  • editing/inserting/insert-list-in-table-cell-05-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-06.html: Added.
  • editing/inserting/insert-list-in-table-cell-06-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-07.html: Added.
  • editing/inserting/insert-list-in-table-cell-07-expected.txt: Added.
  • editing/inserting/insert-list-in-table-cell-08.html: Added.
  • editing/inserting/insert-list-in-table-cell-08-expected.txt: Added.
Location:
trunk
Files:
16 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r219913 r219914  
     12017-07-26  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        InsertOrderedList command applied to table cells inserts an extra BR before the table
     4        https://bugs.webkit.org/show_bug.cgi?id=174593
     5
     6        Reviewed by Darin Adler.
     7
     8        Tests to verify that the insertOrderedList command works as expected when applied
     9        in table cells.
     10
     11        * editing/inserting/insert-list-in-table-cell-01.html: Added.
     12        * editing/inserting/insert-list-in-table-cell-01-expected.txt: Added.
     13        * editing/inserting/insert-list-in-table-cell-02.html: Added.
     14        * editing/inserting/insert-list-in-table-cell-02-expected.txt: Added.
     15        * editing/inserting/insert-list-in-table-cell-03.html: Added.
     16        * editing/inserting/insert-list-in-table-cell-03-expected.txt: Added.
     17        * editing/inserting/insert-list-in-table-cell-04.html: Added.
     18        * editing/inserting/insert-list-in-table-cell-04-expected.txt: Added.
     19        * editing/inserting/insert-list-in-table-cell-05.html: Added.
     20        * editing/inserting/insert-list-in-table-cell-05-expected.txt: Added.
     21        * editing/inserting/insert-list-in-table-cell-06.html: Added.
     22        * editing/inserting/insert-list-in-table-cell-06-expected.txt: Added.
     23        * editing/inserting/insert-list-in-table-cell-07.html: Added.
     24        * editing/inserting/insert-list-in-table-cell-07-expected.txt: Added.
     25        * editing/inserting/insert-list-in-table-cell-08.html: Added.
     26        * editing/inserting/insert-list-in-table-cell-08-expected.txt: Added.
     27
    1282017-07-26  Ms2ger  <Ms2ger@igalia.com>
    229

  • trunk/Source/WebCore/ChangeLog

    r219910 r219914  
     12017-07-26  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        InsertOrderedList command applied to table cells inserts an extra BR before the table
     4        https://bugs.webkit.org/show_bug.cgi?id=174593
     5
     6        Reviewed by Darin Adler.
     7
     8        Don't add BR when pruning empty blocks if it's the start of a paragraph.
     9
     10        The function MoveParagraph is used for several operations and editing
     11        commands, like 'insertOrderedList'. When moving paragraphs we check out
     12        whether we should add a 'br' element to avoid undesired block collapse.
     13
     14        However, we shouldn't do this when destination is the start of a
     15        paragraph.
     16
     17        Tests: editing/inserting/insert-list-in-table-cell-01.html
     18               editing/inserting/insert-list-in-table-cell-02.html
     19               editing/inserting/insert-list-in-table-cell-03.html
     20               editing/inserting/insert-list-in-table-cell-04.html
     21               editing/inserting/insert-list-in-table-cell-05.html
     22               editing/inserting/insert-list-in-table-cell-06.html
     23               editing/inserting/insert-list-in-table-cell-07.html
     24               editing/inserting/insert-list-in-table-cell-08.html
     25
     26        * editing/CompositeEditCommand.cpp:
     27        (WebCore::CompositeEditCommand::moveParagraphs):
     28
    1292017-07-26  Zan Dobersek  <zdobersek@igalia.com>
    230

  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r219597 r219914  
    14781478    beforeParagraph = VisiblePosition(beforeParagraph.deepEquivalent());
    14791479    afterParagraph = VisiblePosition(afterParagraph.deepEquivalent());
    1480     if (beforeParagraph.isNotNull() && (!isEndOfParagraph(beforeParagraph) || beforeParagraph == afterParagraph)) {
     1480    if (beforeParagraph.isNotNull() && ((!isStartOfParagraph(beforeParagraph) && !isEndOfParagraph(beforeParagraph)) || beforeParagraph == afterParagraph)) {
    14811481        // FIXME: Trim text between beforeParagraph and afterParagraph if they aren't equal.
    14821482        insertNodeAt(HTMLBRElement::create(document()), beforeParagraph.deepEquivalent());
Note: See TracChangeset for help on using the changeset viewer.