Attachment 623610 Details for Bug 590640

[patch] Patch part 7, v1 -- Preserve type-in state when performing block commands

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

(hide)

Description:

Filename:

MIME Type:

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

Size: 5.67 KB

patch

obsolete

># HG changeset patch
># User Aryeh Gregor <ayg@aryeh.name>
># Date 1336290791 -10800
># Node ID 3a44973ec37d73311b8338460843baee235718dd
># Parent  43dbb3e187af4ee1bcbfcd0339a16e287d5eb35b
>Bug 590640 part 7 - Preserve type-in state when performing block commands
>
>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
>@@ -104,16 +104,28 @@ static bool IsBlockNode(nsIDOMNode* node
>   nsHTMLEditor::NodeIsBlockStatic(node, &isBlock);
>   return isBlock;
> }
> 
> static bool IsInlineNode(nsIDOMNode* node)
> {
>   return !IsBlockNode(node);
> }
>+
>+static bool
>+IsStyleCachePreservingAction(nsEditor::OperationID action)
>+{
>+  return action == nsEditor::kOpInsertBreak ||
>+         action == nsEditor::kOpMakeList ||
>+         action == nsEditor::kOpIndent ||
>+         action == nsEditor::kOpOutdent ||
>+         action == nsEditor::kOpAlign ||
>+         action == nsEditor::kOpMakeBasicBlock ||
>+         action == nsEditor::kOpRemoveList;
>+}
>  
> class nsTableCellAndListItemFunctor : public nsBoolDomIterFunctor
> {
>   public:
>     virtual bool operator()(nsIDOMNode* aNode)  // used to build list of all li's, td's & th's iterator covers
>     {
>       if (nsHTMLEditUtils::IsTableCell(aNode)) return true;
>       if (nsHTMLEditUtils::IsListItem(aNode)) return true;
>@@ -330,21 +342,20 @@ nsHTMLEditRules::BeforeEdit(nsEditor::Op
>     }
>     if(mUtilRange)
>     {
>       // ditto for mUtilRange.
>       mUtilRange->Reset(); 
>     }
> 
>     // remember current inline styles for deletion and normal insertion operations
>-    if ((action == nsEditor::kOpInsertText)      || 
>-        (action == nsEditor::kOpInsertIMEText)   ||
>-        (action == nsEditor::kOpDeleteSelection) ||
>-        (action == nsEditor::kOpInsertBreak))
>-    {
>+    if (action == nsEditor::kOpInsertText ||
>+        action == nsEditor::kOpInsertIMEText ||
>+        action == nsEditor::kOpDeleteSelection ||
>+        IsStyleCachePreservingAction(action)) {
>       nsCOMPtr<nsIDOMNode> selNode = selStartNode;
>       if (aDirection == nsIEditor::eNext)
>         selNode = selEndNode;
>       res = CacheInlineStyles(selNode);
>       NS_ENSURE_SUCCESS(res, res);
>     }
> 
>     // Stabilize the document against contenteditable count changes
>@@ -497,21 +508,20 @@ nsHTMLEditRules::AfterEditInner(nsEditor
>         (action == nsHTMLEditor::kOpHTMLPaste ||
>         (action == nsHTMLEditor::kOpLoadHTML)))
>     {
>       res = AdjustSelection(selection, aDirection);
>       NS_ENSURE_SUCCESS(res, res);
>     }
> 
>     // check for any styles which were removed inappropriately
>-    if ((action == nsEditor::kOpInsertText)      || 
>-        (action == nsEditor::kOpInsertIMEText)   ||
>-        (action == nsEditor::kOpDeleteSelection) ||
>-        (action == nsEditor::kOpInsertBreak))
>-    {
>+    if (action == nsEditor::kOpInsertText ||
>+        action == nsEditor::kOpInsertIMEText ||
>+        action == nsEditor::kOpDeleteSelection ||
>+        IsStyleCachePreservingAction(action)) {
>       mHTMLEditor->mTypeInState->UpdateSelState(selection);
>       res = ReapplyCachedStyles();
>       NS_ENSURE_SUCCESS(res, res);
>       res = ClearCachedStyles();
>       NS_ENSURE_SUCCESS(res, res);
>     }    
>   }
> 
>@@ -1263,24 +1273,26 @@ nsHTMLEditRules::WillInsert(nsISelection
>       NS_ENSURE_SUCCESS(res, res);
>     }
>   }
> 
>   // if we deleted selection then also for cached styles
>   if (mDidDeleteSelection &&
>       (mTheAction == nsEditor::kOpInsertText ||
>        mTheAction == nsEditor::kOpInsertIMEText ||
>-       mTheAction == nsEditor::kOpInsertBreak ||
>        mTheAction == nsEditor::kOpDeleteSelection)) {
>     res = ReapplyCachedStyles();
>     NS_ENSURE_SUCCESS(res, res);
>   }
>-  // either way we clear the cached styles array
>-  res = ClearCachedStyles();
>-  NS_ENSURE_SUCCESS(res, res);
>+  // For most actions we want to clear the cached styles, but there are
>+  // exceptions
>+  if (!IsStyleCachePreservingAction(mTheAction)) {
>+    res = ClearCachedStyles();
>+    NS_ENSURE_SUCCESS(res, res);
>+  }
> 
>   return NS_OK;
> }    
> 
> nsresult
> nsHTMLEditRules::WillInsertText(nsEditor::OperationID aAction,
>                                 nsISelection *aSelection, 
>                                 bool            *aCancel,
>@@ -7314,20 +7326,16 @@ nsHTMLEditRules::CacheInlineStyles(nsIDO
> 
> nsresult 
> nsHTMLEditRules::ReapplyCachedStyles()
> {
>   // The idea here is to examine our cached list of styles
>   // and see if any have been removed.  If so, add typeinstate
>   // for them, so that they will be reinserted when new 
>   // content is added.
>-  
>-  // When we apply cached styles to TypeInState, we always want
>-  // to blow away prior TypeInState:
>-  mHTMLEditor->mTypeInState->Reset();
> 
>   // remember if we are in css mode
>   bool useCSS = mHTMLEditor->IsCSSEnabled();
> 
>   // get selection point
>   nsCOMPtr<nsISelection>selection;
>   nsresult res = mHTMLEditor->GetSelection(getter_AddRefs(selection));
>   NS_ENSURE_SUCCESS(res, res);
>@@ -7351,18 +7359,17 @@ nsHTMLEditRules::ReapplyCachedStyles()
>       }
>       if (!bAny) // then check typeinstate and html style
>       {
>         res = mHTMLEditor->GetInlinePropertyBase(mCachedStyles[j].tag, &(mCachedStyles[j].attr), &(mCachedStyles[j].value), 
>                                                         &bFirst, &bAny, &bAll, &curValue, false);
>         NS_ENSURE_SUCCESS(res, res);
>       }
>       // this style has disappeared through deletion.  Add it onto our typeinstate:
>-      if (!bAny) 
>-      {
>+      if (!bAny || IsStyleCachePreservingAction(mTheAction)) {
>         mHTMLEditor->mTypeInState->SetProp(mCachedStyles[j].tag, mCachedStyles[j].attr, mCachedStyles[j].value);
>       }
>     }
>   }
>   return NS_OK;
> }
> 
>

Actions: View | Diff | Review

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