Bug 1361843 part 4. Remove the now-unused mBatching member of ServoStyleSet. r?emilio draft
authorBoris Zbarsky <bzbarsky@mit.edu>
Wed, 10 May 2017 13:13:50 -0400
changeset 575567 a70cae92b1883c7b515dbcf0c1d02bf948f6e610
parent 575566 a64c242e8f95ab3aa5fae8fcd30decd9bd0af670
child 627960 521c5ecf46c75603c77229d3e4db45f3fca66dcb
push id58101
push userbzbarsky@mozilla.com
push dateWed, 10 May 2017 17:14:15 +0000
reviewersemilio
bugs1361843
milestone55.0a1
Bug 1361843 part 4. Remove the now-unused mBatching member of ServoStyleSet. r?emilio MozReview-Commit-ID: DvyZkQh6q8A
layout/style/ServoStyleSet.cpp
layout/style/ServoStyleSet.h
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -25,17 +25,16 @@
 #include "nsStyleContext.h"
 #include "nsStyleSet.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 ServoStyleSet::ServoStyleSet()
   : mPresContext(nullptr)
-  , mBatching(0)
   , mUniqueIDCounter(0)
   , mAllowResolveStaleStyles(false)
   , mAuthorStyleDisabled(false)
   , mStylistMayNeedRebuild(false)
 {
 }
 
 ServoStyleSet::~ServoStyleSet()
@@ -159,24 +158,21 @@ ServoStyleSet::SetAuthorStyleDisabled(bo
   // notification on content documents?
 
   return NS_OK;
 }
 
 void
 ServoStyleSet::BeginUpdate()
 {
-  ++mBatching;
 }
 
 nsresult
 ServoStyleSet::EndUpdate()
 {
-  MOZ_ASSERT(mBatching > 0);
-  --mBatching;
   return NS_OK;
 }
 
 already_AddRefed<nsStyleContext>
 ServoStyleSet::ResolveStyleFor(Element* aElement,
                                nsStyleContext* aParentContext,
                                LazyComputeBehavior aMayCompute)
 {
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -446,17 +446,16 @@ private:
     // nsIDocument::FindDocStyleSheetInsertionPoint.
     operator ServoStyleSheet*() const { return sheet; }
   };
 
   nsPresContext* mPresContext;
   UniquePtr<RawServoStyleSet> mRawSet;
   EnumeratedArray<SheetType, SheetType::Count,
                   nsTArray<Entry>> mEntries;
-  int32_t mBatching;
   uint32_t mUniqueIDCounter;
   bool mAllowResolveStaleStyles;
   bool mAuthorStyleDisabled;
   bool mStylistMayNeedRebuild;
 
   // Stores pointers to our cached style contexts for non-inheriting anonymous
   // boxes.
   EnumeratedArray<nsCSSAnonBoxes::NonInheriting,