corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 1018486 - Part 2: Changes in editor/, r=masayuki

Browse Source 
MozReview-Commit-ID: JA7UCVXEd8j
This commit is contained in:
Michael Layzell
2016-07-18 12:36:19 -04:00
parent f2f13378b5
commit b73afbd34b
10 changed files with 368 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/libeditor/HTMLAbsPositionEditor.cpp
View File

@@ -70,12 +70,12 @@ HTMLEditor::AbsolutePositionSelection(bool aEnabled)
EditAction::removeAbsolutePosition);
bool cancel, handled;
// Protect the edit rules object from dying
nsCOMPtr<nsIEditRules> kungFuDeathGrip(mRules);
nsresult res = mRules->WillDoAction(selection, &ruleInfo, &cancel, &handled);
nsCOMPtr<nsIEditRules> rules(mRules);
nsresult res = rules->WillDoAction(selection, &ruleInfo, &cancel, &handled);
if (NS_FAILED(res) || cancel)
return res;
return mRules->DidDoAction(selection, &ruleInfo, res);
return rules->DidDoAction(selection, &ruleInfo, res);
}
NS_IMETHODIMP
@@ -176,12 +176,12 @@ HTMLEditor::RelativeChangeZIndex(int32_t aChange)
EditAction::increaseZIndex);
bool cancel, handled;
// Protect the edit rules object from dying
nsCOMPtr<nsIEditRules> kungFuDeathGrip(mRules);
nsresult res = mRules->WillDoAction(selection, &ruleInfo, &cancel, &handled);
nsCOMPtr<nsIEditRules> rules(mRules);
nsresult res = rules->WillDoAction(selection, &ruleInfo, &cancel, &handled);
if (cancel || NS_FAILED(res))
return res;
return mRules->DidDoAction(selection, &ruleInfo, res);
return rules->DidDoAction(selection, &ruleInfo, res);
}
NS_IMETHODIMP