Unreviewed, rolling out r95335 and r95645.
http://trac.webkit.org/changeset/95335
http://trac.webkit.org/changeset/95645
https://bugs.webkit.org/show_bug.cgi?id=68649
Wrong fix (Requested by rniwa on #webkit).
Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-09-22
Source/WebCore:
* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::saveTypingStyleState):
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::removeStyleAddedByNode):
* editing/EditingStyle.h:
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline):
* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::serializeNodes):
(WebCore::ancestorToRetainStructureAndAppearance):
* editing/markup.h:
LayoutTests:
* editing/deleting/merge-paragraph-from-address-expected.txt: Removed.
* editing/deleting/merge-paragraph-from-address.html: Removed.
* editing/deleting/merge-paragraph-from-h6-expected.txt: Removed.
* editing/deleting/merge-paragraph-from-h6-with-style-expected.txt: Removed.
* editing/deleting/merge-paragraph-from-h6-with-style.html: Removed.
* editing/deleting/merge-paragraph-from-h6.html: Removed.
* editing/deleting/merge-paragraph-from-listing-expected.txt: Removed.
* editing/deleting/merge-paragraph-from-listing.html: Removed.
* editing/deleting/merge-paragraph-from-p-with-style-expected.txt: Removed.
* editing/deleting/merge-paragraph-from-p-with-style.html: Removed.
* editing/deleting/merge-paragraph-into-h1-expected.txt: Removed.
* editing/deleting/merge-paragraph-into-h1-style-expected.txt: Removed.
* editing/deleting/merge-paragraph-into-h1-with-style-expected.txt: Removed.
* editing/deleting/merge-paragraph-into-h1-with-style.html: Removed.
* editing/deleting/merge-paragraph-into-h1.html: Removed.
* editing/deleting/merge-paragraph-into-pre-expected.txt: Removed.
* editing/deleting/merge-paragraph-into-pre.html: Removed.
* platform/mac/editing/deleting/merge-whitespace-pre-expected.png:
* platform/mac/editing/deleting/merge-whitespace-pre-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95745 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/editing/DeleteSelectionCommand.cpp b/Source/WebCore/editing/DeleteSelectionCommand.cpp
index ba33e3b..99cb5d1 100644
--- a/Source/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/Source/WebCore/editing/DeleteSelectionCommand.cpp
@@ -283,7 +283,7 @@
// Figure out the typing style in effect before the delete is done.
m_typingStyle = EditingStyle::create(m_selectionToDelete.start());
- m_typingStyle->removeStyleFromRules(enclosingAnchorElement(m_selectionToDelete.start()));
+ m_typingStyle->removeStyleAddedByNode(enclosingAnchorElement(m_selectionToDelete.start()));
// If we're deleting into a Mail blockquote, save the style at end() instead of start()
// We'll use this later in computeTypingStyleAfterDelete if we end up outside of a Mail blockquote
