Bug 1484612 - Remove EditSubActionInfo.bOrdered due to unused. r=masayuki
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 20 Aug 2018 12:23:56 +0000
changeset 432474 9576c19562ae2a1cd9a623dddea8e66428c477f9
parent 432473 3f0325c0b307be193b5549f6bd98881a2d70a371
child 432475 7c934a5a2c05b8dff1b60315dba9c29e1e3f8ad3
push id34477
push userdluca@mozilla.com
push dateTue, 21 Aug 2018 09:53:37 +0000
treeherdermozilla-central@6cc53c0f6efe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1484612
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1484612 - Remove EditSubActionInfo.bOrdered due to unused. r=masayuki RemoveList doesn't use aListType parameter, but c-c still call this method. So I keep aListType parameter even if unused. Differential Revision: https://phabricator.services.mozilla.com/D3762
editor/libeditor/HTMLEditor.cpp
editor/libeditor/TextEditRules.h
editor/nsIHTMLEditor.idl
--- a/editor/libeditor/HTMLEditor.cpp
+++ b/editor/libeditor/HTMLEditor.cpp
@@ -2215,17 +2215,17 @@ HTMLEditor::MakeOrChangeList(const nsASt
       return error.StealNSResult();
     }
   }
 
   return rules->DidDoAction(selection, subActionInfo, rv);
 }
 
 NS_IMETHODIMP
-HTMLEditor::RemoveList(const nsAString& aListType)
+HTMLEditor::RemoveList(const nsAString&)
 {
   if (!mRules) {
     return NS_ERROR_NOT_INITIALIZED;
   }
 
   // Protect the edit rules object from dying
   RefPtr<TextEditRules> rules(mRules);
 
@@ -2236,21 +2236,16 @@ HTMLEditor::RemoveList(const nsAString& 
                                       *this, EditSubAction::eRemoveList,
                                       nsIEditor::eNext);
 
   // pre-process
   RefPtr<Selection> selection = GetSelection();
   NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
 
   EditSubActionInfo subActionInfo(EditSubAction::eRemoveList);
-  if (aListType.LowerCaseEqualsLiteral("ol")) {
-    subActionInfo.bOrdered = true;
-  } else {
-    subActionInfo.bOrdered = false;
-  }
   nsresult rv =
     rules->WillDoAction(selection, subActionInfo, &cancel, &handled);
   if (cancel || NS_FAILED(rv)) {
     return rv;
   }
 
   // no default behavior for this yet.  what would it mean?
 
--- a/editor/libeditor/TextEditRules.h
+++ b/editor/libeditor/TextEditRules.h
@@ -519,17 +519,16 @@ public:
     : mEditSubAction(aEditSubAction)
     , inString(nullptr)
     , outString(nullptr)
     , outputFormat(nullptr)
     , maxLength(-1)
     , flags(0)
     , collapsedAction(nsIEditor::eNext)
     , stripWrappers(nsIEditor::eStrip)
-    , bOrdered(false)
     , entireList(false)
     , bulletType(nullptr)
     , alignType(nullptr)
     , blockType(nullptr)
   {}
 
   EditSubAction mEditSubAction;
 
@@ -541,19 +540,16 @@ public:
 
   // EditSubAction::eComputeTextToOutput
   uint32_t flags;
 
   // EditSubAction::eDeleteSelectedContent
   nsIEditor::EDirection collapsedAction;
   nsIEditor::EStripWrappers stripWrappers;
 
-  // EditSubAction::eRemoveList
-  bool bOrdered;
-
   // EditSubAction::eCreateOrChangeList
   bool entireList;
   const nsAString* bulletType;
 
   // EditSubAction::eSetOrClearAlignment
   const nsAString* alignType;
 
   // EditSubAction::eCreateOrRemoveBlock
--- a/editor/nsIHTMLEditor.idl
+++ b/editor/nsIHTMLEditor.idl
@@ -279,18 +279,20 @@ interface nsIHTMLEditor : nsISupports
   /**
    * Document me!
    *
    */
   void makeOrChangeList(in AString aListType, in boolean entireList,
                         in AString aBulletType);
 
   /**
-   * Document me!
+   * removeList removes list items (<li>, <dd>, and <dt>) and list structures
+   * (<ul>, <ol>, and <dl>).
    *
+   * @param aListType  Unused.
    */
   void removeList(in AString aListType);
 
   /**
    * Document me!
    *
    */
   void indent(in AString aIndent);