Changeset 32497 in webkit

Timestamp:

Apr 24, 2008, 10:41:11 AM (17 years ago)

Author:

justin.garcia@apple.com

Message:

WebCore:

2008-04-24 Justin Garcia <​justin.garcia@apple.com>

Reviewed by Darin Adler.

<rdar://problem/5604313> FormatBlock to apply an h1 also inserts a style span around the first letter (16004)

• editing/TextIterator.cpp: (WebCore::TextIterator::advance): We emit an extra newline when leaving a block element that has atypical margin/padding. When we emit the extra newline, it needs to be positioned after that block's contents, not after the block. This is how we position the first newline, too, since the range for emitted newlines should start where the line break begins visually.

LayoutTests:

2008-04-24 Justin Garcia <​justin.garcia@apple.com>

Reviewed by Darin Adler.

<rdar://problem/5604313> FormatBlock leaves first letter incorrectly styled (16004)

• editing/execCommand/5604313-expected.txt: Added.
• editing/execCommand/5604313.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/5604313-expected.txt (added)
• LayoutTests/editing/execCommand/5604313.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/TextIterator.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-24  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/5604313> FormatBlock leaves first letter incorrectly styled (16004)
+
+        * editing/execCommand/5604313-expected.txt: Added.
+        * editing/execCommand/5604313.html: Added.
+
 r2008-04-23  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-24  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/5604313> FormatBlock to apply an h1 also inserts a style span around the first letter (16004)
+        
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::advance): We emit an extra newline when leaving a
+        block element that has atypical margin/padding. When we emit the extra newline, 
+        it needs to be positioned after that block's contents, not after the block. 
+        This is how we position the first newline, too, since the range for emitted newlines 
+        should start where the line break begins visually.
+
 2008-04-24  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/editing/TextIterator.cpp

@@ -146 +146 @@
     // handle remembered node that needed a newline after the text node's newline
     if (m_needAnotherNewline) {
-        // emit the newline, with position a collapsed range at the end of current node.
-        emitCharacter('\n', m_node->parentNode(), m_node, 1, 1);
+        // Emit the extra newline, and position it *inside* m_node, after m_node's 
+        // contents, in case it's a block, in the same way that we position the first 
+        // newline.  The range for the emitted newline should start where the line 
+        // break begins.
+        // FIXME: It would be cleaner if we emitted two newlines during the last 
+        // iteration, instead of using m_needAnotherNewline.
+        Node* baseNode = m_node->lastChild() ? m_node->lastChild() : m_node;
+        emitCharacter('\n', baseNode->parentNode(), baseNode, 1, 1);
         m_needAnotherNewline = false;
         return;