Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 07:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 6 changesets (bug 1921341, bug 1921268, bug 1921270, bug 1921269, bug 1921267, bug 1921276) for causing build bustages @ gfxSVGGlyphs.h CLOSED TREE

Browse Source 
Backed out changeset 2a5d5e7e863b (bug 1921341)
Backed out changeset 86df2445ee83 (bug 1921276)
Backed out changeset bf1b223af380 (bug 1921270)
Backed out changeset 4cdbd2521712 (bug 1921269)
Backed out changeset 6bb5d64f664a (bug 1921267)
Backed out changeset 7ec43f4b07ff (bug 1921268)
This commit is contained in:
Sandor Molnar 2024-10-03 02:05:13 +03:00
parent b707156786
commit 6f7a808f76
11 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/events/WheelHandlingHelper.cpp
View File

@ -118,9 +118,8 @@ WheelHandlingUtils::GetDisregardedWheelScrollDirection(const nsIFrame* aFrame) {
/* mozilla::WheelTransaction */
/******************************************************************/
MOZ_CONSTINIT AutoWeakFrame WheelTransaction::sScrollTargetFrame;
MOZ_CONSTINIT AutoWeakFrame WheelTransaction::sEventTargetFrame;
AutoWeakFrame WheelTransaction::sScrollTargetFrame(nullptr);
AutoWeakFrame WheelTransaction::sEventTargetFrame(nullptr);
bool WheelTransaction::sHandledByApz(false);
uint32_t WheelTransaction::sTime = 0;
uint32_t WheelTransaction::sMouseMoved = 0;
@ -474,9 +473,13 @@ DeltaValues WheelTransaction::OverrideSystemScrollSpeed(
/* mozilla::ScrollbarsForWheel */
/******************************************************************/
MOZ_CONSTINIT AutoWeakFrame ScrollbarsForWheel::sActiveOwner;
MOZ_CONSTINIT AutoWeakFrame
ScrollbarsForWheel::sActivatedScrollTargets[kNumberOfTargets];
const DeltaValues ScrollbarsForWheel::directions[kNumberOfTargets] = {
DeltaValues(-1, 0), DeltaValues(+1, 0), DeltaValues(0, -1),
DeltaValues(0, +1)};
AutoWeakFrame ScrollbarsForWheel::sActiveOwner = nullptr;
AutoWeakFrame ScrollbarsForWheel::sActivatedScrollTargets[kNumberOfTargets] = {
nullptr, nullptr, nullptr, nullptr};
bool ScrollbarsForWheel::sHadWheelStart = false;
bool ScrollbarsForWheel::sOwnWheelTransaction = false;

8
dom/events/WheelHandlingHelper.h
View File

@ -27,9 +27,9 @@ class ScrollContainerFrame;
*/
struct DeltaValues {
constexpr DeltaValues() : deltaX(0.0), deltaY(0.0) {}
DeltaValues() : deltaX(0.0), deltaY(0.0) {}
constexpr DeltaValues(double aDeltaX, double aDeltaY)
DeltaValues(double aDeltaX, double aDeltaY)
: deltaX(aDeltaX), deltaY(aDeltaY) {}
explicit DeltaValues(WidgetWheelEvent* aEvent);
@ -92,9 +92,7 @@ class ScrollbarsForWheel {
protected:
static const size_t kNumberOfTargets = 4;
static constexpr DeltaValues directions[kNumberOfTargets] = {
DeltaValues(-1, 0), DeltaValues(+1, 0), DeltaValues(0, -1),
DeltaValues(0, +1)};
static const DeltaValues directions[kNumberOfTargets];
static AutoWeakFrame sActiveOwner;
static AutoWeakFrame sActivatedScrollTargets[kNumberOfTargets];
static bool sHadWheelStart;

5
dom/smil/SMILMilestone.h
View File

@ -38,10 +38,9 @@ namespace mozilla {
*/
class SMILMilestone {
public:
constexpr SMILMilestone(SMILTime aTime, bool aIsEnd)
: mTime(aTime), mIsEnd(aIsEnd) {}
SMILMilestone(SMILTime aTime, bool aIsEnd) : mTime(aTime), mIsEnd(aIsEnd) {}
constexpr SMILMilestone() : mTime(0), mIsEnd(false) {}
SMILMilestone() : mTime(0), mIsEnd(false) {}
bool operator==(const SMILMilestone& aOther) const {
return mTime == aOther.mTime && mIsEnd == aOther.mIsEnd;

3
dom/smil/SMILTimedElement.cpp
View File

@ -201,6 +201,9 @@ const nsAttrValue::EnumTable SMILTimedElement::sRestartModeTable[] = {
{"never", RESTART_NEVER},
{nullptr, 0}};
const SMILMilestone SMILTimedElement::sMaxMilestone(
std::numeric_limits<SMILTime>::max(), false);
// The thresholds at which point we start filtering intervals and instance times
// indiscriminately.
// See FilterIntervals and FilterInstanceTimes.

4
dom/smil/SMILTimedElement.h
View File

@ -8,7 +8,6 @@
#define DOM_SMIL_SMILTIMEDELEMENT_H_
#include <utility>
#include <limits>
#include "mozilla/EventForwards.h"
#include "mozilla/SMILInstanceTime.h"
@ -586,8 +585,7 @@ class SMILTimedElement {
IntervalList mOldIntervals;
uint32_t mCurrentRepeatIteration;
SMILMilestone mPrevRegisteredMilestone;
static constexpr SMILMilestone sMaxMilestone = {
std::numeric_limits<SMILTime>::max(), false};
static const SMILMilestone sMaxMilestone;
static const uint8_t sMaxNumIntervals;
static const uint8_t sMaxNumInstanceTimes;

7
gfx/2d/Types.h
View File

@ -954,11 +954,10 @@ struct sRGBColor {
/* Color is stored in non-premultiplied form in device color space */
struct DeviceColor {
public:
constexpr DeviceColor() : r(0.0f), g(0.0f), b(0.0f), a(0.0f) {}
constexpr DeviceColor(Float aR, Float aG, Float aB, Float aA)
DeviceColor() : r(0.0f), g(0.0f), b(0.0f), a(0.0f) {}
DeviceColor(Float aR, Float aG, Float aB, Float aA)
: r(aR), g(aG), b(aB), a(aA) {}
constexpr DeviceColor(Float aR, Float aG, Float aB)
: r(aR), g(aG), b(aB), a(1.0f) {}
DeviceColor(Float aR, Float aG, Float aB) : r(aR), g(aG), b(aB), a(1.0f) {}
/* The following Mask* variants are helpers used to make it clear when a
* particular color is being used for masking purposes. These masks should

3
gfx/thebes/gfxSVGGlyphs.cpp
View File

@ -40,6 +40,9 @@ using namespace mozilla;
using mozilla::dom::Document;
using mozilla::dom::Element;
/* static */
const mozilla::gfx::DeviceColor SimpleTextContextPaint::sZero;
gfxSVGGlyphs::gfxSVGGlyphs(hb_blob_t* aSVGTable, gfxFontEntry* aFontEntry)
: mSVGData(aSVGTable), mFontEntry(aFontEntry) {
unsigned int length;

2
gfx/thebes/gfxSVGGlyphs.h
View File

@ -177,7 +177,7 @@ class gfxSVGGlyphs {
*/
class SimpleTextContextPaint : public mozilla::SVGContextPaint {
private:
static constexpr mozilla::gfx::DeviceColor sZero;
static const mozilla::gfx::DeviceColor sZero;
static gfxMatrix SetupDeviceToPatternMatrix(gfxPattern* aPattern,
const gfxMatrix& aCTM) {

2
layout/generic/nsIFrame.h
View File

@ -5627,7 +5627,7 @@ MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(nsIFrame::ReflowChildFlags)
class WeakFrame;
class MOZ_NONHEAP_CLASS AutoWeakFrame {
public:
explicit constexpr AutoWeakFrame() : mPrev(nullptr), mFrame(nullptr) {}
explicit AutoWeakFrame() : mPrev(nullptr), mFrame(nullptr) {}
AutoWeakFrame(const AutoWeakFrame& aOther) : mPrev(nullptr), mFrame(nullptr) {
Init(aOther.GetFrame());

4
netwerk/url-classifier/UrlClassifierFeatureFactory.cpp
View File

@ -308,10 +308,10 @@ struct BlockingErrorCode {
nsresult mErrorCode;
uint32_t mBlockingEventCode;
const char* mConsoleMessage;
nsLiteralCString mConsoleCategory;
nsCString mConsoleCategory;
};
static constexpr BlockingErrorCode sBlockingErrorCodes[] = {
static const BlockingErrorCode sBlockingErrorCodes[] = {
{NS_ERROR_TRACKING_URI,
nsIWebProgressListener::STATE_BLOCKED_TRACKING_CONTENT,
"TrackerUriBlocked", "Tracking Protection"_ns},

12
widget/gtk/nsWindow.cpp
View File

@ -186,12 +186,12 @@ constexpr GdkEventType GDK_TOUCHPAD_PINCH = static_cast<GdkEventType>(42);
#endif
constexpr gint kEvents =
GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
GDK_VISIBILITY_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SMOOTH_SCROLL_MASK |
GDK_TOUCH_MASK | GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK |
GDK_PROPERTY_CHANGE_MASK;
const gint kEvents = GDK_TOUCHPAD_GESTURE_MASK | GDK_EXPOSURE_MASK |
GDK_STRUCTURE_MASK | GDK_VISIBILITY_NOTIFY_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SCROLL_MASK |
GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
/* utility functions */
static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,