Bug 1314790 - Part 3. Ignore nsIEditor::eNone case. r=masayuki a=gchang
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Sun, 20 Nov 2016 10:35:17 +0900
changeset 358954 881b37dc7f945c1d1031284abe03b15049254565
parent 358953 ba5384798a4d821d60c188f1deffeecc86b19fd3
child 358955 ebddbe716951a92bc9104d85e56a68ed31258ed0
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki, gchang
bugs1314790
milestone51.0
Bug 1314790 - Part 3. Ignore nsIEditor::eNone case. r=masayuki a=gchang MozReview-Commit-ID: 6KHFQ84J7dU
editor/libeditor/HTMLEditRules.cpp
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -4856,17 +4856,17 @@ HTMLEditRules::CheckForEmptyBlock(nsINod
         if (priorNode) {
           EditorDOMPoint pt = GetGoodSelPointForNode(*priorNode, aAction);
           res = aSelection->Collapse(pt.node, pt.offset);
           NS_ENSURE_SUCCESS(res, res);
         } else {
           res = aSelection->Collapse(blockParent, offset + 1);
           NS_ENSURE_SUCCESS(res, res);
         }
-      } else {
+      } else if (aAction != nsIEditor::eNone) {
         NS_RUNTIMEABORT("CheckForEmptyBlock doesn't support this action yet");
       }
     }
     NS_ENSURE_STATE(htmlEditor);
     res = htmlEditor->DeleteNode(emptyBlock);
     *aHandled = true;
     NS_ENSURE_SUCCESS(res, res);
   }