Bug 1379529 - drop AllowResolveStaleStyles flag. r?emilio
It's no longer used since
bug 1357142.
MozReview-Commit-ID: LqNQTux2OZl
--- a/layout/style/ServoBindingList.h
+++ b/layout/style/ServoBindingList.h
@@ -480,18 +480,17 @@ SERVO_BINDING_FUNC(Servo_Initialize, voi
SERVO_BINDING_FUNC(Servo_Shutdown, void)
// Restyle and change hints.
SERVO_BINDING_FUNC(Servo_NoteExplicitHints, void, RawGeckoElementBorrowed element,
nsRestyleHint restyle_hint, nsChangeHint change_hint)
SERVO_BINDING_FUNC(Servo_TakeChangeHint, nsChangeHint, RawGeckoElementBorrowed element)
SERVO_BINDING_FUNC(Servo_ResolveStyle, ServoComputedValuesStrong,
RawGeckoElementBorrowed element,
- RawServoStyleSetBorrowed set,
- bool allow_stale)
+ RawServoStyleSetBorrowed set)
SERVO_BINDING_FUNC(Servo_ResolvePseudoStyle, ServoComputedValuesStrong,
RawGeckoElementBorrowed element,
mozilla::CSSPseudoElementType pseudo_type,
bool is_probe,
ServoComputedValuesBorrowedOrNull inherited_style,
RawServoStyleSetBorrowed set)
SERVO_BINDING_FUNC(Servo_SetExplicitStyle, void,
RawGeckoElementBorrowed element,
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -32,17 +32,16 @@
#include "nsStyleSet.h"
#include "gfxUserFontSet.h"
using namespace mozilla;
using namespace mozilla::dom;
ServoStyleSet::ServoStyleSet()
: mPresContext(nullptr)
- , mAllowResolveStaleStyles(false)
, mAuthorStyleDisabled(false)
, mStylistState(StylistState::NotDirty)
, mUserFontSetUpdateGeneration(0)
, mNeedsRestyleAfterEnsureUniqueInner(false)
{
}
ServoStyleSet::~ServoStyleSet()
@@ -491,18 +490,18 @@ ServoStyleSet::ResolvePseudoElementStyle
{
UpdateStylistIfNeeded();
MOZ_ASSERT(aType < CSSPseudoElementType::Count);
RefPtr<ServoComputedValues> computedValues;
if (aPseudoElement) {
MOZ_ASSERT(aType == aPseudoElement->GetPseudoElementType());
- computedValues = Servo_ResolveStyle(aPseudoElement, mRawSet.get(),
- mAllowResolveStaleStyles).Consume();
+ computedValues = Servo_ResolveStyle(aPseudoElement,
+ mRawSet.get()).Consume();
} else {
const ServoComputedValues* parentStyle =
aParentContext ? aParentContext->ComputedValues() : nullptr;
computedValues =
Servo_ResolvePseudoStyle(aOriginatingElement,
aType,
/* is_probe = */ false,
parentStyle,
@@ -1147,18 +1146,17 @@ ServoStyleSet::CompatibilityModeChanged(
{
Servo_StyleSet_CompatModeChanged(mRawSet.get());
}
already_AddRefed<ServoComputedValues>
ServoStyleSet::ResolveServoStyle(Element* aElement)
{
UpdateStylistIfNeeded();
- return Servo_ResolveStyle(aElement, mRawSet.get(),
- mAllowResolveStaleStyles).Consume();
+ return Servo_ResolveStyle(aElement, mRawSet.get()).Consume();
}
void
ServoStyleSet::ClearNonInheritingStyleContexts()
{
for (RefPtr<nsStyleContext>& ptr : mNonInheritingStyleContexts) {
ptr = nullptr;
}
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -72,39 +72,16 @@ MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(St
* Stylist. A ServoStyleSet contains ServoStyleSheets.
*/
class ServoStyleSet
{
friend class ServoRestyleManager;
typedef ServoElementSnapshotTable SnapshotTable;
public:
- class AutoAllowStaleStyles
- {
- public:
- explicit AutoAllowStaleStyles(ServoStyleSet* aStyleSet)
- : mStyleSet(aStyleSet)
- {
- if (mStyleSet) {
- MOZ_ASSERT(!mStyleSet->mAllowResolveStaleStyles);
- mStyleSet->mAllowResolveStaleStyles = true;
- }
- }
-
- ~AutoAllowStaleStyles()
- {
- if (mStyleSet) {
- mStyleSet->mAllowResolveStaleStyles = false;
- }
- }
-
- private:
- ServoStyleSet* mStyleSet;
- };
-
static bool IsInServoTraversal()
{
// The callers of this function are generally main-thread-only _except_
// for potentially running during the Servo traversal, in which case they may
// take special paths that avoid writing to caches and the like. In order
// to allow those callers to branch efficiently without checking TLS, we
// maintain this static boolean. However, the danger is that those callers
// are generally unprepared to deal with non-Servo-but-also-non-main-thread
@@ -598,17 +575,16 @@ private:
void RemoveSheetOfType(SheetType aType,
ServoStyleSheet* aSheet);
nsPresContext* mPresContext;
UniquePtr<RawServoStyleSet> mRawSet;
EnumeratedArray<SheetType, SheetType::Count,
nsTArray<RefPtr<ServoStyleSheet>>> mSheets;
- bool mAllowResolveStaleStyles;
bool mAuthorStyleDisabled;
StylistState mStylistState;
uint64_t mUserFontSetUpdateGeneration;
bool mNeedsRestyleAfterEnsureUniqueInner;
// Stores pointers to our cached style contexts for non-inheriting anonymous
// boxes.