From a7ea204c19a295f7044b9b57ec0972c40091fb1e Mon Sep 17 00:00:00 2001 From: roytam1 Date: Tue, 20 Dec 2022 12:06:53 +0800 Subject: [PATCH] import changes from `dev' branch of rmottola/Arctic-Fox: - fix restore button on MacOS 10.6 fullscreen (08151078bd) - Bug 1216580 - Make background-position:fixed clip stealing work with display items that create their own layer. r=mattwoodrow (7760c8ddd8) - Bug 1222661 - Replace ToUntyped(obj) calls with obj.ToUnknown*(). r=nical (76e36824f0) - Bug 1223310 (part 1) - Pass a LayoutDeviceIntPoint instead of an nsIntPoint to InitEvent(). r=kats. (ea95207afe) - Bug 1223310 (part 2) - Use LayoutDeviceIntRect for bounds-related functions in nsIWidget. r=kats. (4993cccff8) - Bug 1218552 - Fix GTK drag-and-drop coordinate scaling on HiDPI displays (r=karlt) (d03cf04136) - fix preprocessing (2f4c1a1c94) - Bug 1205923: Make VectorImage::GetWidth/GetHeight set outparam to 0 (not -1) on failure, to accomodate callers that don't check error codes. r=seth (487de31340) - Bug 1212954 - Make BaseSize::IsEmpty return true for negative sizes to avoid NS_ERROR in VectorImage::GetFrameAtSize when root svg doesn't have intrinsic width or height. r=roc (402b154f56) - fix ordering (ac8483c966) - Bug 1216056 - Always sent OpRemoveTextureAsync as pending async Messages r=nica (66c9ee8708) - Bug 121976 - Add a destruction handshake to PCompositable so as to avoid races between messages and the protocol. r=sotaro (636a669e44) - Bug 1209724 - Cancel ImageBridge proxy functions if they are called too late. r=sotao (5bf81453ef) - Bug 1221371 - Switch chromium IPC code to use mozilla::Tuple (r=jld,cpearce,kats) (eebcd419e9) - Bug 1221371 - Remove unused Chromium callback code (r=jld) (3f2e882485) - Bug 1221368 - Change MakeTuple to decay the types of its arguments (r=froydnj) (bed635f565) - Bug 1181303. Set composition time earlier so that computing invalid regions works properly. r=mattwoodrow (7a3e41cd96) - Bug 1150552 - Fix partial present bug with FPS counter. r=mattwoodrow (6e6ae92909) - Bug 1216287 - Properly invalidate the debug overlay. r=mattwoodrow (60d4f3451a) - Compute the compositor's damage region before composites, rather than layers updates. (bug 1217560, r=mattwoodrow) (6efcac085b) - Bug 1216248 - Recomposite when the window overlay changes. r=mattwoodrow (8a8c5ccd07) - Bug 1224021 - Support fractional async scroll offsets in the reftest harness. r=tn (353f75d3aa) - Bug 1121072 - Always notify when layers cleared (r=dvander) (aa6ffc67e2) - Bug 1224403 (part 1) - Make Configuration::mBounds a LayoutDeviceIntRect. r=kats. (7617b9da7e) - Bug 1224403 (part 2) - Split GetClientOffset() into typed and untyped versions. r=kats. (06916479b1) - Bug 1224403 (part 3) - Make mNonClientOffset a LayoutDeviceIntMargin. r=kats. (76efba1fb6) - Bug 1224403 (part 4) - Make {Get,Set}NonClientMargins() return/take aLayoutDeviceIntMargin. r=kats. (99cfc2fdbc) - Bug 1224403 (part 5) - Make OnDefaultButtonLoaded() return/take a LayoutDeviceIntMargin. r=kats (c402452f97) - Bug 1224403 (part 6) - Remove one WidgetToScreenOffsetUntyped() call. r=kats. (8e4485a404) - Bug 1224403 (part 7) - Use LayoutDeviceIntMargin more in IMMHandler. r=kats. (6b5e9124fc) - Bug 1224403 (part 8) - Use LayoutDeviceIntMargin more in HyperTextAccessible. r=kats. (5bc1a04cc7) - Bug 1224403 (part 9) - Remove GetRestoredBoundsUntyped(). r=kats. (20e2b28335) - Bug 1224403 (part 10) - Make nsScreenGonk::GetNaturalBoundsUntyped() typed. r=kats. (9d19986f22) - Bug 1224403 (part 11) - Remove a GetBoundsUntyped() call. r=kats. (58ce962157) - Bug 1214267 - Followup to fix missing propagation of 'fixedPositionSides' to the compositor, and add it to the layers dump. r=mattwoodrow (7dc122eb62) - Use compositor clip rects, not client clip rects, when computing the compositor's backbuffer damage region. (bug 1189159, r=mattwoodrow) (b70d71b1b7) - Bug 1210784 - Layer tree invalidation with Preserves3D. r=roc (8a7bfa1a22) - Bug 1166165 - Check if the timestamp is null to prevent assertion. r=nical (189a8d42d0) - Bug 1137004 - Changed the location of the counter so when it is used in a maximized window it is no longer cut off, and added a little left padding. r=mattwoodrow (140d294445) - Bug 1222661 - Replace FromUntyped(obj) calls with FromUnknown*(obj). r=nical (b399ccef2e) - Bug 1216506. Properly initialize min inset box shadow color to black. r=mstange (335259200c) - Bug 1223690 - Remove implicit Rect conversions. r=jrmuizel. (5aef25158f) - Bug 1056356 - Allow calling NewRunnableMethod() with a const pointer to the callee object. r=froydnj (145279b91c) - Bug 1209649. Part 2: Reftest to test box shadows and border radii. r=mstange (9405ccfe23) - Bug 1211363. Part 2: reftest with int border radius. r=mstange (9edb37635e) - Bug 1216200. Inset box shadow reftest with negative spread value. r=mstange (8350478107) - Bug 1211264. Fallback to render dest rect with outer box shadows on non-int transforms. r=mstange (a244775d24) - Bug 1216200. Correct for negative spread values with inset box shadows. r=mstange (4851e9c792) - cleanup (1f78332ad8) - Bug 1213970 - Enable APZ on iOS r=kats (1d170e32e3) - Bug 1217939 - part 1 - remove nsContentUtils::GetViewportInfo; r=smaug (8c25236851) - Bug 1217939 - part 2 - move nsContentUtils::GetSelectionBoundingRect to nsLayoutUtils; r=smaug (6beb37157c) - Bug 1146713 - Don't export NO_PKG_FILES (fix ssltunnel in b2g); r=glandium (a21152c79c) - Bug 1222323 - Avoid passing extra defines to the compiler from config.mk. r=gps (2d1076d513) - Bug 1222321 - Avoid the duplication of OS_CPPFLAGS on the compiler command line. r=gps (cf762f1644) - Bug 1210687 - Separate out jar.mn parsing in a separate class. r=gps (d54cc5576b) - Bug 1219147 - Use addEntriesToListFile in mozbuild.jar.JarMaker.updateManifest. r=mshal (3cd74ff478) - Bug 1208160 - Show information when Xcode requires accepting license agreement; r=gps (352bb43d73) - Bug 1174524 - Make objdir path comparison case-insensitive on Windows. r=mshal (6f74f10845) - Bug 1158898 - Cache config.guess output; r=mshal (a7b01184fa) - Bug 1187245 - Make .mozconfig.mk environment variables available to mach valgrind-test. r=gps (2033642ceb) --- accessible/generic/Accessible.cpp | 2 +- accessible/generic/HyperTextAccessible.cpp | 16 +- accessible/generic/HyperTextAccessible.h | 2 +- accessible/windows/msaa/AccessibleWrap.cpp | 2 +- browser/base/content/sync/aboutSyncTabs.js | 2 +- browser/base/jar.mn | 2 +- browser/components/moz.build | 2 +- browser/themes/linux/browser.css | 3 - browser/themes/osx/browser.css | 3 - browser/themes/windows/browser.css | 3 - build/valgrind/mach_commands.py | 2 + config/config.mk | 10 +- config/tests/src-simple/Makefile.in | 2 +- configure.in | 54 +- docshell/base/nsDocShell.cpp | 2 +- dom/base/nsContentUtils.cpp | 40 -- dom/base/nsContentUtils.h | 26 - dom/base/nsDOMWindowUtils.cpp | 12 +- dom/base/nsGlobalWindow.cpp | 5 +- dom/base/nsIDocument.h | 13 + dom/base/nsViewportInfo.h | 4 +- dom/events/ContentEventHandler.cpp | 8 +- dom/events/EventStateManager.cpp | 2 +- dom/events/IMEContentObserver.cpp | 4 +- dom/events/WheelHandlingHelper.cpp | 4 +- dom/interfaces/base/nsIDOMWindowUtils.idl | 4 +- dom/media/gmp/GMPDecryptorChild.cpp | 4 +- dom/plugins/base/nsPluginInstanceOwner.cpp | 4 +- dom/plugins/ipc/PluginInstanceChild.cpp | 2 +- dom/xul/nsXULElement.cpp | 8 +- embedding/browser/nsWebBrowser.cpp | 2 +- gfx/2d/BaseSize.h | 2 +- gfx/2d/Rect.h | 23 +- gfx/layers/Compositor.cpp | 5 +- gfx/layers/IPDLActor.h | 139 +++++ gfx/layers/LayerSorter.cpp | 4 +- gfx/layers/LayerTreeInvalidation.cpp | 67 ++- gfx/layers/Layers.cpp | 5 +- gfx/layers/Layers.h | 6 +- gfx/layers/RotatedBuffer.cpp | 6 +- gfx/layers/apz/src/APZCTreeManager.cpp | 2 +- .../test/gtest/TestAsyncPanZoomController.cpp | 2 +- gfx/layers/basic/BasicCompositor.cpp | 2 +- gfx/layers/basic/BasicContainerLayer.cpp | 2 +- gfx/layers/basic/BasicLayerManager.cpp | 6 +- gfx/layers/client/ClientLayerManager.cpp | 6 +- gfx/layers/client/ClientTiledPaintedLayer.cpp | 12 +- gfx/layers/client/CompositableClient.cpp | 21 +- gfx/layers/client/CompositableClient.h | 3 +- gfx/layers/client/SingleTiledContentClient.h | 1 - gfx/layers/client/TextureClient.cpp | 18 +- gfx/layers/client/TiledContentClient.cpp | 4 +- gfx/layers/client/TiledContentClient.h | 5 +- gfx/layers/composite/CanvasLayerComposite.cpp | 2 +- gfx/layers/composite/CompositableHost.cpp | 7 +- .../composite/ContainerLayerComposite.cpp | 14 +- .../composite/LayerManagerComposite.cpp | 174 ++++--- gfx/layers/composite/LayerManagerComposite.h | 19 +- gfx/layers/composite/TextureHost.cpp | 42 +- gfx/layers/d3d11/CompositorD3D11.cpp | 2 +- gfx/layers/d3d9/CompositorD3D9.cpp | 2 +- gfx/layers/ipc/CompositorBench.cpp | 1 + gfx/layers/ipc/ImageBridgeChild.cpp | 42 +- gfx/layers/ipc/LayerTransactionParent.cpp | 14 +- gfx/layers/ipc/LayerTransactionParent.h | 2 +- gfx/layers/ipc/LayersMessages.ipdlh | 2 + gfx/layers/ipc/PCompositable.ipdl | 14 +- gfx/layers/ipc/PLayerTransaction.ipdl | 2 +- gfx/layers/ipc/PTexture.ipdl | 8 +- gfx/layers/ipc/ShadowLayers.cpp | 55 +- gfx/layers/opengl/CompositorOGL.cpp | 4 +- gfx/src/nsRegion.h | 4 +- gfx/tests/gtest/TestCompositor.cpp | 6 +- gfx/thebes/gfx2DGlue.h | 10 +- gfx/thebes/gfxBlur.cpp | 77 ++- gfx/thebes/gfxRect.h | 2 - image/VectorImage.cpp | 46 +- image/imgFrame.cpp | 2 +- image/test/crashtests/1205923-1.html | 36 ++ image/test/crashtests/1212954-1.svg | 16 + image/test/crashtests/crashtests.list | 3 + image/test/crashtests/unsized-svg.svg | 1 + ipc/chromium/src/base/task.h | 478 ++++-------------- .../src/chrome/common/ipc_message_utils.h | 1 - js/src/configure.in | 3 + js/src/frontend/TokenStream.cpp | 5 +- js/src/jskwgen.cpp | 2 +- js/src/vm/Keywords.h | 90 ++-- layout/base/AccessibleCaretManager.cpp | 2 +- layout/base/FrameLayerBuilder.cpp | 35 +- layout/base/FrameLayerBuilder.h | 2 +- layout/base/MobileViewportManager.cpp | 3 +- layout/base/SelectionCarets.cpp | 4 +- layout/base/TouchCaret.cpp | 2 +- layout/base/Units.h | 58 +-- layout/base/ZoomConstraintsClient.cpp | 5 +- layout/base/nsDisplayList.cpp | 4 +- layout/base/nsLayoutUtils.cpp | 77 +-- layout/base/nsLayoutUtils.h | 8 + layout/base/nsPresContext.cpp | 4 +- layout/base/nsPresShell.cpp | 11 +- layout/generic/nsFrame.cpp | 7 +- layout/generic/nsPluginFrame.cpp | 3 +- layout/ipc/RenderFrameParent.cpp | 4 +- .../boxshadow-border-radius-int-ref.html | 31 ++ .../boxshadow-border-radius-int.html | 32 ++ .../boxshadow-inset-neg-spread.html | 17 + .../boxshadow-large-border-radius-ref.html | 37 ++ .../boxshadow-large-border-radius.html | 37 ++ .../box-shadow/boxshadow-rotated-ref.html | 15 + .../box-shadow/boxshadow-rotated.html | 16 + layout/reftests/box-shadow/reftest.list | 4 + layout/svg/nsFilterInstance.cpp | 6 +- layout/xul/PopupBoxObject.cpp | 2 +- layout/xul/nsMenuPopupFrame.cpp | 4 +- layout/xul/nsResizerFrame.cpp | 8 +- layout/xul/nsTitleBarFrame.cpp | 4 +- layout/xul/nsXULPopupManager.cpp | 4 +- mfbt/Assertions.h | 12 - mfbt/Tuple.h | 8 +- mfbt/TypeTraits.h | 95 ++++ mfbt/tests/TestTuple.cpp | 10 +- mfbt/tests/TestTypeTraits.cpp | 40 ++ python/mozbuild/mozbuild/action/buildlist.py | 2 +- python/mozbuild/mozbuild/base.py | 78 ++- python/mozbuild/mozbuild/jar.py | 251 ++++----- toolkit/locales/l10n.mk | 2 +- toolkit/mozapps/installer/packager.mk | 9 +- toolkit/mozapps/installer/upload-files.mk | 6 - toolkit/themes/linux/mozapps/jar.mn | 4 + toolkit/themes/osx/global/jar.mn | 4 + toolkit/themes/osx/mozapps/jar.mn | 4 + toolkit/themes/windows/global/jar.mn | 4 + toolkit/themes/windows/mozapps/jar.mn | 4 + view/nsView.cpp | 6 +- view/nsViewManager.cpp | 2 +- widget/PuppetWidget.cpp | 16 +- widget/PuppetWidget.h | 7 +- widget/cocoa/TextInputHandler.mm | 2 +- widget/cocoa/nsChildView.h | 8 +- widget/cocoa/nsChildView.mm | 30 +- widget/cocoa/nsCocoaWindow.h | 8 +- widget/cocoa/nsCocoaWindow.mm | 14 +- widget/gonk/HwcComposer2D.cpp | 7 +- widget/gonk/HwcUtils.cpp | 15 +- widget/gonk/nsAppShell.cpp | 2 +- widget/gonk/nsScreenManagerGonk.cpp | 7 +- widget/gonk/nsScreenManagerGonk.h | 2 +- widget/gonk/nsWindow.cpp | 10 +- widget/gonk/nsWindow.h | 2 +- widget/gtk/IMContextWrapper.cpp | 2 +- widget/gtk/nsDragService.cpp | 23 +- widget/gtk/nsDragService.h | 10 +- widget/gtk/nsWindow.cpp | 38 +- widget/gtk/nsWindow.h | 8 +- widget/nsBaseDragService.cpp | 7 +- widget/nsBaseDragService.h | 11 +- widget/nsBaseWidget.cpp | 37 +- widget/nsBaseWidget.h | 18 +- widget/nsIWidget.h | 73 ++- widget/nsNativeTheme.cpp | 2 +- widget/qt/nsWindow.cpp | 19 +- widget/qt/nsWindow.h | 5 +- widget/uikit/nsWindow.h | 2 +- widget/uikit/nsWindow.mm | 8 +- widget/windows/IMMHandler.cpp | 55 +- widget/windows/IMMHandler.h | 8 +- widget/windows/KeyboardLayout.cpp | 2 +- widget/windows/TSFTextStore.cpp | 10 +- widget/windows/WinMouseScrollHandler.cpp | 4 +- widget/windows/WinMouseScrollHandler.h | 2 +- widget/windows/nsWindow.cpp | 72 ++- widget/windows/nsWindow.h | 26 +- widget/windows/nsWindowBase.cpp | 2 +- widget/windows/nsWindowBase.h | 2 +- xpfe/appshell/nsWebShellWindow.cpp | 2 +- xpfe/appshell/nsXULWindow.cpp | 7 +- 177 files changed, 1889 insertions(+), 1461 deletions(-) create mode 100644 gfx/layers/IPDLActor.h create mode 100644 image/test/crashtests/1205923-1.html create mode 100644 image/test/crashtests/1212954-1.svg create mode 100644 image/test/crashtests/unsized-svg.svg create mode 100644 layout/reftests/box-shadow/boxshadow-border-radius-int-ref.html create mode 100644 layout/reftests/box-shadow/boxshadow-border-radius-int.html create mode 100644 layout/reftests/box-shadow/boxshadow-inset-neg-spread.html create mode 100644 layout/reftests/box-shadow/boxshadow-large-border-radius-ref.html create mode 100644 layout/reftests/box-shadow/boxshadow-large-border-radius.html create mode 100644 layout/reftests/box-shadow/boxshadow-rotated-ref.html create mode 100644 layout/reftests/box-shadow/boxshadow-rotated.html diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp index e57ae93933..4476ec33e6 100644 --- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -535,7 +535,7 @@ Accessible::ChildAtPoint(int32_t aX, int32_t aY, nsIWidget* rootWidget = rootFrame->GetView()->GetNearestWidget(nullptr); NS_ENSURE_TRUE(rootWidget, nullptr); - nsIntRect rootRect; + LayoutDeviceIntRect rootRect; rootWidget->GetScreenBounds(rootRect); WidgetMouseEvent dummyEvent(true, eMouseMove, rootWidget, diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp index b4ec2337f6..df992c2751 100644 --- a/accessible/generic/HyperTextAccessible.cpp +++ b/accessible/generic/HyperTextAccessible.cpp @@ -1285,34 +1285,34 @@ HyperTextAccessible::CaretLineNumber() return lineNumber; } -nsIntRect +LayoutDeviceIntRect HyperTextAccessible::GetCaretRect(nsIWidget** aWidget) { *aWidget = nullptr; RefPtr caret = mDoc->PresShell()->GetCaret(); - NS_ENSURE_TRUE(caret, nsIntRect()); + NS_ENSURE_TRUE(caret, LayoutDeviceIntRect()); bool isVisible = caret->IsVisible(); if (!isVisible) - return nsIntRect(); + return LayoutDeviceIntRect(); nsRect rect; nsIFrame* frame = caret->GetGeometry(&rect); if (!frame || rect.IsEmpty()) - return nsIntRect(); + return LayoutDeviceIntRect(); nsPoint offset; // Offset from widget origin to the frame origin, which includes chrome // on the widget. *aWidget = frame->GetNearestWidget(offset); - NS_ENSURE_TRUE(*aWidget, nsIntRect()); + NS_ENSURE_TRUE(*aWidget, LayoutDeviceIntRect()); rect.MoveBy(offset); - nsIntRect caretRect; - caretRect = rect.ToOutsidePixels(frame->PresContext()->AppUnitsPerDevPixel()); + LayoutDeviceIntRect caretRect = LayoutDeviceIntRect::FromUnknownRect( + rect.ToOutsidePixels(frame->PresContext()->AppUnitsPerDevPixel())); // ((content screen origin) - (content offset in the widget)) = widget origin on the screen - caretRect.MoveBy((*aWidget)->WidgetToScreenOffsetUntyped() - (*aWidget)->GetClientOffset()); + caretRect.MoveBy((*aWidget)->WidgetToScreenOffset() - (*aWidget)->GetClientOffset()); // Correct for character size, so that caret always matches the size of // the character. This is important for font size transitions, and is diff --git a/accessible/generic/HyperTextAccessible.h b/accessible/generic/HyperTextAccessible.h index 76807178fb..5b5251fa66 100644 --- a/accessible/generic/HyperTextAccessible.h +++ b/accessible/generic/HyperTextAccessible.h @@ -331,7 +331,7 @@ public: * @param [out] the widget containing the caret * @return the caret rect */ - nsIntRect GetCaretRect(nsIWidget** aWidget); + mozilla::LayoutDeviceIntRect GetCaretRect(nsIWidget** aWidget); /** * Return selected regions count within the accessible. diff --git a/accessible/windows/msaa/AccessibleWrap.cpp b/accessible/windows/msaa/AccessibleWrap.cpp index 978f7ed602..0155ab6502 100644 --- a/accessible/windows/msaa/AccessibleWrap.cpp +++ b/accessible/windows/msaa/AccessibleWrap.cpp @@ -1378,7 +1378,7 @@ AccessibleWrap::UpdateSystemCaretFor(Accessible* aAccessible) return; nsIWidget* widget = nullptr; - nsIntRect caretRect = text->GetCaretRect(&widget); + LayoutDeviceIntRect caretRect = text->GetCaretRect(&widget); HWND caretWnd; if (caretRect.IsEmpty() || !(caretWnd = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW))) { return; diff --git a/browser/base/content/sync/aboutSyncTabs.js b/browser/base/content/sync/aboutSyncTabs.js index 535c43e561..0c72ce6fb5 100644 --- a/browser/base/content/sync/aboutSyncTabs.js +++ b/browser/base/content/sync/aboutSyncTabs.js @@ -2,7 +2,7 @@ * 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/. */ -const Cu = Components.utils; +var Cu = Components.utils; Cu.import("resource://services-common/utils.js"); Cu.import("resource://services-sync/main.js"); diff --git a/browser/base/jar.mn b/browser/base/jar.mn index fb2207ac08..99afe0a513 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -81,7 +81,7 @@ browser.jar: content/browser/pageinfo/security.js (content/pageinfo/security.js) #ifdef MOZ_SERVICES_SYNC content/browser/sync/aboutSyncTabs.xul (content/sync/aboutSyncTabs.xul) - content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) +* content/browser/sync/aboutSyncTabs.js (content/sync/aboutSyncTabs.js) content/browser/sync/aboutSyncTabs.css (content/sync/aboutSyncTabs.css) content/browser/sync/aboutSyncTabs-bindings.xml (content/sync/aboutSyncTabs-bindings.xml) content/browser/sync/setup.xul (content/sync/setup.xul) diff --git a/browser/components/moz.build b/browser/components/moz.build index c87b6330af..3f92e577cb 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -11,6 +11,7 @@ DIRS += [ 'downloads', 'feeds', 'fuel', + 'migration', 'places', 'preferences', 'privatebrowsing', @@ -18,7 +19,6 @@ DIRS += [ 'sessionstore', 'shell', 'selfsupport', - 'migration', ] if CONFIG['MOZ_BROWSER_STATUSBAR']: diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index e2e3b52a23..6171240402 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -937,9 +937,6 @@ toolbar[iconsize="small"] #webrtc-status-button { .urlbar-icon { cursor: pointer; padding: 0 3px; - /* 16x16 icon with border-box sizing */ - width: 22px; - height: 16px; } #urlbar-search-splitter { diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 5ae75a89c9..c4578dd096 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -913,9 +913,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, .urlbar-icon { padding: 0 3px; - /* 16x16 icon with border-box sizing */ - width: 22px; - height: 16px; } .searchbar-engine-button, diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 0b17b121ea..90f1cb0b7d 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -1340,9 +1340,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, .urlbar-icon { padding: 0 3px; - /* 16x16 icon with border-box sizing */ - width: 22px; - height: 16px; } .searchbar-engine-button, diff --git a/build/valgrind/mach_commands.py b/build/valgrind/mach_commands.py index fb9e1f7db6..63c08a4347 100644 --- a/build/valgrind/mach_commands.py +++ b/build/valgrind/mach_commands.py @@ -92,6 +92,8 @@ class MachCommands(MachCommandBase): env['MOZ_CRASHREPORTER_NO_REPORT'] = '1' env['XPCOM_DEBUG_BREAK'] = 'warn' + env.update(self.extra_environment_variables) + outputHandler = OutputHandler() kp_kwargs = {'processOutputLine': [outputHandler]} diff --git a/config/config.mk b/config/config.mk index 6aa8174f0b..93ea65e467 100644 --- a/config/config.mk +++ b/config/config.mk @@ -115,7 +115,7 @@ FINAL_TARGET ?= $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)$(DIS FINAL_TARGET_FROZEN := '$(FINAL_TARGET)' ifdef XPI_NAME -DEFINES += -DXPI_NAME=$(XPI_NAME) +ACDEFINES += -DXPI_NAME=$(XPI_NAME) endif # The VERSION_NUMBER is suffixed onto the end of the DLLs we ship. @@ -430,8 +430,8 @@ OS_COMPILE_CMMFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch endif endif -COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CFLAGS) $(CFLAGS) $(MOZBUILD_CFLAGS) -COMPILE_CXXFLAGS = $(if $(DISABLE_STL_WRAPPING),,$(STL_FLAGS)) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CXXFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS) +COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS) $(CFLAGS) $(MOZBUILD_CFLAGS) +COMPILE_CXXFLAGS = $(if $(DISABLE_STL_WRAPPING),,$(STL_FLAGS)) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(OS_INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS) $(CXXFLAGS) $(MOZBUILD_CXXFLAGS) COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS) $(MOZBUILD_CMFLAGS) COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS) $(MOZBUILD_CMMFLAGS) ASFLAGS += $(MOZBUILD_ASFLAGS) @@ -551,7 +551,7 @@ sysinstall_cmd = install_cmd # overridden by the command line. (Besides, AB_CD is prettier). AB_CD = $(MOZ_UI_LOCALE) # Many locales directories want this definition. -DEFINES += -DAB_CD=$(AB_CD) +ACDEFINES += -DAB_CD=$(AB_CD) ifndef L10NBASEDIR L10NBASEDIR = $(error L10NBASEDIR not defined by configure) @@ -681,7 +681,5 @@ export CL_INCLUDES_PREFIX # non-English systems. export NONASCII -DEFINES += -DNO_NSPR_10_SUPPORT - # Freeze the values specified by moz.build to catch them if they fail. $(foreach var,$(_MOZBUILD_EXTERNAL_VARIABLES) $(_DEPRECATED_VARIABLES),$(eval $(var)_FROZEN := '$($(var))')) diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index aa5de0b0e1..96f9a41540 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -13,7 +13,7 @@ include $(topsrcdir)/config/config.mk XPI_NAME = test_jar_mn -DEFINES += \ +ACDEFINES += \ -DAB_CD=ab-X-stuff \ $(NULL) diff --git a/configure.in b/configure.in index 2c138a826f..13911cfd3d 100644 --- a/configure.in +++ b/configure.in @@ -3657,7 +3657,6 @@ MOZ_DISABLE_PARENTAL_CONTROLS=1 ENABLE_SYSTEM_EXTENSION_DIRS=1 MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= -MC_OFFICIAL=1 MOZ_FEEDS=1 MOZ_AUTH_EXTENSION=1 MOZ_RAW= @@ -4426,42 +4425,14 @@ MOZ_ARG_ENABLE_STRING(ui-locale, MOZ_UI_LOCALE=$enableval ) AC_SUBST(MOZ_UI_LOCALE) -dnl ======================================================== -dnl = Vendor override -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(official-vendor, -[ --disable-official-vendor Disable the use of official vendor.], - MC_OFFICIAL=, - MC_OFFICIAL=1) - -dnl ======================================================== -dnl = Trademarked Branding -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(official-branding, -[ --enable-official-branding - Enable official branding - Do not distribute builds with - --enable-official-branding unless you have - permission to use the name/logo per - http://www.palemoon.org/redist.shtml .], -[ +AC_SUBST(MOZ_OFFICIAL_BRANDING) +if test -n "$MOZ_OFFICIAL_BRANDING"; then if test -z "$MOZ_OFFICIAL_BRANDING_DIRECTORY"; then AC_MSG_ERROR([You must specify MOZ_OFFICIAL_BRANDING_DIRECTORY to use --enable-official-branding.]) else MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY} - MOZ_OFFICIAL_BRANDING=1 - MC_OFFICIAL=1 + AC_DEFINE(MOZ_OFFICIAL_BRANDING) fi -], MOZ_OFFICIAL_BRANDING=) - -AC_SUBST(MC_OFFICIAL) -if test -n "$MC_OFFICIAL"; then - AC_DEFINE(MC_OFFICIAL) -fi - -AC_SUBST(MOZ_OFFICIAL_BRANDING) -if test -n "$MOZ_OFFICIAL_BRANDING"; then - AC_DEFINE(MOZ_OFFICIAL_BRANDING) fi MOZ_ARG_WITH_STRING(branding, @@ -4481,22 +4452,6 @@ fi AC_SUBST(MOZ_BRANDING_DIRECTORY) -dnl ======================================================== -dnl = Private Build -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(private-build, -[ --enable-private-build Enable private builds - This allows you to build with official - branding for personal use only using any - build time configuration.], - MC_PRIVATE_BUILD=1, - MC_PRIVATE_BUILD=) - -AC_SUBST(MC_PRIVATE_BUILD) -if test -n "$MC_PRIVATE_BUILD"; then - AC_DEFINE(MC_PRIVATE_BUILD) -fi - dnl ======================================================== dnl = Distribution ID dnl ======================================================== @@ -8746,6 +8701,9 @@ if test -z "$JS_SHARED_LIBRARY"; then fi AC_SUBST(JS_SHARED_LIBRARY) +# Avoid using obsolete NSPR features +AC_DEFINE(NO_NSPR_10_SUPPORT) + MOZ_CREATE_CONFIG_STATUS() if test "$COMPILE_ENVIRONMENT"; then diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index ac520e79c1..6a62edb57f 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5758,7 +5758,7 @@ nsDocShell::GetPositionAndSize(int32_t* aX, int32_t* aY, int32_t* aWidth, { if (mParentWidget) { // ensure size is up-to-date if window has changed resolution - nsIntRect r; + LayoutDeviceIntRect r; mParentWidget->GetClientBounds(r); SetPositionAndSize(mBounds.x, mBounds.y, r.width, r.height, false); } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 5f2ad9e9a5..947d3fe262 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -5322,14 +5322,6 @@ static void ProcessViewportToken(nsIDocument *aDocument, #define IS_SEPARATOR(c) ((c == '=') || (c == ',') || (c == ';') || \ (c == '\t') || (c == '\n') || (c == '\r')) -/* static */ -nsViewportInfo -nsContentUtils::GetViewportInfo(nsIDocument *aDocument, - const ScreenIntSize& aDisplaySize) -{ - return aDocument->GetViewportInfo(aDisplaySize); -} - /* static */ nsresult nsContentUtils::ProcessViewportInfo(nsIDocument *aDocument, @@ -6996,38 +6988,6 @@ nsContentUtils::GetSelectionInTextControl(Selection* aSelection, aOutEndOffset = std::max(anchorOffset, focusOffset); } -/* static */ -nsRect -nsContentUtils::GetSelectionBoundingRect(Selection* aSel) -{ - nsRect res; - // Bounding client rect may be empty after calling GetBoundingClientRect - // when range is collapsed. So we get caret's rect when range is - // collapsed. - if (aSel->IsCollapsed()) { - nsIFrame* frame = nsCaret::GetGeometry(aSel, &res); - if (frame) { - nsIFrame* relativeTo = - nsLayoutUtils::GetContainingBlockForClientRect(frame); - res = nsLayoutUtils::TransformFrameRectToAncestor(frame, res, relativeTo); - } - } else { - int32_t rangeCount = aSel->RangeCount(); - nsLayoutUtils::RectAccumulator accumulator; - for (int32_t idx = 0; idx < rangeCount; ++idx) { - nsRange* range = aSel->GetRangeAt(idx); - nsRange::CollectClientRects(&accumulator, range, - range->GetStartParent(), range->StartOffset(), - range->GetEndParent(), range->EndOffset(), - true, false); - } - res = accumulator.mResultRect.IsEmpty() ? accumulator.mFirstRect : - accumulator.mResultRect; - } - - return res; -} - nsIEditor* nsContentUtils::GetHTMLEditor(nsPresContext* aPresContext) diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 611c6d9fc7..884eaf9d73 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1690,24 +1690,6 @@ public: */ static void RunInMetastableState(already_AddRefed aRunnable); - /** - * Retrieve information about the viewport as a data structure. - * This will return information in the viewport META data section - * of the document. This can be used in lieu of ProcessViewportInfo(), - * which places the viewport information in the document header instead - * of returning it directly. - * - * @param aDisplayWidth width of the on-screen display area for this - * document, in device pixels. - * @param aDisplayHeight height of the on-screen display area for this - * document, in device pixels. - * - * NOTE: If the site is optimized for mobile (via the doctype), this - * will return viewport information that specifies default information. - */ - static nsViewportInfo GetViewportInfo(nsIDocument* aDocument, - const mozilla::ScreenIntSize& aDisplaySize); - // Call EnterMicroTask when you're entering JS execution. // Usually the best way to do this is to use nsAutoMicroTask. static void EnterMicroTask(); @@ -2366,14 +2348,6 @@ public: int32_t& aOutStartOffset, int32_t& aOutEndOffset); - /** - * Takes a selection, and return selection's bounding rect which is relative - * to root frame. - * - * @param aSel Selection to check - */ - static nsRect GetSelectionBoundingRect(mozilla::dom::Selection* aSel); - /** * Takes a frame for anonymous content within a text control ( or *