Bug 1304598 Part 4 - Sort #include statements in TouchManager.cpp and PresShell.h. r=dholbert

Need to add #includes "nsPresContext.h" and "nsThreadUtils.h" in
PresShell.h, and "nsViewportInfo.h" in MobileViewportManager.h to compile.

MozReview-Commit-ID: F8bmOwllOiH

--HG--
extra : rebase_source : cacbb30d854c68ea720f849d03b649bbd3c5da03

layout/base/MobileViewportManager.h

@@ -14,6 +14,7 @@
 class nsIDOMEventTarget;
 class nsIDocument;
 class nsIPresShell;
+class nsViewportInfo;
 
 class MobileViewportManager final : public nsIDOMEventListener
                                   , public nsIObserver

layout/base/PresShell.h

@@ -21,23 +21,25 @@
 #ifndef mozilla_PresShell_h
 #define mozilla_PresShell_h
 
-#include "nsIPresShell.h"
-#include "nsStubDocumentObserver.h"
-#include "nsISelectionController.h"
-#include "nsIObserver.h"
-#include "nsWeakReference.h"
-#include "nsCRT.h"
-#include "nsAutoPtr.h"
-#include "nsIWidget.h"
-#include "nsContentUtils.h" // For AddScriptBlocker().
-#include "nsRefreshDriver.h"
-#include "TouchManager.h"
+#include "MobileViewportManager.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/StyleSetHandle.h"
 #include "mozilla/UniquePtr.h"
-#include "MobileViewportManager.h"
+#include "nsAutoPtr.h"
+#include "nsContentUtils.h" // For AddScriptBlocker().
+#include "nsCRT.h"
+#include "nsIObserver.h"
+#include "nsIPresShell.h"
+#include "nsISelectionController.h"
+#include "nsIWidget.h"
+#include "nsPresContext.h"
+#include "nsRefreshDriver.h"
+#include "nsStubDocumentObserver.h"
+#include "nsThreadUtils.h"
+#include "nsWeakReference.h"
+#include "TouchManager.h"
 #include "ZoomConstraintsClient.h"
 
 class nsIDocShell;

layout/base/TouchManager.cpp

@@ -8,8 +8,8 @@
 #include "TouchManager.h"
 
 #include "mozilla/dom/EventTarget.h"
-#include "nsIFrame.h"
 #include "mozilla/PresShell.h"
+#include "nsIFrame.h"
 #include "nsView.h"
 
 using namespace mozilla::dom;