From 1bf9d22652a51c41e45c27bf083cd25feb1a9cc7 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Fri, 31 Mar 2023 13:29:44 +0000 Subject: [PATCH] Bug 1825324 - Make widget/* buildable outside of a unified build environment r=andi,geckoview-reviewers,m_kato Depends on D173637 Differential Revision: https://phabricator.services.mozilla.com/D173969 --- accessible/windows/msaa/Compatibility.h | 2 ++ docshell/base/nsDocShellLoadState.h | 2 +- dom/interfaces/base/nsIBrowserChild.idl | 4 ++++ storage/mozStorageAsyncStatementExecution.cpp | 2 +- widget/GfxInfoBase.cpp | 2 ++ widget/PuppetWidget.cpp | 2 -- widget/VsyncDispatcher.cpp | 2 +- widget/WidgetEventImpl.cpp | 2 ++ widget/android/jni/moz.build | 2 -- widget/android/moz.build | 2 -- widget/cocoa/moz.build | 2 -- widget/cocoa/nsCursorManager.mm | 21 +++++++++++-------- widget/cocoa/nsMacUserActivityUpdater.mm | 1 + widget/cocoa/nsMenuBarX.h | 2 +- widget/cocoa/nsMenuGroupOwnerX.h | 2 +- widget/cocoa/nsTouchBar.mm | 1 + widget/headless/HeadlessWidget.cpp | 1 + widget/headless/moz.build | 2 -- widget/moz.build | 2 -- widget/nsIWidget.h | 2 +- widget/nsPrinterListCUPS.cpp | 2 +- widget/tests/gtest/moz.build | 2 -- widget/windows/IMMHandler.h | 3 +++ widget/windows/InkCollector.cpp | 4 +++- widget/windows/InkCollector.h | 1 + widget/windows/JumpListItem.cpp | 1 + widget/windows/KeyboardLayout.cpp | 1 - widget/windows/RemoteBackbuffer.cpp | 14 +++++++------ widget/windows/RemoteBackbuffer.h | 1 + widget/windows/SystemStatusBar.cpp | 2 ++ widget/windows/SystemStatusBar.h | 1 + widget/windows/TaskbarTabPreview.cpp | 1 - widget/windows/WinEventObserver.cpp | 1 + widget/windows/WinPointerEvents.cpp | 2 ++ widget/windows/WinPointerEvents.h | 3 ++- widget/windows/WinUtils.cpp | 4 ---- widget/windows/WinWindowOcclusionTracker.h | 4 ++++ widget/windows/WindowsConsole.cpp | 2 ++ widget/windows/moz.build | 2 -- widget/windows/nsAppShell.cpp | 1 + widget/windows/nsClipboard.cpp | 15 ++++++++----- widget/windows/nsNativeDragSource.cpp | 1 + widget/windows/nsPrintDialogWin.cpp | 2 ++ widget/windows/nsPrintDialogWin.h | 2 ++ widget/windows/nsPrintSettingsServiceWin.cpp | 4 ++-- widget/windows/nsSound.cpp | 2 ++ widget/windows/nsWindowDbg.cpp | 4 ++++ widget/windows/nsWindowGfx.cpp | 6 +++--- widget/windows/nsWindowLoggedMessages.cpp | 2 ++ xpcom/base/nsISupportsUtils.h | 1 + 50 files changed, 93 insertions(+), 56 deletions(-) diff --git a/accessible/windows/msaa/Compatibility.h b/accessible/windows/msaa/Compatibility.h index 072ecb4e0a05..e5c03bfea17a 100644 --- a/accessible/windows/msaa/Compatibility.h +++ b/accessible/windows/msaa/Compatibility.h @@ -9,6 +9,8 @@ #include #include "mozilla/Maybe.h" +#include "nsString.h" + #include namespace mozilla { diff --git a/docshell/base/nsDocShellLoadState.h b/docshell/base/nsDocShellLoadState.h index ff00b5796ca3..f74e4f24fb28 100644 --- a/docshell/base/nsDocShellLoadState.h +++ b/docshell/base/nsDocShellLoadState.h @@ -24,8 +24,8 @@ class nsIURI; class nsIDocShell; class nsIChannel; class nsIReferrerInfo; -class OriginAttibutes; namespace mozilla { +class OriginAttributes; template class UniquePtr; namespace dom { diff --git a/dom/interfaces/base/nsIBrowserChild.idl b/dom/interfaces/base/nsIBrowserChild.idl index 708f4d256653..3ac63a984ad8 100644 --- a/dom/interfaces/base/nsIBrowserChild.idl +++ b/dom/interfaces/base/nsIBrowserChild.idl @@ -6,6 +6,10 @@ #include "domstubs.idl" #include "nsIDroppedLinkHandler.idl" +%{C++ +#include "mozilla/dom/BindingDeclarations.h" +%} + interface nsIWebBrowserChrome; webidl ContentFrameMessageManager; diff --git a/storage/mozStorageAsyncStatementExecution.cpp b/storage/mozStorageAsyncStatementExecution.cpp index 34204d942c4f..5405555de567 100644 --- a/storage/mozStorageAsyncStatementExecution.cpp +++ b/storage/mozStorageAsyncStatementExecution.cpp @@ -21,7 +21,7 @@ #include "mozilla/Telemetry.h" #ifndef MOZ_STORAGE_SORTWARNING_SQL_DUMP -#include "mozilla/Logging.h" +# include "mozilla/Logging.h" extern mozilla::LazyLogModule gStorageLog; #endif diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp index f5feea0d5e77..233a8c0eb140 100644 --- a/widget/GfxInfoBase.cpp +++ b/widget/GfxInfoBase.cpp @@ -36,6 +36,8 @@ #include "mozilla/widget/ScreenManager.h" #include "mozilla/widget/Screen.h" +#include "jsapi.h" + #include "gfxPlatform.h" #include "gfxConfig.h" #include "DriverCrashGuard.h" diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp index 5c74b74a57d4..99d536c180fa 100644 --- a/widget/PuppetWidget.cpp +++ b/widget/PuppetWidget.cpp @@ -1137,8 +1137,6 @@ PuppetWidget::NotifyIME(TextEventDispatcher* aTextEventDispatcher, default: return NS_ERROR_NOT_IMPLEMENTED; } - - return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP_(IMENotificationRequests) diff --git a/widget/VsyncDispatcher.cpp b/widget/VsyncDispatcher.cpp index e83ff077cdb3..acb00a368afe 100644 --- a/widget/VsyncDispatcher.cpp +++ b/widget/VsyncDispatcher.cpp @@ -238,7 +238,7 @@ void VsyncDispatcher::RemoveMainThreadObserver(VsyncObserver* aObserver) { void VsyncDispatcher::UpdateVsyncStatus() { bool wasObservingVsync = false; bool needVsync = false; - RefPtr vsyncSource; + RefPtr vsyncSource; { auto state = mState.Lock(); diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp index fb40c763acc2..0f458f9339aa 100644 --- a/widget/WidgetEventImpl.cpp +++ b/widget/WidgetEventImpl.cpp @@ -28,6 +28,8 @@ #include "nsPrintfCString.h" #if defined(XP_WIN) +# include "windef.h" +# include "winnetwk.h" # include "npapi.h" # include "WinUtils.h" #endif // #if defined (XP_WIN) diff --git a/widget/android/jni/moz.build b/widget/android/jni/moz.build index b3db8f730a19..373efb90e964 100644 --- a/widget/android/jni/moz.build +++ b/widget/android/jni/moz.build @@ -33,5 +33,3 @@ LOCAL_INCLUDES += [ "/widget", "/widget/android", ] - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/android/moz.build b/widget/android/moz.build index ac22221e2755..2f5367f4644a 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -201,5 +201,3 @@ if CONFIG["MOZ_NATIVE_DEVICES"]: DEFINES["MOZ_NATIVE_DEVICES"] = True # DEFINES['DEBUG_WIDGETS'] = True - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build index ac541cc4c528..c996e62ad6ac 100644 --- a/widget/cocoa/moz.build +++ b/widget/cocoa/moz.build @@ -180,5 +180,3 @@ OS_LIBS += [ ] SPHINX_TREES["/widget/cocoa"] = "docs" - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/cocoa/nsCursorManager.mm b/widget/cocoa/nsCursorManager.mm index 16f7dcb91681..6596df25a3b2 100644 --- a/widget/cocoa/nsCursorManager.mm +++ b/widget/cocoa/nsCursorManager.mm @@ -72,7 +72,6 @@ static constexpr nsCursor kCustomCursor = eCursorCount; NS_OBJC_BEGIN_TRY_BLOCK_RETURN; switch (aCursor) { - SEL cursorSelector; case eCursor_standard: return [nsMacCursor cursorWithCursor:[NSCursor arrowCursor] type:aCursor]; case eCursor_wait: @@ -89,24 +88,27 @@ static constexpr nsCursor kCustomCursor = eCursorCount; return [nsMacCursor cursorWithImageNamed:@"move" hotSpot:NSMakePoint(12, 12) type:aCursor]; case eCursor_help: return [nsMacCursor cursorWithImageNamed:@"help" hotSpot:NSMakePoint(12, 12) type:aCursor]; - case eCursor_copy: - cursorSelector = @selector(dragCopyCursor); + case eCursor_copy: { + SEL cursorSelector = @selector(dragCopyCursor); return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ? [NSCursor performSelector:cursorSelector] : [NSCursor arrowCursor] type:aCursor]; - case eCursor_alias: - cursorSelector = @selector(dragLinkCursor); + } + case eCursor_alias: { + SEL cursorSelector = @selector(dragLinkCursor); return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ? [NSCursor performSelector:cursorSelector] : [NSCursor arrowCursor] type:aCursor]; - case eCursor_context_menu: - cursorSelector = @selector(contextualMenuCursor); + } + case eCursor_context_menu: { + SEL cursorSelector = @selector(contextualMenuCursor); return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ? [NSCursor performSelector:cursorSelector] : [NSCursor arrowCursor] type:aCursor]; + } case eCursor_cell: return [nsMacCursor cursorWithImageNamed:@"cell" hotSpot:NSMakePoint(12, 12) type:aCursor]; case eCursor_grab: @@ -122,12 +124,13 @@ static constexpr nsCursor kCustomCursor = eCursorCount; case eCursor_all_scroll: return [nsMacCursor cursorWithCursor:[NSCursor openHandCursor] type:aCursor]; case eCursor_not_allowed: - case eCursor_no_drop: - cursorSelector = @selector(operationNotAllowedCursor); + case eCursor_no_drop: { + SEL cursorSelector = @selector(operationNotAllowedCursor); return [nsMacCursor cursorWithCursor:[NSCursor respondsToSelector:cursorSelector] ? [NSCursor performSelector:cursorSelector] : [NSCursor arrowCursor] type:aCursor]; + } // Resize Cursors: // North case eCursor_n_resize: diff --git a/widget/cocoa/nsMacUserActivityUpdater.mm b/widget/cocoa/nsMacUserActivityUpdater.mm index b2f8a64f6028..cc80e1259b46 100644 --- a/widget/cocoa/nsMacUserActivityUpdater.mm +++ b/widget/cocoa/nsMacUserActivityUpdater.mm @@ -8,6 +8,7 @@ #include "nsCocoaUtils.h" #include "nsIBaseWindow.h" +#include "gfxPlatform.h" NS_IMPL_ISUPPORTS(nsMacUserActivityUpdater, nsIMacUserActivityUpdater) diff --git a/widget/cocoa/nsMenuBarX.h b/widget/cocoa/nsMenuBarX.h index 0ecc0117ce01..9990c59bc5d1 100644 --- a/widget/cocoa/nsMenuBarX.h +++ b/widget/cocoa/nsMenuBarX.h @@ -13,12 +13,12 @@ #include "nsISupports.h" #include "nsMenuParentX.h" -#include "nsMenuGroupOwnerX.h" #include "nsChangeObserver.h" #include "nsTArray.h" #include "nsString.h" class nsMenuBarX; +class nsMenuGroupOwnerX; class nsMenuX; class nsIWidget; class nsIContent; diff --git a/widget/cocoa/nsMenuGroupOwnerX.h b/widget/cocoa/nsMenuGroupOwnerX.h index 0217fe4a8dc9..a9060a60295e 100644 --- a/widget/cocoa/nsMenuGroupOwnerX.h +++ b/widget/cocoa/nsMenuGroupOwnerX.h @@ -13,10 +13,10 @@ #include "nsStubMutationObserver.h" #include "nsHashKeys.h" #include "nsIObserver.h" +#include "nsMenuBarX.h" #include "nsTHashMap.h" #include "nsString.h" -class nsMenuBarX; class nsMenuItemX; class nsChangeObserver; class nsIWidget; diff --git a/widget/cocoa/nsTouchBar.mm b/widget/cocoa/nsTouchBar.mm index 98c234439567..f6a704238145 100644 --- a/widget/cocoa/nsTouchBar.mm +++ b/widget/cocoa/nsTouchBar.mm @@ -7,6 +7,7 @@ #include #include "mozilla/MacStringHelpers.h" +#include "mozilla/dom/Document.h" #include "nsArrayUtils.h" #include "nsCocoaUtils.h" #include "nsDirectoryServiceDefs.h" diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp index bb369eb0a5e1..1d97a60700b9 100644 --- a/widget/headless/HeadlessWidget.cpp +++ b/widget/headless/HeadlessWidget.cpp @@ -17,6 +17,7 @@ #include "mozilla/WritingModes.h" #include "mozilla/widget/HeadlessWidgetTypes.h" #include "mozilla/widget/PlatformWidgetTypes.h" +#include "mozilla/widget/Screen.h" #include "nsIScreen.h" #include "HeadlessKeyBindings.h" diff --git a/widget/headless/moz.build b/widget/headless/moz.build index babb5e8290d2..a46c3a10e394 100644 --- a/widget/headless/moz.build +++ b/widget/headless/moz.build @@ -46,5 +46,3 @@ else: include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/moz.build b/widget/moz.build index f83f84297c4a..c8ca32e2458c 100644 --- a/widget/moz.build +++ b/widget/moz.build @@ -388,5 +388,3 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_WAYLAND"]: CXXFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"] - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h index c3465a16df11..b7385b7ba26e 100644 --- a/widget/nsIWidget.h +++ b/widget/nsIWidget.h @@ -9,6 +9,7 @@ #include #include +#include "imgIContainer.h" #include "ErrorList.h" #include "Units.h" #include "mozilla/AlreadyAddRefed.h" @@ -46,7 +47,6 @@ // forward declarations class nsIBidiKeyboard; class nsIRollupListener; -class imgIContainer; class nsIContent; class ViewWrapper; class nsIRunnable; diff --git a/widget/nsPrinterListCUPS.cpp b/widget/nsPrinterListCUPS.cpp index 6b215e21f4ef..2629d7626ec8 100644 --- a/widget/nsPrinterListCUPS.cpp +++ b/widget/nsPrinterListCUPS.cpp @@ -34,7 +34,7 @@ static void GetDisplayNameForPrinter(const cups_dest_t& aDest, const char* displayName = CupsShim().cupsGetOption( "printer-info", aDest.num_options, aDest.options); if (displayName) { - CopyUTF8toUTF16(MakeStringSpan(displayName), aName); + CopyUTF8toUTF16(mozilla::MakeStringSpan(displayName), aName); } #endif } diff --git a/widget/tests/gtest/moz.build b/widget/tests/gtest/moz.build index 6f8a37c7f13a..613844fa781d 100644 --- a/widget/tests/gtest/moz.build +++ b/widget/tests/gtest/moz.build @@ -25,5 +25,3 @@ LOCAL_INCLUDES += [ ] DisableStlWrapping() - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/windows/IMMHandler.h b/widget/windows/IMMHandler.h index 3da53387b297..e012541faedf 100644 --- a/widget/windows/IMMHandler.h +++ b/widget/windows/IMMHandler.h @@ -11,7 +11,10 @@ #include "mozilla/TextEventDispatcher.h" #include "mozilla/WritingModes.h" +#include "windef.h" +#include "winnetwk.h" #include "npapi.h" + #include "nsCOMPtr.h" #include "nsIWidget.h" #include "nsRect.h" diff --git a/widget/windows/InkCollector.cpp b/widget/windows/InkCollector.cpp index 4c2dfbf3871a..2fcd2ea77d87 100644 --- a/widget/windows/InkCollector.cpp +++ b/widget/windows/InkCollector.cpp @@ -6,12 +6,14 @@ */ #include "InkCollector.h" +#include "nsDebug.h" +#include "nsISupportsUtils.h" // Msinkaut_i.c and Msinkaut.h should both be included // https://msdn.microsoft.com/en-us/library/windows/desktop/ms695519.aspx #include -StaticAutoPtr InkCollector::sInkCollector; +mozilla::StaticAutoPtr InkCollector::sInkCollector; InkCollector::~InkCollector() { Shutdown(); diff --git a/widget/windows/InkCollector.h b/widget/windows/InkCollector.h index f13bfbf57044..803eeb48410f 100644 --- a/widget/windows/InkCollector.h +++ b/widget/windows/InkCollector.h @@ -8,6 +8,7 @@ #ifndef InkCollector_h__ #define InkCollector_h__ +#include #include #include "mozilla/StaticPtr.h" diff --git a/widget/windows/JumpListItem.cpp b/widget/windows/JumpListItem.cpp index d70f7120b5cf..819d8c1437fd 100644 --- a/widget/windows/JumpListItem.cpp +++ b/widget/windows/JumpListItem.cpp @@ -14,6 +14,7 @@ #include "nsCRT.h" #include "nsNetCID.h" #include "nsCExternalHandlerService.h" +#include "nsComponentManagerUtils.h" #include "nsCycleCollectionParticipant.h" #include "mozilla/Preferences.h" #include "JumpListBuilder.h" diff --git a/widget/windows/KeyboardLayout.cpp b/widget/windows/KeyboardLayout.cpp index aaa9b6747b71..449d1b45363e 100644 --- a/widget/windows/KeyboardLayout.cpp +++ b/widget/windows/KeyboardLayout.cpp @@ -1398,7 +1398,6 @@ void NativeKey::InitIsSkippableForKeyOrChar(const MSG& aLastKeyMSG) { // by the auto-repeat feature. return; } - return; case WM_APPCOMMAND: MOZ_ASSERT_UNREACHABLE( "WM_APPCOMMAND should be handled in " diff --git a/widget/windows/RemoteBackbuffer.cpp b/widget/windows/RemoteBackbuffer.cpp index 5bd5e18ff320..56a8bae0fec5 100644 --- a/widget/windows/RemoteBackbuffer.cpp +++ b/widget/windows/RemoteBackbuffer.cpp @@ -7,6 +7,8 @@ #include "GeckoProfiler.h" #include "nsThreadUtils.h" #include "mozilla/Span.h" +#include "mozilla/gfx/Point.h" +#include "WinUtils.h" #include #include @@ -163,7 +165,7 @@ class SharedImage { already_AddRefed CreateDrawTarget() { return gfx::Factory::CreateDrawTargetForData( - gfx::BackendType::CAIRO, mPixelData, IntSize(mWidth, mHeight), + gfx::BackendType::CAIRO, mPixelData, gfx::IntSize(mWidth, mHeight), GetStride(), gfx::SurfaceFormat::B8G8R8A8); } @@ -287,8 +289,8 @@ class PresentableSharedImage { mDeviceContext, &srcPos, 0 /*colorKey*/, &bf, ULW_ALPHA); } - IntRect sharedImageRect{0, 0, mSharedImage.GetWidth(), - mSharedImage.GetHeight()}; + gfx::IntRect sharedImageRect{0, 0, mSharedImage.GetWidth(), + mSharedImage.GetHeight()}; bool result = true; @@ -298,9 +300,9 @@ class PresentableSharedImage { } for (auto& ipcDirtyRect : aDirtyRects) { - IntRect dirtyRect{ipcDirtyRect.x, ipcDirtyRect.y, ipcDirtyRect.width, - ipcDirtyRect.height}; - IntRect bltRect = dirtyRect.Intersect(sharedImageRect); + gfx::IntRect dirtyRect{ipcDirtyRect.x, ipcDirtyRect.y, ipcDirtyRect.width, + ipcDirtyRect.height}; + gfx::IntRect bltRect = dirtyRect.Intersect(sharedImageRect); if (!::BitBlt(windowDC, bltRect.x /*dstX*/, bltRect.y /*dstY*/, bltRect.width, bltRect.height, mDeviceContext, diff --git a/widget/windows/RemoteBackbuffer.h b/widget/windows/RemoteBackbuffer.h index 8d9817b5cd31..5899e809841d 100644 --- a/widget/windows/RemoteBackbuffer.h +++ b/widget/windows/RemoteBackbuffer.h @@ -9,6 +9,7 @@ #include "nsIWidget.h" #include "mozilla/widget/PCompositorWidgetParent.h" #include "mozilla/Maybe.h" +#include "mozilla/gfx/2D.h" #include "prthread.h" #include diff --git a/widget/windows/SystemStatusBar.cpp b/widget/windows/SystemStatusBar.cpp index 5cdf3b87d1f4..d179b18f4cee 100644 --- a/widget/windows/SystemStatusBar.cpp +++ b/widget/windows/SystemStatusBar.cpp @@ -24,6 +24,8 @@ #include "nsDocShell.h" #include "nsWindowGfx.h" +#include "shellapi.h" + namespace mozilla::widget { using mozilla::LinkedListElement; diff --git a/widget/windows/SystemStatusBar.h b/widget/windows/SystemStatusBar.h index 6c90fc0097dc..6afafd9d8053 100644 --- a/widget/windows/SystemStatusBar.h +++ b/widget/windows/SystemStatusBar.h @@ -7,6 +7,7 @@ #define widget_windows_SystemStatusBar_h #include "nsISystemStatusBar.h" +#include "mozilla/LinkedList.h" namespace mozilla::widget { class StatusBarEntry; diff --git a/widget/windows/TaskbarTabPreview.cpp b/widget/windows/TaskbarTabPreview.cpp index a19a6bf12e1d..3421e68ffb94 100644 --- a/widget/windows/TaskbarTabPreview.cpp +++ b/widget/windows/TaskbarTabPreview.cpp @@ -185,7 +185,6 @@ TaskbarTabPreview::WndProc(UINT nMsg, WPARAM wParam, LPARAM lParam) { return wParam == SC_CLOSE ? ::DefWindowProcW(mProxyWindow, WM_SYSCOMMAND, wParam, lParam) : ::SendMessageW(mWnd, WM_SYSCOMMAND, wParam, lParam); - return 0; } return TaskbarPreview::WndProc(nMsg, wParam, lParam); } diff --git a/widget/windows/WinEventObserver.cpp b/widget/windows/WinEventObserver.cpp index 09daa58e0515..97e644266574 100644 --- a/widget/windows/WinEventObserver.cpp +++ b/widget/windows/WinEventObserver.cpp @@ -14,6 +14,7 @@ #include "mozilla/Logging.h" #include "mozilla/StaticPtr.h" #include "nsHashtablesFwd.h" +#include "nsdefs.h" namespace mozilla::widget { diff --git a/widget/windows/WinPointerEvents.cpp b/widget/windows/WinPointerEvents.cpp index 814b2e93f620..c0465da7d796 100644 --- a/widget/windows/WinPointerEvents.cpp +++ b/widget/windows/WinPointerEvents.cpp @@ -8,7 +8,9 @@ */ #include "nscore.h" +#include "nsWindowDefs.h" #include "WinPointerEvents.h" +#include "WinUtils.h" #include "mozilla/MouseEvents.h" #include "mozilla/StaticPrefs_dom.h" #include "mozilla/WindowsVersion.h" diff --git a/widget/windows/WinPointerEvents.h b/widget/windows/WinPointerEvents.h index db838c514fa3..1d2f1a07cb7c 100644 --- a/widget/windows/WinPointerEvents.h +++ b/widget/windows/WinPointerEvents.h @@ -7,7 +7,8 @@ #define WinPointerEvents_h__ #include "mozilla/MouseEvents.h" -#include "nsWindow.h" +#include "touchinjection_sdk80.h" +#include // Define PointerEvent related macros and structures when building code on // Windows version before Win8. diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp index 799a31e02b70..4c4432b3f6a8 100644 --- a/widget/windows/WinUtils.cpp +++ b/widget/windows/WinUtils.cpp @@ -82,10 +82,6 @@ NS_IMPL_ISUPPORTS(AsyncDeleteAllFaviconsFromDisk, nsIRunnable) const char FaviconHelper::kJumpListCacheDir[] = "jumpListCache"; const char FaviconHelper::kShortcutCacheDir[] = "shortcutCache"; -// Prefix for path used by NT calls. -const wchar_t kNTPrefix[] = L"\\??\\"; -const size_t kNTPrefixLen = ArrayLength(kNTPrefix) - 1; - struct CoTaskMemFreePolicy { void operator()(void* aPtr) { ::CoTaskMemFree(aPtr); } }; diff --git a/widget/windows/WinWindowOcclusionTracker.h b/widget/windows/WinWindowOcclusionTracker.h index a0a706c45c6f..b82a41b98443 100644 --- a/widget/windows/WinWindowOcclusionTracker.h +++ b/widget/windows/WinWindowOcclusionTracker.h @@ -14,9 +14,13 @@ #include "nsIWeakReferenceUtils.h" #include "mozilla/Monitor.h" +#include "mozilla/StaticPtr.h" +#include "mozilla/WindowsVersion.h" #include "mozilla/ThreadSafeWeakPtr.h" #include "mozilla/widget/WindowOcclusionState.h" #include "mozilla/widget/WinEventObserver.h" +#include "Units.h" +#include "nsThreadUtils.h" class nsBaseWidget; struct IVirtualDesktopManager; diff --git a/widget/windows/WindowsConsole.cpp b/widget/windows/WindowsConsole.cpp index 16005a642beb..c8e7eb1a11a2 100644 --- a/widget/windows/WindowsConsole.cpp +++ b/widget/windows/WindowsConsole.cpp @@ -7,6 +7,8 @@ #include #include +#include +#include namespace mozilla { diff --git a/widget/windows/moz.build b/widget/windows/moz.build index 621c288b46ee..10ee24f44dbb 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -202,5 +202,3 @@ if CONFIG["CC_TYPE"] == "clang-cl": ] SPHINX_TREES["/widget/windows"] = "docs" - -REQUIRES_UNIFIED_BUILD = True diff --git a/widget/windows/nsAppShell.cpp b/widget/windows/nsAppShell.cpp index 6e06747851e5..704da730f2ff 100644 --- a/widget/windows/nsAppShell.cpp +++ b/widget/windows/nsAppShell.cpp @@ -30,6 +30,7 @@ #include "mozilla/widget/ScreenManager.h" #include "mozilla/Atomics.h" #include "mozilla/WindowsProcessMitigations.h" +#include "mozilla/WindowsVersion.h" #ifdef MOZ_BACKGROUNDTASKS # include "mozilla/BackgroundTasks.h" diff --git a/widget/windows/nsClipboard.cpp b/widget/windows/nsClipboard.cpp index f3c977bdf56e..1b3c6fa0f7e5 100644 --- a/widget/windows/nsClipboard.cpp +++ b/widget/windows/nsClipboard.cpp @@ -21,6 +21,8 @@ #include "mozilla/Logging.h" #include "mozilla/ScopeExit.h" #include "mozilla/StaticPrefs_clipboard.h" +#include "mozilla/StaticPrefs_widget.h" +#include "mozilla/WindowsVersion.h" #include "SpecialSystemDirectory.h" #include "nsArrayUtils.h" @@ -44,6 +46,7 @@ #include "nsIObserverService.h" #include "nsMimeTypes.h" #include "imgITools.h" +#include "imgIContainer.h" using mozilla::LogLevel; @@ -298,7 +301,8 @@ nsresult nsClipboard::SetupNativeDataObject( } } - if (!StaticPrefs::clipboard_copyPrivateDataToClipboardCloudOrHistory()) { + if (!mozilla::StaticPrefs:: + clipboard_copyPrivateDataToClipboardCloudOrHistory()) { // Let Clipboard know that data is sensitive and must not be copied to // the Cloud Clipboard, Clipboard History and similar. // https://docs.microsoft.com/en-us/windows/win32/dataxchg/clipboard-formats#cloud-clipboard-and-clipboard-history-formats @@ -483,7 +487,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard) { } #ifdef ACCESSIBILITY - a11y::Compatibility::SuppressA11yForClipboardCopy(); + mozilla::a11y::Compatibility::SuppressA11yForClipboardCopy(); #endif RefPtr dataObj; @@ -494,7 +498,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard) { RepeatedlyTryOleSetClipboard(dataObj); const bool doFlush = [&] { - switch (StaticPrefs::widget_windows_sync_clipboard_flush()) { + switch (mozilla::StaticPrefs::widget_windows_sync_clipboard_flush()) { case 0: return false; case 1: @@ -508,7 +512,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(int32_t aWhichClipboard) { // lesser of the two performance/memory evils here and force immediate // rendering. return mightNeedToFlush == MightNeedToFlush::Yes && - NeedsWindows11SuggestedActionsWorkaround(); + mozilla::NeedsWindows11SuggestedActionsWorkaround(); } }(); if (doFlush) { @@ -1401,7 +1405,8 @@ nsresult nsClipboard::SaveStorageOrStream(IDataObject* aDataObject, UINT aIndex, return NS_ERROR_FAILURE; } - auto releaseMediumGuard = MakeScopeExit([&] { ReleaseStgMedium(&stm); }); + auto releaseMediumGuard = + mozilla::MakeScopeExit([&] { ReleaseStgMedium(&stm); }); // We do this check because, even though we *asked* for IStorage or IStream, // it seems that IDataObject providers can just hand us back whatever they diff --git a/widget/windows/nsNativeDragSource.cpp b/widget/windows/nsNativeDragSource.cpp index 1b02a6273c59..ca5459e9dfe1 100644 --- a/widget/windows/nsNativeDragSource.cpp +++ b/widget/windows/nsNativeDragSource.cpp @@ -10,6 +10,7 @@ #include "nsToolkit.h" #include "nsWidgetsCID.h" #include "nsIDragService.h" +#include "nsServiceManagerUtils.h" #include "mozilla/dom/DataTransfer.h" /* diff --git a/widget/windows/nsPrintDialogWin.cpp b/widget/windows/nsPrintDialogWin.cpp index c3fa786377f4..6261f651ca09 100644 --- a/widget/windows/nsPrintDialogWin.cpp +++ b/widget/windows/nsPrintDialogWin.cpp @@ -6,6 +6,7 @@ #include "nsPrintDialogWin.h" #include "nsArray.h" +#include "nsComponentManagerUtils.h" #include "nsCOMPtr.h" #include "nsIBaseWindow.h" #include "nsIBrowserChild.h" @@ -18,6 +19,7 @@ #include "nsPrintDialogUtil.h" #include "nsIPrintSettings.h" #include "nsIWebBrowserChrome.h" +#include "nsServiceManagerUtils.h" #include "nsPIDOMWindow.h" #include "nsQueryObject.h" diff --git a/widget/windows/nsPrintDialogWin.h b/widget/windows/nsPrintDialogWin.h index df519865a183..f268e0a407b9 100644 --- a/widget/windows/nsPrintDialogWin.h +++ b/widget/windows/nsPrintDialogWin.h @@ -11,6 +11,8 @@ #include "nsCOMPtr.h" #include "nsIWindowWatcher.h" +#include + class nsIPrintSettings; class nsIDialogParamBlock; diff --git a/widget/windows/nsPrintSettingsServiceWin.cpp b/widget/windows/nsPrintSettingsServiceWin.cpp index ab0f95abba08..cbc99441ab37 100644 --- a/widget/windows/nsPrintSettingsServiceWin.cpp +++ b/widget/windows/nsPrintSettingsServiceWin.cpp @@ -13,8 +13,8 @@ #include "nsIServiceManager.h" #include "nsWindowsHelpers.h" #include "ipc/IPCMessageUtils.h" - -const char kPrinterListContractID[] = "@mozilla.org/gfx/printerlist;1"; +#include "chrome/common/ipc_channel.h" +#include "mozilla/embedding/PPrintingTypes.h" using namespace mozilla::embedding; diff --git a/widget/windows/nsSound.cpp b/widget/windows/nsSound.cpp index c1871747053a..fea3a645fbd8 100644 --- a/widget/windows/nsSound.cpp +++ b/widget/windows/nsSound.cpp @@ -32,7 +32,9 @@ using mozilla::LogLevel; +#ifdef DEBUG static mozilla::LazyLogModule gWin32SoundLog("nsSound"); +#endif // Hackaround for bug 1644240 // When we call PlaySound for the first time in the process, winmm.dll creates diff --git a/widget/windows/nsWindowDbg.cpp b/widget/windows/nsWindowDbg.cpp index 8d3cf7f1c9c4..8e7159b5aa3e 100644 --- a/widget/windows/nsWindowDbg.cpp +++ b/widget/windows/nsWindowDbg.cpp @@ -8,12 +8,16 @@ */ #include "nsWindowDbg.h" +#include "nsToolkit.h" +#include "WinPointerEvents.h" #include "nsWindowLoggedMessages.h" #include "mozilla/Logging.h" #include "mozilla/Maybe.h" #include #include #include +#include + #include using namespace mozilla; diff --git a/widget/windows/nsWindowGfx.cpp b/widget/windows/nsWindowGfx.cpp index 314b2d234cc1..ddfbfbba4ed3 100644 --- a/widget/windows/nsWindowGfx.cpp +++ b/widget/windows/nsWindowGfx.cpp @@ -25,6 +25,7 @@ #include "gfxEnv.h" #include "gfxImageSurface.h" #include "gfxUtils.h" +#include "gfxConfig.h" #include "gfxWindowsSurface.h" #include "gfxWindowsPlatform.h" #include "gfxDWriteFonts.h" @@ -40,6 +41,8 @@ #include "nsIWidgetListener.h" #include "mozilla/Unused.h" #include "nsDebug.h" +#include "WindowRenderer.h" +#include "mozilla/layers/WebRenderLayerManager.h" #include "mozilla/gfx/GPUProcessManager.h" #include "mozilla/layers/CompositorBridgeParent.h" @@ -72,9 +75,6 @@ extern mozilla::LazyLogModule gWindowsLog; * **************************************************************/ -static UniquePtr sSharedSurfaceData; -static IntSize sSharedSurfaceSize; - struct IconMetrics { int32_t xMetric; int32_t yMetric; diff --git a/widget/windows/nsWindowLoggedMessages.cpp b/widget/windows/nsWindowLoggedMessages.cpp index 4d215d17e1b2..ac0f05a87562 100644 --- a/widget/windows/nsWindowLoggedMessages.cpp +++ b/widget/windows/nsWindowLoggedMessages.cpp @@ -3,8 +3,10 @@ * 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 #include #include "mozilla/StaticPrefs_storage.h" +#include "mozilla/StaticPrefs_widget.h" #include "nsWindowLoggedMessages.h" #include "nsWindow.h" #include "WinUtils.h" diff --git a/xpcom/base/nsISupportsUtils.h b/xpcom/base/nsISupportsUtils.h index e8ebdd242b15..a885c5cb149e 100644 --- a/xpcom/base/nsISupportsUtils.h +++ b/xpcom/base/nsISupportsUtils.h @@ -10,6 +10,7 @@ #include #include "nscore.h" +#include "nsIOutputStream.h" #include "nsISupports.h" #include "nsError.h" #include "nsDebug.h"