Changeset 83039 in webkit

Timestamp:

Apr 6, 2011 5:59:24 AM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-04-06 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

REGRESSION (r46914, r48764): When typing in Mail, line wrapping frequently occurs in the middle of words
​https://bugs.webkit.org/show_bug.cgi?id=57872

r46914 initially introduced a regression by replacing calls to styleAtPosition by editingStyleAtPosition
because editingStyleAtPosition did not avoid tab span to obtain the computed style unlike styleAtPosition.

r46914 also introduced a regression by cloning hierarchy under new block at the insertion position without
avoiding the tab span.

Fixed the both regressions by avoiding tab spans when computing the editing style and when cloning hierarchy.

Test: editing/inserting/insert-paragraph-separator-tab-span.html

• editing/EditingStyle.cpp: (WebCore::EditingStyle::init): Always avoid a tab span when computing the editing style.
• editing/InsertParagraphSeparatorCommand.cpp: (WebCore::InsertParagraphSeparatorCommand::doApply): Avoid cloning tab spans and inserting a paragraph separator into a paragraph separator.

2011-04-06 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

REGRESSION (r46914, r48764): When typing in Mail, line wrapping frequently occurs in the middle of words
​https://bugs.webkit.org/show_bug.cgi?id=57872

Added a test insert a paragraph separator and text around tab spans. WebKit should not apply the tab span's
style to the paragraph separator or the text.

• editing/inserting/insert-paragraph-separator-tab-span-expected.txt: Added.
• editing/inserting/insert-paragraph-separator-tab-span.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/insert-paragraph-separator-tab-span-expected.txt (added)
• LayoutTests/editing/inserting/insert-paragraph-separator-tab-span.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/EditingStyle.cpp (modified) (1 diff)
• Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION (r46914, r48764): When typing in Mail, line wrapping frequently occurs in the middle of words
+        https://bugs.webkit.org/show_bug.cgi?id=57872
+
+        Added a test insert a paragraph separator and text around tab spans. WebKit should not apply the tab span's
+        style to the paragraph separator or the text.
+
+        * editing/inserting/insert-paragraph-separator-tab-span-expected.txt: Added.
+        * editing/inserting/insert-paragraph-separator-tab-span.html: Added.
+
 2011-04-05  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION (r46914, r48764): When typing in Mail, line wrapping frequently occurs in the middle of words
+        https://bugs.webkit.org/show_bug.cgi?id=57872
+
+        r46914 initially introduced a regression by replacing calls to styleAtPosition by editingStyleAtPosition
+        because editingStyleAtPosition did not avoid tab span to obtain the computed style unlike styleAtPosition.
+
+        r46914 also introduced a regression by cloning hierarchy under new block at the insertion position without
+        avoiding the tab span.
+
+        Fixed the both regressions by avoiding tab spans when computing the editing style and when cloning hierarchy.
+
+        Test: editing/inserting/insert-paragraph-separator-tab-span.html
+
+        * editing/EditingStyle.cpp:
+        (WebCore::EditingStyle::init): Always avoid a tab span when computing the editing style.
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::doApply): Avoid cloning tab spans and inserting a paragraph
+        separator into a paragraph separator.
+
 2011-04-06  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/editing/EditingStyle.cpp

@@ -301 +301 @@
 void EditingStyle::init(Node* node, PropertiesToInclude propertiesToInclude)
 {
+    if (isTabSpanTextNode(node))
+        node = tabSpanNode(node)->parentNode();
+    else if (isTabSpanNode(node))
+        node = node->parentNode();
+
     RefPtr<CSSComputedStyleDeclaration> computedStyleAtPosition = computedStyle(node);
     m_mutableStyle = propertiesToInclude == AllProperties && computedStyleAtPosition ? computedStyleAtPosition->copy() : editingStyleFromComputedStyle(computedStyleAtPosition);

trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@ -240 +240 @@
         
         Vector<Element*> ancestors;
-        getAncestorsInsideBlock(insertionPosition.deprecatedNode(), startBlock, ancestors);      
+        getAncestorsInsideBlock(positionBeforeTabSpan(insertionPosition).deprecatedNode(), startBlock, ancestors);      
         RefPtr<Element> parent = cloneHierarchyUnderNewBlock(ancestors, blockToInsert);
         
@@ -255 +255 @@
     if (isFirstInBlock || !inSameBlock(visiblePos, visiblePos.previous())) {
         Node *refNode;
+        
+        insertionPosition = positionBeforeTabSpan(insertionPosition);
+
         if (isFirstInBlock && !nestNewBlock)
             refNode = startBlock;
@@ -271 +274 @@
 
         Vector<Element*> ancestors;
-        getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(insertionPosition).deprecatedNode(), startBlock, ancestors);
+        getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(positionBeforeTabSpan(insertionPosition)).deprecatedNode(), startBlock, ancestors);
         
         appendBlockPlaceholder(cloneHierarchyUnderNewBlock(ancestors, blockToInsert));
@@ -304 +307 @@
     // Build up list of ancestors in between the start node and the start block.
     Vector<Element*> ancestors;
-    getAncestorsInsideBlock(insertionPosition.deprecatedNode(), startBlock, ancestors);
+    getAncestorsInsideBlock(positionBeforeTabSpan(insertionPosition).deprecatedNode(), startBlock, ancestors);
 
     // Make sure we do not cause a rendered space to become unrendered.