Bug 579323. Part 1.6: Clean up dead code, rename nsFrameFrame to nsSubDocumentFrame. r=tnikkel
authorRobert O'Callahan <robert@ocallahan.org>
Tue, 31 Aug 2010 12:49:11 +1200
changeset 51755 b002a8eb529f574d4ab07790510a15e5071c8cd2
parent 51754 248e40d56e0bf4c64b8386702f888f9fae37d268
child 51756 8f8d9eb61a5cbc7341126c503c16b9f3c47de5c0
push idunknown
push userunknown
push dateunknown
reviewerstnikkel
bugs579323
milestone2.0b5pre
Bug 579323. Part 1.6: Clean up dead code, rename nsFrameFrame to nsSubDocumentFrame. r=tnikkel
layout/generic/Makefile.in
layout/generic/nsFrameFrame.cpp
layout/generic/nsIFrameFrame.h
layout/generic/nsSubDocumentFrame.cpp
layout/generic/nsSubDocumentFrame.h
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -85,17 +85,16 @@ CPPSRCS		= \
 		nsBlockReflowContext.cpp \
 		nsBlockReflowState.cpp \
 		nsBulletFrame.cpp \
 		nsColumnSetFrame.cpp \
 		nsContainerFrame.cpp \
 		nsFirstLetterFrame.cpp \
 		nsFloatManager.cpp \
 		nsFrame.cpp \
-		nsFrameFrame.cpp \
 		nsFrameList.cpp \
 		nsFrameSetFrame.cpp \
 		nsFrameUtil.cpp \
 		nsGfxScrollFrame.cpp \
 		nsHTMLCanvasFrame.cpp \
 		nsHTMLContainerFrame.cpp \
 		nsCanvasFrame.cpp \
 		nsHTMLReflowState.cpp \
@@ -108,16 +107,17 @@ CPPSRCS		= \
 		nsLineLayout.cpp \
 		nsObjectFrame.cpp \
 		nsPageContentFrame.cpp \
 		nsPageFrame.cpp \
 		nsPlaceholderFrame.cpp \
 		nsSelection.cpp \
 		nsSimplePageSequence.cpp \
 		nsSplittableFrame.cpp \
+		nsSubDocumentFrame.cpp \
 		nsTextFrameThebes.cpp \
 		nsTextFrameUtils.cpp \
 		nsTextRunTransformations.cpp \
 		nsViewportFrame.cpp \
 		$(NULL)
 
 ifdef MOZ_MEDIA
 CPPSRCS		+= \
deleted file mode 100644
--- a/layout/generic/nsIFrameFrame.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * interface for rendering objects for replaced elements containing a
- * document, such as <frame>, <iframe>, and some <object>s
- */
-
-#ifndef nsIFrameFrame_h___
-#define nsIFrameFrame_h___
-
-class nsIDocShell;
-class nsIView;
-
-class nsIFrameFrame
-{
-public:
-  NS_DECL_QUERYFRAME_TARGET(nsIFrameFrame)
-
-  NS_IMETHOD GetDocShell(nsIDocShell **aDocShell) = 0;
-
-  /**
-   * Only allowed to fail if the other frame is not the same type as
-   * this one or if one of the frames has no docshell.  Don't call
-   * EndSwapDocShells() unless BeginSwapDocShells() succeeds.
-   */
-  NS_IMETHOD BeginSwapDocShells(nsIFrame* aOther) = 0;
-  virtual void EndSwapDocShells(nsIFrame* aOther) = 0;
-
-  /**
-   * The frameloader informs us what kind of widget to create during Show()
-   */
-  virtual nsIView* CreateViewAndWidget(nsContentType aContentType) = 0;
-
-  virtual nsIFrame* GetFrame() = 0;
-
-  virtual nsIFrame* GetSubdocumentRootFrame() = 0;
-};
-
-#endif
rename from layout/generic/nsFrameFrame.cpp
rename to layout/generic/nsSubDocumentFrame.cpp
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -772,26 +772,26 @@ nsSubDocumentFrame::FrameLoader()
       mFrameLoader = static_cast<nsFrameLoader*>(loader.get());
     }
   }
   return mFrameLoader;
 }
 
 // XXX this should be called ObtainDocShell or something like that,
 // to indicate that it could have side effects
-NS_IMETHODIMP
+nsresult
 nsSubDocumentFrame::GetDocShell(nsIDocShell **aDocShell)
 {
   *aDocShell = nsnull;
 
   NS_ENSURE_STATE(FrameLoader());
   return mFrameLoader->GetDocShell(aDocShell);
 }
 
-NS_IMETHODIMP
+nsresult
 nsSubDocumentFrame::BeginSwapDocShells(nsIFrame* aOther)
 {
   if (!aOther || aOther->GetType() != nsGkAtoms::subDocumentFrame) {
     return NS_ERROR_NOT_IMPLEMENTED;
   }
 
   nsSubDocumentFrame* other = static_cast<nsSubDocumentFrame*>(aOther);
   if (!mFrameLoader || !mDidCreateDoc || mCallingShow ||
--- a/layout/generic/nsSubDocumentFrame.h
+++ b/layout/generic/nsSubDocumentFrame.h
@@ -109,21 +109,21 @@ public:
   // the child content ourselves, since it belongs to a different
   // document and CSS doesn't inherit in there.
   virtual PRBool SupportsVisibilityHidden() { return PR_FALSE; }
 
 #ifdef ACCESSIBILITY
   virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
-  NS_IMETHOD GetDocShell(nsIDocShell **aDocShell);
-  NS_IMETHOD BeginSwapDocShells(nsIFrame* aOther);
-  virtual void EndSwapDocShells(nsIFrame* aOther);
+  nsresult GetDocShell(nsIDocShell **aDocShell);
+  nsresult BeginSwapDocShells(nsIFrame* aOther);
+  void EndSwapDocShells(nsIFrame* aOther);
   nsIView* CreateViewAndWidget(nsContentType aContentType);
-  virtual nsIFrame* GetSubdocumentRootFrame();
+  nsIFrame* GetSubdocumentRootFrame();
 
   // nsIReflowCallback
   virtual PRBool ReflowFinished();
   virtual void ReflowCallbackCanceled();
 
 protected:
   friend class AsyncFrameInit;