Changeset 19903 in webkit


Ignore:
Timestamp:
Feb 27, 2007 5:08:25 PM (17 years ago)
Author:
justing
Message:

LayoutTests:

Reviewed by oliver


<rdar://problem/5027300>
REGRESSION: Images inserted with align left/right are lost

  • editing/inserting/12882-expected.checksum: Added.
  • editing/inserting/12882-expected.png: Added.
  • editing/inserting/12882-expected.txt: Added.
  • editing/inserting/12882.html: Added.

WebCore:

Reviewed by oliver

<rdar://problem/5027300>
REGRESSION: Images inserted with align left/right are lost

  • editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::shouldMerge): Don't attempt to merge to or from a position before or after a block because it will be a no-op and lead to infinite recursion. In this case it instead resulted in content loss because of bugs in start/endOfParagraph (5027702).
  • editing/visible_units.cpp: Added two FIXMEs for the problems with start/endOfParagraph.
Location:
trunk
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r19899 r19903  
     12007-02-27  Justin Garcia  <justin.garcia@apple.com>
     2
     3        Reviewed by oliver
     4       
     5        <rdar://problem/5027300>
     6        REGRESSION: Images inserted with align left/right are lost
     7
     8        * editing/inserting/12882-expected.checksum: Added.
     9        * editing/inserting/12882-expected.png: Added.
     10        * editing/inserting/12882-expected.txt: Added.
     11        * editing/inserting/12882.html: Added.
     12
    1132007-02-27  Mitz Pettel  <mitz@webkit.org>
    214

  • trunk/WebCore/ChangeLog

    r19902 r19903  
     12007-02-27  Justin Garcia  <justin.garcia@apple.com>
     2
     3        Reviewed by oliver
     4
     5        <rdar://problem/5027300>
     6        REGRESSION: Images inserted with align left/right are lost
     7
     8        * editing/ReplaceSelectionCommand.cpp:
     9        (WebCore::ReplaceSelectionCommand::shouldMerge):
     10        Don't attempt to merge to or from a position before
     11        or after a block because it will be a no-op and
     12        lead to infinite recursion.
     13        In this case it instead resulted in content loss because
     14        of bugs in start/endOfParagraph (5027702).
     15        * editing/visible_units.cpp: Added two FIXMEs for
     16        the problems with start/endOfParagraph.
     17
    1182007-02-27  Anders Carlsson  <acarlsson@apple.com>
    219

  • trunk/WebCore/editing/ReplaceSelectionCommand.cpp

    r19837 r19903  
    340340           enclosingListChild(fromNode) == enclosingListChild(toNode) &&
    341341           enclosingTableCell(fromNode) == enclosingTableCell(toNode) &&
    342            !(fromNode->renderer() && fromNode->renderer()->isTable()) &&
    343            !(toNode->renderer() && toNode->renderer()->isTable()) &&
    344            !fromNode->hasTagName(hrTag) && !toNode->hasTagName(hrTag);
     342           // Don't merge to or from a position before or after a block because it would
     343           // be a no-op and cause infinite recursion.
     344           !isBlock(fromNode) && !isBlock(toNode);
    345345}
    346346

  • trunk/WebCore/editing/visible_units.cpp

    r19027 r19903  
    579579}
    580580
     581// FIXME: Broken for positions before/after images that aren't inline (5027702)
    581582VisiblePosition startOfParagraph(const VisiblePosition &c)
    582583{
    … …  
    648649}
    649650
     651// FIXME: Broken for positions before/after images that aren't inline (5027702)
    650652VisiblePosition endOfParagraph(const VisiblePosition &c)
    651653{   
Note: See TracChangeset for help on using the changeset viewer.