Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminating dead code. Patch by trev@gtchat.de. r+sr=jst@mozilla.org

Browse Source
This commit is contained in:
jst%mozilla.jstenback.com 2004-09-07 22:34:02 +00:00
parent 6accf3753f
commit 5aed475ce3
5 changed files with 3 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/events/public/nsIEventStateManager.h
View File

@ -53,9 +53,9 @@ class nsIWidget;
* Event listener manager interface.
*/
#define NS_IEVENTSTATEMANAGER_IID \
{ /* 08bd45d8-db4a-4e06-918c-cebffb002fef */ \
0x08bd45d8, 0xdb4a, 0x4e06, \
{ 0x91, 0x8c, 0xce, 0xbf, 0xfb, 0x0, 0x2f, 0xef} };
{ /* 4d45b9d0-fcf2-11d8-9669-0800200c9a66 */ \
0x4d45b9d0, 0xfcf2, 0x11d8, \
{0x96, 0x69, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66} }
#define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_FOCUS_EVENT(event))
@ -78,11 +78,6 @@ public:
nsEventStatus* aStatus,
nsIView* aView) = 0;
// optional notification methods so downstream clients can know
// what event is being processed
NS_IMETHOD SetCurrentEvent(nsEvent *aEvent) = 0;
NS_IMETHOD GetCurrentEvent(nsEvent **aEvent) = 0; // 0 if none
NS_IMETHOD SetPresContext(nsPresContext* aPresContext) = 0;
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame) = 0;

43
content/events/src/nsEventStateManager.cpp
View File

@ -165,40 +165,6 @@ enum {
MOUSE_SCROLL_TEXTSIZE
};
/******************************************************************/
/* CurrentEventShepherd pushes a new current event onto */
/* nsEventStateManager and pops it when destroyed */
/******************************************************************/
class CurrentEventShepherd {
public:
CurrentEventShepherd(nsEventStateManager *aManager, nsEvent *aEvent);
CurrentEventShepherd(nsEventStateManager *aManager);
~CurrentEventShepherd();
void SetRestoreEvent(nsEvent *aEvent) { mRestoreEvent = aEvent; }
void SetCurrentEvent(nsEvent *aEvent) { mManager->mCurrentEvent = aEvent; }
private:
nsEvent *mRestoreEvent;
nsEventStateManager *mManager;
};
CurrentEventShepherd::CurrentEventShepherd(nsEventStateManager *aManager,
nsEvent *aEvent)
{
mRestoreEvent = aManager->mCurrentEvent;
mManager = aManager;
SetCurrentEvent(aEvent);
}
CurrentEventShepherd::CurrentEventShepherd(nsEventStateManager *aManager)
{
mRestoreEvent = aManager->mCurrentEvent;
mManager = aManager;
}
CurrentEventShepherd::~CurrentEventShepherd()
{
mManager->mCurrentEvent = mRestoreEvent;
}
/******************************************************************/
/* nsEventStateManager */
/******************************************************************/
@ -216,7 +182,6 @@ nsEventStateManager::nsEventStateManager()
mCurrentFocusFrame(nsnull),
mLastFocusedWith(eEventFocusedByUnknown),
mCurrentTabIndex(0),
mCurrentEvent(0),
mPresContext(nsnull),
mLClickCount(0),
mMClickCount(0),
@ -2518,7 +2483,6 @@ nsEventStateManager::DispatchMouseEvent(nsPresContext* aPresContext,
mCurrentRelatedContent = aRelatedContent;
BeforeDispatchEvent();
CurrentEventShepherd shepherd(this, &event);
if (aTargetContent) {
aTargetContent->HandleDOMEvent(aPresContext, &event, nsnull,
NS_EVENT_FLAG_INIT, &status);
@ -2570,7 +2534,6 @@ nsEventStateManager::MaybeDispatchMouseEventToIframe(
event.isMeta = ((nsMouseEvent*)aEvent)->isMeta;
event.nativeMsg = ((nsMouseEvent*)aEvent)->nativeMsg;
CurrentEventShepherd shepherd(this, &event);
parentShell->HandleDOMEventWithTarget(docContent, &event, &status);
}
}
@ -3945,8 +3908,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
if (previousFocus && !previousFocus->GetDocument())
previousFocus = nsnull;
CurrentEventShepherd shepherd(this);
if (nsnull != gLastFocusedPresContext) {
nsCOMPtr<nsIContent> focusAfterBlur;
@ -3979,7 +3940,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
//fire blur
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(NS_BLUR_CONTENT);
shepherd.SetCurrentEvent(&event);
EnsureDocument(presShell);
@ -4035,7 +3995,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
if (gLastFocusedDocument && (gLastFocusedDocument != mDocument) && globalObject) {
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(NS_BLUR_CONTENT);
shepherd.SetCurrentEvent(&event);
// Make sure we're not switching command dispatchers, if so, surpress the blurred one
if (mDocument) {
@ -4120,7 +4079,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
//fire focus
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(NS_FOCUS_CONTENT);
shepherd.SetCurrentEvent(&event);
if (nsnull != mPresContext) {
nsCxPusher pusher(aContent);
@ -4142,7 +4100,6 @@ nsEventStateManager::SendFocusBlur(nsPresContext* aPresContext,
//see bugzilla bug 93521
nsEventStatus status = nsEventStatus_eIgnore;
nsEvent event(NS_FOCUS_CONTENT);
shepherd.SetCurrentEvent(&event);
if (nsnull != mPresContext && mDocument) {
nsCxPusher pusher(mDocument);

9
content/events/src/nsEventStateManager.h
View File

@ -56,7 +56,6 @@ class nsIDocShell;
class nsIDocShellTreeNode;
class nsIDocShellTreeItem;
class nsIFocusController;
class CurrentEventShepherd;
// mac uses click-hold context menus, a holdover from 4.x
#if defined(XP_MAC) || defined(XP_MACOSX)
@ -106,11 +105,6 @@ public:
nsEventStatus* aStatus,
nsIView* aView);
NS_IMETHOD GetCurrentEvent(nsEvent **aEvent)
{ *aEvent = mCurrentEvent; return NS_OK; }
NS_IMETHOD SetCurrentEvent(nsEvent *aEvent)
{ mCurrentEvent = aEvent; return NS_OK; }
NS_IMETHOD SetPresContext(nsPresContext* aPresContext);
NS_IMETHOD ClearFrameRefs(nsIFrame* aFrame);
@ -162,8 +156,6 @@ public:
}
protected:
friend class CurrentEventShepherd;
void UpdateCursor(nsPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus);
/**
* Turn a GUI mouse event into a mouse event targeted at the specified
@ -289,7 +281,6 @@ protected:
nsIFrame* mCurrentFocusFrame;
PRInt32 mLastFocusedWith;
PRInt32 mCurrentTabIndex;
nsEvent *mCurrentEvent;
// DocShell Traversal Data Memebers
nsCOMPtr<nsIContent> mLastContentFocus;

4
layout/base/nsPresShell.cpp
View File

@ -5933,9 +5933,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
// 1. Give event to event manager for pre event state changes and
// generation of synthetic events.
nsEvent *managerOldEvent;
manager->GetCurrentEvent(&managerOldEvent);
manager->SetCurrentEvent(aEvent); // don't fail to restore this later
rv = manager->PreHandleEvent(mPresContext, aEvent, mCurrentEventFrame,
aStatus, aView);
@ -6001,7 +5998,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
aStatus, aView);
}
}
manager->SetCurrentEvent(managerOldEvent);
}
return rv;
}

4
layout/html/base/src/nsPresShell.cpp
View File

@ -5933,9 +5933,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
// 1. Give event to event manager for pre event state changes and
// generation of synthetic events.
nsEvent *managerOldEvent;
manager->GetCurrentEvent(&managerOldEvent);
manager->SetCurrentEvent(aEvent); // don't fail to restore this later
rv = manager->PreHandleEvent(mPresContext, aEvent, mCurrentEventFrame,
aStatus, aView);
@ -6001,7 +5998,6 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
aStatus, aView);
}
}
manager->SetCurrentEvent(managerOldEvent);
}
return rv;
}