wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout 58cb6ed02553 (bug 1120622, bug 1120620, bug 1119068, bug 1119268, bug 1119264, bug 1119261) for b2g build bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-01-12 14:48:13 -08:00
parent c9a46ce4b2
commit 8fa3a755e3
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embedding/browser/nsDocShellTreeOwner.h
View File

@ -155,7 +155,7 @@ public:
ChromeTooltipListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome);
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
NS_IMETHOD MouseMove(nsIDOMEvent* aMouseEvent);
// Add/remove the relevant listeners, based on what interfaces
@ -227,7 +227,7 @@ public:
ChromeContextMenuListener(nsWebBrowser* inBrowser, nsIWebBrowserChrome* inChrome);
// nsIDOMContextMenuListener
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) MOZ_OVERRIDE;
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
// Add/remove the relevant listeners, based on what interfaces
// the embedding chrome implements.

18
embedding/components/find/nsFind.cpp
View File

@ -94,12 +94,12 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS(nsFindContentIterator)
// nsIContentIterator
virtual nsresult Init(nsINode* aRoot) MOZ_OVERRIDE
virtual nsresult Init(nsINode* aRoot)
{
NS_NOTREACHED("internal error");
return NS_ERROR_NOT_IMPLEMENTED;
}
virtual nsresult Init(nsIDOMRange* aRange) MOZ_OVERRIDE
virtual nsresult Init(nsIDOMRange* aRange)
{
NS_NOTREACHED("internal error");
return NS_ERROR_NOT_IMPLEMENTED;
@ -107,13 +107,13 @@ public:
// Not a range because one of the endpoints may be anonymous.
nsresult Init(nsIDOMNode* aStartNode, int32_t aStartOffset,
nsIDOMNode* aEndNode, int32_t aEndOffset);
virtual void First() MOZ_OVERRIDE;
virtual void Last() MOZ_OVERRIDE;
virtual void Next() MOZ_OVERRIDE;
virtual void Prev() MOZ_OVERRIDE;
virtual nsINode* GetCurrentNode() MOZ_OVERRIDE;
virtual bool IsDone() MOZ_OVERRIDE;
virtual nsresult PositionAt(nsINode* aCurNode) MOZ_OVERRIDE;
virtual void First();
virtual void Last();
virtual void Next();
virtual void Prev();
virtual nsINode* GetCurrentNode();
virtual bool IsDone();
virtual nsresult PositionAt(nsINode* aCurNode);
protected:
virtual ~nsFindContentIterator()

4
embedding/components/printingui/ipc/PrintProgressDialogChild.h
View File

@ -25,7 +25,7 @@ class PrintProgressDialogChild MOZ_FINAL : public PPrintProgressDialogChild,
public:
MOZ_IMPLICIT PrintProgressDialogChild(nsIObserver* aOpenObserver);
virtual bool RecvDialogOpened() MOZ_OVERRIDE;
virtual bool RecvDialogOpened();
private:
virtual ~PrintProgressDialogChild();
@ -37,4 +37,4 @@ private:
} // namespace embedding
} // namespace mozilla
#endif
#endif

12
embedding/components/printingui/ipc/PrintProgressDialogParent.h
View File

@ -29,26 +29,26 @@ public:
virtual bool
RecvStateChange(
const long& stateFlags,
const nsresult& status) MOZ_OVERRIDE;
const nsresult& status);
virtual bool
RecvProgressChange(
const long& curSelfProgress,
const long& maxSelfProgress,
const long& curTotalProgress,
const long& maxTotalProgress) MOZ_OVERRIDE;
const long& maxTotalProgress);
virtual bool
RecvDocTitleChange(const nsString& newTitle) MOZ_OVERRIDE;
RecvDocTitleChange(const nsString& newTitle);
virtual bool
RecvDocURLChange(const nsString& newURL) MOZ_OVERRIDE;
RecvDocURLChange(const nsString& newURL);
virtual void
ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
ActorDestroy(ActorDestroyReason aWhy);
virtual bool
Recv__delete__() MOZ_OVERRIDE;
Recv__delete__();
private:
virtual ~PrintProgressDialogParent();

4
embedding/components/printingui/ipc/nsPrintingPromptServiceProxy.h
View File

@ -23,10 +23,10 @@ public:
NS_DECL_NSIPRINTINGPROMPTSERVICE
virtual PPrintProgressDialogChild*
AllocPPrintProgressDialogChild() MOZ_OVERRIDE;
AllocPPrintProgressDialogChild();
virtual bool
DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor) MOZ_OVERRIDE;
DeallocPPrintProgressDialogChild(PPrintProgressDialogChild* aActor);
};
#endif

2
embedding/components/webbrowserpersist/nsWebBrowserPersist.h
View File

@ -221,7 +221,7 @@ public:
nsEncoderNodeFixup();
NS_DECL_ISUPPORTS
NS_IMETHOD FixupNode(nsIDOMNode *aNode, bool *aSerializeCloneKids, nsIDOMNode **aOutNode) MOZ_OVERRIDE;
NS_IMETHOD FixupNode(nsIDOMNode *aNode, bool *aSerializeCloneKids, nsIDOMNode **aOutNode);
nsWebBrowserPersist *mWebBrowserPersist;

4
embedding/components/windowwatcher/nsWindowWatcher.cpp
View File

@ -143,8 +143,8 @@ class nsWatcherWindowEnumerator : public nsISimpleEnumerator {
public:
explicit nsWatcherWindowEnumerator(nsWindowWatcher *inWatcher);
NS_IMETHOD HasMoreElements(bool *retval) MOZ_OVERRIDE;
NS_IMETHOD GetNext(nsISupports **retval) MOZ_OVERRIDE;
NS_IMETHOD HasMoreElements(bool *retval);
NS_IMETHOD GetNext(nsISupports **retval);
NS_DECL_ISUPPORTS