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

Bug 825866. Part 4: Remove nsIView's IID as it's not needed anymore. r=tnikkel

Browse Source
This commit is contained in:
Robert O'Callahan 2013-01-04 02:23:09 +13:00
parent b01cd2dee6
commit ef9b45c5d9
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
view/public/nsIView.h
View File

@ -34,10 +34,6 @@ enum nsViewVisibility {
nsViewVisibility_kShow = 1 nsViewVisibility_kShow = 1
}; };
#define NS_IVIEW_IID \
{ 0x7f979fcc, 0xa15a, 0x4f8a, \
{ 0x8b, 0x68, 0xa4, 0x16, 0xa1, 0x87, 0xad, 0xdc } }
// Public view flags // Public view flags
// Indicates that the view is using auto z-indexing // Indicates that the view is using auto z-indexing
@ -69,8 +65,6 @@ enum nsViewVisibility {
class nsIView MOZ_FINAL : public nsIWidgetListener class nsIView MOZ_FINAL : public nsIWidgetListener
{ {
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IVIEW_IID)
nsIView(nsViewManager* aViewManager = nullptr, nsIView(nsViewManager* aViewManager = nullptr,
nsViewVisibility aVisibility = nsViewVisibility_kShow); nsViewVisibility aVisibility = nsViewVisibility_kShow);
@ -347,8 +341,6 @@ public:
// origin) to view origin expressed in appunits of this. // origin) to view origin expressed in appunits of this.
nsPoint ViewToWidgetOffset() const { return mViewToWidgetOffset; } nsPoint ViewToWidgetOffset() const { return mViewToWidgetOffset; }
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
/** /**
* Called to indicate that the position of the view has been changed. * Called to indicate that the position of the view has been changed.
* The specified coordinates are in the parent view's coordinate space. * The specified coordinates are in the parent view's coordinate space.
@ -488,6 +480,4 @@ protected:
bool mInAlternatePaint; bool mInAlternatePaint;
}; };
NS_DEFINE_STATIC_IID_ACCESSOR(nsIView, NS_IVIEW_IID)
#endif #endif

19
view/src/nsView.cpp
View File

@ -117,25 +117,6 @@ void nsIView::DestroyWidget()
} }
} }
nsresult nsIView::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
if (nullptr == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
NS_ASSERTION(!aIID.Equals(NS_GET_IID(nsISupports)),
"Someone expects views to be ISupports-derived!");
*aInstancePtr = nullptr;
if (aIID.Equals(NS_GET_IID(nsIView))) {
*aInstancePtr = (void*)(nsIView*)this;
return NS_OK;
}
return NS_NOINTERFACE;
}
nsIView* nsIView::GetViewFor(nsIWidget* aWidget) nsIView* nsIView::GetViewFor(nsIWidget* aWidget)
{ {
NS_PRECONDITION(nullptr != aWidget, "null widget ptr"); NS_PRECONDITION(nullptr != aWidget, "null widget ptr");