Changeset 83097 in webkit

Timestamp:

Apr 6, 2011 1:55:17 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-06 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r83039.
​http://trac.webkit.org/changeset/83039
​https://bugs.webkit.org/show_bug.cgi?id=57978

introduced a new regression in conjunction to
ReplaceSelectionCommand (Requested by rniwa on #webkit).

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

2011-04-06 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r83039.
​http://trac.webkit.org/changeset/83039
​https://bugs.webkit.org/show_bug.cgi?id=57978

introduced a new regression in conjunction to
ReplaceSelectionCommand (Requested by rniwa on #webkit).

• editing/EditingStyle.cpp: (WebCore::EditingStyle::init):
• editing/InsertParagraphSeparatorCommand.cpp: (WebCore::InsertParagraphSeparatorCommand::doApply):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/inserting/insert-paragraph-separator-tab-span-expected.txt (deleted)
• LayoutTests/editing/inserting/insert-paragraph-separator-tab-span.html (deleted)
• 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  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r83039.
+        http://trac.webkit.org/changeset/83039
+        https://bugs.webkit.org/show_bug.cgi?id=57978
+
+        introduced a new regression in conjunction to
+        ReplaceSelectionCommand (Requested by rniwa on #webkit).
+
+        * editing/inserting/insert-paragraph-separator-tab-span-expected.txt: Removed.
+        * editing/inserting/insert-paragraph-separator-tab-span.html: Removed.
+
 2011-04-06  Naoki Takano  <takano.naoki@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r83039.
+        http://trac.webkit.org/changeset/83039
+        https://bugs.webkit.org/show_bug.cgi?id=57978
+
+        introduced a new regression in conjunction to
+        ReplaceSelectionCommand (Requested by rniwa on #webkit).
+
+        * editing/EditingStyle.cpp:
+        (WebCore::EditingStyle::init):
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::doApply):
+
 2011-04-06  Naoki Takano  <takano.naoki@gmail.com>
 

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(positionBeforeTabSpan(insertionPosition).deprecatedNode(), startBlock, ancestors);      
+        getAncestorsInsideBlock(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;
@@ -274 +271 @@
 
         Vector<Element*> ancestors;
-        getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(positionBeforeTabSpan(insertionPosition)).deprecatedNode(), startBlock, ancestors);
+        getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(insertionPosition).deprecatedNode(), startBlock, ancestors);
         
         appendBlockPlaceholder(cloneHierarchyUnderNewBlock(ancestors, blockToInsert));
@@ -307 +304 @@
     // Build up list of ancestors in between the start node and the start block.
     Vector<Element*> ancestors;
-    getAncestorsInsideBlock(positionBeforeTabSpan(insertionPosition).deprecatedNode(), startBlock, ancestors);
+    getAncestorsInsideBlock(insertionPosition.deprecatedNode(), startBlock, ancestors);
 
     // Make sure we do not cause a rendered space to become unrendered.