From 2e4b8d1b8d54a72e8d9130472a557846fed69a69 Mon Sep 17 00:00:00 2001 From: Daniel Glazman Date: Wed, 23 Jan 2013 18:19:00 -0500 Subject: [PATCH] Bug 833610 - Backout the second half of bug 832025; r=ehsan --- editor/libeditor/html/nsHTMLEditRules.cpp | 4 -- editor/libeditor/html/tests/Makefile.in | 1 - .../html/tests/test_bug832025_2.html | 42 ------------------- 3 files changed, 47 deletions(-) delete mode 100644 editor/libeditor/html/tests/test_bug832025_2.html diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp index b832ebbd2925..a0eb5d078872 100644 --- a/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/editor/libeditor/html/nsHTMLEditRules.cpp @@ -6565,10 +6565,6 @@ nsHTMLEditRules::ReturnInListItem(nsISelection *aSelection, // otherwise kill this listitem res = mHTMLEditor->DeleteNode(aListItem); NS_ENSURE_SUCCESS(res, res); - - res = ClearCachedStyles(); - NS_ENSURE_SUCCESS(res, res); - mHTMLEditor->mTypeInState->ClearAllProps(); // time to insert a paragraph NS_NAMED_LITERAL_STRING(pType, "p"); diff --git a/editor/libeditor/html/tests/Makefile.in b/editor/libeditor/html/tests/Makefile.in index 7457dfa8eefe..27aec1d3c019 100644 --- a/editor/libeditor/html/tests/Makefile.in +++ b/editor/libeditor/html/tests/Makefile.in @@ -85,7 +85,6 @@ MOCHITEST_FILES = \ test_bug790475.html \ test_bug796839.html \ test_bug832025.html \ - test_bug832025_2.html \ test_spellcheck_pref.html \ $(NULL) diff --git a/editor/libeditor/html/tests/test_bug832025_2.html b/editor/libeditor/html/tests/test_bug832025_2.html deleted file mode 100644 index a6955501f79f..000000000000 --- a/editor/libeditor/html/tests/test_bug832025_2.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Test for Bug 832025 - - - - - -Mozilla Bug 832025 -
- - -