Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1379421: followup: Remove more dead code, and mark RestyleManager::mType as protected. r=me

Browse Source 
The protected thing is needed to silence a clang warning about unused fields on
non-stylo builds.

MozReview-Commit-ID: CsFuIGmKfJx
This commit is contained in:
Emilio Cobos Álvarez 2017-07-09 03:29:18 +02:00
parent b79d78ab63
commit ffbc62fe44
3 changed files with 1 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/RestyleManager.h
View File

@ -256,9 +256,9 @@ private:
// they're referenced again later in the changelist.
mozilla::UniquePtr<nsTHashtable<nsPtrHashKey<const nsIFrame>>> mDestroyedFrames;
protected:
const StyleBackendType mType;
protected:
// True if we're in the middle of a nsRefreshDriver refresh
bool mInStyleRefresh;

22
layout/base/RestyleManagerHandle.h
View File

@ -104,16 +104,11 @@ public:
return reinterpret_cast<RestyleManager*>(mValue & ~SERVO_BIT);
}
// These inline methods are defined in RestyleManagerHandleInlines.h.
inline MozExternalRefCountType AddRef();
inline MozExternalRefCountType Release();
// Restyle manager interface. These inline methods are defined in
// RestyleManagerHandleInlines.h and just forward to the underlying
// GeckoRestyleManager or ServoRestyleManager. See corresponding comments
// in GeckoRestyleManager.h for descriptions of these methods.
inline void Disconnect();
inline void PostRestyleEvent(dom::Element* aElement,
nsRestyleHint aRestyleHint,
nsChangeHint aMinChangeHint);
@ -123,17 +118,6 @@ public:
inline void PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint,
nsRestyleHint aRestyleHint);
inline void ProcessPendingRestyles();
inline void ContentInserted(nsINode* aContainer,
nsIContent* aChild);
inline void ContentAppended(nsIContent* aContainer,
nsIContent* aFirstNewContent);
inline void ContentRemoved(nsINode* aContainer,
nsIContent* aOldChild,
nsIContent* aFollowingSibling);
inline void RestyleForInsertOrChange(nsINode* aContainer,
nsIContent* aChild);
inline void RestyleForAppend(nsIContent* aContainer,
nsIContent* aFirstNewContent);
inline nsresult ContentStateChanged(nsIContent* aContent,
EventStates aStateMask);
inline void AttributeWillChange(dom::Element* aElement,
@ -147,12 +131,6 @@ public:
int32_t aModType,
const nsAttrValue* aOldValue);
inline nsresult ReparentStyleContext(nsIFrame* aFrame);
inline uint64_t GetRestyleGeneration() const;
inline uint32_t GetHoverGeneration() const;
inline void SetObservingRefreshDriver(bool aObserving);
inline nsresult ProcessRestyledFrames(nsStyleChangeList& aChangeList);
inline void FlushOverflowChangedTracker();
inline void NotifyDestroyingFrame(nsIFrame* aFrame);
private:
// Stores a pointer to a GeckoRestyleManager or a ServoRestyleManager.

90
layout/base/RestyleManagerHandleInlines.h
View File

@ -21,24 +21,6 @@
namespace mozilla {
MozExternalRefCountType
RestyleManagerHandle::Ptr::AddRef()
{
FORWARD(AddRef, ());
}
MozExternalRefCountType
RestyleManagerHandle::Ptr::Release()
{
FORWARD(Release, ());
}
void
RestyleManagerHandle::Ptr::Disconnect()
{
FORWARD(Disconnect, ());
}
void
RestyleManagerHandle::Ptr::PostRestyleEvent(dom::Element* aElement,
nsRestyleHint aRestyleHint,
@ -74,54 +56,6 @@ RestyleManagerHandle::Ptr::ProcessPendingRestyles()
FORWARD(ProcessPendingRestyles, ());
}
nsresult
RestyleManagerHandle::Ptr::ProcessRestyledFrames(nsStyleChangeList& aChangeList)
{
FORWARD(ProcessRestyledFrames, (aChangeList));
}
void
RestyleManagerHandle::Ptr::FlushOverflowChangedTracker()
{
FORWARD(FlushOverflowChangedTracker, ());
}
void
RestyleManagerHandle::Ptr::ContentInserted(nsINode* aContainer,
nsIContent* aChild)
{
FORWARD(ContentInserted, (aContainer, aChild));
}
void
RestyleManagerHandle::Ptr::ContentAppended(nsIContent* aContainer,
nsIContent* aFirstNewContent)
{
FORWARD(ContentAppended, (aContainer, aFirstNewContent));
}
void
RestyleManagerHandle::Ptr::ContentRemoved(nsINode* aContainer,
nsIContent* aOldChild,
nsIContent* aFollowingSibling)
{
FORWARD(ContentRemoved, (aContainer, aOldChild, aFollowingSibling));
}
void
RestyleManagerHandle::Ptr::RestyleForInsertOrChange(nsINode* aContainer,
nsIContent* aChild)
{
FORWARD(RestyleForInsertOrChange, (aContainer, aChild));
}
void
RestyleManagerHandle::Ptr::RestyleForAppend(nsIContent* aContainer,
nsIContent* aFirstNewContent)
{
FORWARD(RestyleForAppend, (aContainer, aFirstNewContent));
}
nsresult
RestyleManagerHandle::Ptr::ContentStateChanged(nsIContent* aContent,
EventStates aStateMask)
@ -157,30 +91,6 @@ RestyleManagerHandle::Ptr::ReparentStyleContext(nsIFrame* aFrame)
FORWARD(ReparentStyleContext, (aFrame));
}
uint64_t
RestyleManagerHandle::Ptr::GetRestyleGeneration() const
{
FORWARD(GetRestyleGeneration, ());
}
uint32_t
RestyleManagerHandle::Ptr::GetHoverGeneration() const
{
FORWARD(GetHoverGeneration, ());
}
void
RestyleManagerHandle::Ptr::SetObservingRefreshDriver(bool aObserving)
{
FORWARD(SetObservingRefreshDriver, (aObserving));
}
void
RestyleManagerHandle::Ptr::NotifyDestroyingFrame(nsIFrame* aFrame)
{
FORWARD(NotifyDestroyingFrame, (aFrame));
}
} // namespace mozilla
#undef FORWARD