mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
fix crashing bug 30120. check in for tajima@eng.sun.com since the crash is
verified and test on my machine. r=ftang, a=bobj. Will check into the beta branch also.
This commit is contained in:
parent
f7c27d1d9d
commit
6ea7fbcc1c
@ -88,6 +88,7 @@
|
||||
#include "JoinElementTxn.h"
|
||||
#include "nsStyleSheetTxns.h"
|
||||
#include "IMETextTxn.h"
|
||||
#include "nsIHTMLEditor.h"
|
||||
|
||||
// #define HACK_FORCE_REDRAW 1
|
||||
|
||||
@ -1699,6 +1700,11 @@ nsEditor::ForceCompositionEnd()
|
||||
return NS_OK;
|
||||
#endif
|
||||
|
||||
#ifdef XP_UNIX
|
||||
if(mFlags & nsIHTMLEditor::eEditorPasswordMask)
|
||||
return NS_OK;
|
||||
#endif
|
||||
|
||||
nsresult res = NS_OK;
|
||||
nsCOMPtr<nsIPresShell> shell;
|
||||
|
||||
|
@ -88,6 +88,7 @@
|
||||
#include "JoinElementTxn.h"
|
||||
#include "nsStyleSheetTxns.h"
|
||||
#include "IMETextTxn.h"
|
||||
#include "nsIHTMLEditor.h"
|
||||
|
||||
// #define HACK_FORCE_REDRAW 1
|
||||
|
||||
@ -1699,6 +1700,11 @@ nsEditor::ForceCompositionEnd()
|
||||
return NS_OK;
|
||||
#endif
|
||||
|
||||
#ifdef XP_UNIX
|
||||
if(mFlags & nsIHTMLEditor::eEditorPasswordMask)
|
||||
return NS_OK;
|
||||
#endif
|
||||
|
||||
nsresult res = NS_OK;
|
||||
nsCOMPtr<nsIPresShell> shell;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user