Bug 1510247. Fix some unified build issues in widget code. r=spohl

Differential Revision: https://phabricator.services.mozilla.com/D13061

--HG--
extra : rebase_source : 919f43d45fc9bc4fe8502b0acf3d01ed067cdd49

widget/cocoa/GfxInfo.mm

@@ -12,6 +12,7 @@
 #include "nsUnicharUtils.h"
 #include "nsExceptionHandler.h"
 #include "nsCocoaFeatures.h"
+#include "nsCocoaUtils.h"
 #include "nsICrashReporter.h"
 #include "mozilla/Preferences.h"
 #include <algorithm>

widget/cocoa/RectTextureImage.h

@@ -6,7 +6,10 @@
 #ifndef RectTextureImage_h_
 #define RectTextureImage_h_
 
+#include "GLTypes.h"
+#include "mozilla/gfx/2D.h"
 #include "mozilla/RefPtr.h"
+#include "Units.h"
 
 class MacIOSurface;
 
@@ -16,6 +19,10 @@ namespace gl {
 class GLContext;
 } // namespace gl
 
+namespace layers {
+class GLManager;
+} // namespace layers
+
 namespace widget {
 
 // Manages a texture which can resize dynamically, binds to the

widget/cocoa/ScreenHelperCocoa.mm

@@ -12,6 +12,8 @@
 #include "nsCocoaUtils.h"
 #include "nsObjCExceptions.h"
 
+using namespace mozilla;
+
 static LazyLogModule sScreenLog("WidgetScreen");
 
 @interface ScreenHelperDelegate : NSObject

widget/cocoa/SwipeTracker.h

@@ -14,7 +14,9 @@
 #include "nsRefreshDriver.h"
 #include "Units.h"
 
+class nsChildView;
 class nsIPresShell;
+class nsIWidget;
 
 namespace mozilla {
 

widget/cocoa/TextInputHandler.h

@@ -16,6 +16,7 @@
 #include "nsCOMPtr.h"
 #include "nsITimer.h"
 #include "nsTArray.h"
+#include "mozilla/BasicEvents.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/TextEventDispatcherListener.h"
 #include "WritingModes.h"

widget/cocoa/VibrancyManager.mm

@@ -5,7 +5,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "VibrancyManager.h"
+
 #include "nsChildView.h"
+#include "nsCocoaFeatures.h"
 #import <objc/message.h>
 
 using namespace mozilla;

widget/cocoa/ViewRegion.h

@@ -10,6 +10,8 @@
 #include "Units.h"
 #include "nsTArray.h"
 
+class nsChildView;
+
 @class NSView;
 
 namespace mozilla {
@@ -41,7 +43,7 @@ public:
   /**
    * Return an NSView from the region, if there is any.
    */
-  NSView* GetAnyView() { return mViews.Length() > 0 ? mViews[0] : nil; }
+  NSView* GetAnyView() { return mViews.Length() > 0 ? mViews[0] : NULL; }
 
 private:
   mozilla::LayoutDeviceIntRegion mRegion;

widget/cocoa/ViewRegion.mm

@@ -7,6 +7,8 @@
 #include "ViewRegion.h"
 #import <Cocoa/Cocoa.h>
 
+#include "nsChildView.h"
+
 using namespace mozilla;
 
 ViewRegion::~ViewRegion()

widget/cocoa/nsAppShell.mm

@@ -45,6 +45,7 @@
 #include "nsIDOMWakeLockListener.h"
 #include "nsIPowerManagerService.h"
 
+using namespace mozilla;
 using namespace mozilla::widget;
 
 #define WAKE_LOCK_LOG(...) MOZ_LOG(gMacWakeLockLog, mozilla::LogLevel::Debug, (__VA_ARGS__))

widget/cocoa/nsCocoaUtils.mm

@@ -14,6 +14,7 @@
 #include "nsCocoaUtils.h"
 #include "nsChildView.h"
 #include "nsMenuBarX.h"
+#include "nsCocoaFeatures.h"
 #include "nsCocoaWindow.h"
 #include "nsCOMPtr.h"
 #include "nsIInterfaceRequestorUtils.h"

widget/cocoa/nsDeviceContextSpecX.h

@@ -8,6 +8,8 @@
 
 #include "nsIDeviceContextSpec.h"
 
+#include "nsCOMPtr.h"
+
 #include <ApplicationServices/ApplicationServices.h>
 
 class nsDeviceContextSpecX : public nsIDeviceContextSpec

widget/cocoa/nsMacSharingService.mm

@@ -6,6 +6,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "nsMacSharingService.h"
+
+#include "jsapi.h"
 #include "nsCocoaUtils.h"
 #include "mozilla/MacStringHelpers.h"
 

widget/cocoa/nsMenuItemIconX.h

@@ -17,6 +17,7 @@
 
 class nsIURI;
 class nsIContent;
+class nsIPrincipal;
 class imgRequestProxy;
 class nsMenuObjectX;
 

widget/cocoa/nsMenuItemIconX.mm

@@ -40,6 +40,8 @@
 #include "nsIContentPolicy.h"
 #include "nsComputedDOMStyle.h"
 
+using namespace mozilla;
+
 using mozilla::dom::Element;
 using mozilla::gfx::SourceSurface;
 

widget/cocoa/nsMenuItemX.mm

@@ -21,6 +21,8 @@
 #include "nsIWidget.h"
 #include "nsIDocument.h"
 
+using namespace mozilla;
+
 using mozilla::dom::Event;
 using mozilla::dom::CallerType;
 

widget/cocoa/nsMenuX.h

@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "mozilla/EventForwards.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "nsMenuBaseX.h"

widget/cocoa/nsPrintSettingsX.mm

@@ -10,6 +10,7 @@
 #include "plstr.h"
 
 #include "nsCocoaUtils.h"
+#include "nsXULAppAPI.h"
 
 #include "mozilla/Preferences.h"
 

widget/headless/HeadlessWidget.cpp

@@ -11,8 +11,12 @@
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/TextEvents.h"
+#include "mozilla/widget/HeadlessWidgetTypes.h"
+#include "mozilla/widget/PlatformWidgetTypes.h"
+#include "nsIScreen.h"
 #include "HeadlessKeyBindings.h"
 
+using namespace mozilla;
 using namespace mozilla::gfx;
 using namespace mozilla::layers;
 

widget/nsDragServiceProxy.cpp

@@ -13,9 +13,13 @@
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
 
+using mozilla::CSSIntRegion;
 using mozilla::ipc::Shmem;
 using mozilla::dom::TabChild;
 using mozilla::dom::OptionalShmem;
+using mozilla::gfx::DataSourceSurface;
+using mozilla::gfx::SourceSurface;
+using mozilla::gfx::SurfaceFormat;
 using mozilla::LayoutDeviceIntRect;
 using mozilla::Maybe;
 
@@ -66,12 +70,11 @@ nsDragServiceProxy::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
   LayoutDeviceIntRect dragRect;
   if (mHasImage || mSelection) {
     nsPresContext* pc;
-    RefPtr<mozilla::gfx::SourceSurface> surface;
+    RefPtr<SourceSurface> surface;
     DrawDrag(mSourceNode, aRegion, mScreenPosition, &dragRect, &surface, &pc);
 
     if (surface) {
-      RefPtr<mozilla::gfx::DataSourceSurface> dataSurface =
-        surface->GetDataSurface();
+      RefPtr<DataSourceSurface> dataSurface = surface->GetDataSurface();
       if (dataSurface) {
         size_t length;
         int32_t stride;
@@ -101,9 +104,9 @@ nsDragServiceProxy::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
     }
   }
 
-  mozilla::Unused << child->SendInvokeDragSession(dataTransfers, aActionType,
-                                                  mozilla::void_t(), 0, static_cast<gfx::SurfaceFormat>(0), dragRect,
-                                                  principalURISpec);
+  mozilla::Unused << child->SendInvokeDragSession(
+      dataTransfers, aActionType, mozilla::void_t(), 0,
+      static_cast<SurfaceFormat>(0), dragRect, principalURISpec);
   StartDragSession();
   return NS_OK;
 }

widget/nsIDeviceContextSpec.h

@@ -6,6 +6,7 @@
 #ifndef nsIDeviceContextSpec_h___
 #define nsIDeviceContextSpec_h___
 
+#include "gfxPoint.h"
 #include "nsISupports.h"
 
 class nsIWidget;

widget/nsNativeTheme.cpp

@@ -22,6 +22,7 @@
 #include "nsMenuFrame.h"
 #include "nsRangeFrame.h"
 #include "nsCSSRendering.h"
+#include "mozilla/ComputedStyle.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLBodyElement.h"

widget/nsNativeTheme.h

@@ -11,6 +11,7 @@
 
 #include "nsAlgorithm.h"
 #include "nsAtom.h"
+#include "nsColor.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
 #include "nsMargin.h"

widget/nsPrintSettingsService.h

@@ -9,12 +9,11 @@
 
 #include "mozilla/embedding/PPrinting.h"
 #include "nsCOMPtr.h"
+#include "nsIPrintSettings.h"
 #include "nsIPrintSettingsService.h"
 #include "nsString.h"
 #include "nsFont.h"
 
-class nsIPrintSettings;
-
 /**
  * Class nsPrintSettingsService.  Base class for the platform specific widget
  * subclasses to inherit from.

widget/nsTransferable.cpp

@@ -34,6 +34,7 @@ Notes to self:
 #include "nsIOutputStream.h"
 #include "nsIInputStream.h"
 #include "nsILoadContext.h"
+#include "nsXULAppAPI.h"
 #include "mozilla/UniquePtr.h"
 
 using namespace mozilla;