Bug 1691861 - Unified build fixes. r=mconley
authorMarkus Stange <mstange.moz@gmail.com>
Fri, 12 Feb 2021 00:32:01 +0000
changeset 3537630 4c05e66763e2664993d701b9868a6f1c11ccd685
parent 3537629 c93691df2440915a5306c66562b67e5d8ddeee2e
child 3537631 b26ff99675eb6c025dd40ff0cc17781fb6c0563d
push id654313
push userwptsync@mozilla.com
push dateFri, 12 Feb 2021 09:09:29 +0000
treeherdertry@8a032d4accce [default view] [failures only]
reviewersmconley
bugs1691861
milestone87.0a1
Bug 1691861 - Unified build fixes. r=mconley Differential Revision: https://phabricator.services.mozilla.com/D104619
widget/IconLoader.cpp
widget/cocoa/NativeKeyBindings.mm
widget/cocoa/nsCocoaWindow.mm
widget/cocoa/nsTouchBarInputIcon.mm
--- a/widget/IconLoader.cpp
+++ b/widget/IconLoader.cpp
@@ -2,24 +2,23 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/widget/IconLoader.h"
 #include "gfxPlatform.h"
 #include "imgIContainer.h"
 #include "imgLoader.h"
+#include "imgRequestProxy.h"
 #include "mozilla/dom/Document.h"
 #include "nsContentUtils.h"
 #include "nsIContent.h"
 
 using namespace mozilla;
 
-using mozilla::gfx::SourceSurface;
-
 namespace mozilla::widget {
 
 NS_IMPL_CYCLE_COLLECTION(mozilla::widget::IconLoader, mContent, mHelper)
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(mozilla::widget::IconLoader)
   NS_INTERFACE_MAP_ENTRY(imgINotificationObserver)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(mozilla::widget::IconLoader)
--- a/widget/cocoa/NativeKeyBindings.mm
+++ b/widget/cocoa/NativeKeyBindings.mm
@@ -8,16 +8,17 @@
 #include "nsTArray.h"
 #include "nsCocoaUtils.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/WritingModes.h"
 
 #import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
 
 namespace mozilla {
 namespace widget {
 
 static LazyLogModule gNativeKeyBindingsLog("NativeKeyBindings");
 
 NativeKeyBindings* NativeKeyBindings::sInstanceForSingleLineEditor = nullptr;
 NativeKeyBindings* NativeKeyBindings::sInstanceForMultiLineEditor = nullptr;
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -37,16 +37,17 @@
 #include "nsPresContext.h"
 #include "nsDocShell.h"
 
 #include "gfxPlatform.h"
 #include "qcms.h"
 
 #include "mozilla/AutoRestore.h"
 #include "mozilla/BasicEvents.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_widget.h"
 #include "mozilla/WritingModes.h"
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include <algorithm>
--- a/widget/cocoa/nsTouchBarInputIcon.mm
+++ b/widget/cocoa/nsTouchBarInputIcon.mm
@@ -5,16 +5,17 @@
 
 /*
  * Retrieves and displays icons on the macOS Touch Bar.
  */
 
 #include "nsTouchBarInputIcon.h"
 
 #include "mozilla/dom/Document.h"
+#include "mozilla/widget/IconLoader.h"
 #include "nsCocoaUtils.h"
 #include "nsComputedDOMStyle.h"
 #include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 #include "nsINode.h"
 #include "nsNameSpaceManager.h"
 #include "nsObjCExceptions.h"