Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1667176 - Miscellaneous unified build fixes. r=mattwoodrow

Browse Source 
Upcoming patches shift around which files get unified and expose these build
failures.

Differential Revision: https://phabricator.services.mozilla.com/D91332
This commit is contained in:
Kartikaya Gupta 2020-09-25 08:57:23 +00:00
parent 234fe8f57a
commit aaef0a4678
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/components/shell/nsGNOMEShellSearchProvider.cpp
View File

@ -15,6 +15,7 @@
#include "base/task.h" // for NewRunnableMethod, etc
#include "nsIServiceManager.h"
#include "nsNetCID.h"
#include "nsPrintfCString.h"
#include "nsIIOService.h"
#include <dbus/dbus.h>

1
dom/serviceworkers/ServiceWorkerUtils.cpp
View File

@ -12,6 +12,7 @@
#include "nsCOMPtr.h"
#include "nsIPrincipal.h"
#include "nsIURL.h"
#include "nsPrintfCString.h"
namespace mozilla {
namespace dom {

9
gfx/layers/apz/src/AsyncPanZoomController.cpp
View File

@ -60,6 +60,7 @@
#include "mozilla/dom/CheckerboardReportService.h" // for CheckerboardEventStorage
// note: CheckerboardReportService.h actually lives in gfx/layers/apz/util/
#include "mozilla/dom/Touch.h" // for Touch
#include "mozilla/gfx/gfxVars.h" // for gfxVars
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "mozilla/gfx/Point.h" // for Point, RoundedToInt, etc
@ -3626,9 +3627,9 @@ void AsyncPanZoomController::ScaleWithFocus(float aScale,
/*static*/
gfx::IntSize AsyncPanZoomController::GetDisplayportAlignmentMultiplier(
const ScreenSize& aBaseSize) {
MOZ_ASSERT(gfxVars::UseWebRender());
MOZ_ASSERT(gfx::gfxVars::UseWebRender());
IntSize multiplier(1, 1);
gfx::IntSize multiplier(1, 1);
float baseWidth = aBaseSize.width;
while (baseWidth > 500) {
baseWidth /= 2;
@ -3673,7 +3674,7 @@ static CSSSize CalculateDisplayPortSize(const CSSSize& aCompositionSize,
yMultiplier += StaticPrefs::apz_y_skate_highmem_adjust();
}
if (gfxVars::UseWebRender()) {
if (gfx::gfxVars::UseWebRender()) {
// Scale down the margin multipliers by the alignment multiplier because
// the alignment code will expand the displayport outward to the multiplied
// alignment. This is not necessary for correctness, but for performance;
@ -3684,7 +3685,7 @@ static CSSSize CalculateDisplayPortSize(const CSSSize& aCompositionSize,
// calculation doesn't cancel exactly the increased margin from applying
// the alignment multiplier, but this is simple and should provide
// reasonable behaviour in most cases.
IntSize alignmentMultipler =
gfx::IntSize alignmentMultipler =
AsyncPanZoomController::GetDisplayportAlignmentMultiplier(
aCompositionSize * aDpPerCSS);
if (xMultiplier > 1) {

1
gfx/layers/apz/util/DoubleTapToZoom.cpp
View File

@ -16,6 +16,7 @@
#include "mozilla/dom/Document.h"
#include "nsIFrame.h"
#include "nsIFrameInlines.h"
#include "nsIScrollableFrame.h"
#include "nsLayoutUtils.h"
#include "nsStyleConsts.h"

1
gfx/webrender_bindings/DCLayerTree.cpp
View File

@ -15,6 +15,7 @@
#include "mozilla/webrender/RenderTextureHost.h"
#include "mozilla/webrender/RenderThread.h"
#include "mozilla/Telemetry.h"
#include "nsPrintfCString.h"
#undef _WIN32_WINNT
#define _WIN32_WINNT _WIN32_WINNT_WINBLUE

1
gfx/webrender_bindings/RenderCompositorANGLE.cpp
View File

@ -22,6 +22,7 @@
#include "mozilla/widget/WinCompositorWidget.h"
#include "mozilla/WindowsVersion.h"
#include "mozilla/Telemetry.h"
#include "nsPrintfCString.h"
#include "FxROutputHandler.h"
#undef NTDDI_VERSION