From b65796773604cc8b5a3c281a503fa5c0ab139882 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Wed, 2 Nov 2005 16:34:32 +0000 Subject: [PATCH] bug 314679 remove some unused code from nsObjectFrame r+sr=bz --- layout/generic/nsObjectFrame.cpp | 16 ---------------- layout/generic/nsObjectFrame.h | 2 -- 2 files changed, 18 deletions(-) diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 46f323b03d8..952d0314894 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -376,7 +376,6 @@ public: #if defined(XP_MAC) || defined(XP_MACOSX) nsPluginPort* FixUpPluginWindow(PRInt32 inPaintState); void GUItoMacEvent(const nsGUIEvent& anEvent, EventRecord* origEvent, EventRecord& aMacEvent); - void Composite(); #endif private: @@ -1317,12 +1316,6 @@ nsObjectFrame::DidReflow(nsPresContext* aPresContext, mInstanceOwner->ReleasePluginPort((nsPluginPort *)window->window); - if (mWidget) { - PRInt32 x = origin.x; - PRInt32 y = origin.y; - mWidget->Move(x, y); - } - return rv; } @@ -3984,14 +3977,5 @@ nsPluginPort* nsPluginInstanceOwner::FixUpPluginWindow(PRInt32 inPaintState) return pluginPort; } -void nsPluginInstanceOwner::Composite() -{ - //no reference count on view - nsIView* view = mOwner->GetView(); - if (view) { - view->GetViewManager()->UpdateView(view, NS_VMREFRESH_IMMEDIATE); - } -} - #endif // XP_MAC || XP_MACOSX diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h index 26b707806ed..6697a51c08a 100644 --- a/layout/generic/nsObjectFrame.h +++ b/layout/generic/nsObjectFrame.h @@ -200,8 +200,6 @@ protected: private: nsPluginInstanceOwner *mInstanceOwner; nsCOMPtr mFullURL; - nsIFrame *mFirstChild; - nsCOMPtr mWidget; nsRect mWindowlessRect; #ifdef DEBUG