Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 74c5555

Browse files
committed
Backed out 28 changesets (bug 1550422) for marionette AssertionError and failing browser_policy_hardware_acceleration.js on a CLOSED TREE.
Backed out changeset 5dd10a365ba9 (bug 1550422) Backed out changeset 529f5be01ab9 (bug 1550422) Backed out changeset b6861d3badf8 (bug 1550422) Backed out changeset 059cff1a3dde (bug 1550422) Backed out changeset 6ada1116b241 (bug 1550422) Backed out changeset ca67e8e45262 (bug 1550422) Backed out changeset a1961a51ae44 (bug 1550422) Backed out changeset 1c90b9cb3ad4 (bug 1550422) Backed out changeset 285fa46e4f26 (bug 1550422) Backed out changeset e2938a444234 (bug 1550422) Backed out changeset 7a930fc51125 (bug 1550422) Backed out changeset 898ed02804fe (bug 1550422) Backed out changeset e1b7abc99ae9 (bug 1550422) Backed out changeset f781d415cef6 (bug 1550422) Backed out changeset 2fef10a7cce5 (bug 1550422) Backed out changeset ea64b4d8d4ff (bug 1550422) Backed out changeset 86a8ba1b755c (bug 1550422) Backed out changeset 9c0c9e80f309 (bug 1550422) Backed out changeset 10c153ddbaea (bug 1550422) Backed out changeset 60fe635ec2c9 (bug 1550422) Backed out changeset a38796266b28 (bug 1550422) Backed out changeset 2db647dcdf1c (bug 1550422) Backed out changeset 952ddac02972 (bug 1550422) Backed out changeset ba46b53643ec (bug 1550422) Backed out changeset ca47ef6c59f7 (bug 1550422) Backed out changeset f45f471a1a40 (bug 1550422) Backed out changeset 371b4da5b771 (bug 1550422) Backed out changeset 02fc78890032 (bug 1550422)
1 parent 752ec5c commit 74c5555

271 files changed

Lines changed: 3100 additions & 5293 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

devtools/server/actors/highlighters/utils/canvas.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ const { getComputedStyle } = require("./markup");
2727
//
2828
// This canvas size value is the safest we can use because most GPUs can handle it.
2929
// It's also far from the maximum canvas memory allocation limit (4096x4096x4 is
30-
// 67.108.864 bytes, where the limit is 500.000.000 bytes, see
31-
// MaxAllocSizeDoNotUseDirectly in:
32-
// https://searchfox.org/mozilla-central/source/modules/libpref/init/StaticPrefList.h).
30+
// 67.108.864 bytes, where the limit is 500.000.000 bytes, see:
31+
// http://searchfox.org/mozilla-central/source/gfx/thebes/gfxPrefs.h#401).
3332
//
3433
// Note:
3534
// Once bug 1232491 lands, we could try to refactor this code to use the values from

dom/base/Document.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
#include "nsWindowSizes.h"
269269
#include "mozilla/dom/Location.h"
270270
#include "mozilla/dom/FontFaceSet.h"
271+
#include "gfxPrefs.h"
271272
#include "nsISupportsPrimitives.h"
272273
#include "mozilla/ServoStyleSet.h"
273274
#include "mozilla/StyleSheet.h"
@@ -6927,7 +6928,7 @@ nsViewportInfo Document::GetViewportInfo(const ScreenIntSize& aDisplaySize) {
69276928
// Special behaviour for desktop mode, provided we are not on an about: page
69286929
nsPIDOMWindowOuter* win = GetWindow();
69296930
if (win && win->IsDesktopModeViewport() && !IsAboutPage()) {
6930-
CSSCoord viewportWidth = StaticPrefs::DesktopViewportWidth() / fullZoom;
6931+
CSSCoord viewportWidth = gfxPrefs::DesktopViewportWidth() / fullZoom;
69316932
CSSToScreenScale scaleToFit(aDisplaySize.width / viewportWidth);
69326933
float aspectRatio = (float)aDisplaySize.height / aDisplaySize.width;
69336934
CSSSize viewportSize(viewportWidth, viewportWidth * aspectRatio);
@@ -7065,7 +7066,7 @@ nsViewportInfo Document::GetViewportInfo(const ScreenIntSize& aDisplaySize) {
70657066
nsViewportInfo::ZoomFlag effectiveZoomFlag =
70667067
mAllowZoom ? nsViewportInfo::ZoomFlag::AllowZoom
70677068
: nsViewportInfo::ZoomFlag::DisallowZoom;
7068-
if (StaticPrefs::ForceUserScalable()) {
7069+
if (gfxPrefs::ForceUserScalable()) {
70697070
// If the pref to force user-scalable is enabled, we ignore the values
70707071
// from the meta-viewport tag for these properties and just assume they
70717072
// allow the page to be scalable. Note in particular that this code is
@@ -7178,7 +7179,7 @@ nsViewportInfo Document::GetViewportInfo(const ScreenIntSize& aDisplaySize) {
71787179
// Divide by fullZoom to stretch CSS pixel size of viewport in order
71797180
// to keep device pixel size unchanged after full zoom applied.
71807181
// See bug 974242.
7181-
width = StaticPrefs::DesktopViewportWidth() / fullZoom;
7182+
width = gfxPrefs::DesktopViewportWidth() / fullZoom;
71827183
} else {
71837184
// Some viewport information was provided; follow the spec.
71847185
width = displaySize.width;

dom/base/TextInputProcessor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* License, v. 2.0. If a copy of the MPL was not distributed with this
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
66

7+
#include "gfxPrefs.h"
78
#include "mozilla/dom/Event.h"
89
#include "mozilla/EventForwards.h"
910
#include "mozilla/Maybe.h"
@@ -389,7 +390,7 @@ nsresult TextInputProcessor::BeginInputTransactionInternal(
389390

390391
nsresult rv = NS_OK;
391392
if (aForTests) {
392-
bool isAPZAware = StaticPrefs::TestEventsAsyncEnabled();
393+
bool isAPZAware = gfxPrefs::TestEventsAsyncEnabled();
393394
rv = dispatcher->BeginTestInputTransaction(this, isAPZAware);
394395
} else {
395396
rv = dispatcher->BeginInputTransaction(this);

dom/base/nsContentUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// is included in mozAutoDocUpdate.h.
3131
#include "nsNPAPIPluginInstance.h"
3232
#include "gfxDrawable.h"
33-
#include "mozilla/StaticPrefs.h"
33+
#include "gfxPrefs.h"
3434
#include "ImageOps.h"
3535
#include "mozAutoDocUpdate.h"
3636
#include "mozilla/AntiTrackingCommon.h"
@@ -7897,7 +7897,7 @@ nsresult nsContentUtils::SendMouseEvent(
78977897
}
78987898
return presShell->HandleEvent(view->GetFrame(), &event, false, &status);
78997899
}
7900-
if (StaticPrefs::TestEventsAsyncEnabled()) {
7900+
if (gfxPrefs::TestEventsAsyncEnabled()) {
79017901
status = widget->DispatchInputEvent(&event);
79027902
} else {
79037903
nsresult rv = widget->DispatchEvent(&event, status);

dom/base/nsDOMWindowUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#include "mozilla/MiscEvents.h"
4747
#include "mozilla/MouseEvents.h"
4848
#include "mozilla/PresShell.h"
49-
#include "mozilla/StaticPrefs.h"
5049
#include "mozilla/TextEvents.h"
5150
#include "mozilla/TextEventDispatcher.h"
5251
#include "mozilla/TouchEvents.h"
@@ -70,6 +69,7 @@
7069
#endif
7170

7271
#include "Layers.h"
72+
#include "gfxPrefs.h"
7373

7474
#include "mozilla/dom/AudioDeviceInfo.h"
7575
#include "mozilla/dom/Element.h"
@@ -470,7 +470,7 @@ nsDOMWindowUtils::SetDisplayPortForElement(float aXPx, float aYPx,
470470
new DisplayPortPropertyData(displayport, aPriority),
471471
nsINode::DeleteProperty<DisplayPortPropertyData>);
472472

473-
if (StaticPrefs::LayoutUseContainersForRootFrames()) {
473+
if (gfxPrefs::LayoutUseContainersForRootFrames()) {
474474
nsIFrame* rootScrollFrame = presShell->GetRootScrollFrame();
475475
if (rootScrollFrame && aElement == rootScrollFrame->GetContent() &&
476476
nsLayoutUtils::UsesAsyncScrolling(rootScrollFrame)) {

dom/base/nsImageLoadingContent.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
#include "nsIContentPolicy.h"
4040
#include "SVGObserverUtils.h"
4141

42+
#include "gfxPrefs.h"
43+
4244
#include "mozAutoDocUpdate.h"
4345
#include "mozilla/AsyncEventDispatcher.h"
4446
#include "mozilla/AutoRestore.h"
@@ -527,7 +529,7 @@ void nsImageLoadingContent::MaybeForceSyncDecoding(
527529
// attribute on a timer.
528530
TimeStamp now = TimeStamp::Now();
529531
TimeDuration threshold = TimeDuration::FromMilliseconds(
530-
StaticPrefs::ImageInferSrcAnimationThresholdMS());
532+
gfxPrefs::ImageInferSrcAnimationThresholdMS());
531533

532534
// If the length of time between request changes is less than the threshold,
533535
// then force sync decoding to eliminate flicker from the animation.

dom/canvas/CanvasRenderingContext2D.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#include "gfxPlatform.h"
5252
#include "gfxFont.h"
5353
#include "gfxBlur.h"
54+
#include "gfxPrefs.h"
5455
#include "gfxTextRun.h"
5556
#include "gfxUtils.h"
5657

@@ -92,7 +93,6 @@
9293
#include "mozilla/MathAlgorithms.h"
9394
#include "mozilla/Preferences.h"
9495
#include "mozilla/ServoBindings.h"
95-
#include "mozilla/StaticPrefs.h"
9696
#include "mozilla/Telemetry.h"
9797
#include "mozilla/TimeStamp.h"
9898
#include "mozilla/UniquePtr.h"
@@ -1231,8 +1231,8 @@ bool CanvasRenderingContext2D::EnsureTarget(const gfx::Rect* aCoveredRect,
12311231
}
12321232

12331233
// Check that the dimensions are sane
1234-
if (mWidth > StaticPrefs::MaxCanvasSize() ||
1235-
mHeight > StaticPrefs::MaxCanvasSize() || mWidth < 0 || mHeight < 0) {
1234+
if (mWidth > gfxPrefs::MaxCanvasSize() ||
1235+
mHeight > gfxPrefs::MaxCanvasSize() || mWidth < 0 || mHeight < 0) {
12361236
SetErrorState();
12371237
return false;
12381238
}

dom/canvas/WebGL2Context.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "WebGL2Context.h"
77

8-
#include "mozilla/StaticPrefs.h"
8+
#include "gfxPrefs.h"
99
#include "GLContext.h"
1010
#include "mozilla/dom/WebGL2RenderingContextBinding.h"
1111
#include "mozilla/ArrayUtils.h"
@@ -31,7 +31,7 @@ UniquePtr<webgl::FormatUsageAuthority> WebGL2Context::CreateFormatUsage(
3131
}
3232

3333
/*static*/
34-
bool WebGL2Context::IsSupported() { return StaticPrefs::WebGL2Enabled(); }
34+
bool WebGL2Context::IsSupported() { return gfxPrefs::WebGL2Enabled(); }
3535

3636
/*static*/
3737
WebGL2Context* WebGL2Context::Create() { return new WebGL2Context(); }

dom/canvas/WebGL2ContextQueries.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "WebGL2Context.h"
77
#include "GLContext.h"
88
#include "WebGLQuery.h"
9+
#include "gfxPrefs.h"
910
#include "nsThreadUtils.h"
1011

1112
namespace mozilla {

dom/canvas/WebGL2ContextSync.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ GLenum WebGL2Context::ClientWaitSync(const WebGLSync& sync, GLbitfield flags,
6767
}
6868

6969
const bool canBeAvailable =
70-
(sync.mCanBeAvailable || StaticPrefs::WebGLImmediateQueries());
70+
(sync.mCanBeAvailable || gfxPrefs::WebGLImmediateQueries());
7171
if (!canBeAvailable) {
7272
if (timeout) {
7373
GenerateWarning(
@@ -118,7 +118,7 @@ void WebGL2Context::GetSyncParameter(JSContext*, const WebGLSync& sync,
118118
////
119119

120120
const bool canBeAvailable =
121-
(sync.mCanBeAvailable || StaticPrefs::WebGLImmediateQueries());
121+
(sync.mCanBeAvailable || gfxPrefs::WebGLImmediateQueries());
122122
if (!canBeAvailable && pname == LOCAL_GL_SYNC_STATUS) {
123123
retval.set(JS::Int32Value(LOCAL_GL_UNSIGNALED));
124124
return;

0 commit comments

Comments
 (0)