Bug 584841 patch 7: Rename imgContainer source files. r=bholley a=blocking
authorDaniel Holbert <dholbert@cs.stanford.edu>
Fri, 13 Aug 2010 21:09:49 -0700
changeset 50551 1893ccde199ec4b047a8e3e9c57a9b29b686dc54
parent 50550 20adb37475a5815223e442b76736c648548ff0d2
child 50552 3d1f9740a61a04870fc7e1b1ee6b7cfea9329dba
push id15072
push userdholbert@mozilla.com
push dateSat, 14 Aug 2010 04:11:44 +0000
treeherdermozilla-central@eccba2835f01 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley, blocking
bugs584841
milestone2.0b4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 584841 patch 7: Rename imgContainer source files. r=bholley a=blocking
modules/libpr0n/build/nsImageModule.cpp
modules/libpr0n/src/DiscardTracker.cpp
modules/libpr0n/src/Makefile.in
modules/libpr0n/src/RasterImage.cpp
modules/libpr0n/src/RasterImage.h
modules/libpr0n/src/imgContainer.cpp
modules/libpr0n/src/imgContainer.h
modules/libpr0n/src/imgLoader.cpp
modules/libpr0n/src/imgRequest.cpp
modules/libpr0n/src/imgTools.cpp
--- a/modules/libpr0n/build/nsImageModule.cpp
+++ b/modules/libpr0n/build/nsImageModule.cpp
@@ -46,17 +46,17 @@
 #define IMG_BUILD_jpeg 1
 #endif
 
 #include "nsIDeviceContext.h"
 #include "mozilla/ModuleUtils.h"
 #include "nsXPCOMCID.h"
 #include "nsServiceManagerUtils.h"
 
-#include "imgContainer.h"
+#include "RasterImage.h"
 
 /* We end up pulling in windows.h because we eventually hit gfxWindowsSurface;
  * windows.h defines LoadImage, so we have to #undef it or imgLoader::LoadImage
  * gets changed.
  * This #undef needs to be in multiple places because we don't always pull
  * headers in in the same order.
  */
 #undef LoadImage
--- a/modules/libpr0n/src/DiscardTracker.cpp
+++ b/modules/libpr0n/src/DiscardTracker.cpp
@@ -36,17 +36,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsIServiceManager.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch2.h"
 
 #include "nsComponentManagerUtils.h"
 #include "nsITimer.h"
-#include "imgContainer.h"
+#include "RasterImage.h"
 #include "DiscardTracker.h"
 
 namespace mozilla {
 namespace imagelib {
 
 static PRBool sInitialized = PR_FALSE;
 static PRBool sTimerOn = PR_FALSE;
 static PRUint32 sMinDiscardTimeoutMs = 10000; /* Default if pref unreadable. */
--- a/modules/libpr0n/src/Makefile.in
+++ b/modules/libpr0n/src/Makefile.in
@@ -48,17 +48,17 @@ FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsImageLib2Module
 GRE_MODULE	= 1
 LIBXUL_LIBRARY  = 1
 
 
 CPPSRCS		= \
 			Image.cpp \
 			DiscardTracker.cpp \
-			imgContainer.cpp \
+			RasterImage.cpp \
 			imgFrame.cpp \
 			imgLoader.cpp    \
 			imgRequest.cpp   \
 			imgRequestProxy.cpp \
 			imgTools.cpp \
                         imgStatusTracker.cpp \
 			$(NULL)
 
rename from modules/libpr0n/src/imgContainer.cpp
rename to modules/libpr0n/src/RasterImage.cpp
--- a/modules/libpr0n/src/imgContainer.cpp
+++ b/modules/libpr0n/src/RasterImage.cpp
@@ -42,17 +42,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsComponentManagerUtils.h"
 #include "imgIContainerObserver.h"
 #include "ImageErrors.h"
 #include "imgIDecoder.h"
 #include "imgIDecoderObserver.h"
-#include "imgContainer.h"
+#include "RasterImage.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsAutoPtr.h"
 #include "nsStringStream.h"
 #include "prmem.h"
 #include "prlog.h"
 #include "prenv.h"
 #include "nsTime.h"
rename from modules/libpr0n/src/imgContainer.h
rename to modules/libpr0n/src/RasterImage.h
--- a/modules/libpr0n/src/imgLoader.cpp
+++ b/modules/libpr0n/src/imgLoader.cpp
@@ -36,17 +36,17 @@
  * 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 ***** */
 
 #include "imgLoader.h"
 #include "imgRequestProxy.h"
 
-#include "imgContainer.h"
+#include "RasterImage.h"
 /* We end up pulling in windows.h because we eventually hit gfxWindowsSurface;
  * windows.h defines LoadImage, so we have to #undef it or imgLoader::LoadImage
  * gets changed.
  * This #undef needs to be in multiple places because we don't always pull
  * headers in in the same order.
  */
 #undef LoadImage
 
--- a/modules/libpr0n/src/imgRequest.cpp
+++ b/modules/libpr0n/src/imgRequest.cpp
@@ -45,17 +45,17 @@
  * gets changed.
  * This #undef needs to be in multiple places because we don't always pull
  * headers in in the same order.
  */
 #undef LoadImage
 
 #include "imgLoader.h"
 #include "imgRequestProxy.h"
-#include "imgContainer.h"
+#include "RasterImage.h"
 
 #include "imgILoader.h"
 #include "ImageLogging.h"
 
 #include "netCore.h"
 
 #include "nsIChannel.h"
 #include "nsICachingChannel.h"
--- a/modules/libpr0n/src/imgTools.cpp
+++ b/modules/libpr0n/src/imgTools.cpp
@@ -47,17 +47,17 @@
 #include "imgIContainerObserver.h"
 #include "gfxContext.h"
 #include "nsStringStream.h"
 #include "nsComponentManagerUtils.h"
 #include "nsWeakReference.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsStreamUtils.h"
 #include "nsNetUtil.h"
-#include "imgContainer.h"
+#include "RasterImage.h"
 
 using namespace mozilla::imagelib;
 
 /* ========== imgITools implementation ========== */
 
 
 
 NS_IMPL_ISUPPORTS1(imgTools, imgITools)