Attachment 623486 Details for Bug 590640

[patch] Patch part 2, v1 -- Remove dead code

patch (text/plain), 6.57 KB, created by Aryeh Gregor (:ayg) (no longer with Mozilla)

(hide)

Description:

Filename:

MIME Type:

Creator: Aryeh Gregor (:ayg) (no longer with Mozilla)

Size: 6.57 KB

patch

obsolete

># HG changeset patch
># User Aryeh Gregor <ayg@aryeh.name>
># Date 1336556721 -10800
># Node ID ad70961f2338cf742f6daeda235d82af21c5c384
># Parent  6f32e54e32ae5df42a1ba9247d6ba45f6b66c9c0
>Bug 590640 part 2 - Remove dead code
>
>diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
>--- a/editor/libeditor/html/nsHTMLEditRules.cpp
>+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
>@@ -1266,24 +1266,16 @@ nsHTMLEditRules::WillInsert(nsISelection
>   // we need to get the doc
>   nsCOMPtr<nsIDOMDocument> doc = mHTMLEditor->GetDOMDocument();
>   NS_ENSURE_TRUE(doc, NS_ERROR_NOT_INITIALIZED);
>     
>   // for every property that is set, insert a new inline style node
>   return CreateStyleForInsertText(aSelection, doc);
> }    
> 
>-#ifdef XXX_DEAD_CODE
>-nsresult
>-nsHTMLEditRules::DidInsert(nsISelection *aSelection, nsresult aResult)
>-{
>-  return nsTextEditRules::DidInsert(aSelection, aResult);
>-}
>-#endif
>-
> nsresult
> nsHTMLEditRules::WillInsertText(nsEditor::OperationID aAction,
>                                 nsISelection *aSelection, 
>                                 bool            *aCancel,
>                                 bool            *aHandled,
>                                 const nsAString *inString,
>                                 nsAString       *outString,
>                                 PRInt32          aMaxLength)
>@@ -5232,79 +5224,16 @@ nsHTMLEditRules::ExpandSelectionForDelet
>   {
>     // only expand to just before br
>     res = aSelection->Extend(firstBRParent, firstBROffset);
>   }
>   
>   return res;
> }
> 
>-#ifdef XXX_DEAD_CODE
>-///////////////////////////////////////////////////////////////////////////
>-// AtStartOfBlock: is node/offset at the start of the editable material in this block?
>-//                  
>-bool
>-nsHTMLEditRules::AtStartOfBlock(nsIDOMNode *aNode, PRInt32 aOffset, nsIDOMNode *aBlock)
>-{
>-  nsCOMPtr<nsIDOMCharacterData> nodeAsText = do_QueryInterface(aNode);
>-  if (nodeAsText && aOffset) return false;  // there are chars in front of us
>-  
>-  nsCOMPtr<nsIDOMNode> priorNode;
>-  nsresult  res = mHTMLEditor->GetPriorHTMLNode(aNode, aOffset, address_of(priorNode));
>-  NS_ENSURE_SUCCESS(res, true);
>-  NS_ENSURE_TRUE(priorNode, true);
>-  nsCOMPtr<nsIDOMNode> blockParent = mHTMLEditor->GetBlockNodeParent(priorNode);
>-  if (blockParent && (blockParent == aBlock)) return false;
>-  return true;
>-}
>-
>-
>-///////////////////////////////////////////////////////////////////////////
>-// AtEndOfBlock: is node/offset at the end of the editable material in this block?
>-//                  
>-bool
>-nsHTMLEditRules::AtEndOfBlock(nsIDOMNode *aNode, PRInt32 aOffset, nsIDOMNode *aBlock)
>-{
>-  nsCOMPtr<nsIDOMCharacterData> nodeAsText = do_QueryInterface(aNode);
>-  if (nodeAsText)   
>-  {
>-    PRUint32 strLength;
>-    nodeAsText->GetLength(&strLength);
>-    if ((PRInt32)strLength > aOffset) return false;  // there are chars in after us
>-  }
>-  nsCOMPtr<nsIDOMNode> nextNode;
>-  nsresult  res = mHTMLEditor->GetNextHTMLNode(aNode, aOffset, address_of(nextNode));
>-  NS_ENSURE_SUCCESS(res, true);
>-  NS_ENSURE_TRUE(nextNode, true);
>-  nsCOMPtr<nsIDOMNode> blockParent = mHTMLEditor->GetBlockNodeParent(nextNode);
>-  if (blockParent && (blockParent == aBlock)) return false;
>-  return true;
>-}
>-
>-
>-///////////////////////////////////////////////////////////////////////////
>-// CreateMozDiv: makes a div with type = _moz
>-//                       
>-nsresult
>-nsHTMLEditRules::CreateMozDiv(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outDiv)
>-{
>-  NS_ENSURE_TRUE(inParent && outDiv, NS_ERROR_NULL_POINTER);
>-  nsAutoString divType= "div";
>-  *outDiv = nsnull;
>-  nsresult res = mHTMLEditor->CreateNode(divType, inParent, inOffset, getter_AddRefs(*outDiv));
>-  NS_ENSURE_SUCCESS(res, res);
>-  // give it special moz attr
>-  nsCOMPtr<nsIDOMElement> mozDivElem = do_QueryInterface(*outDiv);
>-  res = mHTMLEditor->SetAttribute(mozDivElem, "type", "_moz");
>-  NS_ENSURE_SUCCESS(res, res);
>-  res = AddTrailerBR(*outDiv);
>-  return res;
>-}
>-#endif    
>-
> 
> ///////////////////////////////////////////////////////////////////////////
> // NormalizeSelection:  tweak non-collapsed selections to be more "natural".
> //    Idea here is to adjust selection endpoint so that they do not cross
> //    breaks or block boundaries unless something editable beyond that boundary
> //    is also selected.  This adjustment makes it much easier for the various
> //    block operations to determine what nodes to act on.
> //                       
>diff --git a/editor/libeditor/html/nsHTMLEditRules.h b/editor/libeditor/html/nsHTMLEditRules.h
>--- a/editor/libeditor/html/nsHTMLEditRules.h
>+++ b/editor/libeditor/html/nsHTMLEditRules.h
>@@ -135,19 +135,16 @@ protected:
>   enum BRLocation
>   {
>     kBeforeBlock,
>     kBlockEnd
>   };
> 
>   // nsHTMLEditRules implementation methods
>   nsresult WillInsert(nsISelection *aSelection, bool *aCancel);
>-#ifdef XXX_DEAD_CODE
>-  nsresult DidInsert(nsISelection *aSelection, nsresult aResult);
>-#endif
>   nsresult WillInsertText(  nsEditor::OperationID aAction,
>                             nsISelection *aSelection, 
>                             bool            *aCancel,
>                             bool            *aHandled,
>                             const nsAString *inString,
>                             nsAString       *outString,
>                             PRInt32          aMaxLength);
>   nsresult WillLoadHTML(nsISelection *aSelection, bool *aCancel);
>@@ -227,20 +224,16 @@ protected:
>                               nsIDOMNode *aBodyNode,
>                               nsISelection *aSelection,
>                               bool *aHandled);
>   nsresult CheckForInvisibleBR(nsIDOMNode *aBlock, nsHTMLEditRules::BRLocation aWhere, 
>                                nsCOMPtr<nsIDOMNode> *outBRNode, PRInt32 aOffset=0);
>   nsresult ExpandSelectionForDeletion(nsISelection *aSelection);
>   bool IsFirstNode(nsIDOMNode *aNode);
>   bool IsLastNode(nsIDOMNode *aNode);
>-#ifdef XXX_DEAD_CODE
>-  bool AtStartOfBlock(nsIDOMNode *aNode, PRInt32 aOffset, nsIDOMNode *aBlock);
>-  bool AtEndOfBlock(nsIDOMNode *aNode, PRInt32 aOffset, nsIDOMNode *aBlock);
>-#endif
>   nsresult NormalizeSelection(nsISelection *inSelection);
>   nsresult GetPromotedPoint(RulesEndpoint aWhere, nsIDOMNode *aNode,
>                             PRInt32 aOffset, nsEditor::OperationID actionID,
>                             nsCOMPtr<nsIDOMNode> *outNode, PRInt32 *outOffset);
>   nsresult GetPromotedRanges(nsISelection *inSelection, 
>                              nsCOMArray<nsIDOMRange> &outArrayOfRanges, 
>                              nsEditor::OperationID inOperationType);
>   nsresult PromoteRange(nsIDOMRange *inRange,

Flags:

ehsan.akhgari: review+

Actions: View | Diff | Review

Attachments on bug 590640: 471667 | 504055 | 623485 | 623486 | 623487 | 623488 | 623489 | 623609 | 623610 | 624737 | 624810