From eb52584f848f50fbd4423618fc0d42f9d918fc17 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 17 Mar 2013 08:55:13 +0100
Subject: [PATCH] Bug 845374 - Part g: Stop including nsContentSink.h in
 nsContentUtils.h; r=khuey

---
 content/base/public/nsContentUtils.h |  1 -
 image/src/VectorImage.cpp            | 24 +++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index c52cd84de6a4..9d1ffed89470 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -25,7 +25,6 @@
 #include "nsAString.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentListDeclarations.h"
-#include "nsContentSink.h"
 #include "nsDataHashtable.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp
index 066e3f1a45f0..975cb62341da 100644
--- a/image/src/VectorImage.cpp
+++ b/image/src/VectorImage.cpp
@@ -5,25 +5,27 @@
 
 #include "VectorImage.h"
 
-#include "imgDecoderObserver.h"
-#include "SVGDocumentWrapper.h"
+#include <algorithm>
+
 #include "gfxContext.h"
+#include "gfxDrawable.h"
 #include "gfxPlatform.h"
-#include "nsPresContext.h"
-#include "nsRect.h"
+#include "gfxUtils.h"
+#include "imgDecoderObserver.h"
+#include "mozilla/AutoRestore.h"
+#include "mozilla/dom/SVGSVGElement.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIObserverService.h"
 #include "nsIPresShell.h"
 #include "nsIStreamListener.h"
 #include "nsMimeTypes.h"
-#include "nsComponentManagerUtils.h"
+#include "nsPresContext.h"
+#include "nsRect.h"
 #include "nsServiceManagerUtils.h"
-#include "nsSVGUtils.h"  // for nsSVGUtils::ConvertToSurfaceSize
+#include "nsStubDocumentObserver.h"
 #include "nsSVGEffects.h" // for nsSVGRenderingObserver
-#include "gfxDrawable.h"
-#include "gfxUtils.h"
-#include "mozilla/AutoRestore.h"
-#include "mozilla/dom/SVGSVGElement.h"
-#include <algorithm>
+#include "nsSVGUtils.h"  // for nsSVGUtils::ConvertToSurfaceSize
+#include "SVGDocumentWrapper.h"
 
 namespace mozilla {