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 352648 12a7e9d627b5ef91b8c1a9061012cd48ae1a6df0
parent 352647 7b4599e0220c20eb60f3431916b89cb874d65990
child 352649 55b599ca3530c8286f6ad15405d99d2bcaecfbd1
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki, gchang
bugs1314790
milestone52.0a2
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
@@ -4876,17 +4876,17 @@ HTMLEditRules::CheckForEmptyBlock(nsINod
         if (priorNode) {
           EditorDOMPoint pt = GetGoodSelPointForNode(*priorNode, aAction);
           nsresult rv = aSelection->Collapse(pt.node, pt.offset);
           NS_ENSURE_SUCCESS(rv, rv);
         } else {
           nsresult rv = aSelection->Collapse(blockParent, offset + 1);
           NS_ENSURE_SUCCESS(rv, rv);
         }
-      } else {
+      } else if (aAction != nsIEditor::eNone) {
         NS_RUNTIMEABORT("CheckForEmptyBlock doesn't support this action yet");
       }
     }
     NS_ENSURE_STATE(htmlEditor);
     *aHandled = true;
     nsresult rv = htmlEditor->DeleteNode(emptyBlock);
     NS_ENSURE_SUCCESS(rv, rv);
   }