Changeset 32353 in webkit

Timestamp:

Apr 21, 2008 3:48:41 PM (16 years ago)

Author:

justin.garcia@apple.com

Message:

WebCore:

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

Reviewed by John Sullivan.

<rdar://problem/5803706> Pressing return at the end of a header doesn't break out of header (17460)

If we're doing InsertParagraphSeparator at the end of a header element, do not clone it.
Renamed m_useDefaultParagraphElement to m_mustUseDefaultParagraphElement, since now,
when it is false, that does not necessarily mean that a default paragraph element
will not be used. Callers that passed false for this argument are OK with this.

• editing/InsertParagraphSeparatorCommand.cpp: (WebCore::InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand): (WebCore::InsertParagraphSeparatorCommand::shouldUseDefaultParagraphElement): (WebCore::InsertParagraphSeparatorCommand::doApply):
• editing/InsertParagraphSeparatorCommand.h:

LayoutTests:

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

Reviewed by John Sullivan.

<rdar://problem/5803706> Pressing return at the end of a header doesn't break out of header (17460)

• editing/inserting/5803706-1-expected.txt: Added.
• editing/inserting/5803706-1.html: Added.
• editing/inserting/5803706-2-expected.txt: Added.
• editing/inserting/5803706-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/5803706-1-expected.txt (added)
• LayoutTests/editing/inserting/5803706-1.html (added)
• LayoutTests/editing/inserting/5803706-2-expected.txt (added)
• LayoutTests/editing/inserting/5803706-2.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/InsertParagraphSeparatorCommand.cpp (modified) (3 diffs)
• WebCore/editing/InsertParagraphSeparatorCommand.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-21  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/5803706> Pressing return at the end of a header doesn't break out of header (17460)
+
+        * editing/inserting/5803706-1-expected.txt: Added.
+        * editing/inserting/5803706-1.html: Added.
+        * editing/inserting/5803706-2-expected.txt: Added.
+        * editing/inserting/5803706-2.html: Added.
+
 2008-04-21  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-21  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by John Sullivan.
+
+        <rdar://problem/5803706> Pressing return at the end of a header doesn't break out of header (17460)
+        
+        If we're doing InsertParagraphSeparator at the end of a header element, do not clone it.
+        Renamed m_useDefaultParagraphElement to m_mustUseDefaultParagraphElement, since now,
+        when it is false, that does not necessarily mean that a default paragraph element
+        will not be used.  Callers that passed false for this argument are OK with this.
+
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand): 
+        (WebCore::InsertParagraphSeparatorCommand::shouldUseDefaultParagraphElement):
+        (WebCore::InsertParagraphSeparatorCommand::doApply):
+        * editing/InsertParagraphSeparatorCommand.h:
+
 2008-04-21  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@ -43 +43 @@
 using namespace HTMLNames;
 
-InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand(Document *document, bool useDefaultParagraphElement) 
+InsertParagraphSeparatorCommand::InsertParagraphSeparatorCommand(Document *document, bool mustUseDefaultParagraphElement) 
     : CompositeEditCommand(document)
-    , m_useDefaultParagraphElement(useDefaultParagraphElement)
+    , m_mustUseDefaultParagraphElement(mustUseDefaultParagraphElement)
 {
 }
@@ -77 +77 @@
     if (m_style->length() > 0)
         applyStyle(m_style.get());
+}
+
+bool InsertParagraphSeparatorCommand::shouldUseDefaultParagraphElement(Node* enclosingBlock) const
+{
+    if (m_mustUseDefaultParagraphElement)
+        return true;
+    
+    // Assumes that if there was a range selection, it was already deleted.
+    if (!isEndOfBlock(endingSelection().visibleStart()))
+        return false;
+
+    return enclosingBlock->hasTagName(h1Tag) ||
+           enclosingBlock->hasTagName(h2Tag) ||
+           enclosingBlock->hasTagName(h3Tag) ||
+           enclosingBlock->hasTagName(h4Tag) ||
+           enclosingBlock->hasTagName(h5Tag);
 }
 
@@ -140 +156 @@
         blockToInsert = static_pointer_cast<Node>(createDefaultParagraphElement(document()));
         nestNewBlock = true;
-    } else if (m_useDefaultParagraphElement)
+    } else if (shouldUseDefaultParagraphElement(startBlock)) 
         blockToInsert = static_pointer_cast<Node>(createDefaultParagraphElement(document()));
     else

trunk/WebCore/editing/InsertParagraphSeparatorCommand.h

@@ -40 +40 @@
     void calculateStyleBeforeInsertion(const Position&);
     void applyStyleAfterInsertion();
+    
+    bool shouldUseDefaultParagraphElement(Node*) const;
 
     virtual bool preservesTypingStyle() const;
@@ -45 +47 @@
     RefPtr<CSSMutableStyleDeclaration> m_style;
     
-    bool m_useDefaultParagraphElement;
+    bool m_mustUseDefaultParagraphElement;
 };