Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge bustage for bug 313309

Browse Source
This commit is contained in:
bsmedberg%covad.net 2005-12-12 21:23:47 +00:00
parent 5176b93796
commit a1f185429a
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsBidiFrames.cpp
View File

@ -68,13 +68,6 @@ nsDirectionalFrame::GetType() const
return nsLayoutAtoms::directionalFrame;
}
const nsIID&
nsDirectionalFrame::GetIID()
{
static nsIID iid = NS_DIRECTIONAL_FRAME_IID;
return iid;
}
NS_IMETHODIMP
nsDirectionalFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{

2
layout/generic/nsBidiFrames.h
View File

@ -57,7 +57,7 @@ protected:
public:
nsDirectionalFrame(PRUnichar aChar);
static const nsIID& GetIID();
NS_DECLARE_STATIC_IID_ACCESSOR(NS_DIRECTIONAL_FRAME_IID)
NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);

2
layout/generic/nsIObjectFrame.h
View File

@ -43,7 +43,7 @@ class nsIPluginInstance;
// {F455B51F-7A1F-4bbe-B55D-679F033AD3FE}
#define NS_IOBJECTFRAME_IID \
{ 0xf455b51f, 0x7a1f, 0x4bbe, { 0xb5, 0x5d, 0x67, 0x9f, 0x3, 0x3a, 0xd3, 0xfe } };
{ 0xf455b51f, 0x7a1f, 0x4bbe, { 0xb5, 0x5d, 0x67, 0x9f, 0x3, 0x3a, 0xd3, 0xfe } }
class nsIObjectFrame : public nsISupports {
public: