Bug 648885 - Part 2: Remove nsIImageFrame. r=roc

--HG--
extra : rebase_source : 3097ee732ab2ba3b7a79253f7f71c09eed22d033

accessible/src/base/nsAccessibilityService.cpp

@@ -65,7 +65,7 @@
 #include "nsIDOMHTMLOptionElement.h"
 #include "nsIDOMXULElement.h"
 #include "nsIHTMLDocument.h"
-#include "nsIImageFrame.h"
+#include "nsImageFrame.h"
 #include "nsILink.h"
 #include "nsIObserverService.h"
 #include "nsIPluginInstance.h"
@@ -1266,7 +1266,7 @@ nsAccessibilityService::GetAreaAccessible(nsIFrame* aImageFrame,
                                           nsAccessible** aImageAccessible)
 {
   // Check if frame is an image frame, and content is <area>.
-  nsIImageFrame *imageFrame = do_QueryFrame(aImageFrame);
+  nsImageFrame *imageFrame = do_QueryFrame(aImageFrame);
   if (!imageFrame)
     return nsnull;
 

accessible/src/html/nsHTMLImageMapAccessible.cpp

@@ -47,7 +47,7 @@
 #include "nsIDOMElement.h"
 #include "nsIDOMHTMLAreaElement.h"
 #include "nsIFrame.h"
-#include "nsIImageFrame.h"
+#include "nsImageFrame.h"
 #include "nsIImageMap.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -203,7 +203,7 @@ nsHTMLAreaAccessible::GetBounds(PRInt32 *aX, PRInt32 *aY,
 
   nsIFrame *frame = GetFrame();
   NS_ENSURE_TRUE(frame, NS_ERROR_FAILURE);
-  nsIImageFrame *imageFrame = do_QueryFrame(frame);
+  nsImageFrame *imageFrame = do_QueryFrame(frame);
 
   nsCOMPtr<nsIImageMap> map;
   imageFrame->GetImageMap(presContext, getter_AddRefs(map));

layout/generic/Makefile.in

@@ -61,7 +61,6 @@ EXPORTS		= \
 		nsIAnonymousContentCreator.h \
 		nsIFrame.h \
 		nsIFrameUtil.h \
-		nsIImageFrame.h \
 		nsILineIterator.h \
 		nsIObjectFrame.h \
 		nsIPageSequenceFrame.h \

layout/generic/nsIImageFrame.h

@@ -1,61 +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 with bitmap
- * image data
- */
-
-#ifndef nsIImageFrame_h___
-#define nsIImageFrame_h___
-
-struct nsSize;
-class imgIRequest;
-class nsPresContext;
-class nsIImageMap;
-
-class nsIImageFrame
-{
-public:
-  NS_DECL_QUERYFRAME_TARGET(nsIImageFrame)
-
-  NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize) = 0;
-
-  NS_IMETHOD GetImageMap(nsPresContext *aPresContext, nsIImageMap **aImageMap) = 0;
-};
-
-#endif /* nsIImageFrame_h___ */

layout/generic/nsImageFrame.cpp

@@ -182,7 +182,7 @@ nsImageFrame::~nsImageFrame()
 }
 
 NS_QUERYFRAME_HEAD(nsImageFrame)
-  NS_QUERYFRAME_ENTRY(nsIImageFrame)
+  NS_QUERYFRAME_ENTRY(nsImageFrame)
 NS_QUERYFRAME_TAIL_INHERITING(ImageFrameSuper)
 
 #ifdef ACCESSIBILITY
@@ -1444,7 +1444,7 @@ nsImageFrame::ShouldDisplaySelection()
   return true;
 }
 
-NS_IMETHODIMP
+nsresult
 nsImageFrame::GetImageMap(nsPresContext *aPresContext, nsIImageMap **aImageMap)
 {
   nsImageMap *map = GetImageMap(aPresContext);
@@ -1757,7 +1757,7 @@ nsImageFrame::GetSkipSides() const
   return skip;
 }
 
-NS_IMETHODIMP 
+nsresult
 nsImageFrame::GetIntrinsicImageSize(nsSize& aSize)
 {
   if (mIntrinsicSize.width.GetUnit() == eStyleUnit_Coord &&

layout/generic/nsImageFrame.h

@@ -42,7 +42,6 @@
 #define nsImageFrame_h___
 
 #include "nsSplittableFrame.h"
-#include "nsIImageFrame.h"
 #include "nsIIOService.h"
 #include "nsIObserver.h"
 
@@ -63,6 +62,7 @@ class nsDisplayImage;
 class nsPresContext;
 class nsImageFrame;
 class nsTransform2D;
+class nsIImageMap;
 
 namespace mozilla {
 namespace layers {
@@ -100,7 +100,7 @@ private:
 
 #define ImageFrameSuper nsSplittableFrame
 
-class nsImageFrame : public ImageFrameSuper, public nsIImageFrame {
+class nsImageFrame : public ImageFrameSuper {
 public:
   typedef mozilla::layers::ImageContainer ImageContainer;
   typedef mozilla::layers::ImageLayer ImageLayer;
@@ -110,6 +110,7 @@ public:
 
   nsImageFrame(nsStyleContext* aContext);
 
+  NS_DECL_QUERYFRAME_TARGET(nsImageFrame)
   NS_DECL_QUERYFRAME
 
   virtual void DestroyFrom(nsIFrame* aDestructRoot);
@@ -158,9 +159,9 @@ public:
 
   virtual PRIntn GetSkipSides() const;
 
-  NS_IMETHOD GetImageMap(nsPresContext *aPresContext, nsIImageMap **aImageMap);
+  nsresult GetImageMap(nsPresContext *aPresContext, nsIImageMap **aImageMap);
 
-  NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize);
+  nsresult GetIntrinsicImageSize(nsSize& aSize);
 
   static void ReleaseGlobals() {
     if (gIconLoad) {

layout/generic/nsQueryFrame.h

@@ -114,7 +114,6 @@ public:
     nsIFormControlFrame_id,
     nsIFrame_id,
     nsIFrameFrame_id,
-    nsIImageFrame_id,
     nsIListControlFrame_id,
     nsIMathMLFrame_id,
     nsIMenuFrame_id,