From 9740d173164ca7bbe3ba2eab1f3530348bfc94e8 Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 4 Oct 2007 03:07:38 +0000
Subject: [PATCH] Bug 398369 - "Break friendship between imgContainer and
 nsGIFDecoder2" [p=alfredkayser@nl.ibm.com (Alfred Kayser) r+sr+a1.9=stuart]

git-svn-id: svn://10.0.0.236/trunk@237236 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp | 5 -----
 mozilla/modules/libpr0n/src/imgContainer.h             | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
index f9a0a3ea6c2..99512a7f384 100644
--- a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -72,10 +72,7 @@ mailing address.
 */
 
 #include <stddef.h>
-#include "prtypes.h"
 #include "prmem.h"
-#include "prlog.h"
-#include "GIF2.h"
 
 #include "nsIImage.h"
 #include "nsIInterfaceRequestorUtils.h"
@@ -87,8 +84,6 @@ mailing address.
 
 #include "imgILoad.h"
 
-#include "imgContainer.h"
-
 #include "gfxColor.h"
 #include "gfxPlatform.h"
 #include "lcms.h"
diff --git a/mozilla/modules/libpr0n/src/imgContainer.h b/mozilla/modules/libpr0n/src/imgContainer.h
index dfd159a5fd3..379da52f634 100644
--- a/mozilla/modules/libpr0n/src/imgContainer.h
+++ b/mozilla/modules/libpr0n/src/imgContainer.h
@@ -103,7 +103,7 @@
  *
  * @note
  * <li> "Mask", "Alpha", and "Alpha Level" are interchangable phrases in
- * respects to imgContainerGIF.
+ * respects to imgContainer.
  *
  * @par
  * <li> GIFs never have more than a 1 bit alpha.
@@ -143,8 +143,6 @@ public:
   virtual ~imgContainer();
 
 private:
-  friend class nsGIFDecoder2;
-  
   struct Anim
   {
     //! Area of the first frame that needs to be redrawn on subsequent loops.