mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Changed nsIPresContext& to nsIPresContext*. Changed nsEventStatus& to nsEventStatus*. Now more compatible with XPIDL. a=vidur r=scc

This commit is contained in:
tbogard%aol.net 1999-11-24 06:03:41 +00:00
Родитель 981b300078
Коммит a0640b60c4
535 изменённых файлов: 5277 добавлений и 5869 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
content/base/public/nsIContent.h
Просмотреть файл

@ -244,11 +244,11 @@ public:
/**
* Handle a DOM event for this piece of content.
*/
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus) = 0;
nsEventStatus* aEventStatus) = 0;
/**
* Get and set a unique ID for this piece of content.

4
content/base/public/nsIDocument.h
Просмотреть файл

@ -300,11 +300,11 @@ public:
virtual void SetDisplaySelection(PRBool aToggle) = 0;
virtual PRBool GetDisplaySelection() const = 0;
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus) = 0;
nsEventStatus* aEventStatus) = 0;

8
content/base/src/nsCommentNode.cpp
Просмотреть файл

@ -149,11 +149,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const {
return mInner.FinishConvertToXIF(aConverter);
}
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
NS_IMETHOD GetContentID(PRUint32* aID) {
*aID = mContentID;
@ -325,11 +325,11 @@ nsCommentNode::List(FILE* out, PRInt32 aIndent) const
}
NS_IMETHODIMP
nsCommentNode::HandleDOMEvent(nsIPresContext& aPresContext,
nsCommentNode::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

11
content/base/src/nsDocument.cpp
Просмотреть файл

@ -2348,11 +2348,11 @@ nsresult nsDocument::GetNewListenerManager(nsIEventListenerManager **aInstancePt
return NS_NewEventListenerManager(aInstancePtrResult);
}
nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult nsDocument::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult mRet = NS_OK;
nsIDOMEvent* mDOMEvent = nsnull;
@ -2379,10 +2379,9 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
//Bubbling stage
if (NS_EVENT_FLAG_CAPTURE != aFlags && nsnull != mScriptContextOwner) {
nsIScriptGlobalObject* mGlobal;
if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_BUBBLE, aEventStatus);
NS_RELEASE(mGlobal);
nsCOMPtr<nsIScriptGlobalObject> global;
if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(getter_AddRefs(global))) {
global->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_BUBBLE, aEventStatus);
}
}

4
content/base/src/nsDocument.h
Просмотреть файл

@ -386,11 +386,11 @@ public:
PRBool aUseCapture);
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
virtual PRBool IsInSelection(nsIDOMSelection* aSelection, const nsIContent *aContent) const;

7
content/base/src/nsDocumentFragment.cpp
Просмотреть файл

@ -181,13 +181,14 @@ public:
{ return NS_OK; }
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const
{ return NS_OK; }
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
aEventStatus = nsEventStatus_eIgnore;
NS_ENSURE_ARG_POINTER(aEventStatus);
*aEventStatus = nsEventStatus_eIgnore;
return NS_OK;
}

2
content/base/src/nsDocumentViewer.cpp
Просмотреть файл

@ -650,7 +650,7 @@ DocumentViewerImpl::PrintContent(nsIWebShell *aParent,nsIDeviceContext *aDConte
ps->GetPageSequenceFrame(&pageSequence);
NS_ASSERTION(nsnull != pageSequence, "no page sequence frame");
pageSequence->Print(*cx, options, nsnull);
pageSequence->Print(cx, options, nsnull);
aDContext->EndDocument();
ps->EndObservingDocument();

4
content/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -765,11 +765,11 @@ nsGenericDOMDataNode::SetParent(nsIContent* aParent)
}
nsresult
nsGenericDOMDataNode::HandleDOMEvent(nsIPresContext& aPresContext,
nsGenericDOMDataNode::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult ret = NS_OK;
nsIDOMEvent* domEvent = nsnull;

8
content/base/src/nsGenericDOMDataNode.h
Просмотреть файл

@ -167,11 +167,11 @@ struct nsGenericDOMDataNode {
return NS_OK;
}
nsresult List(FILE* out, PRInt32 aIndent) const;
nsresult HandleDOMEvent(nsIPresContext& aPresContext,
nsresult HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
nsresult RangeAdd(nsIDOMRange& aRange);
nsresult RangeRemove(nsIDOMRange& aRange);
nsresult GetRangeList(nsVoidArray*& aResult) const;
@ -465,11 +465,11 @@ struct nsGenericDOMDataNode {
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \
PRUint32 aFlags, \
nsEventStatus& aEventStatus); \
nsEventStatus* aEventStatus); \
NS_IMETHOD GetContentID(PRUint32* aID); \
NS_IMETHOD SetContentID(PRUint32 aID); \
NS_IMETHOD RangeAdd(nsIDOMRange& aRange){ \

8
content/base/src/nsGenericElement.cpp
Просмотреть файл

@ -750,11 +750,11 @@ nsGenericElement::GetTag(nsIAtom*& aResult) const
nsresult
nsGenericElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsGenericElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult ret = NS_OK;
@ -1243,7 +1243,7 @@ nsGenericElement::Release()
//----------------------------------------------------------------------
void
nsGenericElement::TriggerLink(nsIPresContext& aPresContext,
nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
const nsString& aURLSpec,
@ -1251,7 +1251,7 @@ nsGenericElement::TriggerLink(nsIPresContext& aPresContext,
PRBool aClick)
{
nsILinkHandler* handler;
nsresult rv = aPresContext.GetLinkHandler(&handler);
nsresult rv = aPresContext->GetLinkHandler(&handler);
if (NS_SUCCEEDED(rv) && (nsnull != handler)) {
// Resolve url to an absolute url
nsAutoString absURLSpec;

22
content/base/src/nsGenericElement.h
Просмотреть файл

@ -148,11 +148,11 @@ public:
}
nsresult GetNameSpaceID(PRInt32& aNameSpaceID) const;
nsresult GetTag(nsIAtom*& aResult) const;
nsresult HandleDOMEvent(nsIPresContext& aPresContext,
nsresult HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
nsresult GetContentID(PRUint32* aID) {
*aID = mContentID;
@ -193,7 +193,7 @@ public:
const nsString& aValue,
REFNSIID aIID);
void TriggerLink(nsIPresContext& aPresContext,
void TriggerLink(nsIPresContext* aPresContext,
nsLinkVerb aVerb,
nsIURI* aBaseURL,
const nsString& aURLSpec,
@ -514,11 +514,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \
PRUint32 aFlags, \
nsEventStatus& aEventStatus); \
nsEventStatus* aEventStatus); \
NS_IMETHOD GetContentID(PRUint32* aID) { \
return _g.GetContentID(aID); \
} \
@ -623,11 +623,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \
PRUint32 aFlags, \
nsEventStatus& aEventStatus); \
nsEventStatus* aEventStatus); \
NS_IMETHOD GetContentID(PRUint32* aID) { \
return _g.GetContentID(aID); \
} \
@ -732,11 +732,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \
PRUint32 aFlags, \
nsEventStatus& aEventStatus); \
nsEventStatus* aEventStatus); \
NS_IMETHOD GetContentID(PRUint32* aID) { \
return _g.GetContentID(aID); \
} \
@ -839,11 +839,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \
PRUint32 aFlags, \
nsEventStatus& aEventStatus); \
nsEventStatus* aEventStatus); \
NS_IMETHOD GetContentID(PRUint32* aID) { \
return _g.GetContentID(aID); \
} \

4
content/base/src/nsTextNode.cpp
Просмотреть файл

@ -196,11 +196,11 @@ nsTextNode::List(FILE* out, PRInt32 aIndent) const
}
NS_IMETHODIMP
nsTextNode::HandleDOMEvent(nsIPresContext& aPresContext,
nsTextNode::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

6
content/events/public/nsIEventListenerManager.h
Просмотреть файл

@ -102,18 +102,18 @@ public:
* @param an event listener
*/
virtual nsresult HandleEvent(nsIPresContext& aPresContext,
virtual nsresult HandleEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus) = 0;
nsEventStatus* aEventStatus) = 0;
/**
* Creates a DOM event that can subsequently be passed into HandleEvent.
* (used rarely in the situation where methods on the event need to be
* invoked prior to the processing of the event).
*/
virtual nsresult CreateEvent(nsIPresContext& aPresContext,
virtual nsresult CreateEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent) = 0;

8
content/events/public/nsIEventStateManager.h
Просмотреть файл

@ -46,16 +46,16 @@ class nsIEventStateManager : public nsISupports {
public:
static const nsIID& GetIID() { static nsIID iid = NS_IEVENTSTATEMANAGER_IID; return iid; }
NS_IMETHOD PreHandleEvent(nsIPresContext& aPresContext,
NS_IMETHOD PreHandleEvent(nsIPresContext* aPresContext,
nsGUIEvent *aEvent,
nsIFrame* aTargetFrame,
nsEventStatus& aStatus,
nsEventStatus* aStatus,
nsIView* aView) = 0;
NS_IMETHOD PostHandleEvent(nsIPresContext& aPresContext,
NS_IMETHOD PostHandleEvent(nsIPresContext* aPresContext,
nsGUIEvent *aEvent,
nsIFrame* aTargetFrame,
nsEventStatus& aStatus,
nsEventStatus* aStatus,
nsIView* aView) = 0;
NS_IMETHOD SetPresContext(nsIPresContext* aPresContext) = 0;

4
content/events/public/nsIPrivateDOMEvent.h
Просмотреть файл

@ -48,7 +48,7 @@ public:
NS_IMETHOD SetTarget(nsIDOMNode* aNode) = 0;
};
extern nsresult NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext& aPresContext, nsEvent *aEvent);
extern nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext& aPresContext, nsEvent *aEvent);
extern nsresult NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext* aPresContext, nsEvent *aEvent);
extern nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext* aPresContext, nsEvent *aEvent);
#endif // nsIPrivateDOMEvent_h__

10
content/events/src/nsDOMEvent.cpp
Просмотреть файл

@ -687,7 +687,7 @@ NS_METHOD nsDOMEvent::GetRangeParent(nsIDOMNode** aRangeParent)
nsIContent* parent = nsnull;
PRInt32 offset, endOffset;
PRBool beginOfContent;
if (NS_SUCCEEDED(targetFrame->GetContentAndOffsetsFromPoint(*mPresContext,
if (NS_SUCCEEDED(targetFrame->GetContentAndOffsetsFromPoint(mPresContext,
mEvent->point,
&parent,
offset,
@ -718,7 +718,7 @@ NS_METHOD nsDOMEvent::GetRangeOffset(PRInt32* aRangeOffset)
nsIContent* parent = nsnull;
PRInt32 endOffset;
PRBool beginOfContent;
if (NS_SUCCEEDED(targetFrame->GetContentAndOffsetsFromPoint(*mPresContext,
if (NS_SUCCEEDED(targetFrame->GetContentAndOffsetsFromPoint(mPresContext,
mEvent->point,
&parent,
*aRangeOffset,
@ -904,9 +904,9 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
return nsnull;
}
nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext& aPresContext, nsEvent *aEvent)
nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext* aPresContext, nsEvent *aEvent)
{
nsDOMEvent* it = new nsDOMEvent(&aPresContext, aEvent);
nsDOMEvent* it = new nsDOMEvent(aPresContext, aEvent);
if (nsnull == it) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -914,7 +914,7 @@ nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext& aPre
return it->QueryInterface(kIDOMEventIID, (void **) aInstancePtrResult);
}
nsresult NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext& aPresContext, nsEvent *aEvent)
nsresult NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsIPresContext* aPresContext, nsEvent *aEvent)
{
return NS_ERROR_FAILURE;
}

15
content/events/src/nsEventListenerManager.cpp
Просмотреть файл

@ -511,12 +511,13 @@ nsresult nsEventListenerManager::RegisterScriptEventListener(nsIScriptContext *a
* @param an event listener
*/
nsresult nsEventListenerManager::HandleEvent(nsIPresContext& aPresContext,
nsresult nsEventListenerManager::HandleEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG_POINTER(aEventStatus);
nsresult ret = NS_OK;
if (aFlags & NS_EVENT_FLAG_INIT) {
aFlags |= (NS_EVENT_FLAG_BUBBLE | NS_EVENT_FLAG_CAPTURE);
@ -1204,14 +1205,14 @@ nsresult nsEventListenerManager::HandleEvent(nsIPresContext& aPresContext,
break;
}
//XXX This is going away
aEventStatus = (NS_OK == ret)
? aEventStatus
*aEventStatus = (NS_OK == ret)
? *aEventStatus
: nsEventStatus_eConsumeNoDefault;
// This is correct
aEventStatus = (aEvent->flags & NS_EVENT_FLAG_NO_DEFAULT)
*aEventStatus = (aEvent->flags & NS_EVENT_FLAG_NO_DEFAULT)
? nsEventStatus_eConsumeNoDefault
: aEventStatus;
: *aEventStatus;
return NS_OK;
}
@ -1220,7 +1221,7 @@ nsresult nsEventListenerManager::HandleEvent(nsIPresContext& aPresContext,
* Creates a DOM event
*/
nsresult nsEventListenerManager::CreateEvent(nsIPresContext& aPresContext,
nsresult nsEventListenerManager::CreateEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent)
{

6
content/events/src/nsEventListenerManager.h
Просмотреть файл

@ -81,13 +81,13 @@ public:
virtual nsresult CaptureEvent(nsIDOMEventListener *aListener);
virtual nsresult ReleaseEvent(nsIDOMEventListener *aListener);
virtual nsresult HandleEvent(nsIPresContext& aPresContext,
virtual nsresult HandleEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
virtual nsresult CreateEvent(nsIPresContext& aPresContext,
virtual nsresult CreateEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent);

119
content/events/src/nsEventStateManager.cpp
Просмотреть файл

@ -119,12 +119,14 @@ NS_IMPL_ISUPPORTS1(nsEventStateManager, nsIEventStateManager)
static nsCOMPtr<nsIContent> mLastFocusedContent;
NS_IMETHODIMP
nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
nsEventStateManager::PreHandleEvent(nsIPresContext* aPresContext,
nsGUIEvent *aEvent,
nsIFrame* aTargetFrame,
nsEventStatus& aStatus,
nsEventStatus* aStatus,
nsIView* aView)
{
NS_ENSURE_ARG_POINTER(aStatus);
NS_ENSURE_ARG(aPresContext);
// This is an experiement and may be temporary
// this consumes the very next focus event
if (mConsumeFocusEvents && aEvent->message == NS_GOTFOCUS) {
@ -144,7 +146,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
state |= NS_FRAME_EXTERNAL_REFERENCE;
mCurrentTarget->SetFrameState(state);
aStatus = nsEventStatus_eIgnore;
*aStatus = nsEventStatus_eIgnore;
NS_ASSERTION(aEvent, "aEvent is null. this should never happen");
if (!aEvent) return NS_ERROR_NULL_POINTER;
@ -219,7 +221,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
if (!mDocument) {
nsCOMPtr<nsIPresShell> presShell;
aPresContext.GetShell(getter_AddRefs(presShell));
aPresContext->GetShell(getter_AddRefs(presShell));
if (presShell) {
presShell->GetDocument(&mDocument);
}
@ -235,8 +237,8 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
contextOwner->GetScriptGlobalObject(getter_AddRefs(globalObject));
if(!globalObject) break;
globalObject->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
mDocument->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
globalObject->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
mDocument->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
}
@ -253,7 +255,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
if (!mDocument) {
nsCOMPtr<nsIPresShell> presShell;
aPresContext.GetShell(getter_AddRefs(presShell));
aPresContext->GetShell(getter_AddRefs(presShell));
if (presShell) {
presShell->GetDocument(&mDocument);
}
@ -273,8 +275,8 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
contextOwner->GetScriptGlobalObject(getter_AddRefs(globalObject));
if(!globalObject) break;
globalObject->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, status);
mDocument->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, status);
globalObject->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status);
mDocument->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
}
@ -311,7 +313,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
if (!mDocument) {
nsCOMPtr<nsIPresShell> presShell;
aPresContext.GetShell(getter_AddRefs(presShell));
aPresContext->GetShell(getter_AddRefs(presShell));
if (presShell) {
presShell->GetDocument(&mDocument);
}
@ -330,7 +332,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
contextOwner->GetScriptGlobalObject(getter_AddRefs(globalObject));
if(!globalObject) break;
globalObject->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, status);
globalObject->HandleDOMEvent(aPresContext, &focusevent, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
@ -359,7 +361,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
if (!mDocument) {
nsCOMPtr<nsIPresShell> presShell;
aPresContext.GetShell(getter_AddRefs(presShell));
aPresContext->GetShell(getter_AddRefs(presShell));
if (presShell) {
presShell->GetDocument(&mDocument);
}
@ -376,7 +378,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
contextOwner->GetScriptGlobalObject(getter_AddRefs(globalObject));
if(!globalObject) break;
globalObject->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
globalObject->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
@ -443,8 +445,9 @@ nsEventStateManager :: StopTrackingDragGesture ( )
// Do we need to do anything about this? Let's wait and see.
//
void
nsEventStateManager :: GenerateDragGesture ( nsIPresContext& aPresContext, nsGUIEvent *aEvent )
nsEventStateManager :: GenerateDragGesture ( nsIPresContext* aPresContext, nsGUIEvent *aEvent )
{
NS_WARN_IF_FALSE(aPresContext, "This shouldn't happen.");
if ( IsTrackingDragGesture() ) {
// figure out the delta in twips, since that is how it is in the event.
// Do we need to do this conversion every time? Will the pres context really change on
@ -452,7 +455,7 @@ nsEventStateManager :: GenerateDragGesture ( nsIPresContext& aPresContext, nsGUI
long twipDeltaToStartDrag = 0;
const long pixelDeltaToStartDrag = 5;
nsCOMPtr<nsIDeviceContext> devContext;
aPresContext.GetDeviceContext ( getter_AddRefs(devContext) );
aPresContext->GetDeviceContext ( getter_AddRefs(devContext) );
if ( devContext ) {
float pixelsToTwips = 0.0;
devContext->GetDevUnitsToTwips(pixelsToTwips);
@ -476,12 +479,12 @@ nsEventStateManager :: GenerateDragGesture ( nsIPresContext& aPresContext, nsGUI
if ( mGestureDownFrame ) {
mGestureDownFrame->GetContent(getter_AddRefs(lastContent));
if ( lastContent )
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
// dispatch to the frame
if ( mGestureDownFrame )
mGestureDownFrame->HandleEvent(aPresContext, &event, status);
mGestureDownFrame->HandleEvent(aPresContext, &event, &status);
StopTrackingDragGesture();
}
@ -490,12 +493,14 @@ nsEventStateManager :: GenerateDragGesture ( nsIPresContext& aPresContext, nsGUI
NS_IMETHODIMP
nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext,
nsGUIEvent *aEvent,
nsIFrame* aTargetFrame,
nsEventStatus& aStatus,
nsEventStatus* aStatus,
nsIView* aView)
{
NS_ENSURE_ARG(aPresContext);
NS_ENSURE_ARG_POINTER(aStatus);
mCurrentTarget = aTargetFrame;
NS_IF_RELEASE(mCurrentTargetContent);
nsresult ret = NS_OK;
@ -510,7 +515,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
case NS_MOUSE_MIDDLE_BUTTON_DOWN:
case NS_MOUSE_RIGHT_BUTTON_DOWN:
{
if (nsEventStatus_eConsumeNoDefault != aStatus) {
if (nsEventStatus_eConsumeNoDefault != *aStatus) {
nsCOMPtr<nsIContent> newFocus;
mCurrentTarget->GetContent(getter_AddRefs(newFocus));
nsCOMPtr<nsIFocusableContent> focusable;
@ -625,7 +630,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
SetContentState(nsnull, NS_EVENT_STATE_ACTIVE);
nsCOMPtr<nsIPresShell> shell;
nsresult rv = aPresContext.GetShell(getter_AddRefs(shell));
nsresult rv = aPresContext->GetShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell){
nsCOMPtr<nsIFrameSelection> frameSel;
rv = shell->GetFrameSelection(getter_AddRefs(frameSel));
@ -636,13 +641,13 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
}
break;
case NS_MOUSE_SCROLL:
if (nsEventStatus_eConsumeNoDefault != aStatus) {
if (nsEventStatus_eConsumeNoDefault != *aStatus) {
nsIFrame* focusFrame = nsnull;
nsIView* focusView = nsnull;
nsCOMPtr<nsIPresShell> presShell;
aPresContext.GetShell(getter_AddRefs(presShell));
aPresContext->GetShell(getter_AddRefs(presShell));
if(!presShell) // this is bad
break;
@ -660,7 +665,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
presShell->GetPrimaryFrameFor(mCurrentFocus, &focusFrame);
if (focusFrame)
focusFrame->GetView(&aPresContext, &focusView);
focusFrame->GetView(aPresContext, &focusView);
}
@ -701,7 +706,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
focusView = aView;
} else {
focusFrame = GetDocumentFrame(aPresContext);
focusFrame->GetView(&aPresContext, &focusView);
focusFrame->GetView(aPresContext, &focusView);
#ifdef DEBUG_scroll
if (focusView)
@ -770,7 +775,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
GenerateDragDropEnterExit(aPresContext, aEvent);
break;
case NS_KEY_PRESS:
if (nsEventStatus_eConsumeNoDefault != aStatus) {
if (nsEventStatus_eConsumeNoDefault != *aStatus) {
nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
//This is to prevent keyboard scrolling while alt modifier in use.
if (!keyEvent->isAlt) {
@ -778,7 +783,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext& aPresContext,
case NS_VK_TAB:
//Shift focus forward or back depending on shift key
ShiftFocus(!((nsInputEvent*)aEvent)->isShift);
aStatus = nsEventStatus_eConsumeNoDefault;
*aStatus = nsEventStatus_eConsumeNoDefault;
break;
case NS_VK_PAGE_DOWN:
case NS_VK_PAGE_UP:
@ -915,8 +920,8 @@ nsEventStateManager::GetNearestSelfScrollingFrame(nsIFrame* aFrame)
}
void
nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame,
nsEventStatus& aStatus)
nsEventStateManager::UpdateCursor(nsIPresContext* aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame,
nsEventStatus* aStatus)
{
PRInt32 cursor;
nsCursor c;
@ -965,16 +970,16 @@ nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint,
}
if (NS_STYLE_CURSOR_AUTO != cursor) {
aStatus = nsEventStatus_eConsumeDoDefault;
*aStatus = nsEventStatus_eConsumeDoDefault;
}
nsCOMPtr<nsIWidget> window;
aTargetFrame->GetWindow(&aPresContext, getter_AddRefs(window));
aTargetFrame->GetWindow(aPresContext, getter_AddRefs(window));
window->SetCursor(c);
}
void
nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIEvent* aEvent)
nsEventStateManager::GenerateMouseEnterExit(nsIPresContext* aPresContext, nsGUIEvent* aEvent)
{
//Hold onto old target content through the event and reset after.
nsCOMPtr<nsIContent> targetBeforeEvent = mCurrentTargetContent;
@ -1012,14 +1017,14 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIE
if (lastContent != targetContent) {
//XXX This event should still go somewhere!!
if (nsnull != lastContent) {
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
//Now dispatch to the frame
if (mLastMouseOverFrame) {
//XXX Get the new frame
mLastMouseOverFrame->HandleEvent(aPresContext, &event, status);
mLastMouseOverFrame->HandleEvent(aPresContext, &event, &status);
}
NS_IF_RELEASE(mCurrentTargetContent);
@ -1045,7 +1050,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIE
if (lastContent != targetContent) {
//XXX This event should still go somewhere!!
if (targetContent) {
targetContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
targetContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
if (nsEventStatus_eConsumeNoDefault != status) {
@ -1056,7 +1061,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIE
//Now dispatch to the frame
if (mCurrentTarget) {
//XXX Get the new frame
mCurrentTarget->HandleEvent(aPresContext, &event, status);
mCurrentTarget->HandleEvent(aPresContext, &event, &status);
}
NS_IF_RELEASE(mCurrentTargetContent);
@ -1087,7 +1092,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIE
mCurrentRelatedContent = nsnull;
if (lastContent) {
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
if (nsEventStatus_eConsumeNoDefault != status) {
SetContentState(nsnull, NS_EVENT_STATE_HOVER);
@ -1098,7 +1103,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIE
//Now dispatch to the frame
if (nsnull != mLastMouseOverFrame) {
//XXX Get the new frame
mLastMouseOverFrame->HandleEvent(aPresContext, &event, status);
mLastMouseOverFrame->HandleEvent(aPresContext, &event, &status);
mLastMouseOverFrame = nsnull;
}
@ -1113,7 +1118,7 @@ nsEventStateManager::GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIE
}
void
nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsGUIEvent* aEvent)
nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext* aPresContext, nsGUIEvent* aEvent)
{
//Hold onto old target content through the event and reset after.
nsCOMPtr<nsIContent> targetBeforeEvent = mCurrentTargetContent;
@ -1149,7 +1154,7 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
if ( lastContent != targetContent ) {
//XXX This event should still go somewhere!!
if (lastContent)
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
// clear the drag hover
if (status != nsEventStatus_eConsumeNoDefault )
@ -1158,7 +1163,7 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
// Finally dispatch exit to the frame
if ( mLastDragOverFrame ) {
mLastDragOverFrame->HandleEvent(aPresContext, &event, status);
mLastDragOverFrame->HandleEvent(aPresContext, &event, &status);
NS_IF_RELEASE(mCurrentTargetContent);
NS_IF_RELEASE(mCurrentRelatedContent);
@ -1185,7 +1190,7 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
if ( lastContent != targetContent ) {
//XXX This event should still go somewhere!!
if ( targetContent )
targetContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
targetContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
// set drag hover on this frame
if ( status != nsEventStatus_eConsumeNoDefault )
@ -1195,7 +1200,7 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
// Finally dispatch to the frame
if (mCurrentTarget) {
//XXX Get the new frame
mCurrentTarget->HandleEvent(aPresContext, &event, status);
mCurrentTarget->HandleEvent(aPresContext, &event, &status);
}
NS_IF_RELEASE(mCurrentTargetContent);
@ -1230,7 +1235,7 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
mCurrentRelatedContent = nsnull;
if ( lastContent ) {
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
lastContent->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
if ( status != nsEventStatus_eConsumeNoDefault )
SetContentState(nsnull, NS_EVENT_STATE_DRAGOVER);
}
@ -1238,7 +1243,7 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
// Finally dispatch to the frame
if ( mLastDragOverFrame ) {
//XXX Get the new frame
mLastDragOverFrame->HandleEvent(aPresContext, &event, status);
mLastDragOverFrame->HandleEvent(aPresContext, &event, &status);
mLastDragOverFrame = nsnull;
}
@ -1253,9 +1258,9 @@ nsEventStateManager::GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsG
}
NS_IMETHODIMP
nsEventStateManager::SetClickCount(nsIPresContext& aPresContext,
nsEventStateManager::SetClickCount(nsIPresContext* aPresContext,
nsMouseEvent *aEvent,
nsEventStatus& aStatus)
nsEventStatus* aStatus)
{
nsresult ret = NS_OK;
nsCOMPtr<nsIContent> mouseContent;
@ -1319,9 +1324,9 @@ nsEventStateManager::SetClickCount(nsIPresContext& aPresContext,
}
NS_IMETHODIMP
nsEventStateManager::CheckForAndDispatchClick(nsIPresContext& aPresContext,
nsEventStateManager::CheckForAndDispatchClick(nsIPresContext* aPresContext,
nsMouseEvent *aEvent,
nsEventStatus& aStatus)
nsEventStatus* aStatus)
{
nsresult ret = NS_OK;
nsMouseEvent event;
@ -1366,9 +1371,9 @@ nsEventStateManager::CheckForAndDispatchClick(nsIPresContext& aPresContext,
}
NS_IMETHODIMP
nsEventStateManager::DispatchKeyPressEvent(nsIPresContext& aPresContext,
nsEventStateManager::DispatchKeyPressEvent(nsIPresContext* aPresContext,
nsKeyEvent *aEvent,
nsEventStatus& aStatus)
nsEventStatus* aStatus)
{
nsresult ret = NS_OK;
@ -1914,7 +1919,7 @@ nsEventStateManager::SendFocusBlur(nsIPresContext* aPresContext, nsIContent *aCo
NS_ADDREF(mCurrentTargetContent);
if (nsnull != mPresContext) {
mCurrentFocus->HandleDOMEvent(*mPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
mCurrentFocus->HandleDOMEvent(mPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
NS_IF_RELEASE(mCurrentTargetContent);
@ -1932,7 +1937,7 @@ nsEventStateManager::SendFocusBlur(nsIPresContext* aPresContext, nsIContent *aCo
NS_ADDREF(mCurrentTargetContent);
if (nsnull != mPresContext) {
aContent->HandleDOMEvent(*mPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
aContent->HandleDOMEvent(mPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
NS_IF_RELEASE(mCurrentTargetContent);
@ -2023,14 +2028,14 @@ nsEventStateManager::GetFocusedContent(nsIContent** aContent)
}
nsIFrame*
nsEventStateManager::GetDocumentFrame(nsIPresContext& aPresContext)
nsEventStateManager::GetDocumentFrame(nsIPresContext* aPresContext)
{
nsCOMPtr<nsIPresShell> presShell;
nsIDocument* aDocument;
nsIFrame* aFrame;
nsIView* aView;
aPresContext.GetShell(getter_AddRefs(presShell));
aPresContext->GetShell(getter_AddRefs(presShell));
if (nsnull == presShell) {
#ifdef DEBUG_scroll
printf("Got a null PresShell\n");
@ -2040,12 +2045,12 @@ nsEventStateManager::GetDocumentFrame(nsIPresContext& aPresContext)
presShell->GetDocument(&aDocument);
presShell->GetPrimaryFrameFor(aDocument->GetRootContent(), &aFrame);
aFrame->GetView(&aPresContext, &aView);
aFrame->GetView(aPresContext, &aView);
if (!aView) {
#ifdef DEBUG_scroll
printf("looking for a parent with a view\n");
#endif
aFrame->GetParentWithView(&aPresContext, &aFrame);
aFrame->GetParentWithView(aPresContext, &aFrame);
}
return aFrame;
}

24
content/events/src/nsEventStateManager.h
Просмотреть файл

@ -41,16 +41,16 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD PreHandleEvent(nsIPresContext& aPresContext,
NS_IMETHOD PreHandleEvent(nsIPresContext* aPresContext,
nsGUIEvent *aEvent,
nsIFrame* aTargetFrame,
nsEventStatus& aStatus,
nsEventStatus* aStatus,
nsIView* aView);
NS_IMETHOD PostHandleEvent(nsIPresContext& aPresContext,
NS_IMETHOD PostHandleEvent(nsIPresContext* aPresContext,
nsGUIEvent *aEvent,
nsIFrame* aTargetFrame,
nsEventStatus& aStatus,
nsEventStatus* aStatus,
nsIView* aView);
NS_IMETHOD SetPresContext(nsIPresContext* aPresContext);
@ -68,12 +68,12 @@ public:
NS_IMETHOD ConsumeFocusEvents(PRBool aDoConsume) { mConsumeFocusEvents = aDoConsume; return NS_OK; }
protected:
void UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame, nsEventStatus& aStatus);
void GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIEvent* aEvent);
void GenerateDragDropEnterExit(nsIPresContext& aPresContext, nsGUIEvent* aEvent);
NS_IMETHOD DispatchKeyPressEvent(nsIPresContext& aPresContext, nsKeyEvent *aEvent, nsEventStatus& aStatus);
NS_IMETHOD SetClickCount(nsIPresContext& aPresContext, nsMouseEvent *aEvent, nsEventStatus& aStatus);
NS_IMETHOD CheckForAndDispatchClick(nsIPresContext& aPresContext, nsMouseEvent *aEvent, nsEventStatus& aStatus);
void UpdateCursor(nsIPresContext* aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame, nsEventStatus* aStatus);
void GenerateMouseEnterExit(nsIPresContext* aPresContext, nsGUIEvent* aEvent);
void GenerateDragDropEnterExit(nsIPresContext* aPresContext, nsGUIEvent* aEvent);
NS_IMETHOD DispatchKeyPressEvent(nsIPresContext* aPresContext, nsKeyEvent *aEvent, nsEventStatus* aStatus);
NS_IMETHOD SetClickCount(nsIPresContext* aPresContext, nsMouseEvent *aEvent, nsEventStatus* aStatus);
NS_IMETHOD CheckForAndDispatchClick(nsIPresContext* aPresContext, nsMouseEvent *aEvent, nsEventStatus* aStatus);
PRBool ChangeFocus(nsIContent* aFocus, nsIFrame* aFocusFrame, PRBool aSetFocus);
void ShiftFocus(PRBool foward);
nsIContent* GetNextTabbableContent(nsIContent* aParent, nsIContent* aChild, nsIContent* aTop, PRBool foward);
@ -82,12 +82,12 @@ protected:
nsIScrollableView* GetNearestScrollingView(nsIView* aView);
nsISelfScrollingFrame* GetNearestSelfScrollingFrame(nsIFrame* aFrame);
nsIFrame* GetDocumentFrame(nsIPresContext& aPresContext);
nsIFrame* GetDocumentFrame(nsIPresContext* aPresContext);
// routines for the d&d gesture tracking state machine
void BeginTrackingDragGesture ( nsGUIEvent* inDownEvent, nsIFrame* inDownFrame ) ;
void StopTrackingDragGesture ( ) ;
void GenerateDragGesture ( nsIPresContext& aPresContext, nsGUIEvent *aEvent ) ;
void GenerateDragGesture ( nsIPresContext* aPresContext, nsGUIEvent *aEvent ) ;
PRBool IsTrackingDragGesture ( ) const { return mIsTrackingDragGesture; }
//Any frames here must be checked for validity in ClearFrameRefs

8
content/html/content/src/nsAttributeContent.cpp
Просмотреть файл

@ -135,11 +135,11 @@ public:
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const { return NS_OK; }
NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const;
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
NS_IMETHOD GetContentID(PRUint32* aID) {
*aID = 0;
@ -369,11 +369,11 @@ nsAttributeContent::SetParent(nsIContent* aParent)
}
nsresult
nsAttributeContent::HandleDOMEvent(nsIPresContext& aPresContext,
nsAttributeContent::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult ret = NS_OK;
return ret;

26
content/html/content/src/nsHTMLAnchorElement.cpp
Просмотреть файл

@ -328,17 +328,19 @@ nsHTMLAnchorElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
// XXX support suppress in here
NS_IMETHODIMP
nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG(aPresContext);
NS_ENSURE_ARG_POINTER(aEventStatus);
// Try script event handlers first
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
if ((NS_OK == ret) && (nsEventStatus_eIgnore == *aEventStatus) &&
!(aFlags & NS_EVENT_FLAG_CAPTURE)) {
// If this anchor element has an HREF then it is sensitive to
// mouse events (otherwise ignore them).
@ -350,15 +352,15 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
{
// don't make the link grab the focus if there is no link handler
nsILinkHandler* handler;
nsresult rv = aPresContext.GetLinkHandler(&handler);
nsresult rv = aPresContext->GetLinkHandler(&handler);
if (NS_SUCCEEDED(rv) && (nsnull != handler)) {
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS);
NS_RELEASE(stateManager);
}
NS_RELEASE(handler);
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
}
break;
@ -366,7 +368,7 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
case NS_MOUSE_LEFT_CLICK:
case NS_KEY_PRESS:
{
if (nsEventStatus_eConsumeNoDefault != aEventStatus) {
if (nsEventStatus_eConsumeNoDefault != *aEventStatus) {
nsKeyEvent * keyEvent;
if (aEvent->eventStructType == NS_KEY_EVENT) {
@ -386,7 +388,7 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
aEventStatus = nsEventStatus_eConsumeDoDefault;
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
}
}
@ -399,7 +401,7 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
case NS_MOUSE_ENTER:
{
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(this, NS_EVENT_STATE_HOVER);
NS_RELEASE(stateManager);
}
@ -414,21 +416,21 @@ nsHTMLAnchorElement::HandleDOMEvent(nsIPresContext& aPresContext,
mInner.TriggerLink(aPresContext, eLinkVerb_Replace,
baseURL, href, target, PR_FALSE);
NS_IF_RELEASE(baseURL);
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;
case NS_MOUSE_EXIT:
{
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(nsnull, NS_EVENT_STATE_HOVER);
NS_RELEASE(stateManager);
}
nsAutoString empty;
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;

4
content/html/content/src/nsHTMLAppletElement.cpp
Просмотреть файл

@ -255,11 +255,11 @@ nsHTMLAppletElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLAppletElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLAppletElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLAreaElement.cpp
Просмотреть файл

@ -220,11 +220,11 @@ nsHTMLAreaElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLAreaElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLAreaElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLBRElement.cpp
Просмотреть файл

@ -207,11 +207,11 @@ nsHTMLBRElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc,
NS_IMETHODIMP
nsHTMLBRElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLBRElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLBaseElement.cpp
Просмотреть файл

@ -177,11 +177,11 @@ nsHTMLBaseElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLBaseElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLBaseElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLBaseFontElement.cpp
Просмотреть файл

@ -197,11 +197,11 @@ nsHTMLBaseFontElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
NS_IMETHODIMP
nsHTMLBaseFontElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLBaseFontElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLBodyElement.cpp
Просмотреть файл

@ -712,11 +712,11 @@ nsHTMLBodyElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLBodyElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLBodyElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

26
content/html/content/src/nsHTMLButtonElement.cpp
Просмотреть файл

@ -407,27 +407,29 @@ nsHTMLButtonElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
}
NS_IMETHODIMP
nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLButtonElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG(aPresContext);
NS_ENSURE_ARG_POINTER(aEventStatus);
// Try script event handlers first
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
if ((NS_OK == ret) && (nsEventStatus_eIgnore == *aEventStatus) &&
!(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS);
NS_RELEASE(stateManager);
}
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;
@ -435,13 +437,13 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
{
nsIEventStateManager *stateManager;
nsIContent *activeLink = nsnull;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
//stateManager->GetActiveLink(&activeLink);
NS_RELEASE(stateManager);
}
if (activeLink == this) {
if (nsEventStatus_eConsumeNoDefault != aEventStatus) {
if (nsEventStatus_eConsumeNoDefault != *aEventStatus) {
nsAutoString href, target, disabled;
nsIURI* baseURL = nsnull;
GetBaseURL(baseURL);
@ -454,7 +456,7 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
}
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
}
}
@ -467,11 +469,11 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
case NS_MOUSE_ENTER:
{
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(this, NS_EVENT_STATE_HOVER);
NS_RELEASE(stateManager);
}
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;
@ -479,11 +481,11 @@ nsHTMLButtonElement::HandleDOMEvent(nsIPresContext& aPresContext,
case NS_MOUSE_EXIT:
{
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(nsnull, NS_EVENT_STATE_HOVER);
NS_RELEASE(stateManager);
}
aEventStatus = nsEventStatus_eConsumeNoDefault;
*aEventStatus = nsEventStatus_eConsumeNoDefault;
}
break;

4
content/html/content/src/nsHTMLDListElement.cpp
Просмотреть файл

@ -191,11 +191,11 @@ nsHTMLDListElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLDListElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLDListElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLDelElement.cpp
Просмотреть файл

@ -181,11 +181,11 @@ nsHTMLDelElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLDelElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLDelElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLDirectoryElement.cpp
Просмотреть файл

@ -226,11 +226,11 @@ nsHTMLDirectoryElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontM
NS_IMETHODIMP
nsHTMLDirectoryElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLDirectoryElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLDivElement.cpp
Просмотреть файл

@ -216,11 +216,11 @@ nsHTMLDivElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLDivElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLDivElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLEmbedElement.cpp
Просмотреть файл

@ -203,11 +203,11 @@ nsHTMLEmbedElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLEmbedElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLEmbedElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLFieldSetElement.cpp
Просмотреть файл

@ -268,11 +268,11 @@ nsHTMLFieldSetElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
NS_IMETHODIMP
nsHTMLFieldSetElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLFieldSetElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLFontElement.cpp
Просмотреть файл

@ -368,11 +368,11 @@ nsHTMLFontElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
}
NS_IMETHODIMP
nsHTMLFontElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLFontElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLFormElement.cpp
Просмотреть файл

@ -439,11 +439,11 @@ nsHTMLFormElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLFormElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLFormElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

10
content/html/content/src/nsHTMLFrameElement.cpp
Просмотреть файл

@ -246,11 +246,11 @@ nsHTMLFrameElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
}
NS_IMETHODIMP
nsHTMLFrameElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLFrameElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
@ -271,7 +271,5 @@ NS_IMETHODIMP nsHTMLFrameElement::HandleChromeEvent(nsIPresContext* aPresContext
nsEvent* aEvent, nsIDOMEvent** aDOMEvent, PRUint32 aFlags,
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG(aPresContext);
NS_ENSURE_ARG_POINTER(aEventStatus);
return HandleDOMEvent(*aPresContext, aEvent, aDOMEvent, aFlags,*aEventStatus);
}
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
}

4
content/html/content/src/nsHTMLFrameSetElement.cpp
Просмотреть файл

@ -205,11 +205,11 @@ nsHTMLFrameSetElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
}
NS_IMETHODIMP
nsHTMLFrameSetElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLFrameSetElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLHRElement.cpp
Просмотреть файл

@ -299,11 +299,11 @@ nsHTMLHRElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc,
NS_IMETHODIMP
nsHTMLHRElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLHRElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLHeadElement.cpp
Просмотреть файл

@ -175,11 +175,11 @@ nsHTMLHeadElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLHeadElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLHeadElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLHeadingElement.cpp
Просмотреть файл

@ -199,11 +199,11 @@ nsHTMLHeadingElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMap
NS_IMETHODIMP
nsHTMLHeadingElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLHeadingElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

7
content/html/content/src/nsHTMLHtmlElement.cpp
Просмотреть файл

@ -180,17 +180,18 @@ nsHTMLHtmlElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
}
NS_IMETHODIMP
nsHTMLHtmlElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLHtmlElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG_POINTER(aEventStatus);
if (nsnull != mInner.mDocument) {
return mInner.mDocument->HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
}
aEventStatus = nsEventStatus_eIgnore;
*aEventStatus = nsEventStatus_eIgnore;
return NS_OK;
}

12
content/html/content/src/nsHTMLIFrameElement.cpp
Просмотреть файл

@ -305,11 +305,11 @@ nsHTMLIFrameElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLIFrameElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLIFrameElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
@ -330,9 +330,5 @@ NS_IMETHODIMP nsHTMLIFrameElement::HandleChromeEvent(nsIPresContext* aPresContex
nsEvent* aEvent, nsIDOMEvent** aDOMEvent, PRUint32 aFlags,
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG(aPresContext);
NS_ENSURE_ARG_POINTER(aEventStatus);
return HandleDOMEvent(*aPresContext, aEvent, aDOMEvent, aFlags,*aEventStatus);
}
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
}

4
content/html/content/src/nsHTMLImageElement.cpp
Просмотреть файл

@ -323,11 +323,11 @@ nsHTMLImageElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLImageElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLImageElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

11
content/html/content/src/nsHTMLInputElement.cpp
Просмотреть файл

@ -598,7 +598,7 @@ nsHTMLInputElement::Click()
nsGUIEvent event;
event.eventStructType = NS_GUI_EVENT;
event.message = NS_MOUSE_LEFT_CLICK;
rv = HandleDOMEvent(*context, &event, nsnull, NS_EVENT_FLAG_INIT, status);
rv = HandleDOMEvent(context, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
NS_RELEASE(shell);
}
@ -609,12 +609,13 @@ nsHTMLInputElement::Click()
}
NS_IMETHODIMP
nsHTMLInputElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG_POINTER(aEventStatus);
if ((aEvent->message == NS_FOCUS_CONTENT && mSkipFocusEvent) ||
(aEvent->message == NS_BLUR_CONTENT && mSkipFocusEvent)) {
return NS_OK;
@ -624,7 +625,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
if ((NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
if ((NS_OK == ret) && (nsEventStatus_eIgnore == *aEventStatus) &&
!(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_FOCUS_CONTENT:
@ -669,7 +670,7 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsIFormControlFrame* formControlFrame = nsnull;
if (NS_OK == nsGenericHTMLElement::GetPrimaryFrame(this, formControlFrame)) {
if (formControlFrame) {
formControlFrame->MouseClicked(&aPresContext);
formControlFrame->MouseClicked(aPresContext);
}
}
}

4
content/html/content/src/nsHTMLInsElement.cpp
Просмотреть файл

@ -182,11 +182,11 @@ nsHTMLInsElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLInsElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLInsElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLIsIndexElement.cpp
Просмотреть файл

@ -188,11 +188,11 @@ nsHTMLIsIndexElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMap
NS_IMETHODIMP
nsHTMLIsIndexElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLIsIndexElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLLIElement.cpp
Просмотреть файл

@ -224,11 +224,11 @@ nsHTMLLIElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc,
}
NS_IMETHODIMP
nsHTMLLIElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLLIElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

7
content/html/content/src/nsHTMLLabelElement.cpp
Просмотреть файл

@ -297,19 +297,20 @@ nsHTMLLabelElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
}
NS_IMETHODIMP
nsHTMLLabelElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLLabelElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG_POINTER(aEventStatus);
nsresult rv = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
// Now a little special trickery because we are a label:
// We need to pass this event on to our child iff it is a focus,
// keypress/up/dn, mouseclick/dblclick/up/down.
if ((NS_OK == rv) && (nsEventStatus_eIgnore == aEventStatus) && (NS_EVENT_FLAG_INIT == aFlags)) {
if ((NS_OK == rv) && (nsEventStatus_eIgnore == *aEventStatus) && (NS_EVENT_FLAG_INIT == aFlags)) {
PRBool isFormElement = PR_FALSE;
nsIHTMLContent* node = nsnull; // Strong ref to node we are a label for
switch (aEvent->message) {

4
content/html/content/src/nsHTMLLegendElement.cpp
Просмотреть файл

@ -227,11 +227,11 @@ nsHTMLLegendElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLLegendElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLLegendElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLLinkElement.cpp
Просмотреть файл

@ -277,11 +277,11 @@ nsHTMLLinkElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLLinkElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLLinkElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

8
content/html/content/src/nsHTMLMapElement.cpp
Просмотреть файл

@ -157,11 +157,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const {
return mInner.FinishConvertToXIF(aConverter);
}
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
NS_IMETHOD GetContentID(PRUint32* aID) {
return mInner.GetContentID(aID);
@ -351,11 +351,11 @@ nsHTMLMapElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLMapElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLMapElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLMenuElement.cpp
Просмотреть файл

@ -218,11 +218,11 @@ nsHTMLMenuElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLMenuElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLMenuElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLMetaElement.cpp
Просмотреть файл

@ -187,11 +187,11 @@ nsHTMLMetaElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLMetaElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLMetaElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLModElement.cpp
Просмотреть файл

@ -183,11 +183,11 @@ nsHTMLModElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLModElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLModElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLOListElement.cpp
Просмотреть файл

@ -262,11 +262,11 @@ nsHTMLOListElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLOListElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLOListElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLObjectElement.cpp
Просмотреть файл

@ -260,11 +260,11 @@ nsHTMLObjectElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLObjectElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLObjectElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLOptGroupElement.cpp
Просмотреть файл

@ -181,11 +181,11 @@ nsHTMLOptGroupElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
NS_IMETHODIMP
nsHTMLOptGroupElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLOptGroupElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLOptionElement.cpp
Просмотреть файл

@ -421,11 +421,11 @@ nsHTMLOptionElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLOptionElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLOptionElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLParagraphElement.cpp
Просмотреть файл

@ -208,11 +208,11 @@ nsHTMLParagraphElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontM
NS_IMETHODIMP
nsHTMLParagraphElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLParagraphElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLParamElement.cpp
Просмотреть файл

@ -188,11 +188,11 @@ nsHTMLParamElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLParamElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLParamElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLPreElement.cpp
Просмотреть файл

@ -269,11 +269,11 @@ nsHTMLPreElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLPreElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLPreElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLQuoteElement.cpp
Просмотреть файл

@ -178,11 +178,11 @@ nsHTMLQuoteElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLQuoteElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLQuoteElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLScriptElement.cpp
Просмотреть файл

@ -239,11 +239,11 @@ nsHTMLScriptElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLScriptElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLScriptElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLSelectElement.cpp
Просмотреть файл

@ -821,11 +821,11 @@ nsHTMLSelectElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLSelectElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLSelectElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLSharedObjectElement.cpp
Просмотреть файл

@ -260,11 +260,11 @@ nsHTMLObjectElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLObjectElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLObjectElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLSpacerElement.cpp
Просмотреть файл

@ -237,11 +237,11 @@ nsHTMLSpacerElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapF
NS_IMETHODIMP
nsHTMLSpacerElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLSpacerElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLSpanElement.cpp
Просмотреть файл

@ -164,11 +164,11 @@ nsHTMLSpanElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFun
NS_IMETHODIMP
nsHTMLSpanElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLSpanElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLStyleElement.cpp
Просмотреть файл

@ -261,11 +261,11 @@ nsHTMLStyleElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLStyleElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLStyleElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableCaptionElement.cpp
Просмотреть файл

@ -210,11 +210,11 @@ nsHTMLTableCaptionElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFo
NS_IMETHODIMP
nsHTMLTableCaptionElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableCaptionElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableCellElement.cpp
Просмотреть файл

@ -548,11 +548,11 @@ nsHTMLTableCellElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontM
NS_IMETHODIMP
nsHTMLTableCellElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableCellElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableColElement.cpp
Просмотреть файл

@ -321,11 +321,11 @@ nsHTMLTableColElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
NS_IMETHODIMP
nsHTMLTableColElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableColElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableColGroupElement.cpp
Просмотреть файл

@ -301,11 +301,11 @@ nsHTMLTableColGroupElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aF
NS_IMETHODIMP
nsHTMLTableColGroupElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableColGroupElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableElement.cpp
Просмотреть файл

@ -1292,11 +1292,11 @@ nsHTMLTableElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLTableElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableRowElement.cpp
Просмотреть файл

@ -728,11 +728,11 @@ nsHTMLTableRowElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
NS_IMETHODIMP
nsHTMLTableRowElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableRowElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTableSectionElement.cpp
Просмотреть файл

@ -363,11 +363,11 @@ nsHTMLTableSectionElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFo
NS_IMETHODIMP
nsHTMLTableSectionElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTableSectionElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTextAreaElement.cpp
Просмотреть файл

@ -474,11 +474,11 @@ nsHTMLTextAreaElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMa
NS_IMETHODIMP
nsHTMLTextAreaElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTextAreaElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLTitleElement.cpp
Просмотреть файл

@ -233,11 +233,11 @@ nsHTMLTitleElement::SetText(const nsString& aTitle)
}
NS_IMETHODIMP
nsHTMLTitleElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLTitleElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLUListElement.cpp
Просмотреть файл

@ -238,11 +238,11 @@ nsHTMLUListElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFu
NS_IMETHODIMP
nsHTMLUListElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLUListElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/html/content/src/nsHTMLWBRElement.cpp
Просмотреть файл

@ -174,11 +174,11 @@ nsHTMLWBRElement::GetAttributeMappingFunctions(nsMapAttributesFunc& aFontMapFunc
NS_IMETHODIMP
nsHTMLWBRElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsHTMLWBRElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

4
content/xml/content/src/nsXMLCDATASection.cpp
Просмотреть файл

@ -203,11 +203,11 @@ nsXMLCDATASection::List(FILE* out, PRInt32 aIndent) const
}
NS_IMETHODIMP
nsXMLCDATASection::HandleDOMEvent(nsIPresContext& aPresContext,
nsXMLCDATASection::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
return mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);

20
content/xml/content/src/nsXMLElement.cpp
Просмотреть файл

@ -113,33 +113,35 @@ nsXMLElement::SetAttribute(PRInt32 aNameSpaceID, nsIAtom* aName,
}
NS_IMETHODIMP
nsXMLElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG_POINTER(aEventStatus);
NS_ENSURE_ARG(aPresContext);
// Try script event handlers first
nsresult ret = mInner.HandleDOMEvent(aPresContext, aEvent, aDOMEvent,
aFlags, aEventStatus);
if (mIsLink && (NS_OK == ret) && (nsEventStatus_eIgnore == aEventStatus) &&
if (mIsLink && (NS_OK == ret) && (nsEventStatus_eIgnore == *aEventStatus) &&
!(aFlags & NS_EVENT_FLAG_CAPTURE)) {
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
{
nsIEventStateManager *stateManager;
if (NS_OK == aPresContext.GetEventStateManager(&stateManager)) {
if (NS_OK == aPresContext->GetEventStateManager(&stateManager)) {
stateManager->SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS);
NS_RELEASE(stateManager);
}
aEventStatus = nsEventStatus_eConsumeDoDefault;
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
break;
case NS_MOUSE_LEFT_CLICK:
{
if (nsEventStatus_eConsumeNoDefault != aEventStatus) {
if (nsEventStatus_eConsumeNoDefault != *aEventStatus) {
nsAutoString show, href, target;
nsIURI* baseURL = nsnull;
nsLinkVerb verb = eLinkVerb_Replace;
@ -159,7 +161,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext& aPresContext,
}
mInner.TriggerLink(aPresContext, verb, baseURL, href, target, PR_TRUE);
NS_IF_RELEASE(baseURL);
aEventStatus = nsEventStatus_eConsumeDoDefault;
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
}
break;
@ -180,7 +182,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext& aPresContext,
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, baseURL, href, target, PR_FALSE);
NS_IF_RELEASE(baseURL);
aEventStatus = nsEventStatus_eConsumeDoDefault;
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
break;
@ -189,7 +191,7 @@ nsXMLElement::HandleDOMEvent(nsIPresContext& aPresContext,
{
nsAutoString empty;
mInner.TriggerLink(aPresContext, eLinkVerb_Replace, nsnull, empty, empty, PR_FALSE);
aEventStatus = nsEventStatus_eConsumeDoDefault;
*aEventStatus = nsEventStatus_eConsumeDoDefault;
}
break;

4
content/xml/content/src/nsXMLElement.h
Просмотреть файл

@ -143,11 +143,11 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const {
return mInner.FinishConvertToXIF(aConverter);
}
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
NS_IMETHOD GetContentID(PRUint32* aID) {
*aID = mContentID;

4
content/xml/content/src/nsXMLEntity.cpp
Просмотреть файл

@ -293,11 +293,11 @@ nsXMLEntity::List(FILE* out, PRInt32 aIndent) const
}
NS_IMETHODIMP
nsXMLEntity::HandleDOMEvent(nsIPresContext& aPresContext,
nsXMLEntity::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
// We should never be getting events
NS_ASSERTION(0, "event handler called for entity");

4
content/xml/content/src/nsXMLNotation.cpp
Просмотреть файл

@ -276,11 +276,11 @@ nsXMLNotation::List(FILE* out, PRInt32 aIndent) const
}
NS_IMETHODIMP
nsXMLNotation::HandleDOMEvent(nsIPresContext& aPresContext,
nsXMLNotation::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
// We should never be getting events
NS_ASSERTION(0, "event handler called for notation");

4
content/xml/content/src/nsXMLProcessingInstruction.cpp
Просмотреть файл

@ -266,11 +266,11 @@ nsXMLProcessingInstruction::List(FILE* out, PRInt32 aIndent) const
}
NS_IMETHODIMP
nsXMLProcessingInstruction::HandleDOMEvent(nsIPresContext& aPresContext,
nsXMLProcessingInstruction::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
// We should never be getting events
NS_ASSERTION(0, "event handler called for processing instruction");

10
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -2513,11 +2513,11 @@ nsXULElement::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const
NS_IMETHODIMP
nsXULElement::HandleDOMEvent(nsIPresContext& aPresContext,
nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult ret = NS_OK;
@ -2970,7 +2970,7 @@ nsXULElement::ExecuteJSCode(nsIDOMElement* anElement, nsEvent* aEvent)
// Handle the DOM event
nsEventStatus status = nsEventStatus_eIgnore;
content->HandleDOMEvent(*aPresContext, aEvent, nsnull, NS_EVENT_FLAG_INIT, status);
content->HandleDOMEvent(aPresContext, aEvent, nsnull, NS_EVENT_FLAG_INIT, &status);
}
return NS_OK;
@ -3485,9 +3485,7 @@ NS_IMETHODIMP nsXULElement::HandleChromeEvent(nsIPresContext* aPresContext,
nsEvent* aEvent, nsIDOMEvent** aDOMEvent, PRUint32 aFlags,
nsEventStatus* aEventStatus)
{
NS_ENSURE_ARG(aPresContext);
NS_ENSURE_ARG_POINTER(aEventStatus);
return HandleDOMEvent(*aPresContext, aEvent, aDOMEvent, aFlags,*aEventStatus);
return HandleDOMEvent(aPresContext, aEvent, aDOMEvent, aFlags,aEventStatus);
}
//----------------------------------------------------------------------

4
content/xul/content/src/nsXULElement.h
Просмотреть файл

@ -322,11 +322,11 @@ public:
NS_IMETHOD ConvertContentToXIF(nsXIFConverter& aConverter) const;
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const;
NS_IMETHOD SizeOf(nsISizeOfHandler* aSizer, PRUint32* aResult) const;
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
NS_IMETHOD GetContentID(PRUint32* aID);
NS_IMETHOD SetContentID(PRUint32 aID);

2
content/xul/content/src/nsXULTreeElement.cpp
Просмотреть файл

@ -376,7 +376,7 @@ nsXULTreeElement::FireOnSelectHandler()
event.eventStructType = NS_EVENT;
event.message = NS_FORM_SELECTED;
content->HandleDOMEvent(*aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
content->HandleDOMEvent(aPresContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
return NS_OK;

2
content/xul/document/src/nsXULCommandDispatcher.cpp
Просмотреть файл

@ -357,7 +357,7 @@ XULCommandDispatcherImpl::UpdateCommands(const nsString& aEventName)
nsEvent event;
event.eventStructType = NS_EVENT;
event.message = NS_XUL_COMMAND_UPDATE;
content->HandleDOMEvent(*context, &event, nsnull, NS_EVENT_FLAG_INIT, status);
content->HandleDOMEvent(context, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
}
}
return NS_OK;

4
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -1700,11 +1700,11 @@ nsXULDocument::GetDisplaySelection() const
}
NS_IMETHODIMP
nsXULDocument::HandleDOMEvent(nsIPresContext& aPresContext,
nsXULDocument::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult ret = NS_OK;
nsIDOMEvent* domEvent = nsnull;

4
content/xul/document/src/nsXULDocument.h
Просмотреть файл

@ -260,11 +260,11 @@ public:
virtual PRBool GetDisplaySelection() const;
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
// nsIXMLDocument interface

6
docshell/base/nsWebShell.cpp
Просмотреть файл

@ -1128,7 +1128,7 @@ nsWebShell::Destroy()
nsMouseEvent event;
event.eventStructType = NS_EVENT;
event.message = NS_PAGE_UNLOAD;
rv = mScriptGlobal->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
rv = mScriptGlobal->HandleDOMEvent(presContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
NS_RELEASE(presContext);
}
@ -3534,7 +3534,7 @@ nsWebShell::OnStartDocumentLoad(nsIDocumentLoader* loader,
nsMouseEvent event;
event.eventStructType = NS_EVENT;
event.message = NS_PAGE_UNLOAD;
rv = mScriptGlobal->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
rv = mScriptGlobal->HandleDOMEvent(presContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
NS_RELEASE(presContext);
}
@ -3609,7 +3609,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader,
nsMouseEvent event;
event.eventStructType = NS_EVENT;
event.message = NS_PAGE_LOAD;
rv = mScriptGlobal->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
rv = mScriptGlobal->HandleDOMEvent(presContext, &event, nsnull, NS_EVENT_FLAG_INIT, &status);
NS_RELEASE(presContext);
}

4
dom/public/nsIScriptGlobalObject.h
Просмотреть файл

@ -54,11 +54,11 @@ public:
NS_IMETHOD_(void) GetWebShell(nsIWebShell **aWebShell)=0;
NS_IMETHOD_(void) SetOpenerWindow(nsIDOMWindow *aOpener)=0;
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)=0;
nsEventStatus* aEventStatus)=0;
};
extern "C" NS_DOM nsresult NS_NewScriptGlobalObject(nsIScriptGlobalObject **aGlobal);

8
dom/src/base/nsGlobalWindow.cpp
Просмотреть файл

@ -2938,11 +2938,11 @@ GlobalWindowImpl::GetNewListenerManager(nsIEventListenerManager **aInstancePtrRe
}
nsresult
GlobalWindowImpl::HandleDOMEvent(nsIPresContext& aPresContext,
GlobalWindowImpl::HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus)
nsEventStatus* aEventStatus)
{
nsresult mRet = NS_OK;
nsIDOMEvent* mDOMEvent = nsnull;
@ -2955,7 +2955,7 @@ GlobalWindowImpl::HandleDOMEvent(nsIPresContext& aPresContext,
//Capturing stage
if (NS_EVENT_FLAG_BUBBLE != aFlags && mChromeEventHandler) {
// Check chrome document capture here.
mChromeEventHandler->HandleChromeEvent(&aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, &aEventStatus);
mChromeEventHandler->HandleChromeEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
}
//Local handling stage
@ -2971,7 +2971,7 @@ GlobalWindowImpl::HandleDOMEvent(nsIPresContext& aPresContext,
// For now filter out load and unload, since they cause problems.
if (aEvent->message != NS_PAGE_LOAD && aEvent->message != NS_PAGE_UNLOAD && aEvent->message != NS_FOCUS_CONTENT
&& aEvent->message != NS_BLUR_CONTENT) {
mChromeEventHandler->HandleChromeEvent(&aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_BUBBLE, &aEventStatus);
mChromeEventHandler->HandleChromeEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_BUBBLE, aEventStatus);
}
}

4
dom/src/base/nsGlobalWindow.h
Просмотреть файл

@ -208,11 +208,11 @@ public:
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
NS_IMETHOD HandleDOMEvent(nsIPresContext* aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,
PRUint32 aFlags,
nsEventStatus& aEventStatus);
nsEventStatus* aEventStatus);
// nsIJSScriptObject interface
virtual PRBool AddProperty(JSContext *aContext, jsval aID, jsval *aVp);

464
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

34
layout/base/nsCSSRendering.cpp
Просмотреть файл

@ -1358,7 +1358,7 @@ PRIntn whichSide=0;
}
// XXX improve this to constrain rendering to the damaged area
void nsCSSRendering::PaintBorder(nsIPresContext& aPresContext,
void nsCSSRendering::PaintBorder(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -1448,7 +1448,7 @@ void nsCSSRendering::PaintBorder(nsIPresContext& aPresContext,
/* Get our conversion values */
nscoord twipsPerPixel;
float p2t;
aPresContext.GetScaledPixelsToTwips(&p2t);
aPresContext->GetScaledPixelsToTwips(&p2t);
twipsPerPixel = NSIntPixelsToTwips(1,p2t);
@ -1492,7 +1492,7 @@ void nsCSSRendering::PaintBorder(nsIPresContext& aPresContext,
}
// XXX improve this to constrain rendering to the damaged area
void nsCSSRendering::PaintOutline(nsIPresContext& aPresContext,
void nsCSSRendering::PaintOutline(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -1538,7 +1538,7 @@ void nsCSSRendering::PaintOutline(nsIPresContext& aPresContext,
/* XXX something is misnamed here!!!! */
nscoord twipsPerPixel;/* XXX */
float p2t;/* XXX */
aPresContext.GetPixelsToTwips(&p2t);/* XXX */
aPresContext->GetPixelsToTwips(&p2t);/* XXX */
twipsPerPixel = (nscoord) p2t;/* XXX */
nscolor outlineColor;
@ -1582,7 +1582,7 @@ void nsCSSRendering::PaintOutline(nsIPresContext& aPresContext,
// XXX: doesn't do corners or junctions well at all. Just uses logic stolen
// from PaintBorder which is insufficient
void nsCSSRendering::PaintBorderEdges(nsIPresContext& aPresContext,
void nsCSSRendering::PaintBorderEdges(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -1614,7 +1614,7 @@ void nsCSSRendering::PaintBorderEdges(nsIPresContext& aPresContext,
// Draw all the other sides
nscoord twipsPerPixel;
float p2t;
aPresContext.GetPixelsToTwips(&p2t);
aPresContext->GetPixelsToTwips(&p2t);
twipsPerPixel = (nscoord) p2t;/* XXX huh!*/
if (0 == (aSkipSides & (1<<NS_SIDE_TOP))) {
@ -1854,7 +1854,7 @@ GetNearestScrollFrame(nsIFrame* aFrame)
}
void
nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -1874,7 +1874,7 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
nsSize imageSize;
nsIImage* image = nsnull;
nsIFrameImageLoader* loader = nsnull;
nsresult rv = aPresContext.StartLoadImage(aColor.mBackgroundImage,
nsresult rv = aPresContext->StartLoadImage(aColor.mBackgroundImage,
transparentBG
? nsnull
: &aColor.mBackgroundColor,
@ -1969,7 +1969,7 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
scrollFrame = GetNearestScrollFrame(aForFrame);
// Get the viewport size
clipView = GetClipView(&aPresContext, scrollFrame);
clipView = GetClipView(aPresContext, scrollFrame);
clipView->GetDimensions(&viewportArea.width, &viewportArea.height);
}
@ -1988,10 +1988,10 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
if (NS_STYLE_BG_ATTACHMENT_FIXED == aColor.mBackgroundAttachment) {
nsIView* view;
aForFrame->GetView(&aPresContext, &view);
aForFrame->GetView(aPresContext, &view);
if (!view) {
nsPoint offset;
aForFrame->GetOffsetFromView(&aPresContext, offset, &view);
aForFrame->GetOffsetFromView(aPresContext, offset, &view);
anchor -= offset;
}
NS_ASSERTION(view, "expected a view");
@ -2101,9 +2101,9 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
aRenderingContext.GetDrawingSurface((void**)&theSurface);
aPresContext.GetVisibleArea(srcRect);
aPresContext->GetVisibleArea(srcRect);
tvrect.SetRect(0,0,x1-x0,y1-y0);
aPresContext.GetTwipsToPixels(&t2p);
aPresContext->GetTwipsToPixels(&t2p);
if ((tileWidth<(tvrect.width/16)) || (tileHeight<(tvrect.height/16))) {
//tvrect.width /=4;
@ -2257,7 +2257,7 @@ static void AntiAliasPoly(nsIRenderingContext& aRenderingContext,nsPoint aPoint
* @update 3/26/99 dwc
*/
void
nsCSSRendering::PaintRoundedBackground(nsIPresContext& aPresContext,
nsCSSRendering::PaintRoundedBackground(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -2279,7 +2279,7 @@ nscoord twipsPerPixel;
float p2t;
// needed for our border thickness
aPresContext.GetPixelsToTwips(&p2t);
aPresContext->GetPixelsToTwips(&p2t);
twipsPerPixel = NSToCoordRound(p2t);
aRenderingContext.SetColor(aColor.mBackgroundColor);
@ -2347,7 +2347,7 @@ float p2t;
* @update 3/26/99 dwc
*/
void
nsCSSRendering::PaintRoundedBorder(nsIPresContext& aPresContext,
nsCSSRendering::PaintRoundedBorder(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -2377,7 +2377,7 @@ float p2t;
}
// needed for our border thickness
aPresContext.GetPixelsToTwips(&p2t);
aPresContext->GetPixelsToTwips(&p2t);
twipsPerPixel = NSToCoordRound(p2t);
// Base our thickness check on the segment being less than a pixel and 1/2

12
layout/base/nsCSSRendering.h
Просмотреть файл

@ -36,7 +36,7 @@ public:
* Both aDirtyRect and aBorderArea are in the local coordinate space
* of aForFrame
*/
static void PaintBorder(nsIPresContext& aPresContext,
static void PaintBorder(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -56,7 +56,7 @@ public:
* Both aDirtyRect and aBorderArea are in the local coordinate space
* of aForFrame
*/
static void PaintOutline(nsIPresContext& aPresContext,
static void PaintOutline(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -77,7 +77,7 @@ public:
* Both aDirtyRect and aBorderArea are in the local coordinate space
* of aForFrame
*/
static void PaintBorderEdges(nsIPresContext& aPresContext,
static void PaintBorderEdges(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -95,7 +95,7 @@ public:
* Both aDirtyRect and aBorderArea are in the local coordinate space
* of aForFrame
*/
static void PaintBackground(nsIPresContext& aPresContext,
static void PaintBackground(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -142,7 +142,7 @@ protected:
* Both aDirtyRect and aBorderArea are in the local coordinate space
* of aForFrame
*/
static void PaintRoundedBorder(nsIPresContext& aPresContext,
static void PaintRoundedBorder(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,
@ -157,7 +157,7 @@ protected:
const nsStyleSpacing& aBorderStyle,nsIStyleContext* aStyleContext,
PRUint8 aSide,nsMargin &aBorThick,nscoord aTwipsPerPixel);
static void PaintRoundedBackground(nsIPresContext& aPresContext,
static void PaintRoundedBackground(nsIPresContext* aPresContext,
nsIRenderingContext& aRenderingContext,
nsIFrame* aForFrame,
const nsRect& aDirtyRect,

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше