Bug 845374 - Part g: Stop including nsContentSink.h in nsContentUtils.h; r=khuey

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"

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 {