Bug 579323. Part 1.6: Clean up dead code, rename nsFrameFrame to nsSubDocumentFrame. r=tnikkel

--HG--
rename : layout/generic/nsFrameFrame.cpp => layout/generic/nsSubDocumentFrame.cpp
extra : rebase_source : af240f2cb12b94e544031a5860fca1a9fb1217e0

layout/generic/Makefile.in

@@ -90,7 +90,6 @@ CPPSRCS		= \
 		nsFirstLetterFrame.cpp \
 		nsFloatManager.cpp \
 		nsFrame.cpp \
-		nsFrameFrame.cpp \
 		nsFrameList.cpp \
 		nsFrameSetFrame.cpp \
 		nsFrameUtil.cpp \
@@ -113,6 +112,7 @@ CPPSRCS		= \
 		nsSelection.cpp \
 		nsSimplePageSequence.cpp \
 		nsSplittableFrame.cpp \
+		nsSubDocumentFrame.cpp \
 		nsTextFrameThebes.cpp \
 		nsTextFrameUtils.cpp \
 		nsTextRunTransformations.cpp \

layout/generic/nsIFrameFrame.h

@@ -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

layout/generic/nsSubDocumentFrame.cpp

@@ -777,7 +777,7 @@ nsSubDocumentFrame::FrameLoader()
 
 // 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;
@@ -786,7 +786,7 @@ nsSubDocumentFrame::GetDocShell(nsIDocShell **aDocShell)
   return mFrameLoader->GetDocShell(aDocShell);
 }
 
-NS_IMETHODIMP
+nsresult
 nsSubDocumentFrame::BeginSwapDocShells(nsIFrame* aOther)
 {
   if (!aOther || aOther->GetType() != nsGkAtoms::subDocumentFrame) {

layout/generic/nsSubDocumentFrame.h

@@ -114,11 +114,11 @@ public:
   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();