mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-27 19:09:47 +00:00
Bug 348238, Remove some unused code from ESM, r+sr=roc
This commit is contained in:
parent
2cfe84ecc4
commit
77f151f65f
@ -384,10 +384,8 @@ nsEventStateManager::nsEventStateManager()
|
||||
mRClickCount(0),
|
||||
mNormalLMouseEventInProcess(PR_FALSE),
|
||||
m_haveShutdown(PR_FALSE),
|
||||
mClearedFrameRefsDuringEvent(PR_FALSE),
|
||||
mBrowseWithCaret(PR_FALSE),
|
||||
mTabbedThroughDocument(PR_FALSE),
|
||||
mDOMEventLevel(0),
|
||||
mAccessKeys(nsnull)
|
||||
{
|
||||
++sESMInstanceCount;
|
||||
@ -2545,9 +2543,6 @@ nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
|
||||
if (aFrame && aFrame == mCurrentTarget) {
|
||||
mCurrentTargetContent = aFrame->GetContent();
|
||||
}
|
||||
if (mDOMEventLevel > 0) {
|
||||
mClearedFrameRefsDuringEvent = PR_TRUE;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -2779,15 +2774,6 @@ nsEventStateManager::SetCursor(PRInt32 aCursor, imgIContainer* aContainer,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
nsEventStateManager::AfterDispatchEvent()
|
||||
{
|
||||
mDOMEventLevel--;
|
||||
if (mClearedFrameRefsDuringEvent && mDOMEventLevel == 0) {
|
||||
mClearedFrameRefsDuringEvent = PR_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
class nsESMEventCB : public nsDispatchingCallback
|
||||
{
|
||||
public:
|
||||
@ -2829,7 +2815,6 @@ nsEventStateManager::DispatchMouseEvent(nsGUIEvent* aEvent, PRUint32 aMessage,
|
||||
|
||||
mCurrentTargetContent = aTargetContent;
|
||||
|
||||
BeforeDispatchEvent();
|
||||
nsIFrame* targetFrame = nsnull;
|
||||
if (aTargetContent) {
|
||||
nsESMEventCB callback(aTargetContent);
|
||||
@ -2845,8 +2830,6 @@ nsEventStateManager::DispatchMouseEvent(nsGUIEvent* aEvent, PRUint32 aMessage,
|
||||
}
|
||||
}
|
||||
|
||||
AfterDispatchEvent();
|
||||
|
||||
mCurrentTargetContent = nsnull;
|
||||
|
||||
return targetFrame;
|
||||
|
@ -287,11 +287,6 @@ protected:
|
||||
nsresult GetDocSelectionLocation(nsIContent **start, nsIContent **end,
|
||||
nsIFrame **startFrame, PRUint32 *startOffset);
|
||||
|
||||
// To be called before and after you fire an event, to update booleans and
|
||||
// such
|
||||
void BeforeDispatchEvent() { ++mDOMEventLevel; }
|
||||
void AfterDispatchEvent();
|
||||
|
||||
PRInt32 mLockCursor;
|
||||
|
||||
nsWeakFrame mCurrentTarget;
|
||||
@ -355,20 +350,12 @@ protected:
|
||||
|
||||
PRPackedBool m_haveShutdown;
|
||||
|
||||
// To inform people that dispatched events that frames have been cleared and
|
||||
// they need to drop frame refs
|
||||
PRPackedBool mClearedFrameRefsDuringEvent;
|
||||
|
||||
// So we don't have to keep checking accessibility.browsewithcaret pref
|
||||
PRPackedBool mBrowseWithCaret;
|
||||
|
||||
// Recursion guard for tabbing
|
||||
PRPackedBool mTabbedThroughDocument;
|
||||
|
||||
// The number of events we are currently nested in (currently just applies to
|
||||
// those handlers that care about clearing frame refs)
|
||||
PRInt32 mDOMEventLevel;
|
||||
|
||||
//Hashtable for accesskey support
|
||||
nsSupportsHashtable *mAccessKeys;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user