зеркало из https://github.com/mozilla/gecko-dev.git
Get rid of the redundant command state saving methods.
This commit is contained in:
Родитель
58ed70653c
Коммит
a8340dd50e
|
@ -376,30 +376,6 @@ nsInterfaceState::ForceUpdate(const PRUnichar *tagToUpdate)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsInterfaceState::SetCommandStateData(const nsString& commandName, void* stateData)
|
|
||||||
{
|
|
||||||
nsStringKey commandKey(commandName);
|
|
||||||
mCommandStateTable.Put(&commandKey, stateData);
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsInterfaceState::GetCommandStateData(const nsString& commandName, void* *outStateData)
|
|
||||||
{
|
|
||||||
nsStringKey commandKey(commandName);
|
|
||||||
|
|
||||||
// sucks that we have to do two hash lookups
|
|
||||||
if (!mCommandStateTable.Exists(&commandKey))
|
|
||||||
return NS_ERROR_UNEXPECTED;
|
|
||||||
|
|
||||||
*outStateData = mCommandStateTable.Get(&commandKey);
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
PRBool
|
PRBool
|
||||||
nsInterfaceState::SelectionIsCollapsed()
|
nsInterfaceState::SelectionIsCollapsed()
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,8 +32,6 @@
|
||||||
#include "nsITimer.h"
|
#include "nsITimer.h"
|
||||||
#include "nsITimerCallback.h"
|
#include "nsITimerCallback.h"
|
||||||
|
|
||||||
#include "nsHashtable.h"
|
|
||||||
|
|
||||||
class nsIHTMLEditor;
|
class nsIHTMLEditor;
|
||||||
class nsIDOMXULDocument;
|
class nsIDOMXULDocument;
|
||||||
|
|
||||||
|
@ -61,9 +59,6 @@ public:
|
||||||
// nsIDOMSelectionListener interface
|
// nsIDOMSelectionListener interface
|
||||||
NS_IMETHOD NotifySelectionChanged(nsIDOMDocument *aDoc, nsIDOMSelection *aSel, short aReason);
|
NS_IMETHOD NotifySelectionChanged(nsIDOMDocument *aDoc, nsIDOMSelection *aSel, short aReason);
|
||||||
|
|
||||||
NS_IMETHOD SetCommandStateData(const nsString& commandName, void* stateData);
|
|
||||||
NS_IMETHOD GetCommandStateData(const nsString& commandName, void* *outStateData);
|
|
||||||
|
|
||||||
NS_DECL_NSIDOCUMENTSTATELISTENER
|
NS_DECL_NSIDOCUMENTSTATELISTENER
|
||||||
|
|
||||||
// nsITimerCallback interfaces
|
// nsITimerCallback interfaces
|
||||||
|
@ -132,9 +127,7 @@ protected:
|
||||||
PRPackedBool mUpdateBold;
|
PRPackedBool mUpdateBold;
|
||||||
PRPackedBool mUpdateItalics;
|
PRPackedBool mUpdateItalics;
|
||||||
PRPackedBool mUpdateUnderline;
|
PRPackedBool mUpdateUnderline;
|
||||||
|
|
||||||
nsHashtable mCommandStateTable;
|
|
||||||
|
|
||||||
// current state
|
// current state
|
||||||
PRInt8 mBoldState;
|
PRInt8 mBoldState;
|
||||||
PRInt8 mItalicState;
|
PRInt8 mItalicState;
|
||||||
|
|
|
@ -376,30 +376,6 @@ nsInterfaceState::ForceUpdate(const PRUnichar *tagToUpdate)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsInterfaceState::SetCommandStateData(const nsString& commandName, void* stateData)
|
|
||||||
{
|
|
||||||
nsStringKey commandKey(commandName);
|
|
||||||
mCommandStateTable.Put(&commandKey, stateData);
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsInterfaceState::GetCommandStateData(const nsString& commandName, void* *outStateData)
|
|
||||||
{
|
|
||||||
nsStringKey commandKey(commandName);
|
|
||||||
|
|
||||||
// sucks that we have to do two hash lookups
|
|
||||||
if (!mCommandStateTable.Exists(&commandKey))
|
|
||||||
return NS_ERROR_UNEXPECTED;
|
|
||||||
|
|
||||||
*outStateData = mCommandStateTable.Get(&commandKey);
|
|
||||||
return NS_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
PRBool
|
PRBool
|
||||||
nsInterfaceState::SelectionIsCollapsed()
|
nsInterfaceState::SelectionIsCollapsed()
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,8 +32,6 @@
|
||||||
#include "nsITimer.h"
|
#include "nsITimer.h"
|
||||||
#include "nsITimerCallback.h"
|
#include "nsITimerCallback.h"
|
||||||
|
|
||||||
#include "nsHashtable.h"
|
|
||||||
|
|
||||||
class nsIHTMLEditor;
|
class nsIHTMLEditor;
|
||||||
class nsIDOMXULDocument;
|
class nsIDOMXULDocument;
|
||||||
|
|
||||||
|
@ -61,9 +59,6 @@ public:
|
||||||
// nsIDOMSelectionListener interface
|
// nsIDOMSelectionListener interface
|
||||||
NS_IMETHOD NotifySelectionChanged(nsIDOMDocument *aDoc, nsIDOMSelection *aSel, short aReason);
|
NS_IMETHOD NotifySelectionChanged(nsIDOMDocument *aDoc, nsIDOMSelection *aSel, short aReason);
|
||||||
|
|
||||||
NS_IMETHOD SetCommandStateData(const nsString& commandName, void* stateData);
|
|
||||||
NS_IMETHOD GetCommandStateData(const nsString& commandName, void* *outStateData);
|
|
||||||
|
|
||||||
NS_DECL_NSIDOCUMENTSTATELISTENER
|
NS_DECL_NSIDOCUMENTSTATELISTENER
|
||||||
|
|
||||||
// nsITimerCallback interfaces
|
// nsITimerCallback interfaces
|
||||||
|
@ -132,9 +127,7 @@ protected:
|
||||||
PRPackedBool mUpdateBold;
|
PRPackedBool mUpdateBold;
|
||||||
PRPackedBool mUpdateItalics;
|
PRPackedBool mUpdateItalics;
|
||||||
PRPackedBool mUpdateUnderline;
|
PRPackedBool mUpdateUnderline;
|
||||||
|
|
||||||
nsHashtable mCommandStateTable;
|
|
||||||
|
|
||||||
// current state
|
// current state
|
||||||
PRInt8 mBoldState;
|
PRInt8 mBoldState;
|
||||||
PRInt8 mItalicState;
|
PRInt8 mItalicState;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче