Changeset 31932 in webkit

Timestamp:

Apr 15, 2008, 10:30:13 PM (17 years ago)

Author:

justin.garcia@apple.com

Message:

WebCore:

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

Reviewed by Oliver.

<rdar://problem/5665299> REGRESSION (r27369): Paste text into a contenteditable div creates a contenteditable div for each line (16661)

• editing/markup.cpp: (WebCore::createFragmentFromText): Don't use clones of the enclosing block to hold paragraphs if the enclosing block is the root editable element.

LayoutTests:

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

Reviewed by Oliver.

<rdar://problem/5665299> REGRESSION (r27369): Paste text into a contenteditable div creates a contenteditable div for each line (16661)

• editing/pasteboard/5665299-expected.txt: Added.
• editing/pasteboard/5665299.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/pasteboard/5665299-expected.txt (added)
• LayoutTests/editing/pasteboard/5665299.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/markup.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-15  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Oliver.
+
+        <rdar://problem/5665299> REGRESSION (r27369): Paste text into a contenteditable div creates a contenteditable div for each line (16661)
+
+        * editing/pasteboard/5665299-expected.txt: Added.
+        * editing/pasteboard/5665299.html: Added.
+
 2008-04-15  Anatoli Papirovski  <apapirovski@mac.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-15  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by Oliver.
+
+        <rdar://problem/5665299> REGRESSION (r27369): Paste text into a contenteditable div creates a contenteditable div for each line (16661)
+
+        * editing/markup.cpp:
+        (WebCore::createFragmentFromText): Don't use clones of the enclosing block to hold
+        paragraphs if the enclosing block is the root editable element.
+
 2008-04-15  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/editing/markup.cpp

@@ -1057 +1057 @@
     // Break string into paragraphs. Extra line breaks turn into empty paragraphs.
     Node* block = enclosingBlock(context->firstNode());
-    bool useClonesOfEnclosingBlock = block && !block->hasTagName(bodyTag) && !block->hasTagName(htmlTag);
+    bool useClonesOfEnclosingBlock = block && !block->hasTagName(bodyTag) && !block->hasTagName(htmlTag) && block != editableRootForPosition(context->startPosition());
     
     Vector<String> list;